diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2015-01-15 23:11:56 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-01-15 23:12:45 +1000 |
| commit | 148fffb0f23fa437c67639ff3cc69177fb71d76a (patch) | |
| tree | a121b619c9ebf6a087148a6426cfc0f2d3f9ede0 /client/shaders/nodes_shader | |
| parent | bd0d7865909d2c7f3f2b0b1ba4900d763642af35 (diff) | |
| download | minetest-148fffb0f23fa437c67639ff3cc69177fb71d76a.tar.gz minetest-148fffb0f23fa437c67639ff3cc69177fb71d76a.tar.bz2 minetest-148fffb0f23fa437c67639ff3cc69177fb71d76a.zip | |
Optimize bumpmapping mathematics
OpenGL_vertex:
* bufferize a duplicate calcul
* Factorize vertexes
Diffstat (limited to 'client/shaders/nodes_shader')
| -rw-r--r-- | client/shaders/nodes_shader/opengl_fragment.glsl | 7 | ||||
| -rw-r--r-- | client/shaders/nodes_shader/opengl_vertex.glsl | 31 |
2 files changed, 30 insertions, 8 deletions
diff --git a/client/shaders/nodes_shader/opengl_fragment.glsl b/client/shaders/nodes_shader/opengl_fragment.glsl index 2a1cbc568..7ef30cc52 100644 --- 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 ff310cc2f..07684f616 100644 --- 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
vec4 pos = gl_Vertex;
pos.y -= 2.0;
- pos.y -= sin (pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) * WATER_WAVE_HEIGHT
- + sin ((pos.z/WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH) / 7.0) * WATER_WAVE_HEIGHT;
+
+ float posYbuf = (pos.z / WATER_WAVE_LENGTH + animationTimer * WATER_WAVE_SPEED * WATER_WAVE_LENGTH);
+
+ pos.y -= sin(posYbuf) * WATER_WAVE_HEIGHT + sin(posYbuf / 7.0) * WATER_WAVE_HEIGHT;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_LEAVES && ENABLE_WAVING_LEAVES
vec4 pos = gl_Vertex;
vec4 pos2 = mWorld * gl_Vertex;
- pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2.x * 0.01 + pos2.z * 0.01) * 2.0 - 1.0) * 0.4;
- pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.2;
- pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2.x * -0.01 + pos2.z * -0.01) * 2.0 - 1.0) * 0.4;
+
+ /*
+ * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)
+ * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)
+ * And bufferize calcul to a float
+ */
+ float pos2XpZ = pos2.x + pos2.z;
+
+ pos.x += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * 0.01) * 2.0 - 1.0) * 0.4;
+ pos.y += (smoothTriangleWave(animationTimer*15.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.2;
+ pos.z += (smoothTriangleWave(animationTimer*10.0 + pos2XpZ * -0.01) * 2.0 - 1.0) * 0.4;
gl_Position = mWorldViewProj * pos;
#elif MATERIAL_TYPE == TILE_MATERIAL_WAVING_PLANTS && ENABLE_WAVING_PLANTS
vec4 pos = gl_Vertex;
vec4 pos2 = mWorld * gl_Vertex;
if (gl_TexCoord[0].y < 0.05) {
- pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2.x * 0.1 + pos2.z * 0.1) * 2.0 - 1.0) * 0.8;
- pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2.x * -0.5 + pos2.z * -0.5) * 2.0 - 1.0) * 0.4;
+ /*
+ * Mathematic optimization: pos2.x * A + pos2.z * A (2 multiplications + 1 addition)
+ * replaced with: (pos2.x + pos2.z) * A (1 addition + 1 multiplication)
+ * And bufferize calcul to a float
+ */
+ float pos2XpZ = pos2.x + pos2.z;
+
+ pos.x += (smoothTriangleWave(animationTimer * 20.0 + pos2XpZ * 0.1) * 2.0 - 1.0) * 0.8;
+ pos.y -= (smoothTriangleWave(animationTimer * 10.0 + pos2XpZ * -0.5) * 2.0 - 1.0) * 0.4;
}
gl_Position = mWorldViewProj * pos;
#else
|