diff --git a/Assets/Images/Controls/HTC_Controls_Catalog.png b/Assets/Images/Controls/HTC_Controls_Catalog.png index cb4b571..3d46c37 100644 --- a/Assets/Images/Controls/HTC_Controls_Catalog.png +++ b/Assets/Images/Controls/HTC_Controls_Catalog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bd20f3e8786097ccdbdd70a9d09a061ebbcec9549e6905a9a82e9068c7810a5 -size 318386 +oid sha256:d6dbf0e5e5474271f1fd6ef8479ddbb22378f8cf48ddc9182119f0db364e6bd7 +size 322559 diff --git a/Assets/Images/Controls/HTC_Controls_Catalog.png.meta b/Assets/Images/Controls/HTC_Controls_Catalog.png.meta index 385de02..94614e3 100644 --- a/Assets/Images/Controls/HTC_Controls_Catalog.png.meta +++ b/Assets/Images/Controls/HTC_Controls_Catalog.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 832e255abc5d1d94bad3a345e7f6264e +guid: 9df0243b6fb399244be95a5c72f686da TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Images/Controls/Oculus_Controls_Catalog.png b/Assets/Images/Controls/Oculus_Controls_Catalog.png index a70cc94..9561f95 100644 --- a/Assets/Images/Controls/Oculus_Controls_Catalog.png +++ b/Assets/Images/Controls/Oculus_Controls_Catalog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66243de858a10a73bf9f89fc1dcfb814eed8a5d938a71384ef170312f129c866 -size 347295 +oid sha256:f5613da3385793736167233f139bbb42252d95af15a4112f58d076f3b2e4e06b +size 351869 diff --git a/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta b/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta index e8cc8ca..b8e9d6a 100644 --- a/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta +++ b/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f3adb458eb2a4504284313642076de69 +guid: e722dc1453341754dba8e5c24ad17fac TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/LowlyPoly/Stylized Grass Texture/Materials/Vol_42_1_Base_Color.mat b/Assets/LowlyPoly/Stylized Grass Texture/Materials/Vol_42_1_Base_Color.mat index cef0451..a304c24 100644 --- a/Assets/LowlyPoly/Stylized Grass Texture/Materials/Vol_42_1_Base_Color.mat +++ b/Assets/LowlyPoly/Stylized Grass Texture/Materials/Vol_42_1_Base_Color.mat @@ -11,6 +11,7 @@ Material: m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - _PARALLAXMAP + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -39,11 +40,11 @@ Material: m_Offset: {x: 0, y: 0} - _EmissionMap: m_Texture: {fileID: 0} - m_Scale: {x: 2000, y: 2000} + m_Scale: {x: 100, y: 100} m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: b900361e13e6eaa44963cb851faf3ed3, type: 3} - m_Scale: {x: 2000, y: 2000} + m_Scale: {x: 100, y: 100} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -63,14 +64,14 @@ Material: - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _GlossMapScale: 0 + - _Glossiness: 0 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.08 - - _SmoothnessTextureChannel: 0 + - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 diff --git a/Assets/Materials/Keyboard/Light Blue.mat b/Assets/Materials/Keyboard/Light Blue.mat new file mode 100644 index 0000000..e6477e7 --- /dev/null +++ b/Assets/Materials/Keyboard/Light Blue.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Light Blue + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.59999996 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Keyboard/Light Blue.mat.meta b/Assets/Materials/Keyboard/Light Blue.mat.meta new file mode 100644 index 0000000..4bb28f9 --- /dev/null +++ b/Assets/Materials/Keyboard/Light Blue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d41ffe0eeea31304fb95ae438d31d1a7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Keyboard/lightest Blue.mat b/Assets/Materials/Keyboard/lightest Blue.mat new file mode 100644 index 0000000..483cea1 --- /dev/null +++ b/Assets/Materials/Keyboard/lightest Blue.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: lightest Blue + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.59999996 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/Keyboard/lightest Blue.mat.meta b/Assets/Materials/Keyboard/lightest Blue.mat.meta new file mode 100644 index 0000000..95ebbd9 --- /dev/null +++ b/Assets/Materials/Keyboard/lightest Blue.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d34fb393ef0930e4caeccf07c8dba3c6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/IndoorPlant01.prefab b/Assets/Models/IndoorPlant01.prefab index c85e710..ef3c8be 100644 --- a/Assets/Models/IndoorPlant01.prefab +++ b/Assets/Models/IndoorPlant01.prefab @@ -27,7 +27,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 999207089627997314} m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0.039, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -122,7 +122,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5022219494863929666} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.2239313, y: 1.046101, z: -0.024066806} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -146,6 +146,7 @@ MonoBehaviour: combinedBounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &8294151951189356629 GameObject: m_ObjectHideFlags: 0 @@ -173,7 +174,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8294151951189356629} m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: -0} + m_LocalPosition: {x: 0, y: 0.039, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Models/IndoorPlant02.prefab b/Assets/Models/IndoorPlant02.prefab index 318f978..fce21d9 100644 --- a/Assets/Models/IndoorPlant02.prefab +++ b/Assets/Models/IndoorPlant02.prefab @@ -25,7 +25,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6502689968648656832} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.9697971, y: 1.0193512, z: -1.9544978} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: @@ -48,6 +48,7 @@ MonoBehaviour: combinedBounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1001 &743310008199716879 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Models/Simple table.prefab b/Assets/Models/Simple table.prefab index 10cbefa..32b60d1 100644 --- a/Assets/Models/Simple table.prefab +++ b/Assets/Models/Simple table.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &392586589562003607 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6114432350300135443} + - component: {fileID: 8817835740557246532} + m_Layer: 9 + m_Name: FurnitureTrigger + m_TagString: FurnitureTrigger + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6114432350300135443 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392586589562003607} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3674349604157782260} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &8817835740557246532 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392586589562003607} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 12.237078, y: 6.518132, z: 9.380431} + m_Center: {x: 0.1100985, y: 3.444804, z: -0.26158008} --- !u!1 &1253093426770874476 GameObject: m_ObjectHideFlags: 0 @@ -72,8 +117,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2048859290140646716} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.0600014, y: 6.87, z: -3.75} - m_LocalScale: {x: 1, y: 0.94424, z: 1} + m_LocalPosition: {x: 5.0600014, y: 6.87, z: -3.9438} + m_LocalScale: {x: 1, y: 0.94424, z: 1.0554} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3674349604157782260} @@ -174,6 +219,7 @@ Transform: - {fileID: 7846351332623750186} - {fileID: 705425444331171642} - {fileID: 5160726694365660193} + - {fileID: 6114432350300135443} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -189,6 +235,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} m_Name: m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!1 &6146061087085142095 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Models/chair.prefab b/Assets/Models/chair.prefab index b3f14c2..4d7db02 100644 --- a/Assets/Models/chair.prefab +++ b/Assets/Models/chair.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3884115040606308642 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6821231163936271320} + - component: {fileID: 6695299937866651750} + m_Layer: 9 + m_Name: FurnitureTrigger + m_TagString: FurnitureTrigger + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6821231163936271320 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3884115040606308642} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5262755222010251265} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6695299937866651750 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3884115040606308642} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 4.568707, y: 7.746119, z: 5.480494} + m_Center: {x: -0.1474282, y: 4.3566036, z: -0.06824057} --- !u!1 &8231086993610971755 GameObject: m_ObjectHideFlags: 0 @@ -278,6 +323,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7310167259df75745b825087bf4c8de0, type: 3} m_Name: m_EditorClassIdentifier: + combinedBounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!4 &5035235579416466379 stripped Transform: m_CorrespondingSourceObject: {fileID: 820629935725706273, guid: 61dd8047e5e66dc4db5c150abe38beae, type: 3} diff --git a/Assets/Models/computer.prefab b/Assets/Models/computer.prefab index 9690ac4..f1647e9 100644 --- a/Assets/Models/computer.prefab +++ b/Assets/Models/computer.prefab @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4699182198977620406} m_LocalRotation: {x: -0, y: -0, z: 0.70710576, w: 0.70710784} - m_LocalPosition: {x: -0.51733893, y: 1.621, z: -1.4194237} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -58,7 +58,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5078885061494400643} m_LocalRotation: {x: -0.00000005960465, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.62495, z: -0.25492} + m_LocalPosition: {x: 0.168, y: 0.113, z: -0.229} m_LocalScale: {x: -0.16656025, y: -0.16656025, z: -0.16656025} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Models/shelf_empty.prefab b/Assets/Models/shelf_empty.prefab index d1ffb3d..4a6cfce 100644 --- a/Assets/Models/shelf_empty.prefab +++ b/Assets/Models/shelf_empty.prefab @@ -288,6 +288,7 @@ Transform: - {fileID: 1696234186987782576} - {fileID: 2781697966167280641} - {fileID: 5613503160827514234} + - {fileID: 5878205338461874499} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} @@ -306,6 +307,7 @@ MonoBehaviour: combinedBounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} + wallMount: 0 --- !u!65 &6645681851711596344 BoxCollider: m_ObjectHideFlags: 0 @@ -568,6 +570,51 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4588887904168053738 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5878205338461874499} + - component: {fileID: 9184669346505142783} + m_Layer: 9 + m_Name: FurnitureTrigger + m_TagString: FurnitureTrigger + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5878205338461874499 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4588887904168053738} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2996515769384266075} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &9184669346505142783 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4588887904168053738} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1.9363493, y: 1.3597183, z: 4.2336807} + m_Center: {x: -0.016334474, y: 0.029815674, z: 2.1933994} --- !u!1 &4983300697117577925 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Models/smarttv.prefab b/Assets/Models/smarttv.prefab index f71483e..ea9780c 100644 --- a/Assets/Models/smarttv.prefab +++ b/Assets/Models/smarttv.prefab @@ -1,5 +1,50 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &451019611259114879 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2833408188615038500} + - component: {fileID: 777966934955362417} + m_Layer: 9 + m_Name: FurnitureTrigger + m_TagString: FurnitureTrigger + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2833408188615038500 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451019611259114879} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 589337997038399236} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &777966934955362417 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 451019611259114879} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 40.602814, y: 20.834862, z: 1.929568} + m_Center: {x: 0.19675513, y: 8.908121, z: -1.2512306} --- !u!1 &2835658414891243653 GameObject: m_ObjectHideFlags: 0 @@ -30,6 +75,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 6063464173187445548} + - {fileID: 2833408188615038500} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -86,7 +132,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: -1.36 objectReference: {fileID: 0} - target: {fileID: 4313268324301600403, guid: 5035aafbde1dd40458b242f88962c3d3, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Models/table double.prefab b/Assets/Models/table double.prefab index 4e22fc7..48cbc90 100644 --- a/Assets/Models/table double.prefab +++ b/Assets/Models/table double.prefab @@ -24,14 +24,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 726151543146820464} m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} - m_LocalPosition: {x: 2.6100001, y: 1.8444445, z: -0.12111112} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.11111112, y: 0.11111112, z: 0.11111112} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 726151543547972459} - {fileID: 726151544272545065} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &726151543547972456 GameObject: @@ -59,7 +59,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 726151543547972456} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: 2.73, y: 7.08, z: -3.48} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -142,7 +142,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 726151544272545062} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} + m_LocalPosition: {x: 2.73, y: 7.08, z: -3.48} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/ProBuilder Data.meta b/Assets/ProBuilder Data.meta new file mode 100644 index 0000000..23f744c --- /dev/null +++ b/Assets/ProBuilder Data.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fcc69a92b1617b146b5072c0c5451fc9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ProBuilder Data/Default Color Palette.asset b/Assets/ProBuilder Data/Default Color Palette.asset new file mode 100644 index 0000000..add1094 --- /dev/null +++ b/Assets/ProBuilder Data/Default Color Palette.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dda436a9c8bbd4d109478acf25cd48d8, type: 3} + m_Name: Default Color Palette + m_EditorClassIdentifier: + m_Colors: + - {r: 0, g: 0.122, b: 0.247, a: 1} + - {r: 0, g: 0.455, b: 0.851, a: 1} + - {r: 0.498, g: 0.859, b: 1, a: 1} + - {r: 0.224, g: 0.8, b: 0.8, a: 1} + - {r: 0.239, g: 0.6, b: 0.439, a: 1} + - {r: 0.18, g: 0.8, b: 0.251, a: 1} + - {r: 0.004, g: 1, b: 0.439, a: 1} + - {r: 1, g: 0.863, b: 0, a: 1} + - {r: 1, g: 0.522, b: 0.106, a: 1} + - {r: 1, g: 0.255, b: 0.212, a: 1} + - {r: 0.522, g: 0.078, b: 0.294, a: 1} + - {r: 0.941, g: 0.071, b: 0.745, a: 1} + - {r: 0.694, g: 0.051, b: 0.788, a: 1} + - {r: 0.067, g: 0.067, b: 0.067, a: 1} + - {r: 0.667, g: 0.667, b: 0.667, a: 1} + - {r: 0.867, g: 0.867, b: 0.867, a: 1} diff --git a/Assets/ProBuilder Data/Default Color Palette.asset.meta b/Assets/ProBuilder Data/Default Color Palette.asset.meta new file mode 100644 index 0000000..62a9236 --- /dev/null +++ b/Assets/ProBuilder Data/Default Color Palette.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b5738c8bf149673478d5b40fb813e653 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ProBuilder Data/Default Material Palette.asset b/Assets/ProBuilder Data/Default Material Palette.asset new file mode 100644 index 0000000..d38ee08 --- /dev/null +++ b/Assets/ProBuilder Data/Default Material Palette.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f1ca63a91b17724bbd99c8fa67e0180, type: 3} + m_Name: Default Material Palette + m_EditorClassIdentifier: + array: + - {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} diff --git a/Assets/ProBuilder Data/Default Material Palette.asset.meta b/Assets/ProBuilder Data/Default Material Palette.asset.meta new file mode 100644 index 0000000..c8195aa --- /dev/null +++ b/Assets/ProBuilder Data/Default Material Palette.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 92d5882a4829f7f469de0848af9115b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 12beb87..eaa28c6 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2435,7 +2435,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_RootOrder - value: 20 + value: 19 objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_LocalScale.x @@ -5935,21 +5935,21 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 184320054} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.026176924, y: -0, z: -0, w: 0.99965733} + m_LocalPosition: {x: 0, y: 0, z: 196.77962} + m_LocalScale: {x: 14.906314, y: 14.906314, z: 14.906314} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2036324424} - {fileID: 1947605092} + - {fileID: 338421613} m_Father: {fileID: 1989420948} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 9173.794, y: 4724.3096} + m_SizeDelta: {x: 1231, y: 639} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &184320056 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5989,7 +5989,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &184320058 Canvas: m_ObjectHideFlags: 0 @@ -5999,7 +5999,7 @@ Canvas: m_GameObject: {fileID: 184320054} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 + m_RenderMode: 2 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -6440,7 +6440,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 18 + value: 17 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -6504,7 +6504,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23786 + m_Name: pb_Mesh50010 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -7097,6 +7097,79 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &338421612 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 338421613} + - component: {fileID: 338421615} + - component: {fileID: 338421614} + m_Layer: 5 + m_Name: Oculus_Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!224 &338421613 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338421612} + m_LocalRotation: {x: -0.052335896, y: 0, z: 0, w: 0.9986295} + m_LocalPosition: {x: 0, y: 0, z: 3.253} + m_LocalScale: {x: 0.02207732, y: 0.012418493, z: 0.02207732} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 184320055} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -6, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -615.44, y: -316.6147} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &338421614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338421612} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: e722dc1453341754dba8e5c24ad17fac, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &338421615 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338421612} + m_CullTransparentMesh: 1 --- !u!1001 &360260901 PrefabInstance: m_ObjectHideFlags: 0 @@ -7381,7 +7454,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_RootOrder - value: 22 + value: 21 objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_LocalScale.x @@ -10638,7 +10711,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24428 + m_Name: pb_Mesh50646 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10876,7 +10949,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24380 + m_Name: pb_Mesh50598 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11636,7 +11709,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 21 + value: 20 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -16746,7 +16819,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24514 + m_Name: pb_Mesh50740 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18593,7 +18666,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24020 + m_Name: pb_Mesh50254 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18757,7 +18830,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23822 + m_Name: pb_Mesh50046 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19065,7 +19138,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23966 + m_Name: pb_Mesh50200 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21686,7 +21759,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_RootOrder - value: 23 + value: 22 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalScale.x @@ -25961,7 +26034,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 19 + value: 18 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -26302,7 +26375,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -28668,7 +28741,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!224 &1947605092 RectTransform: @@ -28677,17 +28750,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1947605091} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.5625, z: 1} + m_LocalRotation: {x: -0.052335896, y: 0, z: 0, w: 0.9986295} + m_LocalPosition: {x: 0, y: 0, z: 3.253} + m_LocalScale: {x: 0.02207732, y: 0.012418493, z: 0.02207732} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 184320055} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -6, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -615.44, y: -316.6147} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1947605093 @@ -28704,13 +28777,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 832e255abc5d1d94bad3a345e7f6264e, type: 3} + m_Texture: {fileID: 2800000, guid: 9df0243b6fb399244be95a5c72f686da, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -28796,7 +28869,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23940 + m_Name: pb_Mesh50174 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29325,6 +29398,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2833408188615038500, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2835658414891243653, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3} propertyPath: m_Name value: SmartTv @@ -29479,79 +29556,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} ---- !u!1 &2036324423 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2036324424} - - component: {fileID: 2036324426} - - component: {fileID: 2036324425} - m_Layer: 5 - m_Name: Oculus_Controls - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2036324424 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036324423} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.5625, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 184320055} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2036324425 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036324423} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: f3adb458eb2a4504284313642076de69, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &2036324426 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036324423} - m_CullTransparentMesh: 1 --- !u!1 &2039536872 GameObject: m_ObjectHideFlags: 0 @@ -32840,7 +32844,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24542 + m_Name: pb_Mesh50776 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 diff --git a/Assets/Scenes/FabLab/FabLab/LightingData.asset b/Assets/Scenes/FabLab/FabLab/LightingData.asset new file mode 100644 index 0000000..d86354a Binary files /dev/null and b/Assets/Scenes/FabLab/FabLab/LightingData.asset differ diff --git a/Assets/Scenes/FabLab/FabLab/LightingData.asset.meta b/Assets/Scenes/FabLab/FabLab/LightingData.asset.meta new file mode 100644 index 0000000..b474d53 --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 986b89aa15fdd8542a030c00f020235c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png new file mode 100644 index 0000000..b0e7edd --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b34e8c6766e7603f03ef94104876dccaf520eb34dd34e6750046f974f3cd6d28 +size 11487 diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png.meta new file mode 100644 index 0000000..b0140dd --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_dir.png.meta @@ -0,0 +1,171 @@ +fileFormatVersion: 2 +guid: 2d34f9bb85b89a44991fae84be30c5c1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr new file mode 100644 index 0000000..ed59329 Binary files /dev/null and b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr.meta new file mode 100644 index 0000000..e29007c --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-0_comp_light.exr.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 96b618a5f89094e4b99256e0c9de0c5f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png new file mode 100644 index 0000000..5e6c373 --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f8b542bddc6e8e5148caed3b7e21a88ccfdbf9a0cd54b4d7d4559b2dcc7e7056 +size 584898 diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png.meta new file mode 100644 index 0000000..ea5aa4c --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_dir.png.meta @@ -0,0 +1,171 @@ +fileFormatVersion: 2 +guid: 9df02e2369aea374f9d8fceff84d2e39 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr new file mode 100644 index 0000000..e34a958 Binary files /dev/null and b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr differ diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr.meta new file mode 100644 index 0000000..26e9b09 --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-1_comp_light.exr.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: a45c01eff442121418898c67ef905264 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png new file mode 100644 index 0000000..479dc31 --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a40b3396cecc3ecef4459b35203b4e4aa872df6b1b0beea8c9a5cb390fa4889e +size 55597 diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png.meta new file mode 100644 index 0000000..b7a7f17 --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_dir.png.meta @@ -0,0 +1,171 @@ +fileFormatVersion: 2 +guid: db10a93ad7571c241848ec5bcfb052e0 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr new file mode 100644 index 0000000..51e8435 Binary files /dev/null and b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr differ diff --git a/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr.meta b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr.meta new file mode 100644 index 0000000..80f5563 --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/Lightmap-2_comp_light.exr.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: fbdea81a152b5e840959a903d2097cb2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 1 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 3 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 0 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 6 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 2 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.exr b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.exr new file mode 100644 index 0000000..6629da4 Binary files /dev/null and b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.exr.meta b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..0357a26 --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.exr.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: d1f9fd436b9bcf7408b31e90143d8fee +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr new file mode 100644 index 0000000..8ffa742 Binary files /dev/null and b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr.meta b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr.meta new file mode 100644 index 0000000..e9fae04 --- /dev/null +++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-1.exr.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 7f91fccb9d86bbf4f8279ec231a4ca1e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 1 + seamlessCubemap: 1 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 2 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 2 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Catalog.cs b/Assets/Scripts/Catalog.cs index 1fa43a6..fb2d5cc 100644 --- a/Assets/Scripts/Catalog.cs +++ b/Assets/Scripts/Catalog.cs @@ -1,12 +1,7 @@ -using JetBrains.Annotations; -using System; using System.Collections; using System.Collections.Generic; -using System.Runtime.CompilerServices; -using UnityEditor; using UnityEngine; -using UnityEngine.ProBuilder.Shapes; -using UnityEngine.XR; +using Valve.VR; using Valve.VR.InteractionSystem; public class Catalog : MonoBehaviour @@ -22,6 +17,8 @@ public class Catalog : MonoBehaviour private GameObject currentSphere; public List Furnitures; private int maxShownObjects; + + private GameObject Trash; // Start is called before the first frame update void Start() { @@ -41,25 +38,68 @@ public class Catalog : MonoBehaviour // Update is called once per frame void Update() { + } + private void SpawnSphere(int index) + { + float radians = angle * Mathf.Deg2Rad; + float angleIncrement = radians / (maxShownObjects - 1); + if (index > Furnitures.Count - 1) + { + Debug.LogError("[Catalog] Sphere index out of bounds", this); + return; + } + var j = index * angleIncrement - radians / 2; + var sphere = Instantiate(spherePrefab); + sphere.transform.parent = transform; + sphere.transform.localScale = Vector3.one * objectScale; + sphere.transform.localPosition = new Vector3(Mathf.Sin(j), 0, Mathf.Cos(j)) * distance; + sphere.SetActive(true); + CatalogElement element = sphere.GetComponent(); + element.SetFurniture(Furnitures[index], objectScale); + element.index = index; + } + + public void SetTrash(MovableFurniture Grabbing) + { + Grabbing.gameObject.SetActive(false); + Trash.GetComponent().material.color = new Color(1, 0.5f, 0, 1); + } + + public void LeaveTrash(MovableFurniture Grabbing) + { + Grabbing.gameObject.SetActive(true); + CatalogElement element = Trash.GetComponent(); + element.ClearFurniture(); + Trash.GetComponent().material.color = new Color(1, 0, 0, 0.5f); + + } + private void SpawnTrash() + { + var sphere = Instantiate(spherePrefab); + sphere.transform.parent = transform; + sphere.transform.localScale = Vector3.one * objectScale; + sphere.transform.localPosition = new Vector3(0, 1, 1) * distance; + sphere.GetComponent().material.color = new Color(1, 0, 0, 0.5f); + sphere.GetComponent().enabled = false; + sphere.GetComponent().enabled = false; + sphere.SetActive(true); + sphere.tag = "Trash"; + sphere.layer = 10; + Trash = sphere; + } private void ShowCatalog() { gameObject.transform.SetParent(player.hands[0].transform); gameObject.transform.localPosition = Vector3.zero; - float radians = angle * Mathf.Deg2Rad; - float angleIncrement = radians / (maxShownObjects - 1); for (int i = 0; i < maxShownObjects; i++) { - var j = i * angleIncrement - radians / 2; - var sphere = Instantiate(spherePrefab); - sphere.transform.parent = transform; - sphere.transform.localScale = Vector3.one * objectScale; - sphere.transform.localPosition = new Vector3(Mathf.Sin(j), 0, Mathf.Cos(j)) * distance; - sphere.SetActive(true); - sphere.GetComponent().SetFurniture(Furnitures[i], objectScale); + SpawnSphere(i); } + SpawnTrash(); + StartCoroutine(CatalogCoroutine()); } @@ -107,18 +147,20 @@ public class Catalog : MonoBehaviour public void OnGrabSphere(CatalogElement sphere, Valve.VR.InteractionSystem.Hand hand) { + SpawnSphere(sphere.index); MovableFurniture grab = hand.GetComponent().Grabbing; if (grab != null) { return; } GameObject furniture = Instantiate(sphere.largeFurnitureModel); - MovableFurniture script = furniture.GetComponent() ; + MovableFurniture script = furniture.GetComponent(); if (!furniture.GetComponent()) { script = furniture.AddComponent(); } script.CalculateBounds(); + //script.OnPointerClickDown(); hand.GetComponent().Grabbing = script; } diff --git a/Assets/Scripts/CatalogElement.cs b/Assets/Scripts/CatalogElement.cs index 3ce80e6..2051730 100644 --- a/Assets/Scripts/CatalogElement.cs +++ b/Assets/Scripts/CatalogElement.cs @@ -1,13 +1,11 @@ using System.Collections; -using System.Collections.Generic; using UnityEngine; -using UnityEngine.Events; -using UnityEngine.ProBuilder.Shapes; using Valve.VR.InteractionSystem; public class CatalogElement : Throwable { public GameObject largeFurnitureModel; + public int index; private GameObject smallFurnitureModel; private Vector3 returnPosition; // Start is called before the first frame update @@ -19,7 +17,7 @@ public class CatalogElement : Throwable // Update is called once per frame void Update() { - + } protected override void OnAttachedToHand(Hand hand) @@ -42,7 +40,7 @@ public class CatalogElement : Throwable Catalog.Instance.OnGrabSphere(this, hand); //hand.GetComponent().Grabbing = largeFurnitureModel.GetComponent(); -} + } //------------------------------------------------- @@ -59,7 +57,7 @@ public class CatalogElement : Throwable Catalog.Instance.OnReleaseSphere(this, hand); Destroy(gameObject); } - + public void SetFurniture(GameObject furniture, float objectScale) { @@ -86,10 +84,16 @@ public class CatalogElement : Throwable }; float rescale = (objectScale / 1.4f) / objectBounds.combinedBounds.size.magnitude; smallFurnitureModel.transform.localScale *= rescale; - smallFurnitureModel.transform.localPosition = Vector3.down * 0.2f; + smallFurnitureModel.transform.localPosition = Vector3.down * 0.2f; StartCoroutine(KeepFurnitureAligned()); } + + public void ClearFurniture() + { + Destroy(smallFurnitureModel); + } + private IEnumerator ReturnSphere() { float time = 0; @@ -97,17 +101,24 @@ public class CatalogElement : Throwable while (time <= 1) { transform.localPosition = Vector3.Lerp(startPosition, returnPosition, time); - time += Time.deltaTime*4; + time += Time.deltaTime * 4; yield return null; } yield break; } - private IEnumerator KeepFurnitureAligned() { + private IEnumerator KeepFurnitureAligned() + { while (true) { - smallFurnitureModel.transform.eulerAngles = new Vector3(0, smallFurnitureModel.transform.eulerAngles.y-(20*Time.deltaTime), 0); + smallFurnitureModel.transform.eulerAngles = new Vector3(0, smallFurnitureModel.transform.eulerAngles.y - (20 * Time.deltaTime), 0); yield return null; } } + + + private void OnPointerEnter() + { + Debug.Log("enter"); + } } diff --git a/Assets/Scripts/FurnitureMover.cs b/Assets/Scripts/FurnitureMover.cs index 7135b6e..e78aa4c 100644 --- a/Assets/Scripts/FurnitureMover.cs +++ b/Assets/Scripts/FurnitureMover.cs @@ -1,6 +1,4 @@ -using System.Collections.Generic; using UnityEngine; -using UnityEngine.EventSystems; using Valve.VR; using Valve.VR.Extras; using Valve.VR.InteractionSystem; @@ -27,6 +25,9 @@ public class FurnitureMover : MonoBehaviour private SnapTurn _snapturn; private Hand hand; + + public static FurnitureMover Instance; + private SnapTurn snapturn { get @@ -40,6 +41,7 @@ public class FurnitureMover : MonoBehaviour } private void Start() { + Instance = this; hand = GetComponent(); if (pose == null) pose = this.GetComponent(); @@ -79,13 +81,30 @@ public class FurnitureMover : MonoBehaviour Ray SnapRaycast = new Ray(transform.position, transform.forward); RaycastHit SnapHit; + + bool SnapbHit = Physics.Raycast(SnapRaycast, out SnapHit, 100f, AutoPlacementEnvironmentMask); if (SnapbHit && Grabbing != null) { - Grabbing.SnapTo(SnapHit.point, AutoPlacementEnvironmentMask, transform.forward); + //TODO Check if object is on walls + if (Grabbing.wallMount) + { + + } + if (SnapHit.collider.gameObject.tag == "Trash" && Grabbing.gameObject.activeInHierarchy) + { + Catalog.Instance.SetTrash(Grabbing); + } + else if (SnapHit.collider.gameObject.tag != "Trash") + { + Catalog.Instance.LeaveTrash(Grabbing); + Grabbing.gameObject.SetActive(true); + Grabbing.SnapTo(SnapHit.point, AutoPlacementEnvironmentMask, transform.forward); + } + } - + if (previousContact && previousContact != hit.transform) { PointerEventArgs args = new PointerEventArgs(); @@ -145,12 +164,9 @@ public class FurnitureMover : MonoBehaviour } pointer.transform.localPosition = new Vector3(0f, 0f, dist / 2f); - - - - if(Grabbing != null && snapLeftAction != null && snapRightAction != null && snapLeftAction.activeBinding && snapRightAction.activeBinding) + //Rotate Logic + if (Grabbing != null && snapLeftAction != null && snapRightAction != null && snapLeftAction.activeBinding && snapRightAction.activeBinding) { - bool leftHandTurnLeft = snapLeftAction.GetStateDown(hand.handType); bool rightHandTurnLeft = snapLeftAction.GetStateDown(hand.otherHand.handType); @@ -184,7 +200,7 @@ public class FurnitureMover : MonoBehaviour } private void OnPointerClickDown(object sender, PointerEventArgs e) { - if (Grabbing) + if (Grabbing != null) { return; } @@ -198,7 +214,7 @@ public class FurnitureMover : MonoBehaviour GrabFurniture(Grabbing.gameObject); /*Grabbing.transform.SetParent(this.transform);*/ } - + public void SetGrabbing(MovableFurniture furniture) { Grabbing = furniture; @@ -234,13 +250,13 @@ public class FurnitureMover : MonoBehaviour private void OnPointerIn(object sender, PointerEventArgs e) { + if (Grabbing != null) return; MovableFurniturePart pointerEnterHandler = e.target.GetComponent(); if (pointerEnterHandler == null) { return; } - pointerEnterHandler.OnPointerEnter(); } } \ No newline at end of file diff --git a/Assets/Scripts/MovableFurniture.cs b/Assets/Scripts/MovableFurniture.cs index 9305035..e1e3ba8 100644 --- a/Assets/Scripts/MovableFurniture.cs +++ b/Assets/Scripts/MovableFurniture.cs @@ -7,7 +7,8 @@ public class MovableFurniture : Furniture private List outlines; private Rigidbody _rigidbody; public bool wallMount; - + private bool isColliding = false; + private bool isGrabbing = false; // Start is called before the first frame update new void Start() { @@ -22,7 +23,7 @@ public class MovableFurniture : Furniture var outline = child.gameObject.AddComponent(); if (!outline) continue; outlines.Add(outline); - outline.OutlineMode = ObjectOutline.Mode.OutlineAll; + outline.OutlineMode = ObjectOutline.Mode.OutlineVisible; outline.OutlineColor = Color.yellow; outline.OutlineWidth = 5f; outline.enabled = false; @@ -37,17 +38,33 @@ public class MovableFurniture : Furniture public void OnPointerClickUp() { + isGrabbing = false; + foreach (ObjectOutline outline in outlines) + { + outline.enabled = false; + } if (_rigidbody != null) { _rigidbody.useGravity = true; + _rigidbody.isKinematic = false; } } + public void OnPointerClickDown() { + isGrabbing = true; + foreach (ObjectOutline outline in outlines) + { + outline.OutlineMode = ObjectOutline.Mode.OutlineAll; + outline.OutlineColor = Color.blue; + outline.OutlineWidth = 5f; + outline.enabled = true; + } if (_rigidbody != null) { _rigidbody.useGravity = false; + _rigidbody.isKinematic = true; } } @@ -56,15 +73,16 @@ public class MovableFurniture : Furniture { foreach (ObjectOutline outline in outlines) { - /*child.OutlineMode = ObjectOutline.Mode.OutlineAll; - child.OutlineColor = Color.yellow; - child.OutlineWidth = 5f;*/ + outline.OutlineMode = ObjectOutline.Mode.OutlineAll; + outline.OutlineColor = Color.yellow; + outline.OutlineWidth = 5f; outline.enabled = true; } } public void OnPointerExit() { + if (isGrabbing) { return; } foreach (ObjectOutline outline in outlines) { outline.enabled = false; @@ -96,6 +114,9 @@ public class MovableFurniture : Furniture { Vector3 previousPosition = transform.position; Vector3 offset = Vector3.zero; + //if (isColliding) { return; } + transform.position = position; + return; if (wallMount) { transform.position = position; @@ -149,21 +170,54 @@ public class MovableFurniture : Furniture void OnDrawGizmos() { // Draw a yellow sphere at the transform's position - Gizmos.color = Color.red; + /*Gizmos.color = Color.red; Gizmos.DrawWireCube(transform.position - centerOffset, combinedBounds.size); - Gizmos.DrawRay((transform.position - centerOffset) - (new Vector3(0, 0, combinedBounds.extents.z)), (new Vector3(0, 0, combinedBounds.size.z))); + Gizmos.DrawRay((transform.position - centerOffset) - (new Vector3(0, 0, combinedBounds.extents.z)), (new Vector3(0, 0, combinedBounds.size.z)));*/ } private void OnDisable() { - if(outlines != null && outlines.Count > 0) + if (outlines != null && outlines.Count > 0) { foreach (ObjectOutline outline in outlines) { outline.enabled = false; } } - } + + //Check if collision before moving an object + public void OnFurnitureCollisionEnter(Collider other) + { + /*foreach (ObjectOutline outline in outlines) + { + outline.OutlineColor = Color.red; + outline.enabled = true; + } + isColliding = true;*/ + } + + public void OnFurnitureCollisionStay(Collider other) + { + //isColliding = true; + } + + public void OnFurnitureCollisionExit(Collider other) + { + //Run CheckFurnitureCollisions on next FixedUpdate loop. If no object is truly colliding, isColliding should be false inside CheckFurnitureCollisions + /*Invoke("CheckFurnitureCollisions", Time.fixedTime * 2); + isColliding = false;*/ + } + private void CheckFurnitureCollisions() + { + if (isColliding == true) return; + + foreach (ObjectOutline outline in outlines) + { + outline.OutlineColor = Color.yellow; + outline.enabled = false; + } + + } } diff --git a/Assets/Scripts/MovableFurniturePart.cs b/Assets/Scripts/MovableFurniturePart.cs index 761caf4..9c77937 100644 --- a/Assets/Scripts/MovableFurniturePart.cs +++ b/Assets/Scripts/MovableFurniturePart.cs @@ -1,7 +1,4 @@ -using System.Collections; -using System.Collections.Generic; using UnityEngine; -using UnityEngine.UI; public class MovableFurniturePart : MonoBehaviour { @@ -9,13 +6,13 @@ public class MovableFurniturePart : MonoBehaviour // Start is called before the first frame update void Start() { - + } // Update is called once per frame void Update() { - + } public void OnPointerClickDown() @@ -32,4 +29,19 @@ public class MovableFurniturePart : MonoBehaviour { parent.OnPointerExit(); } + + private void OnTriggerEnter(Collider other) + { + parent.OnFurnitureCollisionEnter(other); + } + + private void OnTriggerExit(Collider other) + { + parent.OnFurnitureCollisionExit(other); + } + + private void OnTriggerStay(Collider other) + { + parent.OnFurnitureCollisionStay(other); + } } diff --git a/Assets/Unity.VisualScripting.Generated.meta b/Assets/Unity.VisualScripting.Generated.meta new file mode 100644 index 0000000..3c75a58 --- /dev/null +++ b/Assets/Unity.VisualScripting.Generated.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2fa3c84342bf4004a8eb53cc71264e55 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow.meta b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow.meta new file mode 100644 index 0000000..e514b44 --- /dev/null +++ b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38ac2f34e5ce0e54f83d9f9914dc12eb +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db new file mode 100644 index 0000000..19547d6 Binary files /dev/null and b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db differ diff --git a/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta new file mode 100644 index 0000000..7174649 --- /dev/null +++ b/Assets/Unity.VisualScripting.Generated/VisualScripting.Flow/UnitOptions.db.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ef8537c61db31324ca725ad6028f643f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index d617878..47f6a77 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: 7fffffff7fffffff7fffffffffffffff7fffffff7fffffff7fffffff88ffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffff + m_LayerCollisionMatrix: 7ffdffff7ffdffff7ffdffffffffffff7ffdffff7ffdffff7ffdffff88fdff7fffffffff08ffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffdffff m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 diff --git a/ProjectSettings/Packages/com.unity.probuilder/Settings.json b/ProjectSettings/Packages/com.unity.probuilder/Settings.json index 5d6aa6d..abb7348 100644 --- a/ProjectSettings/Packages/com.unity.probuilder/Settings.json +++ b/ProjectSettings/Packages/com.unity.probuilder/Settings.json @@ -98,6 +98,11 @@ "key": "log.path", "value": "{\"m_Value\":\"ProBuilderLog.txt\"}" }, + { + "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089", + "key": "editor.materialPalettePath", + "value": "{\"m_Value\":\"Assets/ProBuilder Data/Default Material Palette.asset\"}" + }, { "type": "UnityEngine.ProBuilder.SemVer, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "about.identifier", @@ -126,7 +131,7 @@ { "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "editor.lastMeshSelectMode", - "value": "{\"m_Value\":4}" + "value": "{\"m_Value\":8}" }, { "type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", @@ -187,6 +192,11 @@ "type": "UnityEngine.Quaternion, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "key": "ShapeBuilder.LastRotation", "value": "{\"m_Value\":{\"x\":0.0,\"y\":0.0,\"z\":0.0,\"w\":1.0}}" + }, + { + "type": "UnityEngine.ProBuilder.ExtrudeMethod, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", + "key": "editor.extrudeMethod", + "value": "{\"m_Value\":2}" } ] } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index a5cc549..1001c23 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -7,6 +7,8 @@ TagManager: - SamplesInfoPanel - projectile - FxTemporaire + - FurnitureTrigger + - Trash layers: - Default - TransparentFX @@ -17,8 +19,8 @@ TagManager: - Static Lighting - Teleport Area - Environment - - - - + - FurnitureTrigger + - Trash - - -