Revision: 6642
http://playerstage.svn.sourceforge.net/playerstage/?rev=6642&view=rev
Author: jeremy_asher
Date: 2008-06-18 14:16:44 -0700 (Wed, 18 Jun 2008)
Log Message:
-----------
Moved grid initialization code to fix bug on PowerPC displaying black ground
Modified Paths:
--------------
code/stage/trunk/libstage/canvas.cc
Modified: code/stage/trunk/libstage/canvas.cc
===================================================================
--- code/stage/trunk/libstage/canvas.cc 2008-06-18 18:39:30 UTC (rev 6641)
+++ code/stage/trunk/libstage/canvas.cc 2008-06-18 21:16:44 UTC (rev 6642)
@@ -382,39 +382,9 @@
{
glLoadIdentity();
glViewport(0,0,W,H);
+}
- if( ! canvas_init_done ) // do a bit of texture setup
- {
- canvas_init_done = true;
- int i, j, c;
- for (i = 0; i < checkImageHeight; i++)
- for (j = 0; j < checkImageWidth; j++)
- {
- int even = (i+j)%2;
- checkImage[i][j][0] = (GLubyte) 255 - 10*even;
- checkImage[i][j][1] = (GLubyte) 255 - 10*even;
- checkImage[i][j][2] = (GLubyte) 255;// -
5*even;
- checkImage[i][j][3] = 255;
- }
-
-
- glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
- glGenTextures(1, &texName);
- glBindTexture(GL_TEXTURE_2D, texName);
- glEnable(GL_TEXTURE_2D);
-
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
GL_NEAREST);
-
-
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, checkImageWidth,
checkImageHeight,
- 0, GL_RGBA, GL_UNSIGNED_BYTE,
checkImage);
- glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
- }
-}
void StgCanvas::DrawGlobalGrid()
@@ -685,6 +655,38 @@
//glEnableClientState( GL_COLOR_ARRAY );
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+
+ if( ! canvas_init_done ) // do a bit of texture setup
+ {
+ canvas_init_done = true;
+ int i, j, c;
+ for (i = 0; i < checkImageHeight; i++)
+ for (j = 0; j < checkImageWidth; j++)
+ {
+ int even = (i+j)%2;
+ checkImage[i][j][0] = (GLubyte) 255 -
10*even;
+ checkImage[i][j][1] = (GLubyte) 255 -
10*even;
+ checkImage[i][j][2] = (GLubyte) 255;//
- 5*even;
+ checkImage[i][j][3] = 255;
+ }
+
+
+ glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+ glGenTextures(1, &texName);
+ glBindTexture(GL_TEXTURE_2D, texName);
+ glEnable(GL_TEXTURE_2D);
+
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S,
GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T,
GL_REPEAT);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
GL_NEAREST);
+
+
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA,
checkImageWidth, checkImageHeight,
+ 0, GL_RGBA, GL_UNSIGNED_BYTE,
checkImage);
+
+ glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,
GL_DECAL);
+ }
}
@@ -716,4 +718,3 @@
FixViewport(W,H);
invalidate();
}
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
