matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "fixed --opengl-renderer from segfaulting. Added a gitignore for vim swap files""

Browse Source 
This reverts commit 90f505c2da.
This commit is contained in:
Bryan Hoyle 2012-08-12 15:14:46 -04:00
parent 90f505c2da
commit 44645c93ee
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
*.swp
*.o *.o
*.exe *.exe
*.user *.user

4
src/graphics/Renderer.cpp
View File

@ -123,8 +123,10 @@ void Renderer::clearScreen(float alpha)
glClear(GL_COLOR_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT);
#endif #endif
#ifdef OGLI #ifdef OGLI
#ifndef OGLR
std::fill(vid, vid+(VIDXRES*VIDYRES), 0); std::fill(vid, vid+(VIDXRES*VIDYRES), 0);
#endif #endif
#endif
} }
#ifdef OGLR #ifdef OGLR
void Renderer::checkShader(GLuint shader, char * shname) 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_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_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); std::fill(fire_b[0]+0, fire_b[(YRES/CELL)-1]+((XRES/CELL)-1), 0);
#ifndef OGLR
std::fill(persistentVid, persistentVid+(VIDXRES*YRES), 0); std::fill(persistentVid, persistentVid+(VIDXRES*YRES), 0);
#endif
} }
void Renderer::AddRenderMode(unsigned int mode) void Renderer::AddRenderMode(unsigned int mode)