summaryrefslogtreecommitdiff
path: root/src/simulation
diff options
context:
space:
mode:
authorBryan Hoyle <starfoxprime@gmail.com>2012-06-20 18:23:22 (GMT)
committer Bryan Hoyle <starfoxprime@gmail.com>2012-06-20 18:23:22 (GMT)
commitc9f837f21d7f2324c838891ec0d43cf7feff0cb9 (patch)
tree41e38fcf7f2112da52b67ae9887d9c4fdf9282d8 /src/simulation
parent088b2f678d5baedcf3555a5afce76710e6900a9e (diff)
downloadpowder-c9f837f21d7f2324c838891ec0d43cf7feff0cb9.zip
powder-c9f837f21d7f2324c838891ec0d43cf7feff0cb9.tar.gz
Opengl can open saves now, just need to get it to render accurately later
Diffstat (limited to 'src/simulation')
-rw-r--r--src/simulation/SaveRenderer.cpp34
1 files changed, 20 insertions, 14 deletions
diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp
index cfa83c6..ba4653c 100644
--- a/src/simulation/SaveRenderer.cpp
+++ b/src/simulation/SaveRenderer.cpp
@@ -19,6 +19,7 @@ SaveRenderer::SaveRenderer(){
Thumbnail * SaveRenderer::Render(GameSave * save)
{
+#ifndef OGLR
Thumbnail * tempThumb = NULL;
int width, height;
width = save->blockWidth;
@@ -30,26 +31,31 @@ 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;
- }
+ ren->render_parts();
- tempThumb = new Thumbnail(0, 0, pData, ui::Point(width*CELL, height*CELL));
+ pData = (pixel *)malloc(PIXELSIZE * ((width*CELL)*(height*CELL)));
+ dst = pData;
+ for(int i = 0; i < height*CELL; i++)
+ {
+ printf("%d\n",i);
+ memcpy(dst, src, (width*CELL)*PIXELSIZE);
+ dst+=(width*CELL);///PIXELSIZE;
+ src+=XRES+BARSIZE;
+ }
-finish:
+ tempThumb = new Thumbnail(0, 0, pData, ui::Point(width*CELL, height*CELL));
+ }
if(pData)
free(pData);
return tempThumb;
+#else
+ VideoBuffer buffer(64, 64);
+ buffer.SetCharacter(32, 32, 'x', 255, 255, 255, 255);
+ Thumbnail * thumb = new Thumbnail(0, 0, buffer.Buffer, ui::Point(64, 64));
+ return thumb;
+#endif
}
Thumbnail * SaveRenderer::Render(unsigned char * saveData, int dataSize)