summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle K <kylek389@gmail.com>2010-10-14 00:43:38 -0500
committerKamil Kaminski <kamilkss@gmail.com>2010-10-14 00:43:38 -0500
commit982bdae0bcb7158e96be398371c73187315bc437 (patch)
tree638ada9cab8dca6135596b6a374f2160afdae762
parentdcacdfe98b38f1e99f837c2135710cc11b1926d9 (diff)
downloadGLPyramid-982bdae0bcb7158e96be398371c73187315bc437.tar.gz
GLPyramid-982bdae0bcb7158e96be398371c73187315bc437.tar.bz2
GLPyramid-982bdae0bcb7158e96be398371c73187315bc437.zip
pyramid: remove duplicate line
-rw-r--r--sdl/pyramid.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sdl/pyramid.c b/sdl/pyramid.c
index 9e4bd8a..0b5d261 100644
--- a/sdl/pyramid.c
+++ b/sdl/pyramid.c
@@ -92,6 +92,8 @@ static void SetupRC()
/* enable color tracking */
glEnable(GL_COLOR_MATERIAL);
+
+ /* set Material properties to follow glColor values */
glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE);
glMaterialfv(GL_FRONT, GL_SPECULAR, fBrightLight);
glMateriali(GL_FRONT, GL_SHININESS, 128);
@@ -105,9 +107,6 @@ static void SetupRC()
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
glEnable(GL_POLYGON_SMOOTH);
glHint(GL_POLYGON_SMOOTH_HINT, GL_NICEST);
-
- /* set Material properties to follow glColor values */
- glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE);
/* gray background */
glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
@@ -140,7 +139,7 @@ static void SetupRC()
/* set the camera to <0,0,0> */
reset_glframe(&camera);
- /* multisampling for polygons */
+ /* multisampling for polygons, conflicts with anti-aliasing */
//glEnable(GL_MULTISAMPLE);
/* don't know about this, but why not */