Changeset 5719 for nanovis/trunk/OrientationIndicator.cpp

Timestamp:

Jun 17, 2015, 1:41:03 PM (9 years ago)

Author:

ldelgass

Message:

Merge changes to OrientationIndicator? from nanovis release branch: retains
labels on axes using GLUT in ifdef-ed blocks.

File:

• nanovis/trunk/OrientationIndicator.cpp (modified) (4 diffs)

nanovis/trunk/OrientationIndicator.cpp

@@ -6 +6 @@
  */
 
+#define USE_GLUT
+
 #include <GL/glew.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
+#ifdef USE_GLUT
+#include <GL/glut.h>
+#endif
 
 #include <vrmath/Vector3f.h>
@@ -106 +111 @@
             gluCylinder(qobj, 0.02, 0.0, 0.06, segments, 1);
             glPopMatrix();
+
+#ifdef USE_GLUT
+            glDisable(GL_LIGHTING);
+            glPushMatrix();
+            glTranslatef(0.4, 0., 0.);
+            glRotatef(90, 1, 0, 0);
+            glRotatef(180, 0, 1, 0);
+            glScalef(0.0005, 0.0005, 0.0005);
+            glutStrokeCharacter(GLUT_STROKE_ROMAN, 'x');
+            glPopMatrix();
+            glEnable(GL_LIGHTING);
+#endif
         }
 
@@ -121 +138 @@
             gluCylinder(qobj, 0.02, 0.0, 0.06, segments, 1);
             glPopMatrix();
+
+#ifdef USE_GLUT
+            glDisable(GL_LIGHTING);
+            glPushMatrix();
+            glTranslatef(0., 0.4, 0.);
+            glRotatef(90, 1, 0, 0);
+            glRotatef(180, 0, 1, 0);
+            glScalef(0.0005, 0.0005, 0.0005);
+            glutStrokeCharacter(GLUT_STROKE_ROMAN, 'y');
+            glPopMatrix();
+            glEnable(GL_LIGHTING);
+#endif
         }
 
@@ -134 +163 @@
             gluCylinder(qobj, 0.02, 0.0, 0.06, segments, 1);
             glPopMatrix();
+
+#ifdef USE_GLUT
+            glDisable(GL_LIGHTING);
+            glPushMatrix();
+            glTranslatef(0., 0., 0.4);
+            glRotatef(90, 1, 0, 0);
+            glRotatef(180, 0, 1, 0);
+            glScalef(0.0005, 0.0005, 0.0005);
+            glutStrokeCharacter(GLUT_STROKE_ROMAN, 'z');
+            glPopMatrix();
+            glEnable(GL_LIGHTING);
+#endif
         }
     }