Changeset 20133

Timestamp:

05/04/07 11:06:38 (2 years ago)

Author:

patrick

Message:

Added lighting code to vrj::GlBasicSimulator? so that OSG and OpenSG
application objects do not have to include that code themselves just so that
the simulator renders nicely. OpenGL application objects still have to set up
their lighting manually, but that lighting (or lack thereof) will not impact
the rendering of the simulator components.

Bumped version to 2.1.25.

Files:

• juggler/branches/2.2/modules/vrjuggler/ChangeLog (modified) (1 diff)
• juggler/branches/2.2/modules/vrjuggler/VERSION (modified) (1 diff)
• juggler/branches/2.2/modules/vrjuggler/samples/OpenSG/advanced/OpenSGNavGrab/OpenSGNavGrab.cpp (modified) (1 diff)
• juggler/branches/2.2/modules/vrjuggler/samples/OpenSG/simple/OpenSGNav/OpenSGNav.cpp (modified) (1 diff)
• juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OGL/GlBasicSimulator.cpp (modified) (5 diffs)
• juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OSG/OsgApp.h (modified) (1 diff)

juggler/branches/2.2/modules/vrjuggler/ChangeLog

@@ -1 +1 @@
-DATE        AUTHOR      CHANGE
------------ ----------- -------------------------------------------------------
+May-04-2007 patrick     Added lighting code to vrj::GlBasicSimulator so that
+                        OSG and OpenSG application objects do not have to
+                        include that code themselves just so that the simulator
+                        renders nicely.
+                        NEW VERSION: 2.1.25
-May-01-2007 patrick     Renamed the x11_pipes property of the display_system
-                        config element to pipes.

juggler/branches/2.2/modules/vrjuggler/VERSION

@@ +1 @@
+2.1.25-0 @05/04/2007 16:10:00 UTC@
-2.1.24-0 @05/02/2007 02:00:00 UTC@
-2.1.23-0 @04/22/2007 21:20:00 UTC@

juggler/branches/2.2/modules/vrjuggler/samples/OpenSG/advanced/OpenSGNavGrab/OpenSGNavGrab.cpp

@@ -332 +332 @@
-void OpenSGNavGrab::initGLState()
-{
-   GLfloat light0_ambient[]  = { 0.1f,  0.1f,  0.1f, 1.0f };
-   GLfloat light0_diffuse[]  = { 0.7f,  0.7f,  0.7f, 1.0f };
-   GLfloat light0_specular[] = { 1.0f,  1.0f,  1.0f, 1.0f };
-   GLfloat light0_position[] = { 0.5f, 0.75f, 0.75f, 0.0f };
-
-   GLfloat mat_ambient[]   = { 0.7f, 0.7f, 0.7f, 1.0f };
-   GLfloat mat_diffuse[]   = { 1.0f, 0.5f, 0.8f, 1.0f };
-   GLfloat mat_specular[]  = { 1.0f, 1.0f, 1.0f, 1.0f };
-   GLfloat mat_shininess[] = { 50.0f };
-//   GLfloat mat_emission[]  = { 1.0f, 1.0f, 1.0f, 1.0f };
-   GLfloat no_mat[]        = { 0.0f, 0.0f, 0.0f, 1.0f };
-
-   glLightfv(GL_LIGHT0, GL_AMBIENT, light0_ambient);
-   glLightfv(GL_LIGHT0, GL_DIFFUSE, light0_diffuse);
-   glLightfv(GL_LIGHT0, GL_SPECULAR, light0_specular);
-   glLightfv(GL_LIGHT0, GL_POSITION, light0_position);
-
-   glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient);
-   glMaterialfv(GL_FRONT, GL_DIFFUSE, mat_diffuse);
-   glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
-   glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess);
-   glMaterialfv(GL_FRONT, GL_EMISSION, no_mat);
-
-   glEnable(GL_DEPTH_TEST);
-   glEnable(GL_LIGHTING);
-   glEnable(GL_LIGHT0);
-   glEnable(GL_COLOR_MATERIAL);
-   glShadeModel(GL_SMOOTH);
-
-   // OpenSG does not handle this yet.  Being smart about it is non-trivial.
-   glEnable(GL_NORMALIZE);

juggler/branches/2.2/modules/vrjuggler/samples/OpenSG/simple/OpenSGNav/OpenSGNav.cpp

@@ -119 +119 @@
-void OpenSGNav::initGLState()
-{
-   GLfloat light0_ambient[]  = { 0.1f,  0.1f,  0.1f, 1.0f };
-   GLfloat light0_diffuse[]  = { 0.7f,  0.7f,  0.7f, 1.0f };
-   GLfloat light0_specular[] = { 1.0f,  1.0f,  1.0f, 1.0f };
-   GLfloat light0_position[] = { 0.5f, 0.75f, 0.75f, 0.0f };
-
-   GLfloat mat_ambient[]   = { 0.7f, 0.7f, 0.7f, 1.0f };
-   GLfloat mat_diffuse[]   = { 1.0f, 0.5f, 0.8f, 1.0f };
-   GLfloat mat_specular[]  = { 1.0f, 1.0f, 1.0f, 1.0f };
-   GLfloat mat_shininess[] = { 50.0f };
-//   GLfloat mat_emission[]  = { 1.0f, 1.0f, 1.0f, 1.0f };
-   GLfloat no_mat[]        = { 0.0f, 0.0f, 0.0f, 1.0f };
-
-   glLightfv(GL_LIGHT0, GL_AMBIENT, light0_ambient);
-   glLightfv(GL_LIGHT0, GL_DIFFUSE, light0_diffuse);
-   glLightfv(GL_LIGHT0, GL_SPECULAR, light0_specular);
-   glLightfv(GL_LIGHT0, GL_POSITION, light0_position);
-
-   glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient);
-   glMaterialfv(GL_FRONT, GL_DIFFUSE, mat_diffuse);
-   glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular);
-   glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess);
-   glMaterialfv(GL_FRONT, GL_EMISSION, no_mat);
-
-   glEnable(GL_DEPTH_TEST);
-   glEnable(GL_LIGHTING);
-   glEnable(GL_LIGHT0);
-   glEnable(GL_COLOR_MATERIAL);
-   glShadeModel(GL_SMOOTH);
-
-   // OpenSG does not handle this yet, being smart about it is not
-   // that trivial...

juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OGL/GlBasicSimulator.cpp

@@ -335 +335 @@
-void GlBasicSimulator::drawSimulator(const float scaleFactor)
-{
- GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT | GL_LIGHTING_BIT
+GL_ALL_ATTRIB_BITS
-   {
-
-
+
+
+
-      glGetBooleanv(GL_LIGHTING, &lighting_on);
-      glGetBooleanv(GL_LIGHT0, &light0_on);
-
-      bool use_lighting_in_sim = (lighting_on == GL_TRUE);
-
-      //vprDEBUG(vprDBG_ALL, vprDBG_HVERB_LVL) << "lighting on: " << ((lighting_on == GL_TRUE)?"Y":"N")
-      //                       << "  light0_on:" << ((light0_on == GL_TRUE)?"Y":"N") << std::endl << vprDEBUG_FLUSH;
-
-      //-----------------set up materials....
-float mat_ambient[] = {0.1f, 0.1f, 0.1f, 1.0f
-float mat_shininess[] = {50.0f
-float mat_diffuse[] = {.7f, .7f, .7f, 1.0f
-float mat_specular[] = {1.0f, 1.0f, 1.0f, 1.0f
+const GLfloat mat_ambient[]   = { 0.1f, 0.1f, 0.1f, 1.0f 
+const GLfloat mat_shininess[] = { 50.0f 
+const GLfloat mat_diffuse[]   = { 0.7f, 0.7f, 0.7f, 1.0f 
+const GLfloat mat_specular[]  = { 1.0f, 1.0f, 1.0f, 1.0f 
-      //-----------------Call Materials.....
-      glMaterialfv(GL_FRONT, GL_AMBIENT, mat_ambient);
@@ -360 +355 @@
-      glColorMaterial(GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE);
-      glEnable(GL_COLOR_MATERIAL);
+      glShadeModel(GL_SMOOTH);
-
-      glDisable(GL_TEXTURE_2D);
@@ -366 +362 @@
-      // Draw base coordinate axis
-      ///*
-(lighting_on
+ ( lighting_on == GL_TRUE 
-      {
-         glDisable(GL_LIGHTING);
@@ -383 +379 @@
-      //*/
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      // Draw the user's head
@@ -407 +418 @@
-      glPopMatrix();
-
-
-
-
-
-
-
+
+
+
+
-      glPushMatrix();
-         glLoadIdentity();
-
+
+
-      glPopMatrix();
-   }

juggler/branches/2.2/modules/vrjuggler/vrj/Draw/OSG/OsgApp.h

@@ -301 +301 @@
-
-   (*sceneViewer) = new_sv;
-
-   //Setup OpenGL light
-   //This should actualy be done in the simulator code
-   GLfloat light0_ambient[] = { 0.1f,  0.1f,  0.1f,  1.0f};
-   GLfloat light0_diffuse[] = { 0.8f,  0.8f,  0.8f,  1.0f};
-   GLfloat light0_specular[] = { 1.0f,  1.0f,  1.0f,  1.0f};
-   GLfloat light0_position[] = {0.0f, 0.75f, 0.75f, 0.0f};
-
-   GLfloat mat_ambient[] = { 0.7f, 0.7f,  0.7f,  1.0f};
-   GLfloat mat_diffuse[] = { 1.0f,  0.5f,  0.8f,  1.0f};
-   GLfloat mat_specular[] = { 1.0f,  1.0f,  1.0f,  1.0f};
-   GLfloat mat_shininess[] = { 50.0f};
-   //GLfloat mat_emission[] = { 1.0f,  1.0f,  1.0f,  1.0f};
-   GLfloat no_mat[] = { 0.0f,  0.0f,  0.0f,  1.0f};
-
-   glLightfv(GL_LIGHT0, GL_AMBIENT,  light0_ambient);
-   glLightfv(GL_LIGHT0, GL_DIFFUSE,  light0_diffuse);
-   glLightfv(GL_LIGHT0, GL_SPECULAR,  light0_specular);
-   glLightfv(GL_LIGHT0, GL_POSITION,  light0_position);
-
-   glMaterialfv( GL_FRONT, GL_AMBIENT, mat_ambient );
-   glMaterialfv( GL_FRONT,  GL_DIFFUSE, mat_diffuse );
-   glMaterialfv( GL_FRONT, GL_SPECULAR, mat_specular );
-   glMaterialfv( GL_FRONT,  GL_SHININESS, mat_shininess );
-   glMaterialfv( GL_FRONT,  GL_EMISSION, no_mat);
-
-   glEnable(GL_DEPTH_TEST);
-   glEnable(GL_NORMALIZE);
-   glEnable(GL_LIGHTING);
-   glEnable(GL_LIGHT0);
-   glEnable(GL_COLOR_MATERIAL);
-   glShadeModel(GL_SMOOTH);
-}
-