diff options
| author | Bryan Hoyle <starfoxprime@gmail.com> | 2012-08-12 18:47:13 (GMT) |
|---|---|---|
| committer | Bryan Hoyle <starfoxprime@gmail.com> | 2012-08-12 18:47:13 (GMT) |
| commit | 90f71f3b11373bda502405856062803111f247d5 (patch) | |
| tree | 54bc2cca07a27ddaf56654201d2ec5948a4fcb8d | |
| parent | 530e093d8b25f8ac9be48507319f1353f4695679 (diff) | |
| download | powder-90f71f3b11373bda502405856062803111f247d5.zip powder-90f71f3b11373bda502405856062803111f247d5.tar.gz | |
fixed --opengl-renderer from segfaulting. Added a gitignore for vim swap files
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/graphics/Renderer.cpp | 4 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,4 @@ +*.swp *.o *.exe *.user @@ -32,4 +33,4 @@ Makefile.me *.settings config.log *.sconsign.dblite -*.sconf_temp
\ No newline at end of file +*.sconf_temp diff --git a/src/graphics/Renderer.cpp b/src/graphics/Renderer.cpp index c0e0455..57d4f8d 100644 --- a/src/graphics/Renderer.cpp +++ b/src/graphics/Renderer.cpp @@ -123,8 +123,10 @@ void Renderer::clearScreen(float alpha) glClear(GL_COLOR_BUFFER_BIT); #endif #ifdef OGLI +#ifndef OGLR std::fill(vid, vid+(VIDXRES*VIDYRES), 0); #endif +#endif } #ifdef OGLR void Renderer::checkShader(GLuint shader, char * shname) @@ -2374,7 +2376,9 @@ void Renderer::ClearAccumulation() std::fill(fire_r[0]+0, fire_r[(YRES/CELL)-1]+((XRES/CELL)-1), 0); std::fill(fire_g[0]+0, fire_g[(YRES/CELL)-1]+((XRES/CELL)-1), 0); std::fill(fire_b[0]+0, fire_b[(YRES/CELL)-1]+((XRES/CELL)-1), 0); +#ifndef OGLR std::fill(persistentVid, persistentVid+(VIDXRES*YRES), 0); +#endif } void Renderer::AddRenderMode(unsigned int mode) |