Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Several gl calls now wrapped via LLRender (gGL) as prep for future changes:

Browse Source 
glMatrixMode -> gGL.matrixMode
..GL_MODELVIEW -> LLRender::MM_MODELVIEW
..GL_POJECTION -> LLRender::MM_PROJECTION
..GL_TEXTURE -> LLRender::MM_TEXTURE
glMultMatrix -> gGL.multMatrix
glLoadMatrixf -> gGL.loadMatrix
glPushMatrix -> gGL.pushMatrix
glPopMatrix -> gGL.popMatrix
glLoadIdentity -> gGL.loadIdentity
glRotatef -> gGL.rotatef
glTransformf -> gGL.transformf
glOrtho -> gGL.ortho
glColor3f -> gGL.diffuseColor3f
glColor3fv -> gGL.diffuseColor3fv
glColor4f -> gGL.diffuseColor4f
glColor4fv -> gGL.diffuseColor4fv
glColor4ubv -> gGL.diffuseColor4ubv
glLightModelfv(GL_LIGHT_MODEL_AMBIENT -> gGL.
This commit is contained in:
Shyotl
2011-11-21 15:55:44 -06:00
parent 1cf367aae5
commit 83e8a9076b
63 changed files with 1266 additions and 1134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/qtoolalign.cpp
View File

@@ -260,7 +260,7 @@ void setup_transforms_bbox(LLBBox bbox)
void render_bbox(LLBBox bbox)
{
glMatrixMode(GL_MODELVIEW);
gGL.matrixMode(LLRender::MM_MODELVIEW);
gGL.pushMatrix();
setup_transforms_bbox(bbox);
@@ -273,7 +273,7 @@ void render_bbox(LLBBox bbox)
void render_cone_bbox(LLBBox bbox)
{
glMatrixMode(GL_MODELVIEW);
gGL.matrixMode(LLRender::MM_MODELVIEW);
gGL.pushMatrix();
setup_transforms_bbox(bbox);
@@ -393,7 +393,7 @@ void QToolAlign::renderManipulators()
gGL.color4fv(color.mV);
// sadly, gCone doesn't use gGL like gBox does (presumably because its author smokes crack) so we
// also set the raw GL color. hopefully this won't screw-up later rendering.
glColor4fv(color.mV);
gGL.diffuseColor4fv(color.mV);
render_cone_bbox(manipulator_bbox);
}