diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-21 12:23:04 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-21 12:23:04 (GMT) |
| commit | 8fc3325b1c55a84d29c3b4fafe242af279c09fe5 (patch) | |
| tree | 1f453542a97704976c16f93b8384411fbebed8af /src | |
| parent | 12ba6834ebff1271000f6232b1b6bce16665c10a (diff) | |
| parent | df13d96335dbb12266b41e403c43ed29a030af68 (diff) | |
| download | powder-8fc3325b1c55a84d29c3b4fafe242af279c09fe5.zip powder-8fc3325b1c55a84d29c3b4fafe242af279c09fe5.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/PowderToypp
Diffstat (limited to 'src')
| -rw-r--r-- | src/OpenGLHeaders.h | 4 | ||||
| -rw-r--r-- | src/PowderToySDL.cpp | 2 | ||||
| -rw-r--r-- | src/Renderer.cpp | 1 | ||||
| -rw-r--r-- | src/Renderer.h | 2 | ||||
| -rw-r--r-- | src/simulation/SaveRenderer.cpp | 28 |
5 files changed, 16 insertions, 21 deletions
diff --git a/src/OpenGLHeaders.h b/src/OpenGLHeaders.h index 3f925ac..8a83472 100644 --- a/src/OpenGLHeaders.h +++ b/src/OpenGLHeaders.h @@ -18,7 +18,7 @@ #else -//#include <GL/glew.h> +#include <GL/glew.h> #include <GL/gl.h> #include <GL/glu.h> -#endif
\ No newline at end of file +#endif diff --git a/src/PowderToySDL.cpp b/src/PowderToySDL.cpp index d268f57..53f9027 100644 --- a/src/PowderToySDL.cpp +++ b/src/PowderToySDL.cpp @@ -114,7 +114,7 @@ SDL_Surface * SDLOpen() surface = SDL_SetVideoMode(XRES + BARSIZE, YRES + MENUSIZE, 32, SDL_OPENGL); #endif -#if defined(WIN32) && defined(OGLR) +#if defined(OGLR) int status = glewInit(); if(status != GLEW_OK) { diff --git a/src/Renderer.cpp b/src/Renderer.cpp index 53727ae..b16602a 100644 --- a/src/Renderer.cpp +++ b/src/Renderer.cpp @@ -4,7 +4,6 @@ * Created on: Jan 7, 2012 * Author: Simon */ - #include <cmath> #include <iostream> #include <vector> diff --git a/src/Renderer.h b/src/Renderer.h index 08befa6..8ad6a58 100644 --- a/src/Renderer.h +++ b/src/Renderer.h @@ -2,7 +2,7 @@ #define RENDERER_H #include <vector> -#if defined(OGLR) +#ifdef OGLR #include "OpenGLHeaders.h" #endif diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp index 5ea99e6..3d0e7c7 100644 --- a/src/simulation/SaveRenderer.cpp +++ b/src/simulation/SaveRenderer.cpp @@ -19,9 +19,7 @@ SaveRenderer::SaveRenderer(){ Thumbnail * SaveRenderer::Render(GameSave * save) { - Thumbnail * tempThumb = NULL; int width, height; - #ifdef OGLR width = save->blockWidth*CELL; height = save->blockHeight*CELL; @@ -42,23 +40,21 @@ Thumbnail * SaveRenderer::Render(GameSave * save) g->Clear(); sim->clear_sim(); - if(sim->Load(save)) - goto finish; - - ren->render_parts(); - - dst = pData = (pixel *)malloc(PIXELSIZE * ((width*CELL)*(height*CELL))); - for(int i = 0; i < height*CELL; i++) + if(!sim->Load(save)) { - memcpy(dst, src, (width*CELL)*PIXELSIZE); - dst+=(width*CELL);///PIXELSIZE; - src+=XRES+BARSIZE; - } - - tempThumb = new Thumbnail(0, 0, pData, ui::Point(width*CELL, height*CELL)); + ren->render_parts(); -finish: + pData = (pixel *)malloc(PIXELSIZE * ((width*CELL)*(height*CELL))); + dst = pData; + for(int i = 0; i < height*CELL; i++) + { + memcpy(dst, src, (width*CELL)*PIXELSIZE); + dst+=(width*CELL);///PIXELSIZE; + src+=XRES+BARSIZE; + } + tempThumb = new Thumbnail(0, 0, pData, ui::Point(width*CELL, height*CELL)); + } if(pData) free(pData); return tempThumb; |