diff --git a/Assets/Models/CleoChair.fbx b/Assets/Models/CleoChair.fbx index 37e695b..1de135c 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:47eab361f8914d340d52c2b902859c1f030d67b436f35e9fa5d25ca6029669fd -size 92665788 +oid sha256:6001e6b747247f47cf72c8fbf61641cf5919e6fc5a28421872a1eb6669f786a3 +size 102680220 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/SUMO Glass.mat b/Assets/Models/Materials/SUMO Glass.mat index e9f0dfb..3fcd512 100644 --- a/Assets/Models/Materials/SUMO Glass.mat +++ b/Assets/Models/Materials/SUMO Glass.mat @@ -8,27 +8,33 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: SUMO Glass - m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + 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: -1 - stringTagMap: {} + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0e1b9773e8a375b4b97a835475698149, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 848ec97bb4fdfba48b6575bd33f9369a, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailMask: @@ -36,7 +42,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailNormalMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0e1b9773e8a375b4b97a835475698149, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _EmissionMap: @@ -44,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 10d48cd4f26066f40a42854999a72266, type: 3} + m_Texture: {fileID: 2800000, guid: 2082c471f208c7c4cad8b2599bded5af, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -64,19 +70,19 @@ Material: - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 + - _Glossiness: 0.278 + - _GlossyReflections: 0 - _Metallic: 0 - - _Mode: 0 + - _Mode: 3 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 + - _SmoothnessTextureChannel: 1 - _SpecularHighlights: 1 - _SrcBlend: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _Color: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 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 51c325a..c5db386 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:1893311211d792a1c35bccc99dcd873c60ec4076580066cdc412e782db22909b -size 139443308 +oid sha256:458d47fc8130a8c4e87064a86eb4e7a675a7c66f54ebe4bcf6dda28aad2f159c +size 139480492 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/color_121212.hdr.meta b/Assets/Models/Textures/color_121212.hdr.meta new file mode 100644 index 0000000..e880cf1 --- /dev/null +++ b/Assets/Models/Textures/color_121212.hdr.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 42b1564bf25452c4c8797ed7b7d3ca86 +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 84c9ca9..c9f2191 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: 1 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 367232941525e8e4b9b3e72d40d7be4d, type: 3} propertyPath: m_LocalRotation.y @@ -38,7 +38,7 @@ PrefabInstance: 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.59999996, y: 0.50000006, z: 0.76500016} + m_Center: {x: 0.19793373, y: 0.27575055, z: 0.069045916} 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 5386589..1e47bc9 100644 --- a/Assets/Prefab/Sandia.prefab +++ b/Assets/Prefab/Sandia.prefab @@ -10,15 +10,15 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalScale.x - value: 0.01 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalScale.y - value: 0.01 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalScale.z - value: 0.01 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalPosition.x @@ -26,7 +26,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: -0.32 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalPosition.z @@ -34,7 +34,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalRotation.x @@ -42,7 +42,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalRotation.z @@ -54,7 +54,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: a159887176eca8843a8a9a42b862cbee, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -102,69 +102,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: 6850552232023683413} 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: [] - 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 &6850552232023683413 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -183,5 +128,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.7211628, y: 0.74265003, z: 1.2384603} + m_Center: {x: -0.001181243, y: 0.5819857, z: -0.04840074} 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 6d5c6c2..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: @@ -2494,7 +2494,7 @@ 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: 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 9dba55b..cdde39f 100644 --- a/Assets/Scenes/MeasuringSystem.unity +++ b/Assets/Scenes/MeasuringSystem.unity @@ -2504,7 +2504,7 @@ 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: 728ad7fae8e460a4ba41265c7308d757, type: 3} m_Name: 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 b6caa5c..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", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 9417acb..7743730 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -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, 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