diff --git a/.gitignore b/.gitignore index d7bf3ac..99656eb 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ Assets/Resources/DOTweenSettings.asset Assets/Resources/DOTweenSettings.asset Assets/LeanTween/Framework/ /Assets/LeanTween/Framework +/Assets/LeanTween diff --git a/Assets/Models/CleoChair.fbx b/Assets/Models/CleoChair.fbx index b94573a..07d6a52 100644 --- a/Assets/Models/CleoChair.fbx +++ b/Assets/Models/CleoChair.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc4284160495a00689eeecc46006a017a1f4e0975af4f8eb1a546b6fc432d09f -size 92091260 +oid sha256:ad047684abce6a88805faa8db421227b8894a209695619c855917975cdd2ba85 +size 92095020 diff --git a/Assets/Models/CleoChair.fbx.meta b/Assets/Models/CleoChair.fbx.meta index b94cf40..7644795 100644 --- a/Assets/Models/CleoChair.fbx.meta +++ b/Assets/Models/CleoChair.fbx.meta @@ -4,21 +4,36 @@ ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Chair + second: {fileID: 2100000, guid: e4e3bb006117ba5468cb6f13dbc645a9, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Legs + second: {fileID: 2100000, guid: ca47a98b1197485488db062e7aa6a411, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Skin + second: {fileID: 2100000, guid: b232094780092884ea339f1739351b97, type: 2} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: CLEO CHAIR COLOR CAPITOLINO_TAN- C0001_003 - second: {fileID: 2800000, guid: d19c3d8d8489ea447a2ad7886af9139e, type: 3} + second: {fileID: 2800000, guid: be3efd2222c604443a5b389c029abd0a, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: CLEO CHAIR WOOD FINISH CHOCOLATE STAINED ASH - second: {fileID: 2800000, guid: 11122267b6137bf4cb2b6606ed5f8149, type: 3} + second: {fileID: 2800000, guid: a72e81b358799734fae1703bfcb08321, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: SOFA FABRIC FILICUDI_WHITE- T0014_001 - second: {fileID: 2800000, guid: e13a0dfdd9dc91d4a8ef96f85c975c69, type: 3} + second: {fileID: 2800000, guid: 08e18a7837026ab45a6755de1bfcd16e, type: 3} materials: materialImportMode: 2 materialName: 0 @@ -47,7 +62,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Models/Materials.meta b/Assets/Models/Materials.meta new file mode 100644 index 0000000..efcc3f6 --- /dev/null +++ b/Assets/Models/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 713a18059c316d143a5dd558460a57b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/0,116,120.001.mat b/Assets/Models/Materials/0,116,120.001.mat new file mode 100644 index 0000000..801dfe8 --- /dev/null +++ b/Assets/Models/Materials/0,116,120.001.mat @@ -0,0 +1,83 @@ +%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: 0,116,120.001 + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: a98683ad4e301e54694d34733f8e7573, type: 3} + 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 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/0,116,120.001.mat.meta b/Assets/Models/Materials/0,116,120.001.mat.meta new file mode 100644 index 0000000..3130192 --- /dev/null +++ b/Assets/Models/Materials/0,116,120.001.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bd2d29398ed50954981410baeb8555d7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/0,116,120.002.mat b/Assets/Models/Materials/0,116,120.002.mat new file mode 100644 index 0000000..c235ae5 --- /dev/null +++ b/Assets/Models/Materials/0,116,120.002.mat @@ -0,0 +1,83 @@ +%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: 0,116,120.002 + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: c93696dcb8bbd084ba719816a87360d3, type: 3} + 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 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/0,116,120.002.mat.meta b/Assets/Models/Materials/0,116,120.002.mat.meta new file mode 100644 index 0000000..e72c2c9 --- /dev/null +++ b/Assets/Models/Materials/0,116,120.002.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c0ebd1874c79b1840b6a1ac19e4d486a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/191,191,191.001.mat b/Assets/Models/Materials/191,191,191.001.mat new file mode 100644 index 0000000..57c1711 --- /dev/null +++ b/Assets/Models/Materials/191,191,191.001.mat @@ -0,0 +1,83 @@ +%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: 191,191,191.001 + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: 01374788fe26e71409a2d0a9cc4ab44e, type: 3} + 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 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/191,191,191.001.mat.meta b/Assets/Models/Materials/191,191,191.001.mat.meta new file mode 100644 index 0000000..3b5910e --- /dev/null +++ b/Assets/Models/Materials/191,191,191.001.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 41dec5500a8d2564da28ea38491f1e49 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/191,191,191.002.mat b/Assets/Models/Materials/191,191,191.002.mat new file mode 100644 index 0000000..2205e17 --- /dev/null +++ b/Assets/Models/Materials/191,191,191.002.mat @@ -0,0 +1,83 @@ +%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: 191,191,191.002 + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: fbde75e0c94e83144a38dc00979fb2a7, type: 3} + 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 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/191,191,191.002.mat.meta b/Assets/Models/Materials/191,191,191.002.mat.meta new file mode 100644 index 0000000..7cc3080 --- /dev/null +++ b/Assets/Models/Materials/191,191,191.002.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0dffa43c10369994fa3272cb75cb7dc1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/237,237,231.001.mat b/Assets/Models/Materials/237,237,231.001.mat new file mode 100644 index 0000000..522775d --- /dev/null +++ b/Assets/Models/Materials/237,237,231.001.mat @@ -0,0 +1,83 @@ +%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: 237,237,231.001 + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: a98683ad4e301e54694d34733f8e7573, type: 3} + 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 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/237,237,231.001.mat.meta b/Assets/Models/Materials/237,237,231.001.mat.meta new file mode 100644 index 0000000..c288b13 --- /dev/null +++ b/Assets/Models/Materials/237,237,231.001.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: addb1be4c5047fe44b642ebb8f618e0a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/237,237,231.002.mat b/Assets/Models/Materials/237,237,231.002.mat new file mode 100644 index 0000000..486bff2 --- /dev/null +++ b/Assets/Models/Materials/237,237,231.002.mat @@ -0,0 +1,83 @@ +%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: 237,237,231.002 + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: c93696dcb8bbd084ba719816a87360d3, type: 3} + 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 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/237,237,231.002.mat.meta b/Assets/Models/Materials/237,237,231.002.mat.meta new file mode 100644 index 0000000..ee23373 --- /dev/null +++ b/Assets/Models/Materials/237,237,231.002.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3f3ca85733238e741b55f6c3f55fba9e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/5,5,5.001.mat b/Assets/Models/Materials/5,5,5.001.mat new file mode 100644 index 0000000..8399659 --- /dev/null +++ b/Assets/Models/Materials/5,5,5.001.mat @@ -0,0 +1,83 @@ +%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: 5,5,5.001 + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: de7c822c4f2decb4985b3fd635fc4384, type: 3} + 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 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/5,5,5.001.mat.meta b/Assets/Models/Materials/5,5,5.001.mat.meta new file mode 100644 index 0000000..5693b41 --- /dev/null +++ b/Assets/Models/Materials/5,5,5.001.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68e65b8249cf86344940a1742e93ff95 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/5,5,5.002.mat b/Assets/Models/Materials/5,5,5.002.mat new file mode 100644 index 0000000..c5731c1 --- /dev/null +++ b/Assets/Models/Materials/5,5,5.002.mat @@ -0,0 +1,83 @@ +%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: 5,5,5.002 + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: 76a0909d2c362b741a5b046448b0899d, type: 3} + 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 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/5,5,5.002.mat.meta b/Assets/Models/Materials/5,5,5.002.mat.meta new file mode 100644 index 0000000..f9d2cc5 --- /dev/null +++ b/Assets/Models/Materials/5,5,5.002.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f61b0b3a6cf35364e8af05873c387e82 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Chair.mat b/Assets/Models/Materials/Chair.mat new file mode 100644 index 0000000..5d6f822 --- /dev/null +++ b/Assets/Models/Materials/Chair.mat @@ -0,0 +1,83 @@ +%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: Chair + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: 08e18a7837026ab45a6755de1bfcd16e, type: 3} + 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 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/Chair.mat.meta b/Assets/Models/Materials/Chair.mat.meta new file mode 100644 index 0000000..630a53e --- /dev/null +++ b/Assets/Models/Materials/Chair.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e4e3bb006117ba5468cb6f13dbc645a9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Glass_normal.001.png b/Assets/Models/Materials/Glass_normal.001.png new file mode 100644 index 0000000..8364754 Binary files /dev/null and b/Assets/Models/Materials/Glass_normal.001.png differ diff --git a/Assets/Models/Materials/Glass_normal.001.png.meta b/Assets/Models/Materials/Glass_normal.001.png.meta new file mode 100644 index 0000000..410a1c3 --- /dev/null +++ b/Assets/Models/Materials/Glass_normal.001.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0e1b9773e8a375b4b97a835475698149 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 1 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Legs.mat b/Assets/Models/Materials/Legs.mat new file mode 100644 index 0000000..1bab80d --- /dev/null +++ b/Assets/Models/Materials/Legs.mat @@ -0,0 +1,83 @@ +%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: Legs + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: a72e81b358799734fae1703bfcb08321, type: 3} + 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.5 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/Legs.mat.meta b/Assets/Models/Materials/Legs.mat.meta new file mode 100644 index 0000000..eed42b3 --- /dev/null +++ b/Assets/Models/Materials/Legs.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca47a98b1197485488db062e7aa6a411 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Material.001.mat b/Assets/Models/Materials/Material.001.mat new file mode 100644 index 0000000..b32337e --- /dev/null +++ b/Assets/Models/Materials/Material.001.mat @@ -0,0 +1,83 @@ +%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: Material.001 + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: e8f869eb78435b04b96cd129546a5766, type: 3} + 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.2672727 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/Material.001.mat.meta b/Assets/Models/Materials/Material.001.mat.meta new file mode 100644 index 0000000..8dc1867 --- /dev/null +++ b/Assets/Models/Materials/Material.001.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82febf23f0ab3a24fa349d4cf3828afa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/SANDIA non reflective.mat b/Assets/Models/Materials/SANDIA non reflective.mat new file mode 100644 index 0000000..8149418 --- /dev/null +++ b/Assets/Models/Materials/SANDIA non reflective.mat @@ -0,0 +1,83 @@ +%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: SANDIA non reflective + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: ccce0ef1aec1a074aa921bb393bc65e7, type: 3} + 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.5 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/SANDIA non reflective.mat.meta b/Assets/Models/Materials/SANDIA non reflective.mat.meta new file mode 100644 index 0000000..57c456a --- /dev/null +++ b/Assets/Models/Materials/SANDIA non reflective.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9941614402f531d419ac9718c9288531 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/SUMO Glass.mat b/Assets/Models/Materials/SUMO Glass.mat new file mode 100644 index 0000000..3fcd512 --- /dev/null +++ b/Assets/Models/Materials/SUMO Glass.mat @@ -0,0 +1,89 @@ +%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: SUMO Glass + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _DETAIL_MULX2 + - _GLOSSYREFLECTIONS_OFF + - _NORMALMAP + - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 2800000, guid: 0e1b9773e8a375b4b97a835475698149, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 2800000, guid: 848ec97bb4fdfba48b6575bd33f9369a, type: 3} + 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: 2800000, guid: 0e1b9773e8a375b4b97a835475698149, type: 3} + 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: 2800000, guid: 2082c471f208c7c4cad8b2599bded5af, type: 3} + 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: 10 + - _GlossMapScale: 1 + - _Glossiness: 0.278 + - _GlossyReflections: 0 + - _Metallic: 0 + - _Mode: 3 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 1 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/SUMO Glass.mat.meta b/Assets/Models/Materials/SUMO Glass.mat.meta new file mode 100644 index 0000000..8fc11c5 --- /dev/null +++ b/Assets/Models/Materials/SUMO Glass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dbcb89d94eeacb24a89c6db521d64419 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/SUMO Metal.mat b/Assets/Models/Materials/SUMO Metal.mat new file mode 100644 index 0000000..f38d823 --- /dev/null +++ b/Assets/Models/Materials/SUMO Metal.mat @@ -0,0 +1,83 @@ +%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: SUMO Metal + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: 10d48cd4f26066f40a42854999a72266, type: 3} + 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.2681818 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/SUMO Metal.mat.meta b/Assets/Models/Materials/SUMO Metal.mat.meta new file mode 100644 index 0000000..e245ca0 --- /dev/null +++ b/Assets/Models/Materials/SUMO Metal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1bbb826a2dbb01246a2aad08d4895a5d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Materials/Skin.mat b/Assets/Models/Materials/Skin.mat new file mode 100644 index 0000000..3adcb48 --- /dev/null +++ b/Assets/Models/Materials/Skin.mat @@ -0,0 +1,83 @@ +%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: Skin + m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + 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: 2800000, guid: be3efd2222c604443a5b389c029abd0a, type: 3} + 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.5 + - _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: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} + m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/Skin.mat.meta b/Assets/Models/Materials/Skin.mat.meta new file mode 100644 index 0000000..d374390 --- /dev/null +++ b/Assets/Models/Materials/Skin.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b232094780092884ea339f1739351b97 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SUMO Coffe Table 102.fbx b/Assets/Models/SUMO Coffe Table 102.fbx index 6862abe..cd9fea9 100644 --- a/Assets/Models/SUMO Coffe Table 102.fbx +++ b/Assets/Models/SUMO Coffe Table 102.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e42218490b604349187c6bdfe94a1e460fed553c032dac254a4b84f9403a2a70 -size 136456108 +oid sha256:33f910aa0ecc06a8a705e5b29d5c33a3f835d0bfefe6c6b5b2b9ccc38383512d +size 159030716 diff --git a/Assets/Models/SUMO Coffe Table 102.fbx.meta b/Assets/Models/SUMO Coffe Table 102.fbx.meta index d0b8466..12b6980 100644 --- a/Assets/Models/SUMO Coffe Table 102.fbx.meta +++ b/Assets/Models/SUMO Coffe Table 102.fbx.meta @@ -3,7 +3,32 @@ guid: e43b07362fa01834384c4c5ec519a8ca ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: SUMO Glass + second: {fileID: 2100000, guid: dbcb89d94eeacb24a89c6db521d64419, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: SUMO Metal + second: {fileID: 2100000, guid: 1bbb826a2dbb01246a2aad08d4895a5d, type: 2} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: SUMO Color alt alpha + second: {fileID: 2800000, guid: 10d48cd4f26066f40a42854999a72266, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: SUMO Glossy + second: {fileID: 2800000, guid: 848ec97bb4fdfba48b6575bd33f9369a, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: SUMO Roughness + second: {fileID: 2800000, guid: 0e38fd3f2e6f13f47899ac1447ba7e02, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/SUMO Coffe Table 102_Glass.glb b/Assets/Models/SUMO Coffe Table 102_Glass.glb new file mode 100644 index 0000000..a3950ca Binary files /dev/null and b/Assets/Models/SUMO Coffe Table 102_Glass.glb differ diff --git a/Assets/Models/SUMO Coffe Table 102_Glass.glb.meta b/Assets/Models/SUMO Coffe Table 102_Glass.glb.meta new file mode 100644 index 0000000..73be248 --- /dev/null +++ b/Assets/Models/SUMO Coffe Table 102_Glass.glb.meta @@ -0,0 +1,31 @@ +fileFormatVersion: 2 +guid: 9191fb6487c2df743aee245a92ca3828 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 715df9372183c47e389bb6e19fbc3b52, type: 3} + editorImportSettings: + generateSecondaryUVSet: 0 + importSettings: + nodeNameMethod: 1 + animationMethod: 2 + generateMipMaps: 1 + texturesReadable: 0 + defaultMinFilterMode: 9729 + defaultMagFilterMode: 9729 + anisotropicFilterLevel: 1 + instantiationSettings: + mask: -1 + layer: 0 + skinUpdateWhenOffscreen: 1 + lightIntensityFactor: 1 + sceneObjectCreation: 2 + assetDependencies: [] + reportItems: + - type: 2 + code: 30 + messages: [] diff --git a/Assets/Models/Sandia.fbx b/Assets/Models/Sandia.fbx index 679c5d2..1b656ff 100644 --- a/Assets/Models/Sandia.fbx +++ b/Assets/Models/Sandia.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:89976303e0f0fcc62a6d9ccb51666768a430ee462ed6d02741f8ec0d060e8860 -size 219480908 +oid sha256:2066316919b7bc620b2df1861927931ed308933fe9e5ab32d910dd3ca45af3a5 +size 120385484 diff --git a/Assets/Models/Sandia.fbx.meta b/Assets/Models/Sandia.fbx.meta index 5a2715a..b38b12d 100644 --- a/Assets/Models/Sandia.fbx.meta +++ b/Assets/Models/Sandia.fbx.meta @@ -3,7 +3,32 @@ guid: a159887176eca8843a8a9a42b862cbee ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: Material.001 + second: {fileID: 2100000, guid: 82febf23f0ab3a24fa349d4cf3828afa, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: SANDIA non reflective + second: {fileID: 2100000, guid: 9941614402f531d419ac9718c9288531, type: 2} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: SANDIA Color alt + second: {fileID: 2800000, guid: ccce0ef1aec1a074aa921bb393bc65e7, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: SANDIA Roughness + second: {fileID: 2800000, guid: 79021ac3b25586e41b4de8036ee635de, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: SANDIA Velvet alt + second: {fileID: 2800000, guid: e8f869eb78435b04b96cd129546a5766, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/TOTU Coffe Table 103.fbx b/Assets/Models/TOTU Coffe Table 103.fbx index 31fbb97..109ff78 100644 --- a/Assets/Models/TOTU Coffe Table 103.fbx +++ b/Assets/Models/TOTU Coffe Table 103.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd2b436deb1a6e7d202f8b1ba4b98f1f2b9f8fc51365be4eeb5463f341792bf4 -size 2635036 +oid sha256:b90865d0708984298aa529c3966f1ddba24628fc097e9e4d3b3e34a4f08dc159 +size 2671212 diff --git a/Assets/Models/TOTU Coffe Table 103.fbx.meta b/Assets/Models/TOTU Coffe Table 103.fbx.meta index 905a0fb..43cefa2 100644 --- a/Assets/Models/TOTU Coffe Table 103.fbx.meta +++ b/Assets/Models/TOTU Coffe Table 103.fbx.meta @@ -4,21 +4,41 @@ ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 0,116,120.002 + second: {fileID: 2100000, guid: c0ebd1874c79b1840b6a1ac19e4d486a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 191,191,191.002 + second: {fileID: 2100000, guid: 0dffa43c10369994fa3272cb75cb7dc1, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 237,237,231.002 + second: {fileID: 2100000, guid: 3f3ca85733238e741b55f6c3f55fba9e, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 5,5,5.002 + second: {fileID: 2100000, guid: f61b0b3a6cf35364e8af05873c387e82, type: 2} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: BRUSHED GUN METAL_ I304S - second: {fileID: 2800000, guid: 7e8c14de5ea67034597e2d4bc9c2a585, type: 3} + second: {fileID: 2800000, guid: 76a0909d2c362b741a5b046448b0899d, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: CARNICO GREY GLOSSY_ M203L - second: {fileID: 2800000, guid: 62392b673cea8e94c9bc4b2885aa289c, type: 3} + second: {fileID: 2800000, guid: c93696dcb8bbd084ba719816a87360d3, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: OLD BRONZE_ I311V - second: {fileID: 2800000, guid: b1ee3daeef1c31b4c8ce034a2da629e8, type: 3} + second: {fileID: 2800000, guid: fbde75e0c94e83144a38dc00979fb2a7, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/TOTU Coffe Table 104.fbx b/Assets/Models/TOTU Coffe Table 104.fbx index b0a4ac7..15d9b6b 100644 --- a/Assets/Models/TOTU Coffe Table 104.fbx +++ b/Assets/Models/TOTU Coffe Table 104.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd513383219c46fc2bb64045073746b4d0c704114d7856d87362070f592be574 -size 8625340 +oid sha256:ee25fb1aa2a9677905a37b84759387cb33c56244353c9647e61a126737ef8435 +size 8625228 diff --git a/Assets/Models/TOTU Coffe Table 104.fbx.meta b/Assets/Models/TOTU Coffe Table 104.fbx.meta index 3d73701..a059104 100644 --- a/Assets/Models/TOTU Coffe Table 104.fbx.meta +++ b/Assets/Models/TOTU Coffe Table 104.fbx.meta @@ -3,7 +3,42 @@ guid: 6d7886c474484de4eb1fb6da8450d072 ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] - externalObjects: {} + externalObjects: + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 0,116,120.001 + second: {fileID: 2100000, guid: bd2d29398ed50954981410baeb8555d7, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 191,191,191.001 + second: {fileID: 2100000, guid: 41dec5500a8d2564da28ea38491f1e49, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 237,237,231.001 + second: {fileID: 2100000, guid: addb1be4c5047fe44b642ebb8f618e0a, type: 2} + - first: + type: UnityEngine:Material + assembly: UnityEngine.CoreModule + name: 5,5,5.001 + second: {fileID: 2100000, guid: 68e65b8249cf86344940a1742e93ff95, type: 2} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: BRUSHED GUN METAL_ I304S + second: {fileID: 2800000, guid: de7c822c4f2decb4985b3fd635fc4384, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: MARMO PATAGONIA CLEARER + second: {fileID: 2800000, guid: a98683ad4e301e54694d34733f8e7573, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: OLD BRONZE_ I311V + second: {fileID: 2800000, guid: 01374788fe26e71409a2d0a9cc4ab44e, type: 3} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 1.jpeg.meta b/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 1.jpeg.meta index 5fcde45..1bc0b7a 100644 --- a/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 1.jpeg.meta +++ b/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 1.jpeg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 09701fadfaaea834fb4636d582d1190e +guid: de7c822c4f2decb4985b3fd635fc4384 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 2.jpeg b/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 2.jpeg deleted file mode 100644 index 2073ebd..0000000 Binary files a/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 2.jpeg and /dev/null differ diff --git a/Assets/Models/Textures/BRUSHED GUN METAL_ I304S.jpeg.meta b/Assets/Models/Textures/BRUSHED GUN METAL_ I304S.jpeg.meta index 50c3fdd..46b3244 100644 --- a/Assets/Models/Textures/BRUSHED GUN METAL_ I304S.jpeg.meta +++ b/Assets/Models/Textures/BRUSHED GUN METAL_ I304S.jpeg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 75b18e068c1fd3c45b81ba21ada61e07 +guid: 76a0909d2c362b741a5b046448b0899d TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L 1.jpeg b/Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L 1.jpeg deleted file mode 100644 index f92aaa7..0000000 Binary files a/Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L 1.jpeg and /dev/null differ diff --git a/Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L.jpeg.meta b/Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L.jpeg.meta index 1e1cd08..696dfc2 100644 --- a/Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L.jpeg.meta +++ b/Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L.jpeg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 34f74ee811daf9e42a947505cc1332b8 +guid: c93696dcb8bbd084ba719816a87360d3 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/CLEO CHAIR COLOR CAPITOLINO_TAN- C0001_003.jpeg.meta b/Assets/Models/Textures/CLEO CHAIR COLOR CAPITOLINO_TAN- C0001_003.jpeg.meta index 981e7c4..d3e2fae 100644 --- a/Assets/Models/Textures/CLEO CHAIR COLOR CAPITOLINO_TAN- C0001_003.jpeg.meta +++ b/Assets/Models/Textures/CLEO CHAIR COLOR CAPITOLINO_TAN- C0001_003.jpeg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d19c3d8d8489ea447a2ad7886af9139e +guid: be3efd2222c604443a5b389c029abd0a TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/CLEO CHAIR WOOD FINISH CHOCOLATE STAINED ASH.jpeg.meta b/Assets/Models/Textures/CLEO CHAIR WOOD FINISH CHOCOLATE STAINED ASH.jpeg.meta index 83436b9..a41de95 100644 --- a/Assets/Models/Textures/CLEO CHAIR WOOD FINISH CHOCOLATE STAINED ASH.jpeg.meta +++ b/Assets/Models/Textures/CLEO CHAIR WOOD FINISH CHOCOLATE STAINED ASH.jpeg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 11122267b6137bf4cb2b6606ed5f8149 +guid: a72e81b358799734fae1703bfcb08321 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/MARMO PATAGONIA CLEARER.jpg.meta b/Assets/Models/Textures/MARMO PATAGONIA CLEARER.jpg.meta index 7816dee..4a160d1 100644 --- a/Assets/Models/Textures/MARMO PATAGONIA CLEARER.jpg.meta +++ b/Assets/Models/Textures/MARMO PATAGONIA CLEARER.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 626c65308dddb804abfdc4615d813f31 +guid: a98683ad4e301e54694d34733f8e7573 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/OLD BRONZE_ I311V 1.jpeg.meta b/Assets/Models/Textures/OLD BRONZE_ I311V 1.jpeg.meta index 7575791..f97f67d 100644 --- a/Assets/Models/Textures/OLD BRONZE_ I311V 1.jpeg.meta +++ b/Assets/Models/Textures/OLD BRONZE_ I311V 1.jpeg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 14823c40ed5a5a94e855786206f601e8 +guid: 01374788fe26e71409a2d0a9cc4ab44e TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/OLD BRONZE_ I311V 2.jpeg b/Assets/Models/Textures/OLD BRONZE_ I311V 2.jpeg deleted file mode 100644 index 6c576fc..0000000 Binary files a/Assets/Models/Textures/OLD BRONZE_ I311V 2.jpeg and /dev/null differ diff --git a/Assets/Models/Textures/OLD BRONZE_ I311V.jpeg.meta b/Assets/Models/Textures/OLD BRONZE_ I311V.jpeg.meta index d9928a5..4e1c260 100644 --- a/Assets/Models/Textures/OLD BRONZE_ I311V.jpeg.meta +++ b/Assets/Models/Textures/OLD BRONZE_ I311V.jpeg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13f2ecee82b9fd548a25f9719e89abe2 +guid: fbde75e0c94e83144a38dc00979fb2a7 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SANDIA Color alt.png b/Assets/Models/Textures/SANDIA Color alt.png index 1493576..259439d 100644 Binary files a/Assets/Models/Textures/SANDIA Color alt.png and b/Assets/Models/Textures/SANDIA Color alt.png differ diff --git a/Assets/Models/Textures/SANDIA Color alt.png.meta b/Assets/Models/Textures/SANDIA Color alt.png.meta index 31c7149..aa1bd22 100644 --- a/Assets/Models/Textures/SANDIA Color alt.png.meta +++ b/Assets/Models/Textures/SANDIA Color alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1c0b245274f7df248b23e4b8c56eba25 +guid: ccce0ef1aec1a074aa921bb393bc65e7 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SANDIA Roughness.png.meta b/Assets/Models/Textures/SANDIA Roughness.png.meta index c7da882..bcafb28 100644 --- a/Assets/Models/Textures/SANDIA Roughness.png.meta +++ b/Assets/Models/Textures/SANDIA Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c38403d9801b01f4fb14a436284a229a +guid: 79021ac3b25586e41b4de8036ee635de TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SANDIA UV.png b/Assets/Models/Textures/SANDIA UV.png deleted file mode 100644 index f7ed095..0000000 Binary files a/Assets/Models/Textures/SANDIA UV.png and /dev/null differ diff --git a/Assets/Models/Textures/SANDIA UV.png.meta b/Assets/Models/Textures/SANDIA UV.png.meta deleted file mode 100644 index bea9241..0000000 --- a/Assets/Models/Textures/SANDIA UV.png.meta +++ /dev/null @@ -1,127 +0,0 @@ -fileFormatVersion: 2 -guid: 5dd40be1042720048892d0ca30b70df1 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 13 - 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 - flipGreenChannel: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMipmapLimit: 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 - swizzle: 50462976 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - ignorePlatformSupport: 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 - ignorePlatformSupport: 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 - ignorePlatformSupport: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Models/Textures/SANDIA Velvet alt.png b/Assets/Models/Textures/SANDIA Velvet alt.png new file mode 100644 index 0000000..4d3f8e2 Binary files /dev/null and b/Assets/Models/Textures/SANDIA Velvet alt.png differ diff --git a/Assets/Models/Textures/OLD BRONZE_ I311V 2.jpeg.meta b/Assets/Models/Textures/SANDIA Velvet alt.png.meta similarity index 98% rename from Assets/Models/Textures/OLD BRONZE_ I311V 2.jpeg.meta rename to Assets/Models/Textures/SANDIA Velvet alt.png.meta index bdb247c..1295cfc 100644 --- a/Assets/Models/Textures/OLD BRONZE_ I311V 2.jpeg.meta +++ b/Assets/Models/Textures/SANDIA Velvet alt.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1ee3daeef1c31b4c8ce034a2da629e8 +guid: e8f869eb78435b04b96cd129546a5766 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SOFA FABRIC FILICUDI_WHITE- T0014_001.jpeg.meta b/Assets/Models/Textures/SOFA FABRIC FILICUDI_WHITE- T0014_001.jpeg.meta index e717ec5..cdd03a0 100644 --- a/Assets/Models/Textures/SOFA FABRIC FILICUDI_WHITE- T0014_001.jpeg.meta +++ b/Assets/Models/Textures/SOFA FABRIC FILICUDI_WHITE- T0014_001.jpeg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e13a0dfdd9dc91d4a8ef96f85c975c69 +guid: 08e18a7837026ab45a6755de1bfcd16e TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SUMO Color alt alpha.png b/Assets/Models/Textures/SUMO Color alt alpha.png new file mode 100644 index 0000000..b75fe09 Binary files /dev/null and b/Assets/Models/Textures/SUMO Color alt alpha.png differ diff --git a/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 2.jpeg.meta b/Assets/Models/Textures/SUMO Color alt alpha.png.meta similarity index 98% rename from Assets/Models/Textures/BRUSHED GUN METAL_ I304S 2.jpeg.meta rename to Assets/Models/Textures/SUMO Color alt alpha.png.meta index 04d0e2a..a5ca602 100644 --- a/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 2.jpeg.meta +++ b/Assets/Models/Textures/SUMO Color alt alpha.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7e8c14de5ea67034597e2d4bc9c2a585 +guid: 10d48cd4f26066f40a42854999a72266 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SANDIA Color.png b/Assets/Models/Textures/SUMO Glossy.png similarity index 58% rename from Assets/Models/Textures/SANDIA Color.png rename to Assets/Models/Textures/SUMO Glossy.png index 651322f..f9bacc2 100644 Binary files a/Assets/Models/Textures/SANDIA Color.png and b/Assets/Models/Textures/SUMO Glossy.png differ diff --git a/Assets/Models/Textures/SANDIA Color.png.meta b/Assets/Models/Textures/SUMO Glossy.png.meta similarity index 98% rename from Assets/Models/Textures/SANDIA Color.png.meta rename to Assets/Models/Textures/SUMO Glossy.png.meta index 89a4928..be84f8e 100644 --- a/Assets/Models/Textures/SANDIA Color.png.meta +++ b/Assets/Models/Textures/SUMO Glossy.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6e76c4d817a272e49a5ccf62d28d6b6a +guid: 848ec97bb4fdfba48b6575bd33f9369a TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SUMO Roughness.png.meta b/Assets/Models/Textures/SUMO Roughness.png.meta index bc6ebfb..2d20701 100644 --- a/Assets/Models/Textures/SUMO Roughness.png.meta +++ b/Assets/Models/Textures/SUMO Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: efc940418ae122f49bee6b56916b937e +guid: 0e38fd3f2e6f13f47899ac1447ba7e02 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/color_121212.hdr b/Assets/Models/Textures/color_121212.hdr new file mode 100644 index 0000000..91b6332 --- /dev/null +++ b/Assets/Models/Textures/color_121212.hdr @@ -0,0 +1,5 @@ +#?RADIANCE +FORMAT=32-bit_rle_rgbe + +-Y 4 +X 4 +行衸行衸行衸行衸行衸行衸行衸行衸行衸行衸行衸行衸行衸行衸行衸行衸 \ No newline at end of file diff --git a/Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L 1.jpeg.meta b/Assets/Models/Textures/color_121212.hdr.meta similarity index 98% rename from Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L 1.jpeg.meta rename to Assets/Models/Textures/color_121212.hdr.meta index 3a9e600..e880cf1 100644 --- a/Assets/Models/Textures/CARNICO GREY GLOSSY_ M203L 1.jpeg.meta +++ b/Assets/Models/Textures/color_121212.hdr.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 62392b673cea8e94c9bc4b2885aa289c +guid: 42b1564bf25452c4c8797ed7b7d3ca86 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Prefab/CleoChair.prefab b/Assets/Prefab/CleoChair.prefab index d37dcbb..f260a53 100644 --- a/Assets/Prefab/CleoChair.prefab +++ b/Assets/Prefab/CleoChair.prefab @@ -22,11 +22,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalRotation.w - value: 0.7071067 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalRotation.y @@ -34,11 +34,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalEulerAnglesHint.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -66,14 +66,14 @@ PrefabInstance: m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} insertIndex: -1 - addedObject: {fileID: 282237338000245767} + addedObject: {fileID: 8609740650048155017} m_SourcePrefab: {fileID: 100100000, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} --- !u!1 &384462179027726530 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} m_PrefabInstance: {fileID: 690330031184416147} m_PrefabAsset: {fileID: 0} ---- !u!65 &282237338000245767 +--- !u!65 &8609740650048155017 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -92,5 +92,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.005912341, y: 0.007649999, z: 0.0053153248} - m_Center: {x: 0.0019504199, y: -0.0006904589, z: 0.002931407} + m_Size: {x: 0.60565597, y: 0.7813879, z: 0.54441494} + m_Center: {x: -0.0014416873, y: -0.13501915, z: 0.08035788} diff --git a/Assets/Prefab/GridIndicator.prefab b/Assets/Prefab/GridIndicator.prefab new file mode 100644 index 0000000..3f0f8ee --- /dev/null +++ b/Assets/Prefab/GridIndicator.prefab @@ -0,0 +1,140 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &5236060892799482280 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8378628612892553542} + - component: {fileID: 8762927115585040554} + - component: {fileID: 6909481848820784089} + - component: {fileID: 3792725663845323067} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8378628612892553542 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5236060892799482280} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.3, y: 1, z: 0.3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4410441032802257291} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8762927115585040554 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5236060892799482280} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6909481848820784089 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5236060892799482280} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d5774351bc3ae4ad393dc1d142ff4235, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &3792725663845323067 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5236060892799482280} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &7069418182187326116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4410441032802257291} + m_Layer: 0 + m_Name: GridIndicator + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4410441032802257291 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7069418182187326116} + serializedVersion: 2 + 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: + - {fileID: 8378628612892553542} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefab/GridIndicator.prefab.meta b/Assets/Prefab/GridIndicator.prefab.meta new file mode 100644 index 0000000..268ca45 --- /dev/null +++ b/Assets/Prefab/GridIndicator.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9d00637d689464a7aabd732cb44e1552 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/SUMO Coffe Table 102.prefab b/Assets/Prefab/SUMO Coffe Table 102.prefab index 720bfb9..43b882c 100644 --- a/Assets/Prefab/SUMO Coffe Table 102.prefab +++ b/Assets/Prefab/SUMO Coffe Table 102.prefab @@ -10,15 +10,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3} propertyPath: m_LocalScale.x - value: 0.023 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3} propertyPath: m_LocalScale.y - value: 0.0099 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3} propertyPath: m_LocalScale.z - value: 0.023 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3} propertyPath: m_LocalPosition.x @@ -60,6 +60,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: -5330287902570191112, guid: e43b07362fa01834384c4c5ec519a8ca, type: 3} propertyPath: m_Layer value: 6 diff --git a/Assets/Prefab/SUMO Coffe Table 102_Glass 1.prefab b/Assets/Prefab/SUMO Coffe Table 102_Glass 1.prefab new file mode 100644 index 0000000..a204d1c --- /dev/null +++ b/Assets/Prefab/SUMO Coffe Table 102_Glass 1.prefab @@ -0,0 +1,116 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6854901362729740891 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -6162068750624236243, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3910990755373119420, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6664223518512364, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 1bbb826a2dbb01246a2aad08d4895a5d, type: 2} + - target: {fileID: 5773508275483786762, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: dbcb89d94eeacb24a89c6db521d64419, type: 2} + - target: {fileID: 8714167562902291545, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_Layer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8714167562902291545, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_TagString + value: Untagged + objectReference: {fileID: 0} + - target: {fileID: 8771091787928289351, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_Name + value: SUMO Coffe Table 102_Glass 1 + objectReference: {fileID: 0} + - target: {fileID: 8771091787928289351, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8771091787928289351, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + propertyPath: m_TagString + value: Selectable + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 8771091787928289351, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + insertIndex: -1 + addedObject: {fileID: 71002784156905198} + m_SourcePrefab: {fileID: -4161369568681901532, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} +--- !u!1 &2781164063182760476 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8771091787928289351, guid: 9191fb6487c2df743aee245a92ca3828, type: 3} + m_PrefabInstance: {fileID: 6854901362729740891} + m_PrefabAsset: {fileID: 0} +--- !u!65 &71002784156905198 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2781164063182760476} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.46114, y: 0.5708766, z: 0.46172866} + m_Center: {x: 0.001202926, y: 0.27378035, z: -0.041099504} diff --git a/Assets/Prefab/SUMO Coffe Table 102_Glass 1.prefab.meta b/Assets/Prefab/SUMO Coffe Table 102_Glass 1.prefab.meta new file mode 100644 index 0000000..f6f33e7 --- /dev/null +++ b/Assets/Prefab/SUMO Coffe Table 102_Glass 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 13c42039e5ae1d0479d845981835756b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefab/Sandia.prefab b/Assets/Prefab/Sandia.prefab index 571872b..1a75532 100644 --- a/Assets/Prefab/Sandia.prefab +++ b/Assets/Prefab/Sandia.prefab @@ -18,7 +18,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.804 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalRotation.w @@ -86,70 +86,14 @@ PrefabInstance: m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3} insertIndex: -1 - addedObject: {fileID: 4985626987982584186} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3} - insertIndex: -1 - addedObject: {fileID: 1496596181943451962} - - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3} - insertIndex: -1 - addedObject: {fileID: 1532020908932792285} + addedObject: {fileID: 3848558690108251817} m_SourcePrefab: {fileID: 100100000, guid: a159887176eca8843a8a9a42b862cbee, type: 3} --- !u!1 &2415200880001261083 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: a159887176eca8843a8a9a42b862cbee, type: 3} m_PrefabInstance: {fileID: 3262274873550086986} m_PrefabAsset: {fileID: 0} ---- !u!33 &4985626987982584186 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2415200880001261083} - m_Mesh: {fileID: 1671890006431517106, guid: a159887176eca8843a8a9a42b862cbee, type: 3} ---- !u!23 &1496596181943451962 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2415200880001261083} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &1532020908932792285 +--- !u!65 &3848558690108251817 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -168,5 +112,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 2.7012548, y: 0.70999986, z: 1.2113101} - m_Center: {x: 0.005261004, y: 0.3606567, z: -0.046916336} + m_Size: {x: 2.7314172, y: 0.747852, z: 1.2305349} + m_Center: {x: -0.001200676, y: 0.3686166, z: 0.04802829} diff --git a/Assets/Prefab/TOTU Coffe Table 103.prefab b/Assets/Prefab/TOTU Coffe Table 103.prefab index 36e7e49..96ce25a 100644 --- a/Assets/Prefab/TOTU Coffe Table 103.prefab +++ b/Assets/Prefab/TOTU Coffe Table 103.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &2014136808166680183 +--- !u!1001 &8887323972945380492 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -10,15 +10,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} propertyPath: m_LocalPosition.y - value: 0.17602158 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} propertyPath: m_LocalPosition.z - value: -0.15351045 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} propertyPath: m_LocalRotation.w @@ -30,11 +30,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -66,20 +66,20 @@ PrefabInstance: m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} insertIndex: -1 - addedObject: {fileID: 5971932524352072402} + addedObject: {fileID: 1266572902175822867} m_SourcePrefab: {fileID: 100100000, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} ---- !u!1 &1671626081882168102 stripped +--- !u!1 &8617488083332643293 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: ac8ccbb83e64fb741805c3bc8ed9c25a, type: 3} - m_PrefabInstance: {fileID: 2014136808166680183} + m_PrefabInstance: {fileID: 8887323972945380492} m_PrefabAsset: {fileID: 0} ---- !u!65 &5971932524352072402 +--- !u!65 &1266572902175822867 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1671626081882168102} + m_GameObject: {fileID: 8617488083332643293} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -92,5 +92,5 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 59.99985, y: 59.99825, z: 35.999996} - m_Center: {x: -0.000073432915, y: 0.00008392333, z: 15.4} + m_Size: {x: 0.59999794, y: 0.3599997, z: 0.5999819} + m_Center: {x: 0.00000074505806, y: 0.16376366, z: -0.0000008493662} diff --git a/Assets/Rendering/Scripts/New/DragAndDropManager.cs b/Assets/Rendering/Scripts/New/DragAndDropManager.cs index c936619..34160de 100644 --- a/Assets/Rendering/Scripts/New/DragAndDropManager.cs +++ b/Assets/Rendering/Scripts/New/DragAndDropManager.cs @@ -8,24 +8,60 @@ using UnityEngine.XR.ARSubsystems; public class DragAndDropManager : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDragHandler { public GameObject prefabToInstance; + public GameObject gridPrefab; // Prefab del grid de detecci贸n - private ARRaycastManager arRaycastManager; // Asignable din醡icamente - private Camera arCamera; // Asignable din醡icamente + private ARRaycastManager arRaycastManager; + private ARAnchorManager arAnchorManager; // Se agrega ARAnchorManager para fijar los objetos + private Camera arCamera; private GameObject draggedObject; + private GameObject gridIndicator; // Instancia del grid + + void Start() + { + if (arRaycastManager == null) + { + arRaycastManager = FindObjectOfType(); + if (arRaycastManager == null) + { + Debug.LogError("ARRaycastManager no est谩 en la escena. Aseg煤rate de agregarlo."); + } + } + + if (arCamera == null) + { + arCamera = Camera.main; + if (arCamera == null) + { + Debug.LogError("C谩mara AR no encontrada. Aseg煤rate de que haya una c谩mara en la escena."); + } + } + + if (arAnchorManager == null) + { + arAnchorManager = FindObjectOfType(); + if (arAnchorManager == null) + { + Debug.LogError("ARAnchorManager no est谩 en la escena."); + } + } + } - // M閠odo para asignar la c醡ara desde MeasuringSystem public void SetCamera(Camera camera) { if (camera == null) { - Debug.LogError("C醡ara proporcionada es nula."); + Debug.LogError("C谩mara proporcionada es nula."); return; } arCamera = camera; - Debug.Log($"C醡ara asignada: {arCamera.name}"); + + if (arCamera.nearClipPlane <= 0.01f) + { + arCamera.nearClipPlane = 0.1f; + Debug.Log("nearClipPlane de la c谩mara ajustado a 0.1"); + } } - // M閠odo para asignar el ARRaycastManager desde MeasuringSystem public void SetARRaycastManager(ARRaycastManager raycastManager) { if (raycastManager == null) @@ -34,7 +70,16 @@ public class DragAndDropManager : MonoBehaviour, IBeginDragHandler, IDragHandler return; } arRaycastManager = raycastManager; - Debug.Log($"ARRaycastManager asignado: {arRaycastManager.name}"); + } + + public void SetARAnchorManager(ARAnchorManager anchorManager) + { + if (anchorManager == null) + { + Debug.LogError("ARAnchorManager proporcionado es nulo."); + return; + } + arAnchorManager = anchorManager; } public void OnBeginDrag(PointerEventData eventData) @@ -44,36 +89,62 @@ public class DragAndDropManager : MonoBehaviour, IBeginDragHandler, IDragHandler draggedObject = Instantiate(prefabToInstance); draggedObject.SetActive(false); } + + // Crear el grid de detecci贸n + if (gridPrefab != null) + { + gridIndicator = Instantiate(gridPrefab); + gridIndicator.SetActive(false); + } } public void OnDrag(PointerEventData eventData) { - if (draggedObject != null) + if (draggedObject != null && arRaycastManager != null && arCamera != null) { - if (arRaycastManager == null || arCamera == null) - { - Debug.LogWarning("ARRaycastManager o c醡ara no asignados. No se puede realizar el raycast."); - return; - } - List hits = new List(); if (arRaycastManager.Raycast(eventData.position, hits, TrackableType.Planes)) { var hitPose = hits[0].pose; - // Colocar el objeto en la posici髇 AR detectada + // Colocar el objeto en la posici贸n AR detectada draggedObject.transform.position = hitPose.position; draggedObject.transform.rotation = hitPose.rotation; draggedObject.SetActive(true); + + // Mostrar el grid en la posici贸n detectada + if (gridIndicator != null) + { + gridIndicator.transform.position = hitPose.position; + gridIndicator.SetActive(true); + } } } } public void OnEndDrag(PointerEventData eventData) { - if (draggedObject != null) + if (draggedObject != null && arAnchorManager != null) { + // Agregar un anclaje al objeto para fijarlo en su lugar + ARAnchor anchor = arAnchorManager.AddAnchor(new Pose(draggedObject.transform.position, draggedObject.transform.rotation)); + + if (anchor != null) + { + draggedObject.transform.SetParent(anchor.transform); // Hacer que el objeto sea hijo del anclaje + } + else + { + Debug.LogWarning("No se pudo crear un ARAnchor. El objeto podr铆a moverse."); + } + draggedObject = null; } + + // Ocultar el grid una vez colocado el objeto + if (gridIndicator != null) + { + Destroy(gridIndicator); + } } } diff --git a/Assets/Rendering/Scripts/New/ObjectSelector.cs b/Assets/Rendering/Scripts/New/ObjectSelector.cs index 0d90d12..57c075e 100644 --- a/Assets/Rendering/Scripts/New/ObjectSelector.cs +++ b/Assets/Rendering/Scripts/New/ObjectSelector.cs @@ -8,8 +8,8 @@ public class ObjectSelector : MonoBehaviour { public LayerMask interactableLayer; - private ARRaycastManager arRaycastManager; // Asignable din醡icamente - private Camera arCamera; // Asignable din醡icamente + private ARRaycastManager arRaycastManager; // Asignable din锟絤icamente + private Camera arCamera; // Asignable din锟絤icamente private GameObject selectedObject; private readonly float longTapTreshold = 1f; @@ -17,15 +17,16 @@ public class ObjectSelector : MonoBehaviour private float tapTimer = 0f; private float lastTapTime = 0f; private bool isRelocating = false; + - // M閠odo para asignar la c醡ara desde MeasuringSystem + // M锟絫odo para asignar la c锟絤ara desde MeasuringSystem public void SetCamera(Camera camera) { arCamera = camera; - Debug.Log($"C醡ara asignada: {arCamera.name}"); + Debug.Log($"C锟絤ara asignada: {arCamera.name}"); } - // M閠odo para asignar el ARRaycastManager desde MeasuringSystem + // M锟絫odo para asignar el ARRaycastManager desde MeasuringSystem public void SetARRaycastManager(ARRaycastManager raycastManager) { arRaycastManager = raycastManager; @@ -37,8 +38,8 @@ public class ObjectSelector : MonoBehaviour { if (arCamera == null || arRaycastManager == null) { - Debug.LogWarning("La c醡ara o el ARRaycastManager no han sido asignados."); - FindObjectOfType().AddMessage("La c醡ara o el ARRaycastManager no han sido asignados."); + Debug.LogWarning("La c锟絤ara o el ARRaycastManager no han sido asignados."); + FindObjectOfType().AddMessage("La c锟絤ara o el ARRaycastManager no han sido asignados."); return; } diff --git a/Assets/Resources/BillingMode.json b/Assets/Resources/BillingMode.json new file mode 100644 index 0000000..6f4bfb7 --- /dev/null +++ b/Assets/Resources/BillingMode.json @@ -0,0 +1 @@ +{"androidStore":"GooglePlay"} \ No newline at end of file diff --git a/Assets/Resources/BillingMode.json.meta b/Assets/Resources/BillingMode.json.meta new file mode 100644 index 0000000..15c7666 --- /dev/null +++ b/Assets/Resources/BillingMode.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 47ee60abed1514dababc02a35d8293ea +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/DOTweenSettings.asset.meta b/Assets/Resources/DOTweenSettings.asset.meta index f176415..d5eabd1 100644 --- a/Assets/Resources/DOTweenSettings.asset.meta +++ b/Assets/Resources/DOTweenSettings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7f937c6f3eaf7d841b62d916944326c9 +guid: 431d4d849c5324c9c9031c4cac6e6c9b NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/Scenes/ARScreen.meta b/Assets/Scenes/ARScreen.meta new file mode 100644 index 0000000..397880b --- /dev/null +++ b/Assets/Scenes/ARScreen.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a3188e52affc2eb4582a94105c6b479b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ARScreen.unity b/Assets/Scenes/ARScreen.unity index d65bc10..c0492cd 100644 --- a/Assets/Scenes/ARScreen.unity +++ b/Assets/Scenes/ARScreen.unity @@ -96,7 +96,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: c46f813b370974442b647f2bed45dc72, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: e0f7d47418bc601428a5aee69ed04077, type: 2} m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: @@ -787,6 +787,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabToInstance: {fileID: 384462179027726530, guid: d7ca2b9d438a97e46b228f65e3ea34fd, type: 3} + gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &518661788 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1913,6 +1914,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabToInstance: {fileID: 2065567086344354061, guid: d5ced78f2c9acf647bc91230db65e53d, type: 3} + gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &1198553689 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2322,6 +2324,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabToInstance: {fileID: 2415200880001261083, guid: 4217598f115eda443b059d1d3029157e, type: 3} + gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &1510757703 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2491,7 +2494,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 1436977506181758233, guid: 5d852d0f90f588547b2ca56c0dd1340a, type: 3} + prefabToInstance: {fileID: 2781164063182760476, guid: 13c42039e5ae1d0479d845981835756b, type: 3} + gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &1824976693 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2709,7 +2713,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2016642935 RectTransform: m_ObjectHideFlags: 0 @@ -2724,9 +2728,9 @@ RectTransform: m_Children: [] m_Father: {fileID: 753346143} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 2981.5166, y: -101.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 521, y: 327} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2016642936 @@ -2741,7 +2745,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6bcac7e483a825d48bb0e327d618f0ce, type: 3} m_Name: m_EditorClassIdentifier: - prefabToInstance: {fileID: 1671626081882168102, guid: 6749fe3471fc05847a373222f309879f, type: 3} + prefabToInstance: {fileID: 8617488083332643293, guid: 6749fe3471fc05847a373222f309879f, type: 3} + gridPrefab: {fileID: 7069418182187326116, guid: 9d00637d689464a7aabd732cb44e1552, type: 3} --- !u!114 &2016642937 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/ARScreen/LightingData.asset b/Assets/Scenes/ARScreen/LightingData.asset new file mode 100644 index 0000000..2c0d10f Binary files /dev/null and b/Assets/Scenes/ARScreen/LightingData.asset differ diff --git a/Assets/Scenes/ARScreen/LightingData.asset.meta b/Assets/Scenes/ARScreen/LightingData.asset.meta new file mode 100644 index 0000000..27e2a92 --- /dev/null +++ b/Assets/Scenes/ARScreen/LightingData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0f7d47418bc601428a5aee69ed04077 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 112000000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/ARScreen/ReflectionProbe-0.exr b/Assets/Scenes/ARScreen/ReflectionProbe-0.exr new file mode 100644 index 0000000..950930b Binary files /dev/null and b/Assets/Scenes/ARScreen/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/ARScreen/ReflectionProbe-0.exr.meta b/Assets/Scenes/ARScreen/ReflectionProbe-0.exr.meta new file mode 100644 index 0000000..2740e5d --- /dev/null +++ b/Assets/Scenes/ARScreen/ReflectionProbe-0.exr.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: dbbc3478578696d449ae1aa64f10aeec +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 100 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MeasuringSystem.unity b/Assets/Scenes/MeasuringSystem.unity index e97d0fb..cdde39f 100644 --- a/Assets/Scenes/MeasuringSystem.unity +++ b/Assets/Scenes/MeasuringSystem.unity @@ -671,6 +671,7 @@ MonoBehaviour: m_HitDetectionType: 0 m_SphereCastRadius: 0.1 m_ConeCastAngle: 6 + m_LiveConeCastDebugVisuals: 0 m_RaycastMask: serializedVersion: 2 m_Bits: 4294967295 @@ -2415,6 +2416,7 @@ GameObject: - component: {fileID: 1776724016} - component: {fileID: 1776724015} - component: {fileID: 1776724019} + - component: {fileID: 1776724020} m_Layer: 0 m_Name: XR Origin (XR Rig) m_TagString: Untagged @@ -2434,7 +2436,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e1760703bbd54c04488a8d10600262ab, type: 3} m_Name: m_EditorClassIdentifier: - m_PlanePrefab: {fileID: 5367619110524989107, guid: 6791394203e51fd4381b2bab568d6455, type: 3} + m_PlanePrefab: {fileID: 0} m_DetectionMode: 1 --- !u!114 &1776724016 MonoBehaviour: @@ -2495,6 +2497,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_RaycastPrefab: {fileID: 0} +--- !u!114 &1776724020 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1776724014} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 728ad7fae8e460a4ba41265c7308d757, type: 3} + m_Name: + m_EditorClassIdentifier: + m_AnchorPrefab: {fileID: 0} --- !u!1 &1821946225 GameObject: m_ObjectHideFlags: 0 @@ -3333,6 +3348,7 @@ MonoBehaviour: m_HitDetectionType: 0 m_SphereCastRadius: 0.1 m_ConeCastAngle: 6 + m_LiveConeCastDebugVisuals: 0 m_RaycastMask: serializedVersion: 2 m_Bits: 4294967295 diff --git a/Assets/Scripts/ObjectDetection/ObjectDetectionSample.cs b/Assets/Scripts/ObjectDetection/ObjectDetectionSample.cs index 9d286df..679c31a 100644 --- a/Assets/Scripts/ObjectDetection/ObjectDetectionSample.cs +++ b/Assets/Scripts/ObjectDetection/ObjectDetectionSample.cs @@ -135,7 +135,7 @@ public class ObjectDetectionSample : MonoBehaviour Debug.Log($"Detected: {categoryName} with confidence {confidence * 100:F1}%"); - string label = $"{categoryName} {confidence * 100:F1}%"; + string label = $"{categoryName}"; _drawRect.CreateRect(rect, _colors[i % _colors.Length], label); } } diff --git a/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta b/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta index 7c97fc9..bdb641c 100644 --- a/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta +++ b/Assets/XR/Resources/XRSimulationRuntimeSettings.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 411b667192765694da11046338d6a0a2 +guid: b4613fa129101f84e97c3e982b3c9e39 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta b/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta index 1ba0a92..6a7d2d4 100644 --- a/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta +++ b/Assets/XR/UserSimulationSettings/Resources/XRSimulationPreferences.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b75274f675a34314aba24fe96b1d85e3 +guid: 634708d1637a77d4e8e47f4f73886eba NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Packages/manifest.json b/Packages/manifest.json index e147773..518f41f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,6 +1,7 @@ { "dependencies": { "com.nianticlabs.lightship": "https://github.com/niantic-lightship/ardk-upm.git", + "com.unity.cloud.gltfast": "6.10.3", "com.unity.collab-proxy": "2.5.2", "com.unity.device-simulator.devices": "1.0.0", "com.unity.feature.development": "1.0.1", @@ -9,9 +10,9 @@ "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.5", - "com.unity.xr.arcore": "5.1.5", - "com.unity.xr.arfoundation": "5.1.5", - "com.unity.xr.interaction.toolkit": "2.6.3", + "com.unity.xr.arcore": "5.1.6", + "com.unity.xr.arfoundation": "5.1.6", + "com.unity.xr.interaction.toolkit": "2.6.4", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 24d2780..7743730 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -16,7 +16,7 @@ "com.unity.cloud.draco": "5.1.4", "com.unity.burst": "1.8.17" }, - "hash": "4137b5921e71c2c49035b858dafdaf6e0c40e6f7" + "hash": "d2589e27c989aaed94f0df0e0c593974f86c7bf3" }, "com.unity.burst": { "version": "1.8.18", @@ -38,6 +38,19 @@ }, "url": "https://packages.unity.com" }, + "com.unity.cloud.gltfast": { + "version": "6.10.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.8.4", + "com.unity.collections": "1.2.4", + "com.unity.mathematics": "1.2.6", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.collab-proxy": { "version": "2.5.2", "depth": 0, @@ -45,6 +58,16 @@ "dependencies": {}, "url": "https://packages.unity.com" }, + "com.unity.collections": { + "version": "1.2.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.burst": "1.6.6", + "com.unity.test-framework": "1.1.31" + }, + "url": "https://packages.unity.com" + }, "com.unity.device-simulator.devices": { "version": "1.0.0", "depth": 0, @@ -211,20 +234,20 @@ "url": "https://packages.unity.com" }, "com.unity.xr.arcore": { - "version": "5.1.5", + "version": "5.1.6", "depth": 0, "source": "registry", "dependencies": { "com.unity.xr.core-utils": "2.1.0", "com.unity.xr.management": "4.0.1", - "com.unity.xr.arfoundation": "5.1.5", + "com.unity.xr.arfoundation": "5.1.6", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.xr.arfoundation": { - "version": "5.1.5", + "version": "5.1.6", "depth": 0, "source": "registry", "dependencies": { @@ -263,7 +286,7 @@ "url": "https://packages.unity.com" }, "com.unity.xr.interaction.toolkit": { - "version": "2.6.3", + "version": "2.6.4", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 849e9c8..246c2c4 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -145,6 +145,14 @@ PlayerSettings: - {fileID: 4800000, guid: b02d09082cbc14569ae46c12d9836abc, type: 3} - {fileID: 4800000, guid: f40a6c94c8e1b494d93d434ae522a14f, type: 3} - {fileID: 4800000, guid: 0f45334fa661448c886e4f99ba812a7e, type: 3} + - {fileID: 479186601668263405, guid: e04dc9557a6bcec40b5d8576988f74a3, type: 2} + - {fileID: 11400000, guid: 6bfaaf31cb485f64fb956f1d691a0e1d, type: 2} + - {fileID: -7180841881952691092, guid: 228964b93c232624fac8c242b79176e5, type: 2} + - {fileID: 4800000, guid: b1d4c517492046e1a4e4cc49b0b73b42, type: 3} + - {fileID: 4800000, guid: 2b7e3540272684e0b8e12fed2c4609de, type: 3} + - {fileID: 11400000, guid: 911becadf2ac07e4da62b8afa0b9ea7f, type: 2} + - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3} + - {fileID: 4800000, guid: 0945859e5a1034c2cb6dce53cb4fb899, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1