From ac1b67140b26ff886791aacebf7d60b19973fd1b Mon Sep 17 00:00:00 2001 From: K0RB4K Date: Thu, 26 Jan 2023 11:14:01 +0100 Subject: [PATCH] netbox optimized --- .../LaserCutter/laser_cutter-Body.mat | 2 +- .../LaserCutter/laser_cutter-ButtonPanel.mat | 7 ++-- Assets/Models/Blender/NetworkBox.blend | 4 +- Assets/Models/Blender/NetworkBox.mtl | 42 +++++++++++++++++++ Assets/Models/Blender/NetworkBox.obj | 3 ++ Assets/Models/NetworkBox.prefab | 42 +++++++------------ .../Texture/NetworkBox-Plate_displacement.png | 3 ++ Assets/Texture/NetworkBox-Plate_emit.png | 3 ++ 8 files changed, 72 insertions(+), 34 deletions(-) create mode 100644 Assets/Models/Blender/NetworkBox.mtl create mode 100644 Assets/Models/Blender/NetworkBox.obj create mode 100644 Assets/Texture/NetworkBox-Plate_displacement.png create mode 100644 Assets/Texture/NetworkBox-Plate_emit.png diff --git a/Assets/Materials/LaserCutter/laser_cutter-Body.mat b/Assets/Materials/LaserCutter/laser_cutter-Body.mat index 15aa1c6..0f40dfa 100644 --- a/Assets/Materials/LaserCutter/laser_cutter-Body.mat +++ b/Assets/Materials/LaserCutter/laser_cutter-Body.mat @@ -41,7 +41,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 8900000, guid: 7f32f8b63134c7d4b8ab68753766fe9e, type: 3} + m_Texture: {fileID: 2800000, guid: 602e4c3a1e6ec60408f569ce334f7858, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/LaserCutter/laser_cutter-ButtonPanel.mat b/Assets/Materials/LaserCutter/laser_cutter-ButtonPanel.mat index 4b39245..9289141 100644 --- a/Assets/Materials/LaserCutter/laser_cutter-ButtonPanel.mat +++ b/Assets/Materials/LaserCutter/laser_cutter-ButtonPanel.mat @@ -9,7 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: laser_cutter-ButtonPanel m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ValidKeywords: [] + m_ValidKeywords: + - _NORMALMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -21,7 +22,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 1e8dd0347e235b6e8b9daeeb84efb86b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -41,7 +42,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0117f57889f31eca9b830c954f9f6af3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Blender/NetworkBox.blend b/Assets/Models/Blender/NetworkBox.blend index daf7845..95f5cdd 100644 --- a/Assets/Models/Blender/NetworkBox.blend +++ b/Assets/Models/Blender/NetworkBox.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7b52cbaec4a876509c299e9fe2697dc01651242d9e5c4fbaa1b0b82a722e957c -size 2049264 +oid sha256:2869ac89265653342b893fd1d101a5ecb5ac48d4ab99b2fcd25b19f6b2347cea +size 2179948 diff --git a/Assets/Models/Blender/NetworkBox.mtl b/Assets/Models/Blender/NetworkBox.mtl new file mode 100644 index 0000000..9a984c4 --- /dev/null +++ b/Assets/Models/Blender/NetworkBox.mtl @@ -0,0 +1,42 @@ +# Blender 3.4.1 MTL File: 'NetworkBox.blend' +# www.blender.org + +newmtl Casing +Kd 0.007039 0.007039 0.007039 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.450000 +d 1.000000 +illum 3 +Pr 0.709945 +Pm 0.867403 +Ps 0.000000 +Pc 0.000000 +Pcr 0.030000 +aniso 0.000000 +anisor 0.000000 + +newmtl Glass +Kd 0.800000 0.800000 0.800000 +Ks 0.500000 0.500000 0.500000 +Ke 0.000000 0.000000 0.000000 +Ni 1.000000 +d 1.000000 +illum 2 +Pr 0.400000 +Pm 0.000000 + +newmtl Plate +Ks 0.000000 0.000000 0.000000 +Ni 1.450000 +illum 1 +Pr 0.500000 +Pm 0.400000 +Ps 0.160221 +Pc 0.000000 +Pcr 0.030000 +aniso 0.000000 +anisor 0.000000 +map_Kd /home/k0rb4k/projects/Phillipes_Fablab/Assets/Texture/NetworkBox-Plate_displacement.png +map_Ke /home/k0rb4k/projects/Phillipes_Fablab/Assets/Texture/NetworkBox-Plate_emit.png +map_d /home/k0rb4k/projects/Phillipes_Fablab/Assets/Texture/NetworkBox-Plate_displacement.png diff --git a/Assets/Models/Blender/NetworkBox.obj b/Assets/Models/Blender/NetworkBox.obj new file mode 100644 index 0000000..4f757b6 --- /dev/null +++ b/Assets/Models/Blender/NetworkBox.obj @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fbeb76d7a134bcb88504afb4d0075046822ded66708e42d88ee3a14de2e1a02 +size 8942 diff --git a/Assets/Models/NetworkBox.prefab b/Assets/Models/NetworkBox.prefab index ca70ab7..4216c2c 100644 --- a/Assets/Models/NetworkBox.prefab +++ b/Assets/Models/NetworkBox.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2103288803068313405 +--- !u!1 &7577333752425881301 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,10 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1620084931302598023} - - component: {fileID: 2437689005040347682} - - component: {fileID: 446030592625008360} - - component: {fileID: 4371612890181493847} + - component: {fileID: 7089730460097201263} + - component: {fileID: 6182338237463481290} + - component: {fileID: 8226076056436850432} m_Layer: 0 m_Name: NetworkBox m_TagString: Untagged @@ -19,36 +18,36 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1620084931302598023 +--- !u!4 &7089730460097201263 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2103288803068313405} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.0622735, y: 2.003796, z: 1.37} - m_LocalScale: {x: 0.255, y: 0.092, z: 0.002} + m_GameObject: {fileID: 7577333752425881301} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 5.312, y: 2.4525094, z: 2.831812} + m_LocalScale: {x: 0.255, y: 0.0024999995, z: 0.09232478} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &2437689005040347682 +--- !u!33 &6182338237463481290 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2103288803068313405} + m_GameObject: {fileID: 7577333752425881301} m_Mesh: {fileID: -855889283239656021, guid: 06a516c85ff4592d3931610c846b8363, type: 3} ---- !u!23 &446030592625008360 +--- !u!23 &8226076056436850432 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2103288803068313405} + m_GameObject: {fileID: 7577333752425881301} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -63,7 +62,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: 5296590585878813031, guid: 06a516c85ff4592d3931610c846b8363, type: 3} - - {fileID: 2100000, guid: e7f8455d46288cb12b49d5367b543018, type: 2} + - {fileID: 8556262120643298411, guid: 06a516c85ff4592d3931610c846b8363, type: 3} - {fileID: -6518380632535569532, guid: 06a516c85ff4592d3931610c846b8363, type: 3} m_StaticBatchInfo: firstSubMesh: 0 @@ -86,16 +85,3 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &4371612890181493847 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2103288803068313405} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 2, y: 2.003796, z: 190} - m_Center: {x: 0, y: -0.0018980505, z: 93} diff --git a/Assets/Texture/NetworkBox-Plate_displacement.png b/Assets/Texture/NetworkBox-Plate_displacement.png new file mode 100644 index 0000000..6af6708 --- /dev/null +++ b/Assets/Texture/NetworkBox-Plate_displacement.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53652f7ff104dd6e4446ef71223d14870bec6b232d8d7edbcafbc210c92c4480 +size 19621 diff --git a/Assets/Texture/NetworkBox-Plate_emit.png b/Assets/Texture/NetworkBox-Plate_emit.png new file mode 100644 index 0000000..7937bbe --- /dev/null +++ b/Assets/Texture/NetworkBox-Plate_emit.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c26210ffc8e7d6e79129ee29a4a2401fc13bb9f757d4ec8ed057bc5ece3258c +size 15748