Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Very very basic wall rendering for opengl

  • Loading branch information...
commit 42d707f8a432afa001d58611fc960d6ce6021676 1 parent c8080cb
@triclops200 triclops200 authored
View
BIN  site_scons/site_tools/gch/__init__.pyc
Binary file not shown
View
BIN  site_scons/site_tools/mfprogram/__init__.pyc
Binary file not shown
View
2  src/graphics/Graphics.h
@@ -160,7 +160,7 @@ class Graphics
void xor_bitmap(unsigned char * bitmap, int x, int y, int w, int h);
void draw_line(int x, int y, int x2, int y2, int r, int g, int b, int a);
- void drawrect(int x, int y, int width, int height, int r, int g, int b, int a);
+ void drawrect(int x, int y, int width, int height, int r, int g, int b, int a,bool hollow=true);
void fillrect(int x, int y, int width, int height, int r, int g, int b, int a);
void clearrect(int x, int y, int width, int height);
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);
View
8 src/graphics/OpenGLDrawMethods.inl
@@ -1,6 +1,7 @@
#include "../data/font.h"
int PIXELMETHODS_CLASS::drawtext(int x, int y, const char *s, int r, int g, int b, int a)
{
+ bool invert = false;
if(!strlen(s))
return 0;
int oR = r, oG = g, oB = b;
@@ -281,7 +282,7 @@ void PIXELMETHODS_CLASS::draw_line(int x, int y, int x2, int y2, int r, int g, i
glEnd();
}
-void PIXELMETHODS_CLASS::drawrect(int x, int y, int width, int height, int r, int g, int b, int a)
+void PIXELMETHODS_CLASS::drawrect(int x, int y, int width, int height, int r, int g, int b, int a,bool hollow)
{
float fx = float(x)+0.5f;
float fy = float(y)+0.5f;
@@ -292,7 +293,10 @@ void PIXELMETHODS_CLASS::drawrect(int x, int y, int width, int height, int r, in
//height-=2;
//width-=2;
glColor4ub(r, g, b, a);
- glBegin(GL_LINE_STRIP);
+ if(hollow)
+ glBegin(GL_LINE_STRIP);
+ else
+ glBegin(GL_QUADS);
glVertex2f(fx, fy);
glVertex2f(fx+fwidth, fy);
glVertex2f(fx+fwidth, fy+fheight);
View
12 src/graphics/Renderer.cpp
@@ -576,7 +576,6 @@ VideoBuffer * Renderer::WallIcon(int wallID, int width, int height)
void Renderer::DrawWalls()
{
-#ifndef OGLR
int x, y, i, j, cr, cg, cb;
unsigned char wt;
pixel pc;
@@ -593,6 +592,13 @@ void Renderer::DrawWalls()
continue;
pc = wtypes[wt].colour;
gc = wtypes[wt].eglow;
+#ifdef OGLR
+ int r = (pc&0x00FF0000)>>8;
+ int g = (pc&0x0000FF00)>>4;
+ int b = (pc&0x000000FF)>>0;
+ int a = 255;
+#endif
+#ifndef OGLR
// standard wall patterns
if (wtypes[wt].drawstyle==1)
@@ -708,8 +714,10 @@ void Renderer::DrawWalls()
fire_b[y][x] = cb;
}
- }
+#else
+ this->drawrect(x*CELL,y*CELL,CELL,CELL,r,g,b,a,false);
#endif
+ }
}
void Renderer::DrawSigns()
View
2  src/graphics/Renderer.h
@@ -105,7 +105,7 @@ class Renderer
void xor_bitmap(unsigned char * bitmap, int x, int y, int w, int h);
void draw_line(int x, int y, int x2, int y2, int r, int g, int b, int a);
- void drawrect(int x, int y, int width, int height, int r, int g, int b, int a);
+ void drawrect(int x, int y, int width, int height, int r, int g, int b, int a,bool hollow = true);
void fillrect(int x, int y, int width, int height, int r, int g, int b, int a);
void clearrect(int x, int y, int width, int height);
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);
Please sign in to comment.
Something went wrong with that request. Please try again.