From 30bb7cc3f24e3435000faf4bdec6e02c365e37e1 Mon Sep 17 00:00:00 2001 From: Legonzaur Date: Tue, 17 Jan 2023 09:32:55 +0100 Subject: [PATCH] =?UTF-8?q?fix=20props=20placement=20and=20specularit?= =?UTF-8?q?=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Materials/Environment/Lamp Metal.mat | 2 +- Assets/Models/Blender/screwdriver.blend | 4 +- Assets/Scenes/FabLab/FabLab.unity | 74 +++++++++---------- .../FabLab/FabLab/ReflectionProbe-0.png | 4 +- .../FabLab/FabLab/ReflectionProbe-0.png.meta | 24 ------ 5 files changed, 42 insertions(+), 66 deletions(-) diff --git a/Assets/Materials/Environment/Lamp Metal.mat b/Assets/Materials/Environment/Lamp Metal.mat index e57e4b3..dc32f2f 100644 --- a/Assets/Materials/Environment/Lamp Metal.mat +++ b/Assets/Materials/Environment/Lamp Metal.mat @@ -67,7 +67,7 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 0.668 - - _Glossiness: 0.7 + - _Glossiness: 0.92 - _GlossyReflections: 1 - _Metallic: 0.544 - _Mode: 0 diff --git a/Assets/Models/Blender/screwdriver.blend b/Assets/Models/Blender/screwdriver.blend index a0f36fe..0443ddf 100644 --- a/Assets/Models/Blender/screwdriver.blend +++ b/Assets/Models/Blender/screwdriver.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e4f3fe6bc5111b12ddd3e34347328dd3482e3c7ecf1b0b9bc275da45476a66f7 -size 1999837 +oid sha256:cca2d13146c1d53286e10ee955b2a77da99a50708ef9609a8d127d13514c224e +size 1354101 diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index dcb49e3..d531eee 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -97,7 +97,7 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: 513619d267b6f204fb3ddc20611ca1ff, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: 452b54fcc00b0c243b1dc869278097de, type: 2} m_LightingSettings: {fileID: 4890085278179872738, guid: e0d1b39396743fc4da42f1d1948a6570, type: 2} --- !u!196 &4 NavMeshSettings: @@ -3000,7 +3000,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh238708 + m_Name: pb_Mesh37068 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -3570,7 +3570,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh238822 + m_Name: pb_Mesh37182 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -4511,7 +4511,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh239078 + m_Name: pb_Mesh37438 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -7789,7 +7789,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh239152 + m_Name: pb_Mesh37512 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -8136,6 +8136,14 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 435302310} m_Modifications: + - target: {fileID: -4025371315460726001, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: showLeftPreview + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -4025371315460726001, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} + propertyPath: previewLeftInstance + value: + objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_RootOrder value: 1 @@ -8150,15 +8158,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalPosition.x - value: 0.5338974 + value: 0.5339 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalPosition.y - value: -0.32368338 + value: -0.448 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalPosition.z - value: 1.4910595 + value: 1.5559 objectReference: {fileID: 0} - target: {fileID: 6291597597410968062, guid: fde4367ea6917fe43b9f69a154c145c1, type: 3} propertyPath: m_LocalRotation.w @@ -8267,7 +8275,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh238860 + m_Name: pb_Mesh37220 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11870,7 +11878,7 @@ ReflectionProbe: m_Mode: 0 m_RefreshMode: 0 m_TimeSlicingMode: 0 - m_Resolution: 128 + m_Resolution: 512 m_UpdateFrequency: 0 m_BoxSize: {x: 12.966665, y: 2.9094334, z: 10} m_BoxOffset: {x: -4.047042, y: -0.90211296, z: 0} @@ -11896,7 +11904,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh238800 + m_Name: pb_Mesh37160 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -12952,11 +12960,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.y - value: -0.25695884 + value: -0.41 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalPosition.z - value: 1.518877 + value: 1.597 objectReference: {fileID: 0} - target: {fileID: 7101811468694509626, guid: cbdff3e37c153cc48b95d4374a38eed9, type: 3} propertyPath: m_LocalRotation.w @@ -13167,6 +13175,22 @@ PrefabInstance: propertyPath: m_SpotAngle value: 179 objectReference: {fileID: 0} + - target: {fileID: 6774370061540394056, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_BoundingSphereOverride.w + value: 1.49e-43 + objectReference: {fileID: 0} + - target: {fileID: 6774370061540394056, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_BoundingSphereOverride.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6774370061540394056, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_BoundingSphereOverride.y + value: NaN + objectReference: {fileID: 0} + - target: {fileID: 6774370061540394056, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} + propertyPath: m_BoundingSphereOverride.z + value: 5.1e-43 + objectReference: {fileID: 0} - target: {fileID: 7864332079199610508, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} propertyPath: m_Layer value: 8 @@ -13195,30 +13219,6 @@ PrefabInstance: propertyPath: m_StaticEditorFlags value: 126 objectReference: {fileID: 0} - - target: {fileID: 8853967305801206996, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} - propertyPath: m_LocalPosition.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8853967305801206996, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} - propertyPath: m_LocalPosition.y - value: -0.246 - objectReference: {fileID: 0} - - target: {fileID: 8853967305801206996, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} - propertyPath: m_LocalRotation.w - value: 0.70710707 - objectReference: {fileID: 0} - - target: {fileID: 8853967305801206996, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} - propertyPath: m_LocalRotation.x - value: 0.7071066 - objectReference: {fileID: 0} - - target: {fileID: 8853967305801206996, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8853967305801206996, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - target: {fileID: 8853967305801206996, guid: 6e95f7c4a8765e544ab90d851dac3bdd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 90 diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png index 68ba4af..699ccdb 100644 --- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png +++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ef602f752731427097e89d37c16d2ba7bf5440d1fd13a59edcb9f612187415b -size 103269 +oid sha256:a5edefe35bf7e7b96031de41a057ddc234c9a6c35335e49167f4f00149a59d66 +size 104514 diff --git a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta index 11ea295..bb1b796 100644 --- a/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta +++ b/Assets/Scenes/FabLab/FabLab/ReflectionProbe-0.png.meta @@ -113,18 +113,6 @@ TextureImporter: 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 @@ -137,18 +125,6 @@ TextureImporter: 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: []