diff --git a/Assets/Models/CleoChair.fbx b/Assets/Models/CleoChair.fbx index b94573a..37e695b 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:47eab361f8914d340d52c2b902859c1f030d67b436f35e9fa5d25ca6029669fd +size 92665788 diff --git a/Assets/Models/CleoChair.fbx.meta b/Assets/Models/CleoChair.fbx.meta index 9ff5740..7644795 100644 --- a/Assets/Models/CleoChair.fbx.meta +++ b/Assets/Models/CleoChair.fbx.meta @@ -23,17 +23,17 @@ ModelImporter: 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 @@ -62,7 +62,7 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: [] - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 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 index 4ffc054..c235ae5 100644 --- a/Assets/Models/Materials/0,116,120.002.mat +++ b/Assets/Models/Materials/0,116,120.002.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 34f74ee811daf9e42a947505cc1332b8, type: 3} + m_Texture: {fileID: 2800000, guid: c93696dcb8bbd084ba719816a87360d3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: 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 index ac45167..2205e17 100644 --- a/Assets/Models/Materials/191,191,191.002.mat +++ b/Assets/Models/Materials/191,191,191.002.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 13f2ecee82b9fd548a25f9719e89abe2, type: 3} + m_Texture: {fileID: 2800000, guid: fbde75e0c94e83144a38dc00979fb2a7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: 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 index 1d5cf31..486bff2 100644 --- a/Assets/Models/Materials/237,237,231.002.mat +++ b/Assets/Models/Materials/237,237,231.002.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 34f74ee811daf9e42a947505cc1332b8, type: 3} + m_Texture: {fileID: 2800000, guid: c93696dcb8bbd084ba719816a87360d3, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: 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 index 8acdb8b..c5731c1 100644 --- a/Assets/Models/Materials/5,5,5.002.mat +++ b/Assets/Models/Materials/5,5,5.002.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 75b18e068c1fd3c45b81ba21ada61e07, type: 3} + m_Texture: {fileID: 2800000, guid: 76a0909d2c362b741a5b046448b0899d, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Materials/Chair.mat b/Assets/Models/Materials/Chair.mat index 370ae9b..5d6f822 100644 --- a/Assets/Models/Materials/Chair.mat +++ b/Assets/Models/Materials/Chair.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: e13a0dfdd9dc91d4a8ef96f85c975c69, type: 3} + m_Texture: {fileID: 2800000, guid: 08e18a7837026ab45a6755de1bfcd16e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Materials/Legs.mat b/Assets/Models/Materials/Legs.mat index 51ad939..1bab80d 100644 --- a/Assets/Models/Materials/Legs.mat +++ b/Assets/Models/Materials/Legs.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 11122267b6137bf4cb2b6606ed5f8149, type: 3} + m_Texture: {fileID: 2800000, guid: a72e81b358799734fae1703bfcb08321, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Materials/Material.001.mat b/Assets/Models/Materials/Material.001.mat new file mode 100644 index 0000000..89dd44d --- /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: ec0a09641a1c1e1468e5590931118227, type: 3} + m_Scale: {x: 10, y: 10} + 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..38a5f05 --- /dev/null +++ b/Assets/Models/Materials/Material.001.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cf81b9f8f1fe4314ea9d046bb2cbe99b +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 index 5734f8b..ce64e52 100644 --- a/Assets/Models/Materials/SANDIA non reflective.mat +++ b/Assets/Models/Materials/SANDIA non reflective.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 1c0b245274f7df248b23e4b8c56eba25, type: 3} + m_Texture: {fileID: 2800000, guid: f94a7a3257b977345b67db72019cd091, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Materials/SUMO Glass.mat b/Assets/Models/Materials/SUMO Glass.mat index cd20901..e9f0dfb 100644 --- a/Assets/Models/Materials/SUMO Glass.mat +++ b/Assets/Models/Materials/SUMO Glass.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 2082c471f208c7c4cad8b2599bded5af, type: 3} + m_Texture: {fileID: 2800000, guid: 10d48cd4f26066f40a42854999a72266, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Models/Materials/SUMO Metal.mat b/Assets/Models/Materials/SUMO Metal.mat index 75c76e3..f38d823 100644 --- a/Assets/Models/Materials/SUMO Metal.mat +++ b/Assets/Models/Materials/SUMO Metal.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 2082c471f208c7c4cad8b2599bded5af, type: 3} + m_Texture: {fileID: 2800000, guid: 10d48cd4f26066f40a42854999a72266, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -66,7 +66,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 0.2681818 - _GlossyReflections: 1 - _Metallic: 0 - _Mode: 0 diff --git a/Assets/Models/Materials/Skin.mat b/Assets/Models/Materials/Skin.mat index 98d10a9..3adcb48 100644 --- a/Assets/Models/Materials/Skin.mat +++ b/Assets/Models/Materials/Skin.mat @@ -44,7 +44,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: d19c3d8d8489ea447a2ad7886af9139e, type: 3} + m_Texture: {fileID: 2800000, guid: be3efd2222c604443a5b389c029abd0a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: 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 210e218..12b6980 100644 --- a/Assets/Models/SUMO Coffe Table 102.fbx.meta +++ b/Assets/Models/SUMO Coffe Table 102.fbx.meta @@ -14,6 +14,21 @@ ModelImporter: 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/Sandia.fbx b/Assets/Models/Sandia.fbx index 679c5d2..51c325a 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:1893311211d792a1c35bccc99dcd873c60ec4076580066cdc412e782db22909b +size 139443308 diff --git a/Assets/Models/Sandia.fbx.meta b/Assets/Models/Sandia.fbx.meta index 8cbafe2..0fa8275 100644 --- a/Assets/Models/Sandia.fbx.meta +++ b/Assets/Models/Sandia.fbx.meta @@ -7,13 +7,28 @@ ModelImporter: - first: type: UnityEngine:Material assembly: UnityEngine.CoreModule - name: SANDIA Reflective - second: {fileID: 2100000, guid: ac505a09fc88bb24a9c4da049cbb562e, type: 2} + name: Material.001 + second: {fileID: 2100000, guid: cf81b9f8f1fe4314ea9d046bb2cbe99b, 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: f94a7a3257b977345b67db72019cd091, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: SANDIA Roughness + second: {fileID: 2800000, guid: bb79d381440fc144bb0b75d1012cc683, type: 3} + - first: + type: UnityEngine:Texture2D + assembly: UnityEngine.CoreModule + name: fabric-textured-background + second: {fileID: 2800000, guid: ec0a09641a1c1e1468e5590931118227, type: 3} materials: materialImportMode: 2 materialName: 0 @@ -53,8 +68,8 @@ ModelImporter: importPhysicalCameras: 1 importVisibility: 1 importBlendShapes: 1 - importCameras: 1 - importLights: 1 + importCameras: 0 + importLights: 0 nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 diff --git a/Assets/Models/TOTU Coffe Table 103.fbx b/Assets/Models/TOTU Coffe Table 103.fbx index 3964cf9..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:ba93a3b4e0bfbad31093ee4942f681de2344148d4de50a50fbbb69460e1fd770 -size 2654908 +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 3ebcfb8..43cefa2 100644 --- a/Assets/Models/TOTU Coffe Table 103.fbx.meta +++ b/Assets/Models/TOTU Coffe Table 103.fbx.meta @@ -28,17 +28,17 @@ ModelImporter: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: BRUSHED GUN METAL_ I304S - second: {fileID: 2800000, guid: 28fd24f00af116748a072ba20ae64a68, 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: 3f5ea35ef6850d9489437fd8b344a71a, type: 3} + second: {fileID: 2800000, guid: c93696dcb8bbd084ba719816a87360d3, type: 3} - first: type: UnityEngine:Texture2D assembly: UnityEngine.CoreModule name: OLD BRONZE_ I311V - second: {fileID: 2800000, guid: 3ca70537c72e7024389487902426d65b, 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 582f641..cdbcc81 100644 --- a/Assets/Models/TOTU Coffe Table 104.fbx.meta +++ b/Assets/Models/TOTU Coffe Table 104.fbx.meta @@ -9,21 +9,56 @@ ModelImporter: assembly: UnityEngine.CoreModule name: 0,116,120 second: {fileID: 2100000, guid: cbe3cde46aad0e94faa492d2b69e8703, type: 2} + - 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 second: {fileID: 2100000, guid: a56d7a9d23d6e024b82ef32a0c10d4ff, 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 second: {fileID: 2100000, guid: 5e58abb58186f4e4ea34a22754ea4396, 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 second: {fileID: 2100000, guid: 5b05a6587a1b2794596d509431f66139, 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 b/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 1.jpeg new file mode 100644 index 0000000..2073ebd Binary files /dev/null and b/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 1.jpeg differ diff --git a/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 1.jpeg.meta b/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 1.jpeg.meta new file mode 100644 index 0000000..1bc0b7a --- /dev/null +++ b/Assets/Models/Textures/BRUSHED GUN METAL_ I304S 1.jpeg.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: de7c822c4f2decb4985b3fd635fc4384 +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/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.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 b/Assets/Models/Textures/OLD BRONZE_ I311V 1.jpeg new file mode 100644 index 0000000..6c576fc Binary files /dev/null and b/Assets/Models/Textures/OLD BRONZE_ I311V 1.jpeg differ diff --git a/Assets/Models/Textures/OLD BRONZE_ I311V 1.jpeg.meta b/Assets/Models/Textures/OLD BRONZE_ I311V 1.jpeg.meta new file mode 100644 index 0000000..f97f67d --- /dev/null +++ b/Assets/Models/Textures/OLD BRONZE_ I311V 1.jpeg.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 01374788fe26e71409a2d0a9cc4ab44e +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/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..3994c2b 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: f94a7a3257b977345b67db72019cd091 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Models/Textures/SANDIA Roughness.png.meta b/Assets/Models/Textures/SANDIA Roughness.png.meta index c7da882..e3bef87 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: bb79d381440fc144bb0b75d1012cc683 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/SUMO Color alt alpha.png.meta b/Assets/Models/Textures/SUMO Color alt alpha.png.meta new file mode 100644 index 0000000..a5ca602 --- /dev/null +++ b/Assets/Models/Textures/SUMO Color alt alpha.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 10d48cd4f26066f40a42854999a72266 +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/SUMO Glossy.png b/Assets/Models/Textures/SUMO Glossy.png new file mode 100644 index 0000000..f9bacc2 Binary files /dev/null and b/Assets/Models/Textures/SUMO Glossy.png differ diff --git a/Assets/Models/Textures/SUMO Glossy.png.meta b/Assets/Models/Textures/SUMO Glossy.png.meta new file mode 100644 index 0000000..be84f8e --- /dev/null +++ b/Assets/Models/Textures/SUMO Glossy.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 848ec97bb4fdfba48b6575bd33f9369a +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/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/fabric-textured-background.jpg b/Assets/Models/Textures/fabric-textured-background.jpg new file mode 100644 index 0000000..a043f4a Binary files /dev/null and b/Assets/Models/Textures/fabric-textured-background.jpg differ diff --git a/Assets/Models/Textures/fabric-textured-background.jpg.meta b/Assets/Models/Textures/fabric-textured-background.jpg.meta new file mode 100644 index 0000000..6665b74 --- /dev/null +++ b/Assets/Models/Textures/fabric-textured-background.jpg.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: ec0a09641a1c1e1468e5590931118227 +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/Prefab/CleoChair.prefab b/Assets/Prefab/CleoChair.prefab index d37dcbb..84c9ca9 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: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalRotation.x - value: -0.7071068 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalRotation.y @@ -34,7 +34,7 @@ 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 diff --git a/Assets/Prefab/SUMO Coffe Table 102.prefab b/Assets/Prefab/SUMO Coffe Table 102.prefab index c8db7f2..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.0099 + 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.0099 + 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/Sandia.prefab b/Assets/Prefab/Sandia.prefab index 56e2781..5386589 100644 --- a/Assets/Prefab/Sandia.prefab +++ b/Assets/Prefab/Sandia.prefab @@ -8,6 +8,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} + propertyPath: m_LocalScale.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} + propertyPath: m_LocalScale.y + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} + propertyPath: m_LocalScale.z + value: 0.01 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -48,6 +60,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} - target: {fileID: -4856827502284789080, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_Layer value: 6 diff --git a/Assets/Rendering/Scripts/New/DragAndDropManager.cs b/Assets/Rendering/Scripts/New/DragAndDropManager.cs index d9bee1e..34160de 100644 --- a/Assets/Rendering/Scripts/New/DragAndDropManager.cs +++ b/Assets/Rendering/Scripts/New/DragAndDropManager.cs @@ -16,6 +16,36 @@ public class DragAndDropManager : MonoBehaviour, IBeginDragHandler, IDragHandler 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."); + } + } + } + public void SetCamera(Camera camera) { if (camera == null) @@ -24,6 +54,12 @@ public class DragAndDropManager : MonoBehaviour, IBeginDragHandler, IDragHandler return; } arCamera = camera; + + if (arCamera.nearClipPlane <= 0.01f) + { + arCamera.nearClipPlane = 0.1f; + Debug.Log("nearClipPlane de la cámara ajustado a 0.1"); + } } public void SetARRaycastManager(ARRaycastManager raycastManager) @@ -92,7 +128,7 @@ public class DragAndDropManager : MonoBehaviour, IBeginDragHandler, IDragHandler { // 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 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ámicamente - private Camera arCamera; // Asignable dinámicamente + private ARRaycastManager arRaycastManager; // Asignable din�micamente + private Camera arCamera; // Asignable din�micamente 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étodo para asignar la cámara desde MeasuringSystem + // M�todo para asignar la c�mara desde MeasuringSystem public void SetCamera(Camera camera) { arCamera = camera; - Debug.Log($"Cámara asignada: {arCamera.name}"); + Debug.Log($"C�mara asignada: {arCamera.name}"); } - // Método para asignar el ARRaycastManager desde MeasuringSystem + // M�todo 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ámara o el ARRaycastManager no han sido asignados."); - FindObjectOfType().AddMessage("La cámara o el ARRaycastManager no han sido asignados."); + Debug.LogWarning("La c�mara o el ARRaycastManager no han sido asignados."); + FindObjectOfType().AddMessage("La c�mara o el ARRaycastManager no han sido asignados."); return; } diff --git a/Assets/Scenes/ARScreen.unity b/Assets/Scenes/ARScreen.unity index 9553e4a..6d5c6c2 100644 --- a/Assets/Scenes/ARScreen.unity +++ b/Assets/Scenes/ARScreen.unity @@ -691,8 +691,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1498425121} m_HandleRect: {fileID: 1498425120} m_Direction: 0 - m_Value: -0.000000050861942 - m_Size: 0.37123078 + m_Value: -0.00000005086193 + m_Size: 0.37499678 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: diff --git a/Assets/Scenes/MeasuringSystem.unity b/Assets/Scenes/MeasuringSystem.unity index db45b90..9dba55b 100644 --- a/Assets/Scenes/MeasuringSystem.unity +++ b/Assets/Scenes/MeasuringSystem.unity @@ -2416,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 @@ -2430,12 +2431,12 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1776724014} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 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: @@ -2496,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: 0 + 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 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ac96722..849e9c8 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -145,14 +145,6 @@ PlayerSettings: - {fileID: 4800000, guid: b02d09082cbc14569ae46c12d9836abc, type: 3} - {fileID: 4800000, guid: f40a6c94c8e1b494d93d434ae522a14f, type: 3} - {fileID: 4800000, guid: 0f45334fa661448c886e4f99ba812a7e, type: 3} - - {fileID: 4800000, guid: b1d4c517492046e1a4e4cc49b0b73b42, type: 3} - - {fileID: 4800000, guid: 2b7e3540272684e0b8e12fed2c4609de, type: 3} - - {fileID: 4800000, guid: c9f956787b1d945e7b36e0516201fc76, type: 3} - - {fileID: 4800000, guid: 0945859e5a1034c2cb6dce53cb4fb899, type: 3} - - {fileID: 479186601668263405, guid: e04dc9557a6bcec40b5d8576988f74a3, type: 2} - - {fileID: 11400000, guid: 6bfaaf31cb485f64fb956f1d691a0e1d, type: 2} - - {fileID: -7180841881952691092, guid: 228964b93c232624fac8c242b79176e5, type: 2} - - {fileID: 11400000, guid: 911becadf2ac07e4da62b8afa0b9ea7f, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1