projects / oweals / minetest.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e58a95)
Optimize bumpmapping mathematics
authorLoic Blot <loic.blot@unix-experience.fr>
Fri, 16 Jan 2015 10:53:14 +0000 (20:53 +1000)
committerCraig Robbins <kde.psych@gmail.com>
Fri, 16 Jan 2015 10:54:04 +0000 (20:54 +1000)
OpenGL_vertex:
* bufferize a duplicate calcul
* Factorize vertexes

client/shaders/nodes_shader/opengl_fragment.glsl patch | blob | history
client/shaders/nodes_shader/opengl_vertex.glsl patch | blob | history
client/shaders/water_surface_shader/opengl_fragment.glsl patch | blob | history
client/shaders/water_surface_shader/opengl_vertex.glsl patch | blob | history

diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl
index 2a1cbc5689633deb0a0e7180db2b96b734cbac09..6dc96eb48c1760a345f7f14f10d7925a3873d2db 100644 (file)
--- a/client/shaders/nodes_shader/opengl_fragment.glsl
+++ b/client/shaders/nodes_shader/opengl_fragment.glsl
@@ -87,7 +87,12 @@ vec4 base = texture2D(baseTexture, uv).rgba;
                vec3 E = normalize(eyeVec);
                float specular = pow(clamp(dot(reflect(L, bump.xyz), E), 0.0, 1.0),0.5); 
                float diffuse = dot(E,bump.xyz);                
-               color = 0.05*base.rgb + diffuse*base.rgb + 0.2*specular*base.rgb;
+               /* Mathematic optimization
+               * Original: color = 0.05*base.rgb + diffuse*base.rgb + 0.2*specular*base.rgb;
+               * This optimization save 2 multiplications (orig: 4 multiplications + 3 additions
+               * end: 2 multiplications + 3 additions)
+               */
+               color = (0.05 + diffuse + 0.2 * specular) * base.rgb;
        } else {
                color = base.rgb;
        }
diff --git a/client/shaders/nodes_shader/opengl_vertex.glsl b/client/shaders/nodes_shader/opengl_vertex.glsl
index ff310cc2f8be9332c230ac02d2f4e62dbdc223d0..07684f6169f1479f7b95f4e6c141ca97fbeccf29 100644 (file)
--- a/client/shaders/nodes_shader/opengl_vertex.glsl
+++ b/client/shaders/nodes_shader/opengl_vertex.glsl
@@ -35,22 +35,39 @@ void main(void)
 #if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER\r
        vec4 pos = gl_Vertex;\r
        pos.y -= 2.0;\r
-       pos.y -= sin (pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) * WATER_WAVE_HEIGHT\r
-               + sin ((pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) / 7.0) * WATER_WAVE_HEIGHT;\r
+\r
+       float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH);\r
+\r
+       pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT;\r
        gl_Position = mWorldViewProj * pos;\r
 #elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES\r
        vec4 pos = gl_Vertex;\r
        vec4 pos2 = mWorld * gl_Vertex;\r
-       pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2.x * 0.01 + pos2.z * 0.01) * 2.0 - 1.0) * 0.4;\r
-       pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.2;\r
-       pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.4;\r
+\r
+       /*\r
+        * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)\r
+        * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)\r
+        * And bufferize calcul to a float\r
+        */\r
+       float pos2XpZ = pos2.x + pos2.z;\r
+\r
+       pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * 0.01) * 2.0 - 1.0) * 0.4;\r
+       pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.2;\r
+       pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.4;\r
        gl_Position = mWorldViewProj * pos;\r
 #elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS\r
        vec4 pos = gl_Vertex;\r
        vec4 pos2 = mWorld * gl_Vertex;\r
        if (gl_TexCoord[0].y < 0.05) {\r
-               pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2.x * 0.1 + pos2.z * 0.1) * 2.0 - 1.0) * 0.8;\r
-               pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2.x * -0.5 + pos2.z * -0.5) * 2.0 - 1.0) * 0.4;\r
+               /*\r
+                * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)\r
+                * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)\r
+                * And bufferize calcul to a float\r
+                */\r
+               float pos2XpZ = pos2.x + pos2.z;\r
+\r
+               pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2XpZ * 0.1) * 2.0 - 1.0) * 0.8;\r
+               pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2XpZ * -0.5) * 2.0 - 1.0) * 0.4;\r
        }\r
        gl_Position = mWorldViewProj * pos;\r
 #else\r
