Convert water/ripple defines to camelCase

apps/opencs/model/world/data.cpp

@@ -161,7 +161,7 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
     defines["radialFog"] = "0";
     defines["lightingModel"] = "0";
     defines["reverseZ"] = "0";
-    defines["refraction_enabled"] = "0";
+    defines["waterRefraction"] = "0";
     for (const auto& define : shadowDefines)
         defines[define.first] = define.second;
     mResourceSystem->getSceneManager()->getShaderManager().setGlobalDefines(defines);

apps/openmw/mwrender/renderingmanager.cpp

@@ -441,7 +441,7 @@ namespace MWRender
         globalDefines["radialFog"] = (exponentialFog || Settings::fog().mRadialFog) ? "1" : "0";
         globalDefines["exponentialFog"] = exponentialFog ? "1" : "0";
         globalDefines["skyBlending"] = mSkyBlending ? "1" : "0";
-        globalDefines["refraction_enabled"] = "0";
+        globalDefines["waterRefraction"] = "0";
         globalDefines["useGPUShader4"] = "0";
         globalDefines["useOVR_multiview"] = "0";
         globalDefines["numViews"] = "1";

apps/openmw/mwrender/ripples.cpp

@@ -100,7 +100,7 @@ namespace MWRender
     {
         auto& shaderManager = mResourceSystem->getSceneManager()->getShaderManager();
 
-        Shader::ShaderManager::DefineMap defineMap = { { "ripple_map_size", std::to_string(sRTTSize) + ".0" } };
+        Shader::ShaderManager::DefineMap defineMap = { { "rippleMapSize", std::to_string(sRTTSize) + ".0" } };
 
         osg::ref_ptr<osg::Shader> vertex = shaderManager.getShader("fullscreen_tri.vert", {}, osg::Shader::VERTEX);
 

apps/openmw/mwrender/water.cpp

@@ -700,11 +700,11 @@ namespace MWRender
     {
         // use a define map to conditionally compile the shader
         std::map<std::string, std::string> defineMap;
-        defineMap["refraction_enabled"] = std::string(mRefraction ? "1" : "0");
+        defineMap["waterRefraction"] = std::string(mRefraction ? "1" : "0");
         const int rippleDetail = Settings::water().mRainRippleDetail;
-        defineMap["rain_ripple_detail"] = std::to_string(rippleDetail);
-        defineMap["ripple_map_world_scale"] = std::to_string(RipplesSurface::sWorldScaleFactor);
-        defineMap["ripple_map_size"] = std::to_string(RipplesSurface::sRTTSize) + ".0";
+        defineMap["rainRippleDetail"] = std::to_string(rippleDetail);
+        defineMap["rippleMapWorldScale"] = std::to_string(RipplesSurface::sWorldScaleFactor);
+        defineMap["rippleMapSize"] = std::to_string(RipplesSurface::sRTTSize) + ".0";
         defineMap["sunlightScattering"] = Settings::water().mSunlightScattering ? "1" : "0";
         defineMap["wobblyShores"] = Settings::water().mWobblyShores ? "1" : "0";
 

files/shaders/compatibility/ripples_blobber.frag

@@ -13,7 +13,7 @@ uniform vec2 offset;
 
 void main()
 {
-    vec2 uv = (gl_FragCoord.xy + offset) / @ripple_map_size;
+    vec2 uv = (gl_FragCoord.xy + offset) / @rippleMapSize;
 
     vec4 color = texture2D(imageIn, uv);
     float wavesizeMultiplier = getTemporalWaveSizeMultiplier(osg_SimulationTime);

files/shaders/compatibility/ripples_simulate.frag

@@ -6,9 +6,9 @@ uniform sampler2D imageIn;
 
 void main()
 {
-    vec2 uv = gl_FragCoord.xy / @ripple_map_size;
+    vec2 uv = gl_FragCoord.xy / @rippleMapSize;
 
-    float pixelSize = 1.0 / @ripple_map_size;
+    float pixelSize = 1.0 / @rippleMapSize;
 
     float oneOffset = pixelSize;
     float oneAndHalfOffset = 1.5 * pixelSize;

files/shaders/compatibility/water.frag

@@ -144,7 +144,7 @@ void main(void)
     float fresnel = clamp(fresnel_dielectric(viewDir, normal, ior), 0.0, 1.0);
 
     vec2 screenCoordsOffset = normal.xy * REFL_BUMP;
-#if @refraction_enabled
+#if @waterRefraction
     float depthSample = linearizeDepth(sampleRefractionDepthMap(screenCoords), near, far);
     float surfaceDepth = linearizeDepth(gl_FragCoord.z, near, far);
     float realWaterDepth = depthSample - surfaceDepth;  // undistorted water depth in view direction, independent of frustum
@@ -169,7 +169,7 @@ void main(void)
     vec3 rainSpecular = abs(rainRipple.w)*mix(skyColorEstimate, vec3(1.0), 0.05)*0.5;
     float waterTransparency = clamp(fresnel * 6.0 + specular, 0.0, 1.0);
 
-#if @refraction_enabled
+#if @waterRefraction
     // selectively nullify screenCoordsOffset to eliminate remaining shore artifacts, not needed for reflection
     if (cameraPos.z > 0.0 && realWaterDepth <= VISIBILITY_DEPTH && waterDepthDistorted > VISIBILITY_DEPTH)
         screenCoordsOffset = vec2(0.0);
@@ -217,7 +217,7 @@ void main(void)
 
     gl_FragData[0].rgb += specular * sunSpec.rgb + rainSpecular;
 
-#if @refraction_enabled && @wobblyShores
+#if @waterRefraction && @wobblyShores
     // wobbly water: hard-fade into refraction texture at extremely low depth, with a wobble based on normal mapping
     vec3 normalShoreRippleRain = texture2D(normalMap,normalCoords(UV, 2.0, 2.7, -1.0*waterTimer,  0.05,  0.1,  normal3)).rgb - 0.5
                                + texture2D(normalMap,normalCoords(UV, 2.0, 2.7,      waterTimer,  0.04, -0.13, normal4)).rgb - 0.5;

files/shaders/compatibility/water.vert

@@ -21,7 +21,7 @@ void main(void)
     position = gl_Vertex;
 
     worldPos = position.xyz + nodePosition.xyz;
-    rippleMapUV = (worldPos.xy - playerPos.xy + (@ripple_map_size * @ripple_map_world_scale / 2.0)) / @ripple_map_size / @ripple_map_world_scale;
+    rippleMapUV = (worldPos.xy - playerPos.xy + (@rippleMapSize * @rippleMapWorldScale / 2.0)) / @rippleMapSize / @rippleMapWorldScale;
 
     vec4 viewPos = modelToView(gl_Vertex);
     linearDepth = getLinearDepth(gl_Position.z, viewPos.z);

files/shaders/lib/core/fragment.glsl

@@ -9,7 +9,7 @@ vec4 sampleReflectionMap(vec2 uv)
     return texture2D(reflectionMap, uv);
 }
 
-#if @refraction_enabled
+#if @waterRefraction
 uniform sampler2D refractionMap;
 uniform sampler2D refractionDepthMap;
 

files/shaders/lib/core/fragment.h.glsl

@@ -6,7 +6,7 @@
 
 vec4 sampleReflectionMap(vec2 uv);
 
-#if @refraction_enabled
+#if @waterRefraction
 vec4 sampleRefractionMap(vec2 uv);
 float sampleRefractionDepthMap(vec2 uv);
 #endif

files/shaders/lib/core/fragment_multiview.glsl

@@ -12,7 +12,7 @@ vec4 sampleReflectionMap(vec2 uv)
     return texture(reflectionMap, vec3((uv), gl_ViewID_OVR));
 }
 
-#if @refraction_enabled
+#if @waterRefraction
 
 uniform sampler2DArray refractionMap;
 uniform sampler2DArray refractionDepthMap;

files/shaders/lib/water/rain_ripples.glsl

@@ -1,8 +1,6 @@
 #ifndef LIB_WATER_RIPPLES
 #define LIB_WATER_RIPPLES
 
-#define RAIN_RIPPLE_DETAIL @rain_ripple_detail
-
 const float RAIN_RIPPLE_GAPS = 10.0;
 const float RAIN_RIPPLE_RADIUS = 0.2;
 
@@ -51,7 +49,7 @@ vec4 circle(vec2 coords, vec2 corner, float adjusted_time)
   float d = length(toCenter);
   float ringfollower = (phase-d/r)/RAIN_RING_TIME_OFFSET-1.0; // -1.0 ~ +1.0 cover the breadth of the ripple's ring
 
-#if RAIN_RIPPLE_DETAIL > 0
+#if @rainRippleDetail > 0
 // normal mapped ripples
   if(ringfollower < -1.0 || ringfollower > 1.0)
     return vec4(0.0);
@@ -88,7 +86,7 @@ vec4 rain(vec2 uv, float time)
   vec2 f_part = fract(uv);
   vec2 i_part = floor(uv);
   float adjusted_time = time * 1.2 + randPhase(i_part);
-#if RAIN_RIPPLE_DETAIL > 0
+#if @rainRippleDetail > 0
   vec4 a = circle(f_part, i_part, adjusted_time);
   vec4 b = circle(f_part, i_part, adjusted_time - RAIN_RING_TIME_OFFSET);
   vec4 c = circle(f_part, i_part, adjusted_time - RAIN_RING_TIME_OFFSET*2.0);
@@ -115,11 +113,11 @@ vec4 rainCombined(vec2 uv, float time) // returns ripple normal in xyz and fake
   return
     rain(uv, time)
   + rain(complex_mult(uv, vec2(0.4, 0.7)) + vec2(1.2, 3.0),time)
-    #if RAIN_RIPPLE_DETAIL == 2
+#if @rainRippleDetail == 2
       + rain(uv * 0.75 + vec2( 3.7,18.9),time)
       + rain(uv * 0.9  + vec2( 5.7,30.1),time)
       + rain(uv * 1.0  + vec2(10.5 ,5.7),time)
-    #endif
+#endif
   ;
 }