diff options
| author | taw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5> | 2008-06-03 00:13:21 +0000 |
|---|---|---|
| committer | taw27 <taw27@84d2e878-0bd5-11dd-ad15-13eda11d74c5> | 2008-06-03 00:13:21 +0000 |
| commit | 9953ce168c8f83bd49316d4c6db3adb487226ba6 (patch) | |
| tree | 20cdaacedb34584b0d02dc731ee6fa2800a33bc5 | |
| parent | 0af3ca0db832ce3dca5b606d1b9564d3a9878431 (diff) | |
Fix platform texturing issues
git-svn-id: svn://cook.msm.cam.ac.uk:745/thrust3d/thrust3d@64 84d2e878-0bd5-11dd-ad15-13eda11d74c5
| -rw-r--r-- | data/models/platform | 32 | ||||
| -rw-r--r-- | src/render.c | 2 |
2 files changed, 18 insertions, 16 deletions
diff --git a/data/models/platform b/data/models/platform index fdfdf30..cb4fccf 100644 --- a/data/models/platform +++ b/data/models/platform @@ -6,25 +6,25 @@ QUADS 1.00 1.00 0.07 1.0 1.0 -1.00 1.00 0.07 0.0 1.0 # - 1.00 1.00 0.00 0.0 0.0 - -1.00 1.00 0.00 1.0 0.0 - -1.00 1.00 0.07 1.0 0.0 - 1.00 1.00 0.07 0.0 0.0 + 1.00 1.00 0.00 1.0 1.0 + -1.00 1.00 0.00 0.0 1.0 + -1.00 1.00 0.07 0.0 1.0 + 1.00 1.00 0.07 1.0 1.0 # - 1.00 -1.00 0.07 0.0 1.0 - -1.00 -1.00 0.07 1.0 1.0 - -1.00 -1.00 0.00 1.0 1.0 - 1.00 -1.00 0.00 0.0 1.0 + 1.00 -1.00 0.07 1.0 0.0 + -1.00 -1.00 0.07 0.0 0.0 + -1.00 -1.00 0.00 0.0 0.0 + 1.00 -1.00 0.00 1.0 0.0 # - 1.00 1.00 0.07 0.0 0.0 - 1.00 -1.00 0.07 0.0 1.0 - 1.00 -1.00 0.00 0.0 1.0 - 1.00 1.00 0.00 0.0 0.0 + 1.00 1.00 0.07 1.0 1.0 + 1.00 -1.00 0.07 1.0 0.0 + 1.00 -1.00 0.00 1.0 0.0 + 1.00 1.00 0.00 1.0 1.0 # - -1.00 1.00 0.00 1.0 0.0 - -1.00 -1.00 0.00 1.0 1.0 - -1.00 -1.00 0.07 1.0 1.0 - -1.00 1.00 0.07 1.0 0.0 + -1.00 1.00 0.00 0.0 1.0 + -1.00 -1.00 0.00 0.0 0.0 + -1.00 -1.00 0.07 0.0 0.0 + -1.00 1.00 0.07 0.0 1.0 # swirly colour 0.8 0.0 0.0 diff --git a/src/render.c b/src/render.c index eed7920..6a638dd 100644 --- a/src/render.c +++ b/src/render.c @@ -342,6 +342,8 @@ static int render_model_instance_draw(ModelInstance *instance, Uint32 t, RenderC if ( r->fbos && r->shaders ) { glBindTexture(GL_TEXTURE_2D, r->swirly_texture); glEnable(GL_TEXTURE_2D); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glUniform1i(glGetUniformLocation(r->lighting_program, "texture_emits"), 1); } else { if ( r->shaders ) { |