Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert skybox rendering code to use VBOs. Simplify UI drawing primitives.

master
per 2013-01-20 00:53:09 +01:00
parent ac59ddfeee
commit 699d1f4d49
5 changed files with 58 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/ivis_opengl/pieblitfunc.cpp
View File

@ -68,7 +68,7 @@ void iV_Line(int x0, int y0, int x1, int y1, PIELIGHT colour)
pie_SetAlphaTest(false);
glColor4ubv(colour.vector);
glBegin(GL_LINE_STRIP);
glBegin(GL_LINES);
glVertex2i(x0, y0);
glVertex2i(x1, y1);
glEnd();
@ -134,12 +134,15 @@ void iV_Box(int x0,int y0, int x1, int y1, PIELIGHT colour)
y1 = rendSurface.clip.bottom;
glColor4ubv(colour.vector);
glBegin(GL_LINE_STRIP);
glVertex2f(x0, y0);
glVertex2f(x1, y0);
glVertex2f(x1, y1);
glVertex2f(x0, y1);
glVertex2f(x0, y0);
glBegin(GL_LINES);
glVertex2i(x0, y1);
glVertex2i(x0, y0);
glVertex2i(x0, y0);
glVertex2i(x1, y0);
glVertex2i(x1, y0);
glVertex2i(x1, y1);
glVertex2i(x0, y1);
glVertex2i(x1, y1);
glEnd();
}

58
lib/ivis_opengl/piefunc.cpp
View File

@ -33,6 +33,8 @@
#include "lib/ivis_opengl/piemode.h"
#include "lib/ivis_opengl/pieclip.h"
static GLuint skyboxbuffers[VBO_MINIMAL];
/*
* Source
*/
@ -115,10 +117,37 @@ void pie_TransColouredTriangle(Vector3f *vrt, PIELIGHT c)
glEnd();
}
void pie_DrawSkybox(float scale, int u, int v, int w, int h)
void pie_Skybox_Init()
{
const int u = 0;
const int v = 0;
const int w = 1;
const int h = 1;
const float r = 1.0f; // just because it is shorter than 1.0f
GLfloat vert[] = { -r, 0, r, -r, r, r, r, 0, r, r, r, r, // front
r, 0,-r, r, r,-r, // right
-r, 0, -r, -r, r, -r, // back
-r, 0, r, -r, r, r };
GLfloat texc[] = { u + w * 0, v + h, u + w * 0, v, u + w * 2, v + h, u + w * 2, v,
u + w * 4, v + h, u + w * 4, v,
u + w * 6, v + h, u + w * 6, v,
u + w * 8, v + h, u + w * 8, v };
glGenBuffers(VBO_MINIMAL, skyboxbuffers);
glBindBuffer(GL_ARRAY_BUFFER, skyboxbuffers[VBO_VERTEX]);
glBufferData(GL_ARRAY_BUFFER, sizeof(vert), vert, GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, skyboxbuffers[VBO_TEXCOORD]);
glBufferData(GL_ARRAY_BUFFER, sizeof(texc), texc, GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0);
}
void pie_Skybox_Shutdown()
{
glDeleteBuffers(VBO_MINIMAL, skyboxbuffers);
}
void pie_DrawSkybox(float scale)
{
glPushAttrib(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT | GL_ENABLE_BIT | GL_FOG_BIT);
// no use in updating the depth buffer
glDepthMask(GL_FALSE);
@ -138,25 +167,14 @@ void pie_DrawSkybox(float scale, int u, int v, int w, int h)
// Apply scale matrix
glScalef(scale, scale/2.0f, scale);
glBegin(GL_QUAD_STRIP);
// Front
glTexCoord2f(u + w * 0, v + h); glVertex3f(-r, 0, r); // bottom left
glTexCoord2f(u + w * 0, v); glVertex3f(-r, r, r); // top left
glTexCoord2f(u + w * 2, v + h); glVertex3f( r, 0, r); // bottom right
glTexCoord2f(u + w * 2, v); glVertex3f( r, r, r); // top right
// Right
glTexCoord2f(u + w * 4, v + h); glVertex3f( r, 0,-r); // bottom r
glTexCoord2f(u + w * 4, v); glVertex3f( r, r,-r); // top r
// Back
glTexCoord2f(u + w * 6, v + h); glVertex3f(-r, 0, -r); // bottom right
glTexCoord2f(u + w * 6, v); glVertex3f(-r, r, -r); // top right
// Left
glTexCoord2f(u + w * 8, v + h); glVertex3f(-r, 0, r); // bottom r
glTexCoord2f(u + w * 8, v); glVertex3f(-r, r, r); // top r
glEnd();
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
glBindBuffer(GL_ARRAY_BUFFER, skyboxbuffers[VBO_VERTEX]); glVertexPointer(3, GL_FLOAT, 0, NULL);
glBindBuffer(GL_ARRAY_BUFFER, skyboxbuffers[VBO_TEXCOORD]); glTexCoordPointer(2, GL_FLOAT, 0, NULL);
glDrawArrays(GL_QUAD_STRIP, 0, 10);
glBindBuffer(GL_ARRAY_BUFFER, 0);
glDisableClientState(GL_VERTEX_ARRAY);
glDisableClientState(GL_TEXTURE_COORD_ARRAY);
glPopAttrib();
}

5
lib/ivis_opengl/piefunc.h
View File

@ -35,9 +35,12 @@
extern UBYTE pie_ByteScale(UBYTE a, UBYTE b) WZ_DECL_CONST;
extern void pie_TransColouredTriangle(Vector3f *vrt, PIELIGHT c);
extern void pie_DrawSkybox(float scale, int u, int v, int w, int h);
extern void pie_DrawViewingWindow( Vector3i *v, UDWORD x1, UDWORD y1, UDWORD x2, UDWORD y2, PIELIGHT colour);
void pie_DrawSkybox(float scale);
void pie_Skybox_Init();
void pie_Skybox_Shutdown();
void pie_ClipBegin(int x1, int y1, int x2, int y2);
void pie_ClipEnd(void);

5
lib/ivis_opengl/screen.cpp
View File

@ -37,6 +37,7 @@
#include "lib/ivis_opengl/piestate.h"
#include "lib/ivis_opengl/pieblitfunc.h"
#include "lib/ivis_opengl/pieclip.h"
#include "lib/ivis_opengl/piefunc.h"
#include "screen.h"
#include "src/console.h"
@ -197,12 +198,16 @@ bool screenInitialise()
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_ACCUM_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
pie_Skybox_Init();
glErrors();
return true;
}
void screenShutDown(void)
{
pie_Skybox_Shutdown();
glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_ACCUM_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
}

2
src/display3d.cpp
View File

@ -3597,7 +3597,7 @@ static void renderSurroundings(void)
{
wind = wrapf(wind + graphicsTimeAdjustedIncrement(windSpeed), 360.0f);
}
pie_DrawSkybox(skybox_scale, 0, 0, 1, 1);
pie_DrawSkybox(skybox_scale);
// Load Saved State
pie_MatEnd();