diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-17 21:34:16 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-05-17 21:34:16 (GMT) |
| commit | 2c5400a7322cc9496df0833fd71367696ede339f (patch) | |
| tree | a2e4508ff86abd11d012b6dd1717e70e94934469 /src/Renderer.cpp | |
| parent | 8efd07a849261220b1c500101790af459c06f805 (diff) | |
| download | powder-2c5400a7322cc9496df0833fd71367696ede339f.zip powder-2c5400a7322cc9496df0833fd71367696ede339f.tar.gz | |
Warp display with newer shader, Render options works in OpenGL
Diffstat (limited to 'src/Renderer.cpp')
| -rw-r--r-- | src/Renderer.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Renderer.cpp b/src/Renderer.cpp index 7f6f9cc..58d4444 100644 --- a/src/Renderer.cpp +++ b/src/Renderer.cpp @@ -2001,18 +2001,18 @@ Renderer::Renderer(Graphics * g, Simulation * sim): glEnable(GL_TEXTURE_2D); glGenTextures(1, &partsTFX); glBindTexture(GL_TEXTURE_2D, partsTFX); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, XRES, YRES, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, XRES/CELL, YRES/CELL, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR); glBindTexture(GL_TEXTURE_2D, 0); glGenTextures(1, &partsTFY); glBindTexture(GL_TEXTURE_2D, partsTFY); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, XRES, YRES, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, XRES/CELL, YRES/CELL, 0, GL_BGRA, GL_UNSIGNED_BYTE, NULL); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR); glBindTexture(GL_TEXTURE_2D, 0); glDisable(GL_TEXTURE_2D); |