From 41065ecea559eecc0ca7e69fffff7ec4d7c6d79e Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Fri, 6 Jan 2023 08:55:48 +0100 Subject: [PATCH] Tri --- .../chair => Materials}/Chair wheels.physicMaterial | 0 .../Chair wheels.physicMaterial.meta | 0 .../Ultimaker.meta => Materials/Environment.meta} | 2 +- Assets/{ => Materials/Environment}/FabLab Floor.mat | 0 .../Environment}/FabLab Floor.mat.meta | 0 .../{ => Materials/Environment}/FabLab Window.mat | 0 .../Environment}/FabLab Window.mat.meta | 0 Assets/Materials/{ => Environment}/Floor gray.mat | 0 .../Materials/{ => Environment}/Floor gray.mat.meta | 0 Assets/Materials/{ => Environment}/Wall green.mat | 0 .../Materials/{ => Environment}/Wall green.mat.meta | 0 Assets/Materials/{ => Environment}/Wall white.mat | 0 .../Materials/{ => Environment}/Wall white.mat.meta | 0 Assets/{Models/chair.meta => Materials/Table.meta} | 2 +- Assets/{Models/table => Materials/Table}/Table.mat | 0 .../table => Materials/Table}/Table.mat.meta | 0 .../Table}/seamless-wood-background-1.mat | 0 .../Table}/seamless-wood-background-1.mat.meta | 0 .../table => Materials/Table}/side table.mat | 0 .../table => Materials/Table}/side table.mat.meta | 0 .../table => Materials/Table}/table double.mat | 0 .../table => Materials/Table}/table double.mat.meta | 0 .../{Models/Ultimaker => Materials}/Ultimaker.mat | 0 .../Ultimaker => Materials}/Ultimaker.mat.meta | 0 Assets/{ => Models}/Blender.meta | 2 +- Assets/Models/{table => Blender}/Simple table.obj | 0 .../Models/{table => Blender}/Simple table.obj.meta | 0 Assets/Models/{chair => Blender}/chair.blend | Bin Assets/Models/{chair => Blender}/chair.blend.meta | 0 Assets/Models/{table => Blender}/table double.obj | 0 .../Models/{table => Blender}/table double.obj.meta | 0 Assets/Models/{table => Blender}/table side.obj | 0 .../Models/{table => Blender}/table side.obj.meta | 0 Assets/Models/{Ultimaker => Blender}/ultimaker.obj | 0 .../{Ultimaker => Blender}/ultimaker.obj.meta | 0 Assets/{ => Models}/Corridors.prefab | 0 Assets/{ => Models}/Corridors.prefab.meta | 0 Assets/{ => Models}/FabLab.prefab | 0 Assets/{ => Models}/FabLab.prefab.meta | 0 Assets/Models/{table => }/Simple table.prefab | 0 Assets/Models/{table => }/Simple table.prefab.meta | 0 .../Models/{Ultimaker => }/UM3_UM3_Ultimaker.prefab | 0 .../{Ultimaker => }/UM3_UM3_Ultimaker.prefab.meta | 0 .../{chair/chair Scripted.prefab => chair.prefab} | 0 ...chair Scripted.prefab.meta => chair.prefab.meta} | 0 .../table double (1).prefab => table double.prefab} | 2 +- ...ble (1).prefab.meta => table double.prefab.meta} | 0 Assets/Models/{table => }/table side.prefab | 0 Assets/Models/{table => }/table side.prefab.meta | 0 Assets/Scenes/SampleScene.unity | 10 +++++----- Assets/{Models/table.meta => Scripts.meta} | 2 +- Assets/Scripts/Chair.meta | 8 ++++++++ .../chair => Scripts/Chair}/Chair Gizmo.asset | 0 .../chair => Scripts/Chair}/Chair Gizmo.asset.meta | 0 .../chair => Scripts/Chair}/Chair wheels.asset | 0 .../chair => Scripts/Chair}/Chair wheels.asset.meta | 0 Assets/Texture.meta | 8 ++++++++ Assets/Texture/Environment.meta | 8 ++++++++ .../seamless_plaster_facade_texture.jpg | Bin .../seamless_plaster_facade_texture.jpg.meta | 0 .../seamless_plaster_facade_texture_DISP.jpg | Bin .../seamless_plaster_facade_texture_DISP.jpg.meta | 0 .../seamless_plaster_facade_texture_NORMAL.jpg | Bin .../seamless_plaster_facade_texture_NORMAL.jpg.meta | 0 .../seamless_plaster_facade_texture_SPECULAR.jpg | Bin ...eamless_plaster_facade_texture_SPECULAR.jpg.meta | 0 .../chair => Texture}/Office_chair_fabric_dif.png | 0 .../Office_chair_fabric_dif.png.meta | 0 Assets/Texture/Table.meta | 8 ++++++++ .../Table}/seamless-wood-background-1.jpg | Bin .../Table}/seamless-wood-background-1.jpg.meta | 0 .../{Models/table => Texture/Table}/side table.png | 0 .../table => Texture/Table}/side table.png.meta | 0 .../table => Texture/Table}/table double.png | 0 .../table => Texture/Table}/table double.png.meta | 0 Assets/{Models/Ultimaker => Texture}/Ultimaker.png | 0 .../Ultimaker => Texture}/Ultimaker.png.meta | 0 77 files changed, 42 insertions(+), 10 deletions(-) rename Assets/{Models/chair => Materials}/Chair wheels.physicMaterial (100%) rename Assets/{Models/chair => Materials}/Chair wheels.physicMaterial.meta (100%) rename Assets/{Models/Ultimaker.meta => Materials/Environment.meta} (77%) rename Assets/{ => Materials/Environment}/FabLab Floor.mat (100%) rename Assets/{ => Materials/Environment}/FabLab Floor.mat.meta (100%) rename Assets/{ => Materials/Environment}/FabLab Window.mat (100%) rename Assets/{ => Materials/Environment}/FabLab Window.mat.meta (100%) rename Assets/Materials/{ => Environment}/Floor gray.mat (100%) rename Assets/Materials/{ => Environment}/Floor gray.mat.meta (100%) rename Assets/Materials/{ => Environment}/Wall green.mat (100%) rename Assets/Materials/{ => Environment}/Wall green.mat.meta (100%) rename Assets/Materials/{ => Environment}/Wall white.mat (100%) rename Assets/Materials/{ => Environment}/Wall white.mat.meta (100%) rename Assets/{Models/chair.meta => Materials/Table.meta} (77%) rename Assets/{Models/table => Materials/Table}/Table.mat (100%) rename Assets/{Models/table => Materials/Table}/Table.mat.meta (100%) rename Assets/{Models/table => Materials/Table}/seamless-wood-background-1.mat (100%) rename Assets/{Models/table => Materials/Table}/seamless-wood-background-1.mat.meta (100%) rename Assets/{Models/table => Materials/Table}/side table.mat (100%) rename Assets/{Models/table => Materials/Table}/side table.mat.meta (100%) rename Assets/{Models/table => Materials/Table}/table double.mat (100%) rename Assets/{Models/table => Materials/Table}/table double.mat.meta (100%) rename Assets/{Models/Ultimaker => Materials}/Ultimaker.mat (100%) rename Assets/{Models/Ultimaker => Materials}/Ultimaker.mat.meta (100%) rename Assets/{ => Models}/Blender.meta (77%) rename Assets/Models/{table => Blender}/Simple table.obj (100%) rename Assets/Models/{table => Blender}/Simple table.obj.meta (100%) rename Assets/Models/{chair => Blender}/chair.blend (100%) rename Assets/Models/{chair => Blender}/chair.blend.meta (100%) rename Assets/Models/{table => Blender}/table double.obj (100%) rename Assets/Models/{table => Blender}/table double.obj.meta (100%) rename Assets/Models/{table => Blender}/table side.obj (100%) rename Assets/Models/{table => Blender}/table side.obj.meta (100%) rename Assets/Models/{Ultimaker => Blender}/ultimaker.obj (100%) rename Assets/Models/{Ultimaker => Blender}/ultimaker.obj.meta (100%) rename Assets/{ => Models}/Corridors.prefab (100%) rename Assets/{ => Models}/Corridors.prefab.meta (100%) rename Assets/{ => Models}/FabLab.prefab (100%) rename Assets/{ => Models}/FabLab.prefab.meta (100%) rename Assets/Models/{table => }/Simple table.prefab (100%) rename Assets/Models/{table => }/Simple table.prefab.meta (100%) rename Assets/Models/{Ultimaker => }/UM3_UM3_Ultimaker.prefab (100%) rename Assets/Models/{Ultimaker => }/UM3_UM3_Ultimaker.prefab.meta (100%) rename Assets/Models/{chair/chair Scripted.prefab => chair.prefab} (100%) rename Assets/Models/{chair/chair Scripted.prefab.meta => chair.prefab.meta} (100%) rename Assets/Models/{table/table double (1).prefab => table double.prefab} (99%) rename Assets/Models/{table/table double (1).prefab.meta => table double.prefab.meta} (100%) rename Assets/Models/{table => }/table side.prefab (100%) rename Assets/Models/{table => }/table side.prefab.meta (100%) rename Assets/{Models/table.meta => Scripts.meta} (77%) create mode 100644 Assets/Scripts/Chair.meta rename Assets/{Models/chair => Scripts/Chair}/Chair Gizmo.asset (100%) rename Assets/{Models/chair => Scripts/Chair}/Chair Gizmo.asset.meta (100%) rename Assets/{Models/chair => Scripts/Chair}/Chair wheels.asset (100%) rename Assets/{Models/chair => Scripts/Chair}/Chair wheels.asset.meta (100%) create mode 100644 Assets/Texture.meta create mode 100644 Assets/Texture/Environment.meta rename Assets/{Materials => Texture/Environment}/seamless_plaster_facade_texture.jpg (100%) rename Assets/{Materials => Texture/Environment}/seamless_plaster_facade_texture.jpg.meta (100%) rename Assets/{Materials => Texture/Environment}/seamless_plaster_facade_texture_DISP.jpg (100%) rename Assets/{Materials => Texture/Environment}/seamless_plaster_facade_texture_DISP.jpg.meta (100%) rename Assets/{Materials => Texture/Environment}/seamless_plaster_facade_texture_NORMAL.jpg (100%) rename Assets/{Materials => Texture/Environment}/seamless_plaster_facade_texture_NORMAL.jpg.meta (100%) rename Assets/{Materials => Texture/Environment}/seamless_plaster_facade_texture_SPECULAR.jpg (100%) rename Assets/{Materials => Texture/Environment}/seamless_plaster_facade_texture_SPECULAR.jpg.meta (100%) rename Assets/{Models/chair => Texture}/Office_chair_fabric_dif.png (100%) rename Assets/{Models/chair => Texture}/Office_chair_fabric_dif.png.meta (100%) create mode 100644 Assets/Texture/Table.meta rename Assets/{Models/table => Texture/Table}/seamless-wood-background-1.jpg (100%) rename Assets/{Models/table => Texture/Table}/seamless-wood-background-1.jpg.meta (100%) rename Assets/{Models/table => Texture/Table}/side table.png (100%) rename Assets/{Models/table => Texture/Table}/side table.png.meta (100%) rename Assets/{Models/table => Texture/Table}/table double.png (100%) rename Assets/{Models/table => Texture/Table}/table double.png.meta (100%) rename Assets/{Models/Ultimaker => Texture}/Ultimaker.png (100%) rename Assets/{Models/Ultimaker => Texture}/Ultimaker.png.meta (100%) diff --git a/Assets/Models/chair/Chair wheels.physicMaterial b/Assets/Materials/Chair wheels.physicMaterial similarity index 100% rename from Assets/Models/chair/Chair wheels.physicMaterial rename to Assets/Materials/Chair wheels.physicMaterial diff --git a/Assets/Models/chair/Chair wheels.physicMaterial.meta b/Assets/Materials/Chair wheels.physicMaterial.meta similarity index 100% rename from Assets/Models/chair/Chair wheels.physicMaterial.meta rename to Assets/Materials/Chair wheels.physicMaterial.meta diff --git a/Assets/Models/Ultimaker.meta b/Assets/Materials/Environment.meta similarity index 77% rename from Assets/Models/Ultimaker.meta rename to Assets/Materials/Environment.meta index 5a7a78d..c790286 100644 --- a/Assets/Models/Ultimaker.meta +++ b/Assets/Materials/Environment.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 09fab1e4105dcbc46aa36ece349e7227 +guid: 1f078c2ee3a7e534d9ac151ed376c9bf folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/FabLab Floor.mat b/Assets/Materials/Environment/FabLab Floor.mat similarity index 100% rename from Assets/FabLab Floor.mat rename to Assets/Materials/Environment/FabLab Floor.mat diff --git a/Assets/FabLab Floor.mat.meta b/Assets/Materials/Environment/FabLab Floor.mat.meta similarity index 100% rename from Assets/FabLab Floor.mat.meta rename to Assets/Materials/Environment/FabLab Floor.mat.meta diff --git a/Assets/FabLab Window.mat b/Assets/Materials/Environment/FabLab Window.mat similarity index 100% rename from Assets/FabLab Window.mat rename to Assets/Materials/Environment/FabLab Window.mat diff --git a/Assets/FabLab Window.mat.meta b/Assets/Materials/Environment/FabLab Window.mat.meta similarity index 100% rename from Assets/FabLab Window.mat.meta rename to Assets/Materials/Environment/FabLab Window.mat.meta diff --git a/Assets/Materials/Floor gray.mat b/Assets/Materials/Environment/Floor gray.mat similarity index 100% rename from Assets/Materials/Floor gray.mat rename to Assets/Materials/Environment/Floor gray.mat diff --git a/Assets/Materials/Floor gray.mat.meta b/Assets/Materials/Environment/Floor gray.mat.meta similarity index 100% rename from Assets/Materials/Floor gray.mat.meta rename to Assets/Materials/Environment/Floor gray.mat.meta diff --git a/Assets/Materials/Wall green.mat b/Assets/Materials/Environment/Wall green.mat similarity index 100% rename from Assets/Materials/Wall green.mat rename to Assets/Materials/Environment/Wall green.mat diff --git a/Assets/Materials/Wall green.mat.meta b/Assets/Materials/Environment/Wall green.mat.meta similarity index 100% rename from Assets/Materials/Wall green.mat.meta rename to Assets/Materials/Environment/Wall green.mat.meta diff --git a/Assets/Materials/Wall white.mat b/Assets/Materials/Environment/Wall white.mat similarity index 100% rename from Assets/Materials/Wall white.mat rename to Assets/Materials/Environment/Wall white.mat diff --git a/Assets/Materials/Wall white.mat.meta b/Assets/Materials/Environment/Wall white.mat.meta similarity index 100% rename from Assets/Materials/Wall white.mat.meta rename to Assets/Materials/Environment/Wall white.mat.meta diff --git a/Assets/Models/chair.meta b/Assets/Materials/Table.meta similarity index 77% rename from Assets/Models/chair.meta rename to Assets/Materials/Table.meta index a674ef2..3930ed8 100644 --- a/Assets/Models/chair.meta +++ b/Assets/Materials/Table.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a93d639731fd5854e84d16dd6e8a4bbe +guid: b8640f059442e9949a64f59404a27e3b folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Models/table/Table.mat b/Assets/Materials/Table/Table.mat similarity index 100% rename from Assets/Models/table/Table.mat rename to Assets/Materials/Table/Table.mat diff --git a/Assets/Models/table/Table.mat.meta b/Assets/Materials/Table/Table.mat.meta similarity index 100% rename from Assets/Models/table/Table.mat.meta rename to Assets/Materials/Table/Table.mat.meta diff --git a/Assets/Models/table/seamless-wood-background-1.mat b/Assets/Materials/Table/seamless-wood-background-1.mat similarity index 100% rename from Assets/Models/table/seamless-wood-background-1.mat rename to Assets/Materials/Table/seamless-wood-background-1.mat diff --git a/Assets/Models/table/seamless-wood-background-1.mat.meta b/Assets/Materials/Table/seamless-wood-background-1.mat.meta similarity index 100% rename from Assets/Models/table/seamless-wood-background-1.mat.meta rename to Assets/Materials/Table/seamless-wood-background-1.mat.meta diff --git a/Assets/Models/table/side table.mat b/Assets/Materials/Table/side table.mat similarity index 100% rename from Assets/Models/table/side table.mat rename to Assets/Materials/Table/side table.mat diff --git a/Assets/Models/table/side table.mat.meta b/Assets/Materials/Table/side table.mat.meta similarity index 100% rename from Assets/Models/table/side table.mat.meta rename to Assets/Materials/Table/side table.mat.meta diff --git a/Assets/Models/table/table double.mat b/Assets/Materials/Table/table double.mat similarity index 100% rename from Assets/Models/table/table double.mat rename to Assets/Materials/Table/table double.mat diff --git a/Assets/Models/table/table double.mat.meta b/Assets/Materials/Table/table double.mat.meta similarity index 100% rename from Assets/Models/table/table double.mat.meta rename to Assets/Materials/Table/table double.mat.meta diff --git a/Assets/Models/Ultimaker/Ultimaker.mat b/Assets/Materials/Ultimaker.mat similarity index 100% rename from Assets/Models/Ultimaker/Ultimaker.mat rename to Assets/Materials/Ultimaker.mat diff --git a/Assets/Models/Ultimaker/Ultimaker.mat.meta b/Assets/Materials/Ultimaker.mat.meta similarity index 100% rename from Assets/Models/Ultimaker/Ultimaker.mat.meta rename to Assets/Materials/Ultimaker.mat.meta diff --git a/Assets/Blender.meta b/Assets/Models/Blender.meta similarity index 77% rename from Assets/Blender.meta rename to Assets/Models/Blender.meta index 18faf93..8e8542f 100644 --- a/Assets/Blender.meta +++ b/Assets/Models/Blender.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 32ee83b6e7b3f054dbfd3d5cbbca3366 +guid: 0e95f05db4f3c0e459732b53039391bb folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Models/table/Simple table.obj b/Assets/Models/Blender/Simple table.obj similarity index 100% rename from Assets/Models/table/Simple table.obj rename to Assets/Models/Blender/Simple table.obj diff --git a/Assets/Models/table/Simple table.obj.meta b/Assets/Models/Blender/Simple table.obj.meta similarity index 100% rename from Assets/Models/table/Simple table.obj.meta rename to Assets/Models/Blender/Simple table.obj.meta diff --git a/Assets/Models/chair/chair.blend b/Assets/Models/Blender/chair.blend similarity index 100% rename from Assets/Models/chair/chair.blend rename to Assets/Models/Blender/chair.blend diff --git a/Assets/Models/chair/chair.blend.meta b/Assets/Models/Blender/chair.blend.meta similarity index 100% rename from Assets/Models/chair/chair.blend.meta rename to Assets/Models/Blender/chair.blend.meta diff --git a/Assets/Models/table/table double.obj b/Assets/Models/Blender/table double.obj similarity index 100% rename from Assets/Models/table/table double.obj rename to Assets/Models/Blender/table double.obj diff --git a/Assets/Models/table/table double.obj.meta b/Assets/Models/Blender/table double.obj.meta similarity index 100% rename from Assets/Models/table/table double.obj.meta rename to Assets/Models/Blender/table double.obj.meta diff --git a/Assets/Models/table/table side.obj b/Assets/Models/Blender/table side.obj similarity index 100% rename from Assets/Models/table/table side.obj rename to Assets/Models/Blender/table side.obj diff --git a/Assets/Models/table/table side.obj.meta b/Assets/Models/Blender/table side.obj.meta similarity index 100% rename from Assets/Models/table/table side.obj.meta rename to Assets/Models/Blender/table side.obj.meta diff --git a/Assets/Models/Ultimaker/ultimaker.obj b/Assets/Models/Blender/ultimaker.obj similarity index 100% rename from Assets/Models/Ultimaker/ultimaker.obj rename to Assets/Models/Blender/ultimaker.obj diff --git a/Assets/Models/Ultimaker/ultimaker.obj.meta b/Assets/Models/Blender/ultimaker.obj.meta similarity index 100% rename from Assets/Models/Ultimaker/ultimaker.obj.meta rename to Assets/Models/Blender/ultimaker.obj.meta diff --git a/Assets/Corridors.prefab b/Assets/Models/Corridors.prefab similarity index 100% rename from Assets/Corridors.prefab rename to Assets/Models/Corridors.prefab diff --git a/Assets/Corridors.prefab.meta b/Assets/Models/Corridors.prefab.meta similarity index 100% rename from Assets/Corridors.prefab.meta rename to Assets/Models/Corridors.prefab.meta diff --git a/Assets/FabLab.prefab b/Assets/Models/FabLab.prefab similarity index 100% rename from Assets/FabLab.prefab rename to Assets/Models/FabLab.prefab diff --git a/Assets/FabLab.prefab.meta b/Assets/Models/FabLab.prefab.meta similarity index 100% rename from Assets/FabLab.prefab.meta rename to Assets/Models/FabLab.prefab.meta diff --git a/Assets/Models/table/Simple table.prefab b/Assets/Models/Simple table.prefab similarity index 100% rename from Assets/Models/table/Simple table.prefab rename to Assets/Models/Simple table.prefab diff --git a/Assets/Models/table/Simple table.prefab.meta b/Assets/Models/Simple table.prefab.meta similarity index 100% rename from Assets/Models/table/Simple table.prefab.meta rename to Assets/Models/Simple table.prefab.meta diff --git a/Assets/Models/Ultimaker/UM3_UM3_Ultimaker.prefab b/Assets/Models/UM3_UM3_Ultimaker.prefab similarity index 100% rename from Assets/Models/Ultimaker/UM3_UM3_Ultimaker.prefab rename to Assets/Models/UM3_UM3_Ultimaker.prefab diff --git a/Assets/Models/Ultimaker/UM3_UM3_Ultimaker.prefab.meta b/Assets/Models/UM3_UM3_Ultimaker.prefab.meta similarity index 100% rename from Assets/Models/Ultimaker/UM3_UM3_Ultimaker.prefab.meta rename to Assets/Models/UM3_UM3_Ultimaker.prefab.meta diff --git a/Assets/Models/chair/chair Scripted.prefab b/Assets/Models/chair.prefab similarity index 100% rename from Assets/Models/chair/chair Scripted.prefab rename to Assets/Models/chair.prefab diff --git a/Assets/Models/chair/chair Scripted.prefab.meta b/Assets/Models/chair.prefab.meta similarity index 100% rename from Assets/Models/chair/chair Scripted.prefab.meta rename to Assets/Models/chair.prefab.meta diff --git a/Assets/Models/table/table double (1).prefab b/Assets/Models/table double.prefab similarity index 99% rename from Assets/Models/table/table double (1).prefab rename to Assets/Models/table double.prefab index 64dd8fa..4e22fc7 100644 --- a/Assets/Models/table/table double (1).prefab +++ b/Assets/Models/table double.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 726151543146820467} m_Layer: 0 - m_Name: table double (1) + m_Name: table double m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Models/table/table double (1).prefab.meta b/Assets/Models/table double.prefab.meta similarity index 100% rename from Assets/Models/table/table double (1).prefab.meta rename to Assets/Models/table double.prefab.meta diff --git a/Assets/Models/table/table side.prefab b/Assets/Models/table side.prefab similarity index 100% rename from Assets/Models/table/table side.prefab rename to Assets/Models/table side.prefab diff --git a/Assets/Models/table/table side.prefab.meta b/Assets/Models/table side.prefab.meta similarity index 100% rename from Assets/Models/table/table side.prefab.meta rename to Assets/Models/table side.prefab.meta diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index a911233..92f04b2 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1394,7 +1394,7 @@ PrefabInstance: objectReference: {fileID: 511198038} - target: {fileID: 2066526415779655844, guid: 2765b8bb888e7a849a369ef050911813, type: 3} propertyPath: m_VersionIndex - value: 15 + value: 18 objectReference: {fileID: 0} - target: {fileID: 2066526415779655844, guid: 2765b8bb888e7a849a369ef050911813, type: 3} propertyPath: m_MeshFormatVersion @@ -1438,7 +1438,7 @@ PrefabInstance: objectReference: {fileID: 759230817} - target: {fileID: 2066526415937511098, guid: 2765b8bb888e7a849a369ef050911813, type: 3} propertyPath: m_VersionIndex - value: 15 + value: 18 objectReference: {fileID: 0} - target: {fileID: 2066526415937511098, guid: 2765b8bb888e7a849a369ef050911813, type: 3} propertyPath: m_MeshFormatVersion @@ -1566,7 +1566,7 @@ PrefabInstance: objectReference: {fileID: 584177120} - target: {fileID: 2066526416306244514, guid: 2765b8bb888e7a849a369ef050911813, type: 3} propertyPath: m_VersionIndex - value: 15 + value: 18 objectReference: {fileID: 0} - target: {fileID: 2066526416306244514, guid: 2765b8bb888e7a849a369ef050911813, type: 3} propertyPath: m_MeshFormatVersion @@ -1662,7 +1662,7 @@ PrefabInstance: objectReference: {fileID: 333828849} - target: {fileID: 2066526416385322603, guid: 2765b8bb888e7a849a369ef050911813, type: 3} propertyPath: m_VersionIndex - value: 15 + value: 18 objectReference: {fileID: 0} - target: {fileID: 2066526416385322603, guid: 2765b8bb888e7a849a369ef050911813, type: 3} propertyPath: m_MeshFormatVersion @@ -1806,7 +1806,7 @@ PrefabInstance: objectReference: {fileID: 1934981378} - target: {fileID: 7224646667630721399, guid: 2765b8bb888e7a849a369ef050911813, type: 3} propertyPath: m_VersionIndex - value: 12 + value: 15 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2765b8bb888e7a849a369ef050911813, type: 3} diff --git a/Assets/Models/table.meta b/Assets/Scripts.meta similarity index 77% rename from Assets/Models/table.meta rename to Assets/Scripts.meta index faa1771..58cad79 100644 --- a/Assets/Models/table.meta +++ b/Assets/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 881e4467022c7794faa2e762098d41c2 +guid: 346bcbd3ccc2ff947b405427b8e84508 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/Chair.meta b/Assets/Scripts/Chair.meta new file mode 100644 index 0000000..74ff2fc --- /dev/null +++ b/Assets/Scripts/Chair.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 39ce69efc9723a44ba0dcaf2927f9886 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/chair/Chair Gizmo.asset b/Assets/Scripts/Chair/Chair Gizmo.asset similarity index 100% rename from Assets/Models/chair/Chair Gizmo.asset rename to Assets/Scripts/Chair/Chair Gizmo.asset diff --git a/Assets/Models/chair/Chair Gizmo.asset.meta b/Assets/Scripts/Chair/Chair Gizmo.asset.meta similarity index 100% rename from Assets/Models/chair/Chair Gizmo.asset.meta rename to Assets/Scripts/Chair/Chair Gizmo.asset.meta diff --git a/Assets/Models/chair/Chair wheels.asset b/Assets/Scripts/Chair/Chair wheels.asset similarity index 100% rename from Assets/Models/chair/Chair wheels.asset rename to Assets/Scripts/Chair/Chair wheels.asset diff --git a/Assets/Models/chair/Chair wheels.asset.meta b/Assets/Scripts/Chair/Chair wheels.asset.meta similarity index 100% rename from Assets/Models/chair/Chair wheels.asset.meta rename to Assets/Scripts/Chair/Chair wheels.asset.meta diff --git a/Assets/Texture.meta b/Assets/Texture.meta new file mode 100644 index 0000000..db5469b --- /dev/null +++ b/Assets/Texture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e512d99f7e303104698aa5c24963a742 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Texture/Environment.meta b/Assets/Texture/Environment.meta new file mode 100644 index 0000000..f16b32c --- /dev/null +++ b/Assets/Texture/Environment.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 514af4ebc8934214d9abef763d1a0783 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/seamless_plaster_facade_texture.jpg b/Assets/Texture/Environment/seamless_plaster_facade_texture.jpg similarity index 100% rename from Assets/Materials/seamless_plaster_facade_texture.jpg rename to Assets/Texture/Environment/seamless_plaster_facade_texture.jpg diff --git a/Assets/Materials/seamless_plaster_facade_texture.jpg.meta b/Assets/Texture/Environment/seamless_plaster_facade_texture.jpg.meta similarity index 100% rename from Assets/Materials/seamless_plaster_facade_texture.jpg.meta rename to Assets/Texture/Environment/seamless_plaster_facade_texture.jpg.meta diff --git a/Assets/Materials/seamless_plaster_facade_texture_DISP.jpg b/Assets/Texture/Environment/seamless_plaster_facade_texture_DISP.jpg similarity index 100% rename from Assets/Materials/seamless_plaster_facade_texture_DISP.jpg rename to Assets/Texture/Environment/seamless_plaster_facade_texture_DISP.jpg diff --git a/Assets/Materials/seamless_plaster_facade_texture_DISP.jpg.meta b/Assets/Texture/Environment/seamless_plaster_facade_texture_DISP.jpg.meta similarity index 100% rename from Assets/Materials/seamless_plaster_facade_texture_DISP.jpg.meta rename to Assets/Texture/Environment/seamless_plaster_facade_texture_DISP.jpg.meta diff --git a/Assets/Materials/seamless_plaster_facade_texture_NORMAL.jpg b/Assets/Texture/Environment/seamless_plaster_facade_texture_NORMAL.jpg similarity index 100% rename from Assets/Materials/seamless_plaster_facade_texture_NORMAL.jpg rename to Assets/Texture/Environment/seamless_plaster_facade_texture_NORMAL.jpg diff --git a/Assets/Materials/seamless_plaster_facade_texture_NORMAL.jpg.meta b/Assets/Texture/Environment/seamless_plaster_facade_texture_NORMAL.jpg.meta similarity index 100% rename from Assets/Materials/seamless_plaster_facade_texture_NORMAL.jpg.meta rename to Assets/Texture/Environment/seamless_plaster_facade_texture_NORMAL.jpg.meta diff --git a/Assets/Materials/seamless_plaster_facade_texture_SPECULAR.jpg b/Assets/Texture/Environment/seamless_plaster_facade_texture_SPECULAR.jpg similarity index 100% rename from Assets/Materials/seamless_plaster_facade_texture_SPECULAR.jpg rename to Assets/Texture/Environment/seamless_plaster_facade_texture_SPECULAR.jpg diff --git a/Assets/Materials/seamless_plaster_facade_texture_SPECULAR.jpg.meta b/Assets/Texture/Environment/seamless_plaster_facade_texture_SPECULAR.jpg.meta similarity index 100% rename from Assets/Materials/seamless_plaster_facade_texture_SPECULAR.jpg.meta rename to Assets/Texture/Environment/seamless_plaster_facade_texture_SPECULAR.jpg.meta diff --git a/Assets/Models/chair/Office_chair_fabric_dif.png b/Assets/Texture/Office_chair_fabric_dif.png similarity index 100% rename from Assets/Models/chair/Office_chair_fabric_dif.png rename to Assets/Texture/Office_chair_fabric_dif.png diff --git a/Assets/Models/chair/Office_chair_fabric_dif.png.meta b/Assets/Texture/Office_chair_fabric_dif.png.meta similarity index 100% rename from Assets/Models/chair/Office_chair_fabric_dif.png.meta rename to Assets/Texture/Office_chair_fabric_dif.png.meta diff --git a/Assets/Texture/Table.meta b/Assets/Texture/Table.meta new file mode 100644 index 0000000..60f43ea --- /dev/null +++ b/Assets/Texture/Table.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc0d04858d071b145b6476c317796937 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/table/seamless-wood-background-1.jpg b/Assets/Texture/Table/seamless-wood-background-1.jpg similarity index 100% rename from Assets/Models/table/seamless-wood-background-1.jpg rename to Assets/Texture/Table/seamless-wood-background-1.jpg diff --git a/Assets/Models/table/seamless-wood-background-1.jpg.meta b/Assets/Texture/Table/seamless-wood-background-1.jpg.meta similarity index 100% rename from Assets/Models/table/seamless-wood-background-1.jpg.meta rename to Assets/Texture/Table/seamless-wood-background-1.jpg.meta diff --git a/Assets/Models/table/side table.png b/Assets/Texture/Table/side table.png similarity index 100% rename from Assets/Models/table/side table.png rename to Assets/Texture/Table/side table.png diff --git a/Assets/Models/table/side table.png.meta b/Assets/Texture/Table/side table.png.meta similarity index 100% rename from Assets/Models/table/side table.png.meta rename to Assets/Texture/Table/side table.png.meta diff --git a/Assets/Models/table/table double.png b/Assets/Texture/Table/table double.png similarity index 100% rename from Assets/Models/table/table double.png rename to Assets/Texture/Table/table double.png diff --git a/Assets/Models/table/table double.png.meta b/Assets/Texture/Table/table double.png.meta similarity index 100% rename from Assets/Models/table/table double.png.meta rename to Assets/Texture/Table/table double.png.meta diff --git a/Assets/Models/Ultimaker/Ultimaker.png b/Assets/Texture/Ultimaker.png similarity index 100% rename from Assets/Models/Ultimaker/Ultimaker.png rename to Assets/Texture/Ultimaker.png diff --git a/Assets/Models/Ultimaker/Ultimaker.png.meta b/Assets/Texture/Ultimaker.png.meta similarity index 100% rename from Assets/Models/Ultimaker/Ultimaker.png.meta rename to Assets/Texture/Ultimaker.png.meta