From 5c0ce8c5c0f80e5312ed2031ca2ab41a191a45be Mon Sep 17 00:00:00 2001 From: Nathan Koch Date: Mon, 4 May 2020 17:32:31 -0400 Subject: [PATCH] cleaned up substance to work height-first, then updated unity scene accordingly --- Assets/Scenes/UndulatingPlain.unity | 148 ++++++++++++++-------------- Assets/Substances/Firish.sbsar | 4 +- Assets/Substances/Firish.sbsar.meta | 8 +- Creative/substances/Firish.sbs | 4 +- 4 files changed, 82 insertions(+), 82 deletions(-) diff --git a/Assets/Scenes/UndulatingPlain.unity b/Assets/Scenes/UndulatingPlain.unity index 953778f..7a4065c 100644 --- a/Assets/Scenes/UndulatingPlain.unity +++ b/Assets/Scenes/UndulatingPlain.unity @@ -1259,7 +1259,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4021928818998582, guid: c0e3337f8a4c648aebfe9ed730bd6f75, type: 3} propertyPath: m_LocalPosition.x - value: -4.257992 + value: -4.2 objectReference: {fileID: 0} - target: {fileID: 4021928818998582, guid: c0e3337f8a4c648aebfe9ed730bd6f75, type: 3} propertyPath: m_LocalPosition.y @@ -1295,7 +1295,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4021928818998582, guid: c0e3337f8a4c648aebfe9ed730bd6f75, type: 3} propertyPath: m_LocalScale.z - value: 18 + value: 20 objectReference: {fileID: 0} - target: {fileID: 4021928818998582, guid: c0e3337f8a4c648aebfe9ed730bd6f75, type: 3} propertyPath: m_LocalEulerAnglesHint.y @@ -2146,7 +2146,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Profile: {fileID: 11400000, guid: ede476cf4d8a649c78d047f41de84788, type: 2} m_StaticLightingSkyUniqueID: 3 - m_SkySettings: {fileID: 1623656879} + m_SkySettings: {fileID: 1558207019} m_SkySettingsFromProfile: {fileID: 558608095000867332, guid: ede476cf4d8a649c78d047f41de84788, type: 2} --- !u!4 &1098216673 @@ -2405,6 +2405,76 @@ Transform: type: 3} m_PrefabInstance: {fileID: 432157770} m_PrefabAsset: {fileID: 0} +--- !u!114 &1558207019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a81bcacc415a1f743bfdf703afc52027, type: 3} + m_Name: + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + rotation: + m_OverrideState: 0 + m_Value: 0 + min: 0 + max: 360 + skyIntensityMode: + m_OverrideState: 0 + m_Value: 0 + exposure: + m_OverrideState: 0 + m_Value: 6 + multiplier: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxValue: + m_OverrideState: 0 + m_Value: 1 + min: 0 + upperHemisphereLuxColor: + m_OverrideState: 0 + m_Value: {x: 0, y: 0, z: 0} + desiredLuxValue: + m_OverrideState: 0 + m_Value: 20000 + updateMode: + m_OverrideState: 0 + m_Value: 0 + updatePeriod: + m_OverrideState: 0 + m_Value: 0 + min: 0 + includeSunInBaking: + m_OverrideState: 0 + m_Value: 0 + top: + m_OverrideState: 0 + m_Value: {r: 0.27467737, g: 0.5149178, b: 0.77582246, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 + middle: + m_OverrideState: 0 + m_Value: {r: 0.38642952, g: 0.32777813, b: 0.31854683, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 + bottom: + m_OverrideState: 0 + m_Value: {r: 0.013702081, g: 0.015208514, b: 0.019382361, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 + gradientDiffusion: + m_OverrideState: 0 + m_Value: 8 --- !u!1001 &1582129799 PrefabInstance: m_ObjectHideFlags: 0 @@ -2681,76 +2751,6 @@ MonoBehaviour: showAdditionalSettings: 0 m_AreaLightEmissiveMeshShadowCastingMode: 0 m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0 ---- !u!114 &1623656879 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a81bcacc415a1f743bfdf703afc52027, type: 3} - m_Name: - m_EditorClassIdentifier: - active: 1 - m_AdvancedMode: 0 - rotation: - m_OverrideState: 0 - m_Value: 0 - min: 0 - max: 360 - skyIntensityMode: - m_OverrideState: 0 - m_Value: 0 - exposure: - m_OverrideState: 0 - m_Value: 6 - multiplier: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxValue: - m_OverrideState: 0 - m_Value: 1 - min: 0 - upperHemisphereLuxColor: - m_OverrideState: 0 - m_Value: {x: 0, y: 0, z: 0} - desiredLuxValue: - m_OverrideState: 0 - m_Value: 20000 - updateMode: - m_OverrideState: 0 - m_Value: 0 - updatePeriod: - m_OverrideState: 0 - m_Value: 0 - min: 0 - includeSunInBaking: - m_OverrideState: 0 - m_Value: 0 - top: - m_OverrideState: 0 - m_Value: {r: 0.27467737, g: 0.5149178, b: 0.77582246, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 - middle: - m_OverrideState: 0 - m_Value: {r: 0.38642952, g: 0.32777813, b: 0.31854683, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 - bottom: - m_OverrideState: 0 - m_Value: {r: 0.013702081, g: 0.015208514, b: 0.019382361, a: 1} - hdr: 1 - showAlpha: 0 - showEyeDropper: 1 - gradientDiffusion: - m_OverrideState: 0 - m_Value: 8 --- !u!4 &1626963564 stripped Transform: m_CorrespondingSourceObject: {fileID: 4140630664002196, guid: af10738c6c7c94a5699fc96a06db75e5, @@ -3008,7 +3008,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4021928818998582, guid: c0e3337f8a4c648aebfe9ed730bd6f75, type: 3} propertyPath: m_LocalScale.z - value: 18 + value: 20 objectReference: {fileID: 0} - target: {fileID: 23994196183376674, guid: c0e3337f8a4c648aebfe9ed730bd6f75, type: 3} diff --git a/Assets/Substances/Firish.sbsar b/Assets/Substances/Firish.sbsar index ad650bf..2e7144f 100644 --- a/Assets/Substances/Firish.sbsar +++ b/Assets/Substances/Firish.sbsar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23c2f4a0c6267d8e7200a97a60847e22e17cb993c08da318a1d2343c80963236 -size 12639 +oid sha256:cecc50bbf99ac8c0082e980a573d18229efdb437b7b8f944cc5e84fc7b04e3ea +size 11225 diff --git a/Assets/Substances/Firish.sbsar.meta b/Assets/Substances/Firish.sbsar.meta index e4349d7..4b1231d 100644 --- a/Assets/Substances/Firish.sbsar.meta +++ b/Assets/Substances/Firish.sbsar.meta @@ -775,7 +775,7 @@ ScriptedImporter: - name: _EnergyConservingSpecularColor float: 1 - name: _HeightAmplitude - float: 20 + float: 3 - name: _HeightCenter float: 0.5 - name: _HeightMapParametrization @@ -789,7 +789,7 @@ ScriptedImporter: - name: _HeightPoMAmplitude float: 2 - name: _HeightTessAmplitude - float: 2000 + float: 300 - name: _HeightTessCenter float: 0.5 - name: _InvTilingScale @@ -875,7 +875,7 @@ ScriptedImporter: - name: _TessellationFactorMinDistance float: 50 - name: _TessellationFactorTriangleSize - float: 5 + float: 1 - name: _TessellationMode float: 1 - name: _TessellationShapeFactor @@ -911,7 +911,7 @@ ScriptedImporter: - name: _UVEmissive float: 0 - name: _UseEmissiveIntensity - float: 0 + float: 1 - name: _UseShadowThreshold float: 0 - name: _ZTestDepthEqualForOpaque diff --git a/Creative/substances/Firish.sbs b/Creative/substances/Firish.sbs index 81d0c91..20e614b 100644 --- a/Creative/substances/Firish.sbs +++ b/Creative/substances/Firish.sbs @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a62df4e6c6fa014be1e2187bbc8606535c764934adbf3485890be6c2aeb7b502 -size 149894 +oid sha256:1f4034ee1e5f67ab68bb58db499e5cf979604519168b56df86032773d2e32920 +size 182090