diff --git a/client/shaders/water_surface_shader/opengl_fragment.glsl b/client/shaders/water_surface_shader/opengl_fragment.glsl
index 2a1cbc5689633deb0a0e7180db2b96b734cbac09..6dc96eb48c1760a345f7f14f10d7925a3873d2db 100644 (file)
--- a/client/shaders/water_surface_shader/opengl_fragment.glsl
+++ b/client/shaders/water_surface_shader/opengl_fragment.glsl
@@ -87,7 +87,12 @@ vec4 base = texture2D(baseTexture, uv).rgba;
                vec3 E = normalize(eyeVec);
                float specular = pow(clamp(dot(reflect(L, bump.xyz), E), 0.0, 1.0),0.5); 
                float diffuse = dot(E,bump.xyz);                
-               color = 0.05*base.rgb + diffuse*base.rgb + 0.2*specular*base.rgb;
+               /* Mathematic optimization
+               * Original: color = 0.05*base.rgb + diffuse*base.rgb + 0.2*specular*base.rgb;
+               * This optimization save 2 multiplications (orig: 4 multiplications + 3 additions
+               * end: 2 multiplications + 3 additions)
+               */
+               color = (0.05 + diffuse + 0.2 * specular) * base.rgb;
        } else {
                color = base.rgb;
        }
diff --git a/client/shaders/water_surface_shader/opengl_vertex.glsl b/client/shaders/water_surface_shader/opengl_vertex.glsl
index ad94fde325c28d1f7de214c804532a2bb351c901..6e70bbc361b442b4de608873fe13a4d0ce68aac1 100644 (file)
--- a/client/shaders/water_surface_shader/opengl_vertex.glsl
+++ b/client/shaders/water_surface_shader/opengl_vertex.glsl
@@ -35,22 +35,36 @@ void main(void)
 #if (MATERIAL_TYPE == TILE_MATERIAL_LIQUID_TRANSPARENT || MATERIAL_TYPE == TILE_MATERIAL_LIQUID_OPAQUE) && ENABLE_WAVING_WATER\r
        vec4 pos = gl_Vertex;\r
        pos.y -= 2.0;\r
-       pos.y -= sin (pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) * WATER_WAVE_HEIGHT\r
-               + sin ((pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) / 7.0) * WATER_WAVE_HEIGHT;\r
+\r
+       float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH);\r
+\r
+       pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT;\r
        gl_Position = mWorldViewProj * pos;\r
 #elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES\r
        vec4 pos = gl_Vertex;\r
        vec4 pos2 = mWorld * gl_Vertex;\r
-       pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2.x * 0.01 + pos2.z * 0.01) * 2.0 - 1.0) * 0.4;\r
-       pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.2;\r
-       pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.4;\r
+       /*\r
+        * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)\r
+        * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)\r
+        * And bufferize calcul to a float\r
+        */\r
+       float pos2XpZ = pos2.x + pos2.z;\r
+       pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * 0.01) * 2.0 - 1.0) * 0.4;\r
+       pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.2;\r
+       pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.4;\r
        gl_Position = mWorldViewProj * pos;\r
 #elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS\r
        vec4 pos = gl_Vertex;\r
        vec4 pos2 = mWorld * gl_Vertex;\r
        if (gl_TexCoord[0].y < 0.05) {\r
-               pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2.x * 0.1 + pos2.z * 0.1) * 2.0 - 1.0) * 0.8;\r
-               pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2.x * -0.5 + pos2.z * -0.5) * 2.0 - 1.0) * 0.4; \r
+               /*\r
+                * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)\r
+                * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)\r
+                * And bufferize calcul to a float\r
+                */\r
+               float pos2XpZ = pos2.x + pos2.z;\r
+               pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2XpZ * 0.1) * 2.0 - 1.0) * 0.8;\r
+               pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2XpZ * -0.5) * 2.0 - 1.0) * 0.4;\r
        }\r
        gl_Position = mWorldViewProj * pos;\r
 #else\r
@@ -88,7 +102,7 @@ void main(void)
                tangent  = normalize(gl_NormalMatrix * vec3(-1.0,  0.0,  0.0));\r
                binormal = normalize(gl_NormalMatrix * vec3( 0.0, -1.0,  0.0));\r
        }\r
-       mat3 tbnMatrix = mat3(  tangent.x, binormal.x, normal.x,\r
+       mat3 tbnMatrix = mat3(tangent.x, binormal.x, normal.x,\r
                                                        tangent.y, binormal.y, normal.y,\r
                                                        tangent.z, binormal.z, normal.z);\r
 \r
Unnamed repository; edit this file 'description' to name the repository.