From a9084d3389bb267f243f1e59695be3cb8a04c72d Mon Sep 17 00:00:00 2001 From: Axel Galand Date: Wed, 18 Jan 2023 16:31:04 +0100 Subject: [PATCH] e --- Assets/Models/Blender/prises.blend.meta | 9 +--- Assets/Models/Blender/prises_12.blend.meta | 6 +-- Assets/Scripts/MovableFurniture.cs | 1 - .../Environment/Prises_Diffuse.png.meta | 50 ++++++++++++++++++- .../Environment/Prises_Roughness.png.meta | 50 ++++++++++++++++++- .../Environment/Prises_metallic.png.meta | 50 ++++++++++++++++++- .../Environment/prises_occlusion.png.meta | 50 ++++++++++++++++++- 7 files changed, 201 insertions(+), 15 deletions(-) diff --git a/Assets/Models/Blender/prises.blend.meta b/Assets/Models/Blender/prises.blend.meta index 7048a57..164ca28 100644 --- a/Assets/Models/Blender/prises.blend.meta +++ b/Assets/Models/Blender/prises.blend.meta @@ -1,14 +1,9 @@ fileFormatVersion: 2 -guid: 3815b8a7d8081484f9339cf78ca53b25 +guid: 2d673329ba8c74f48b4f8f6984ccc9fb ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] - externalObjects: - - first: - type: UnityEngine:Material - assembly: UnityEngine.CoreModule - name: Material.001 - second: {fileID: 2100000, guid: 6de1a72ff651b264ebb6757e18797524, type: 2} + externalObjects: {} materials: materialImportMode: 2 materialName: 0 diff --git a/Assets/Models/Blender/prises_12.blend.meta b/Assets/Models/Blender/prises_12.blend.meta index 2e12764..55ac6ee 100644 --- a/Assets/Models/Blender/prises_12.blend.meta +++ b/Assets/Models/Blender/prises_12.blend.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 53cb2d1a2f0c7c0468ba87eba075cd9a +guid: c4bc9709ddd4c084bb149cd4b8d93914 ModelImporter: serializedVersion: 21300 internalIDToNameTable: [] @@ -68,8 +68,8 @@ ModelImporter: secondaryUVPackMargin: 4 useFileScale: 1 tangentSpace: - normalSmoothAngle: 51 - normalImportMode: 1 + normalSmoothAngle: 60 + normalImportMode: 0 tangentImportMode: 3 normalCalculationMode: 4 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 diff --git a/Assets/Scripts/MovableFurniture.cs b/Assets/Scripts/MovableFurniture.cs index da7d680..e71af04 100644 --- a/Assets/Scripts/MovableFurniture.cs +++ b/Assets/Scripts/MovableFurniture.cs @@ -98,7 +98,6 @@ public class MovableFurniture : Furniture if (wallMount) { transform.position = position; - // check if object has objectBounds, if not combine the bounds of its children Bounds objectBounds; if (combinedBounds == null) { diff --git a/Assets/Texture/Environment/Prises_Diffuse.png.meta b/Assets/Texture/Environment/Prises_Diffuse.png.meta index 304ad36..fe114fd 100644 --- a/Assets/Texture/Environment/Prises_Diffuse.png.meta +++ b/Assets/Texture/Environment/Prises_Diffuse.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 42be5b382f1f98b42b3c72b4424293c9 +guid: 482b1529430b52d4a91b24ff348443ed TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -101,6 +101,54 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Texture/Environment/Prises_Roughness.png.meta b/Assets/Texture/Environment/Prises_Roughness.png.meta index 260f764..5c8ebd2 100644 --- a/Assets/Texture/Environment/Prises_Roughness.png.meta +++ b/Assets/Texture/Environment/Prises_Roughness.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8f303882079a4af40b29743e7616af8d +guid: 131c59877e618bf419d81ff6a977d369 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -101,6 +101,54 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Texture/Environment/Prises_metallic.png.meta b/Assets/Texture/Environment/Prises_metallic.png.meta index c711ca8..32aa8b6 100644 --- a/Assets/Texture/Environment/Prises_metallic.png.meta +++ b/Assets/Texture/Environment/Prises_metallic.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: aa303ab914cfce7498ac26155eae9c90 +guid: f512a1bb22797484881cfda83c6c5439 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -101,6 +101,54 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Texture/Environment/prises_occlusion.png.meta b/Assets/Texture/Environment/prises_occlusion.png.meta index 96f8222..fd09435 100644 --- a/Assets/Texture/Environment/prises_occlusion.png.meta +++ b/Assets/Texture/Environment/prises_occlusion.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e1bd55c2f6156464496e0cdacc1f6f7f +guid: 629deea292961e64fac069fd693ca000 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -101,6 +101,54 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Windows Store Apps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: []