From c9f837f21d7f2324c838891ec0d43cf7feff0cb9 Mon Sep 17 00:00:00 2001 From: Bryan Hoyle Date: Wed, 20 Jun 2012 14:23:22 -0400 Subject: Opengl can open saves now, just need to get it to render accurately later diff --git a/Makefile b/Makefile index cf663f2..01c2e12 100644 --- a/Makefile +++ b/Makefile @@ -21,13 +21,13 @@ powder-x: build/powder-x powder-x.jnilib: build/powder-x.jnilib build/powder-release.exe: CFLAGS += -DWIN32 -O3 -ftree-vectorize -msse2 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 -mwindows +build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua5.1 -lfftw3f-3 -mwindows build/powder.exe: CFLAGS += -DWIN32 build/powder.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 #-mwindows -build/powder-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse2 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f -build/powder: CFLAGS += -DLIN32 -build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f +build/powder-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -I/usr/include/SDL -I/usr/include/lua50 -DOGLR -DPIX32OGL -DPIXALPHA +build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua5.1 -lfftw3f -lGL -lGLEW -ggdb +build/powder: CFLAGS += -DLIN32 -DOGLR -DPIX32OGL -DPIXALPHA -I/usr/include/SDL -I/usr/include/lua50 +build/powder: LFLAGS := -lSDL -lm -lbz2 -llua5.1 -lfftw3f -lGL -lGLEW -ggdb #build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -I/Library/Frameworks/OpenGL.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA #build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -framework Cocoa -framework OpenGL build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -DPIX32BGRA @@ -45,7 +45,6 @@ build/powder-res.o: resources/powder-res.rc resources/powder.ico resources/docum mv resources/powder-res.o build/powder-res.o build/powder-release: $(SOURCES) $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@ - strip $@ build/powder.exe: buildpaths-powder.exe generate $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(LFLAGS) -o $@ -ggdb 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 +#include #include #include -#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 #include #include 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 -#if defined(OGLR) +#ifdef OGLR #include "OpenGLHeaders.h" #endif 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) -- cgit v0.9.2-21-gd62e From b35255b722a5259f34cfc9b7569f58d11658c3b9 Mon Sep 17 00:00:00 2001 From: Bryan Hoyle Date: Wed, 20 Jun 2012 14:25:41 -0400 Subject: Renders an X in place of save icons, atm. diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp index ba4653c..0e4fadf 100644 --- a/src/simulation/SaveRenderer.cpp +++ b/src/simulation/SaveRenderer.cpp @@ -52,7 +52,7 @@ Thumbnail * SaveRenderer::Render(GameSave * save) return tempThumb; #else VideoBuffer buffer(64, 64); - buffer.SetCharacter(32, 32, 'x', 255, 255, 255, 255); + buffer.BlendCharacter(32, 32, 'X', 255, 255, 255, 255); Thumbnail * thumb = new Thumbnail(0, 0, buffer.Buffer, ui::Point(64, 64)); return thumb; #endif -- cgit v0.9.2-21-gd62e From e5e638448cd1c3cda133271a79f0797da4ac6860 Mon Sep 17 00:00:00 2001 From: Bryan Hoyle Date: Wed, 20 Jun 2012 14:42:42 -0400 Subject: remove some debugging diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp index 0e4fadf..d687999 100644 --- a/src/simulation/SaveRenderer.cpp +++ b/src/simulation/SaveRenderer.cpp @@ -39,7 +39,6 @@ Thumbnail * SaveRenderer::Render(GameSave * save) 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; -- cgit v0.9.2-21-gd62e From b6afd854d051daa16e3c99ab5e2d639ecf79f8a2 Mon Sep 17 00:00:00 2001 From: Bryan Hoyle Date: Wed, 20 Jun 2012 14:48:34 -0400 Subject: Reverting makefile diff --git a/Makefile b/Makefile index 01c2e12..930c367 100644 --- a/Makefile +++ b/Makefile @@ -21,13 +21,13 @@ powder-x: build/powder-x powder-x.jnilib: build/powder-x.jnilib build/powder-release.exe: CFLAGS += -DWIN32 -O3 -ftree-vectorize -msse2 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua5.1 -lfftw3f-3 -mwindows +build/powder-release.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 -mwindows build/powder.exe: CFLAGS += -DWIN32 build/powder.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 #-mwindows -build/powder-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -I/usr/include/SDL -I/usr/include/lua50 -DOGLR -DPIX32OGL -DPIXALPHA -build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua5.1 -lfftw3f -lGL -lGLEW -ggdb -build/powder: CFLAGS += -DLIN32 -DOGLR -DPIX32OGL -DPIXALPHA -I/usr/include/SDL -I/usr/include/lua50 -build/powder: LFLAGS := -lSDL -lm -lbz2 -llua5.1 -lfftw3f -lGL -lGLEW -ggdb +build/powder-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations +build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f +build/powder: CFLAGS += -DLIN32 +build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f #build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -I/Library/Frameworks/OpenGL.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA #build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -framework Cocoa -framework OpenGL build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -DPIX32BGRA @@ -45,7 +45,7 @@ build/powder-res.o: resources/powder-res.rc resources/powder.ico resources/docum mv resources/powder-res.o build/powder-res.o build/powder-release: $(SOURCES) $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@ - + strip $@ build/powder.exe: buildpaths-powder.exe generate $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(LFLAGS) -o $@ -ggdb build/obj/powder.exe/%.o: src/%.cpp $(HEADERS) -- cgit v0.9.2-21-gd62e From 3b29a7476721627e66c296db9814840969f639b9 Mon Sep 17 00:00:00 2001 From: Bryan Hoyle Date: Wed, 20 Jun 2012 15:05:25 -0400 Subject: fixes to code and a option for opengl building for release diff --git a/Makefile b/Makefile index 930c367..af12358 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,7 @@ all: build/powder powder-release.exe: build/powder-release.exe powder.exe: build/powder.exe powder-release: build/powder-release +powder-opengl-release: build/powder-opengl-release powder: build/powder powder-x: build/powder-x powder-x.jnilib: build/powder-x.jnilib @@ -26,6 +27,8 @@ build/powder.exe: CFLAGS += -DWIN32 build/powder.exe: LFLAGS := -lmingw32 -lregex -lws2_32 -lSDLmain -lpthread -lSDL -lm -lbz2 -llua -lfftw3f-3 #-mwindows build/powder-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations build/powder-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f +build/powder-opengl-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -funsafe-math-optimizations -ffast-math -fomit-frame-pointer -funsafe-loop-optimizations -Wunsafe-loop-optimizations -DOGLR -DPIX32OGL -DPIXALPHA +build/powder-opengl-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f -lGL -lGLEW -DOGLR -DPIX32OGL -DPIXALPHA build/powder: CFLAGS += -DLIN32 build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f #build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -I/Library/Frameworks/OpenGL.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA @@ -46,6 +49,9 @@ build/powder-res.o: resources/powder-res.rc resources/powder.ico resources/docum build/powder-release: $(SOURCES) $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@ strip $@ +build/powder-opengl-release: $(SOURCES) + $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(SOURCES) $(LFLAGS) -o $@ + strip $@ build/powder.exe: buildpaths-powder.exe generate $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(CPPC_WIN) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder.exe/%.o,$(OBJS)) build/powder-res.o $(LFLAGS) -o $@ -ggdb build/obj/powder.exe/%.o: src/%.cpp $(HEADERS) diff --git a/src/simulation/SaveRenderer.cpp b/src/simulation/SaveRenderer.cpp index 36f6a40..3d0e7c7 100644 --- a/src/simulation/SaveRenderer.cpp +++ b/src/simulation/SaveRenderer.cpp @@ -19,10 +19,7 @@ SaveRenderer::SaveRenderer(){ Thumbnail * SaveRenderer::Render(GameSave * save) { -#ifndef OGLR - Thumbnail * tempThumb = NULL; int width, height; - #ifdef OGLR width = save->blockWidth*CELL; height = save->blockHeight*CELL; @@ -43,6 +40,7 @@ Thumbnail * SaveRenderer::Render(GameSave * save) g->Clear(); sim->clear_sim(); + if(!sim->Load(save)) { ren->render_parts(); @@ -55,17 +53,11 @@ Thumbnail * SaveRenderer::Render(GameSave * save) 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; -#else - VideoBuffer buffer(64, 64); - buffer.BlendCharacter(32, 32, 'X', 255, 255, 255, 255); - Thumbnail * thumb = new Thumbnail(0, 0, buffer.Buffer, ui::Point(64, 64)); - return thumb; #endif } -- cgit v0.9.2-21-gd62e From f5aeaf103874710aa5b1fbe296d55604c60dc12b Mon Sep 17 00:00:00 2001 From: Bryan Hoyle Date: Wed, 20 Jun 2012 15:12:44 -0400 Subject: And, standard powder-opengl for quick testing compiles diff --git a/Makefile b/Makefile index af12358..3ad5e24 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ powder.exe: build/powder.exe powder-release: build/powder-release powder-opengl-release: build/powder-opengl-release powder: build/powder +powder-opengl: build/powder-opengl powder-x: build/powder-x powder-x.jnilib: build/powder-x.jnilib @@ -31,6 +32,8 @@ build/powder-opengl-release: CFLAGS += -DLIN32 -O3 -ftree-vectorize -msse3 -fun build/powder-opengl-release: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f -lGL -lGLEW -DOGLR -DPIX32OGL -DPIXALPHA build/powder: CFLAGS += -DLIN32 build/powder: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f +build/powder-opengl: CFLAGS += -DLIN32 -DOGLR -DPIX32OGL -DPIXALPHA +build/powder-opengl: LFLAGS := -lSDL -lm -lbz2 -llua -lfftw3f -lGL -lGLEW #build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -I/Library/Frameworks/OpenGL.framework/Headers -DOGLR -DPIX32OGL -DPIXALPHA #build/powder-x: LFLAGS := -lm -lbz2 -lfftw3f -framework SDL -framework Lua -framework Cocoa -framework OpenGL build/powder-x: CFLAGS += -DMACOSX -I/Library/Frameworks/SDL.framework/Headers -I/Library/Frameworks/Lua.framework/Headers -DPIX32BGRA @@ -62,12 +65,16 @@ buildpaths-powder.exe: build/powder: buildpaths-powder generate $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)) $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb +build/powder-opengl: buildpaths-powder generate $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS)) + $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb build/obj/powder/%.o: src/%.cpp $(HEADERS) $(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb buildpaths-powder: $(shell mkdir -p build/obj/powder/) $(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS))))) - +buildpaths-powder-opengl: + $(shell mkdir -p build/obj/powder-opengl/) + $(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS))))) build/powder-x: buildpaths-powder-x generate $(patsubst build/obj/%.o,build/obj/powder-x/%.o,$(OBJS)) $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder-x/%.o,$(OBJS)) SDLmain.m $(LFLAGS) -o $@ -ggdb build/obj/powder-x/%.o: src/%.cpp $(HEADERS) -- cgit v0.9.2-21-gd62e From df13d96335dbb12266b41e403c43ed29a030af68 Mon Sep 17 00:00:00 2001 From: Bryan Hoyle Date: Wed, 20 Jun 2012 15:13:18 -0400 Subject: Forgot to actually add it diff --git a/Makefile b/Makefile index 3ad5e24..742ccd2 100644 --- a/Makefile +++ b/Makefile @@ -65,10 +65,12 @@ buildpaths-powder.exe: build/powder: buildpaths-powder generate $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)) $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb -build/powder-opengl: buildpaths-powder generate $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS)) +build/powder-opengl: buildpaths-powder-opengl generate $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS)) $(CPPC) $(CFLAGS) $(OFLAGS) $(LDFLAGS) $(patsubst build/obj/%.o,build/obj/powder-opengl/%.o,$(OBJS)) $(LFLAGS) -o $@ -ggdb build/obj/powder/%.o: src/%.cpp $(HEADERS) $(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb +build/obj/powder-opengl/%.o: src/%.cpp $(HEADERS) + $(CPPC) -c $(CFLAGS) $(OFLAGS) -o $@ $< -ggdb buildpaths-powder: $(shell mkdir -p build/obj/powder/) $(shell mkdir -p $(sort $(dir $(patsubst build/obj/%.o,build/obj/powder/%.o,$(OBJS))))) -- cgit v0.9.2-21-gd62e