diff --git a/Assets/Resources/Settings.asset b/Assets/Resources/Settings.asset index f92142d6b..c3e8fb3a1 100644 --- a/Assets/Resources/Settings.asset +++ b/Assets/Resources/Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab2cdc0732716dcbfa4875e90e598b0dff3f0c8d4f871cc180649a3db2e4cf0c -size 12562 +oid sha256:b004d902ecd9c1b98ff7e0b23215225cce987fd8572fb5f55c5f53fe08f6ccba +size 12530 diff --git a/Assets/Scripts/ServerShared/Settings.cs b/Assets/Scripts/ServerShared/Settings.cs index 85d1f3d96..00db76c68 100644 --- a/Assets/Scripts/ServerShared/Settings.cs +++ b/Assets/Scripts/ServerShared/Settings.cs @@ -26,7 +26,6 @@ public class PlanetSettings // The one global exaggeration of gravity height: height = potential / K, in u/s^2 per unit of height. public float HeightExaggeration = 1f; - public float AsteroidVerticalOffset = -5f; public ExponentialLerp AsteroidSize; public ExponentialLerp AsteroidHitpoints; public ExponentialLerp AsteroidRespawnTime; diff --git a/Assets/Shaders/Asteroid.shader b/Assets/Shaders/Asteroid.shader index 2558cbc53..31904120c 100644 --- a/Assets/Shaders/Asteroid.shader +++ b/Assets/Shaders/Asteroid.shader @@ -12,7 +12,6 @@ Shader "Aetheria/Asteroid" #pragma fragment frag #include "UnityCG.cginc" // for UnityObjectToWorldNormal #include_with_pragmas "Assets/Shaders/Volumetric.cginc" - uniform float _AsteroidVerticalOffset; struct v2f { @@ -25,11 +24,7 @@ Shader "Aetheria/Asteroid" { v2f o; UNITY_SETUP_INSTANCE_ID(v); - float3 worldOrigin = mul(unity_ObjectToWorld, float4(0, 0, 0, 1.0)).xyz; float3 worldPos = mul(unity_ObjectToWorld, float4(v.vertex.xyz, 1.0)).xyz; - const float2 uv = getUV(worldOrigin.xz); - const float surfaceDisp = tex2Dlod(_NebulaSurfaceHeight, half4(uv, 0, 0)).r; - worldPos.y += _AsteroidVerticalOffset - surfaceDisp; o.vertex = mul(UNITY_MATRIX_VP, float4(worldPos, 1.0)); o.uv = v.texcoord; // get vertex normal in world space