josh/treacherous-terrain
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make lava slowly move over time

Browse Source
This commit is contained in:
Josh Holtrop 2012-09-21 22:05:22 -04:00
parent b1163044b8
commit b785304adf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/fs/shaders/lava.f.glsl
View File

@ -1,9 +1,11 @@
uniform sampler2D tex; uniform sampler2D tex;
uniform float shift;
varying vec2 tex_coord_i; varying vec2 tex_coord_i;
void main(void) void main(void)
{ {
gl_FragColor = texture2D(tex, tex_coord_i); vec2 tex_coord = vec2(tex_coord_i.s + shift, tex_coord_i.t);
gl_FragColor = texture2D(tex, tex_coord);
} }

7
src/client/Client-gl.cc
View File

@ -119,7 +119,8 @@ bool Client::initgl()
const char *lava_uniforms[] = { const char *lava_uniforms[] = {
"projection", "projection",
"modelview", "modelview",
"tex" "tex",
"shift"
}; };
const char *obj_v_source = const char *obj_v_source =
(const char *) CFS.get_file("shaders/obj.v.glsl", NULL); (const char *) CFS.get_file("shaders/obj.v.glsl", NULL);
@ -473,7 +474,11 @@ void Client::draw_lava()
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
m_projection.to_uniform(m_lava_program.uniform("projection")); m_projection.to_uniform(m_lava_program.uniform("projection"));
m_lava_texture.bind(); m_lava_texture.bind();
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glUniform1i(m_lava_program.uniform("tex"), 0); glUniform1i(m_lava_program.uniform("tex"), 0);
double shift = m_clock.getElapsedTime().asSeconds() / 40;
glUniform1f(m_lava_program.uniform("shift"), shift);
const int n_lavas = 2 * SKY_DIST / LAVA_SIZE; const int n_lavas = 2 * SKY_DIST / LAVA_SIZE;
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE,
5 * sizeof(GLfloat), NULL); 5 * sizeof(GLfloat), NULL);