diff options
| author | Kyle K <kylek389@gmail.com> | 2011-07-23 15:30:50 -0500 |
|---|---|---|
| committer | Kamil Kaminski <kamilkss@gmail.com> | 2011-07-23 15:30:50 -0500 |
| commit | 7a100cc78096429a623179276d3d052eefc302fa (patch) | |
| tree | 879ffa8a8558fe2335b259bddedb3c42e1b57e9c /sdl | |
| parent | 260b4bdaf2d5ac9e432a5fc5b6c555499b36d3e8 (diff) | |
| download | GLPyramid-7a100cc78096429a623179276d3d052eefc302fa.tar.gz GLPyramid-7a100cc78096429a623179276d3d052eefc302fa.tar.bz2 GLPyramid-7a100cc78096429a623179276d3d052eefc302fa.zip | |
sdl: move gl state settings to gldraw.c
Diffstat (limited to 'sdl')
| -rw-r--r-- | sdl/config.lua | 4 | ||||
| -rw-r--r-- | sdl/gldraw.c | 10 | ||||
| -rw-r--r-- | sdl/pyramid.c | 7 |
3 files changed, 13 insertions, 8 deletions
diff --git a/sdl/config.lua b/sdl/config.lua index 0917809..34a7920 100644 --- a/sdl/config.lua +++ b/sdl/config.lua @@ -2,8 +2,8 @@ platform = { name = "Textured Pyramid", icon = "tux.png", - xres = 320, - yres = 240, + xres = 640, + yres = 480, bpp = 32, af = 8, fovy = 40.0, diff --git a/sdl/gldraw.c b/sdl/gldraw.c index ef01fac..58e4ef7 100644 --- a/sdl/gldraw.c +++ b/sdl/gldraw.c @@ -12,6 +12,8 @@ void glDrawSnowman(void) { + glDisable(GL_TEXTURE_2D); + GLUquadricObj *pObj; /* quadric object */ /* main body */ @@ -64,11 +66,16 @@ void glDrawSnowman(void) /* delete the quadric */ gluDeleteQuadric(pObj); + + glEnable(GL_TEXTURE_2D); } /* this screws up the rendering, possibly becasue it's glut? */ void glDrawFigures(void) { + glDisable(GL_LIGHTING); + glDisable(GL_TEXTURE_2D); + /* scale the figures */ glScalef(0.02f, 0.02f, 0.02f); @@ -106,6 +113,9 @@ void glDrawFigures(void) glTranslatef(0.0f, 0.0f, -60.0f); glutSolidTeapot(25.0f); glPopMatrix(); + + glEnable(GL_LIGHTING); + glEnable(GL_TEXTURE_2D); } void glDrawTriangle(void) diff --git a/sdl/pyramid.c b/sdl/pyramid.c index 316abe5..25fcf31 100644 --- a/sdl/pyramid.c +++ b/sdl/pyramid.c @@ -6,6 +6,7 @@ * Textured Pyramid, * running on a homebrew framework * + * ToDo: VBO * */ @@ -67,11 +68,7 @@ static int client_init(struct client *p) /* figures */ glNewList(p->figures_list, GL_COMPILE); - glDisable(GL_LIGHTING); - glDisable(GL_TEXTURE_2D); glDrawFigures(); - glEnable(GL_LIGHTING); - glEnable(GL_TEXTURE_2D); glEndList(); return 0; @@ -113,14 +110,12 @@ static void render(struct platform *p) glPushMatrix(); /* draw a snowman */ - glDisable(GL_TEXTURE_2D); int i; for (i = 0; i < 3; i++) { glTranslatef(0.0f, 0.0f, -6.0f); glDrawSnowman(); } - glEnable(GL_TEXTURE_2D); glPopMatrix(); glPushMatrix(); |