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

Minor opengl fixes, still not compiling, look at line 14 in src/graphics/OpenGLGraphics.cpp, build/src/graphics/OpenGLGraphics.cpp:14:15: error: expected primary-expression before '{' token

Browse Source 
build/src/graphics/OpenGLGraphics.cpp:14:15: error: expected ')' before '{' token
'
This commit is contained in:
Bryan Hoyle 2012-08-12 11:38:26 -04:00
parent f1fc3811aa
commit 07821d9c85
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements Normal file
View File

@ -0,0 +1,7 @@
#include "ElementClasses.h"
std::vector<Element> GetElements()
{
std::vector<Element> elements;
return elements;
}

3
src/game/Brush.cpp
View File

@ -16,6 +16,7 @@ void Brush::RenderRect(Renderer * ren, ui::Point position1, ui::Point position2)
position1.X += width; position1.X += width;
width *= -1; width *= -1;
} }
ren->xor_line(position1.X, position1.Y, position1.X+width, position1.Y); ren->xor_line(position1.X, position1.Y, position1.X+width, position1.Y);
ren->xor_line(position1.X, position1.Y+height, position1.X+width, position1.Y+height); ren->xor_line(position1.X, position1.Y+height, position1.X+width, position1.Y+height);
ren->xor_line(position1.X+width, position1.Y+1, position1.X+width, position1.Y+height-1); ren->xor_line(position1.X+width, position1.Y+1, position1.X+width, position1.Y+height-1);
@ -39,4 +40,4 @@ void Brush::RenderPoint(Renderer * ren, ui::Point position)
void Brush::RenderFill(Renderer * ren, ui::Point position) void Brush::RenderFill(Renderer * ren, ui::Point position)
{ {
} }

5
src/graphics/OpenGLGraphics.cpp
View File

@ -1,14 +1,15 @@
#include "Graphics.h" #include "Graphics.h"
#include "font.h" #include "font.h"
#include <pthread.h> #include <pthread.h>
#ifdef GetUserName
#undef GetUserName //God dammit microsoft! #undef GetUserName //God dammit microsoft!
#endif
#ifdef OGLI #ifdef OGLI
static pthread_mutex_t gMutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t gMutex = PTHREAD_MUTEX_INITIALIZER;
Graphics::Graphics(): Graphics::Graphics():
sdl_scale(1) sdl_scale(1)
{ {
if(gMutex == PTHREAD_MUTEX_INITIALIZER) if(gMutex == PTHREAD_MUTEX_INITIALIZER)
pthread_mutex_init (&gMutex, NULL); pthread_mutex_init (&gMutex, NULL);

3
src/graphics/Renderer.cpp
View File

@ -31,9 +31,6 @@ extern "C"
#define VIDYRES YRES #define VIDYRES YRES
#endif #endif
#ifdef OGLR
#define drawrect(args) g->drawrect(args)
#endif
void Renderer::RenderBegin() void Renderer::RenderBegin()
{ {

3
src/graphics/Renderer.h
View File

@ -85,7 +85,7 @@ public:
void checkShader(GLuint shader, char * shname); void checkShader(GLuint shader, char * shname);
void checkProgram(GLuint program, char * progname); void checkProgram(GLuint program, char * progname);
void loadShaders(); void loadShaders();
#else #endif
pixel * vid; pixel * vid;
pixel * persistentVid; pixel * persistentVid;
pixel * warpVid; pixel * warpVid;
@ -111,7 +111,6 @@ public:
void gradientrect(int x, int y, int width, int height, int r, int g, int b, int a, int r2, int g2, int b2, int a2); void gradientrect(int x, int y, int width, int height, int r, int g, int b, int a, int r2, int g2, int b2, int a2);
void draw_image(pixel *img, int x, int y, int w, int h, int a); void draw_image(pixel *img, int x, int y, int w, int h, int a);
#endif
VideoBuffer DumpFrame(); VideoBuffer DumpFrame();

7
tools Normal file
View File

@ -0,0 +1,7 @@
#include "ToolClasses.h"
std::vector<SimTool*> GetTools()
{
std::vector<SimTool*> tools;
return tools;
}