[openvrml-commit] openvrml/src/libopenvrml-gl/openvrml/gl viewer.cpp, 1.48, 1.49 viewer.h, 1.14, 1.15

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17911/src/libopenvrml-gl/openvrml/gl

Modified Files:
	viewer.cpp viewer.h 
Log Message:
Applied nonvirtual interface pattern to openvrml::viewer.

Index: viewer.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** viewer.h	19 May 2006 21:52:43 -0000	1.14
--- viewer.h	31 Oct 2006 03:43:07 -0000	1.15
***************
*** 133,143 ****
              double render_time1;
  
-             // Window system specific methods
- 
-             virtual void post_redraw() = 0;
-             virtual void set_cursor(cursor_style c) = 0;
-             virtual void swap_buffers() = 0;
-             virtual void set_timer(double interval) = 0;
- 
              // Initialize OpenGL state
              void initialize();
--- 133,136 ----
***************
*** 161,322 ****
              virtual ~viewer() OPENVRML_NOTHROW;
  
!             virtual rendering_mode mode();
!             virtual double frame_rate();
  
!             virtual void reset_user_navigation();
  
              // Scope dirlights, open/close display lists
!             virtual object_t begin_object(const char * id, bool retain);
!             virtual void end_object();
  
              // Insert objects into the display list
              virtual object_t
!             insert_background(const std::vector<float> & groundAngle,
!                               const std::vector<color> & groundColor,
!                               const std::vector<float> & skyAngle,
!                               const std::vector<color> & skyColor,
!                               const image & front,
!                               const image & back,
!                               const image & left,
!                               const image & right,
!                               const image & top,
!                               const image & bottom);
  
  
!             virtual object_t insert_box(const vec3f & size);
!             virtual object_t insert_cone(float height, float radius,
!                                          bool bottom, bool side);
!             virtual object_t insert_cylinder(float height, float radius,
!                                              bool bottom, bool side, bool top);
  
              virtual object_t
!             insert_elevation_grid(unsigned int mask,
!                                   const std::vector<float> & height,
!                                   int32 xDimension,
!                                   int32 zDimension,
!                                   float xSpacing,
!                                   float zSpacing,
!                                   const std::vector<color> & color,
!                                   const std::vector<vec3f> & normal,
!                                   const std::vector<vec2f> & texCoord);
              virtual object_t
!             insert_extrusion(
!                 unsigned int mask,
!                 const std::vector<vec3f> & spine,
!                 const std::vector<vec2f> & crossSection,
!                 const std::vector<openvrml::rotation> & orientation,
!                 const std::vector<vec2f> & scale);
              virtual object_t
!             insert_line_set(const std::vector<vec3f> & coord,
!                             const std::vector<int32> & coordIndex,
!                             bool colorPerVertex,
!                             const std::vector<color> & color,
!                             const std::vector<int32> & colorIndex);
              virtual object_t
!             insert_point_set(const std::vector<vec3f> & coord,
!                              const std::vector<color> & color);
              virtual object_t
!             insert_shell(unsigned int mask,
!                          const std::vector<vec3f> & coord,
!                          const std::vector<int32> & coordIndex,
!                          const std::vector<color> & color,
!                          const std::vector<int32> & colorIndex,
!                          const std::vector<vec3f> & normal,
!                          const std::vector<int32> & normalIndex,
!                          const std::vector<vec2f> & texCoord,
!                          const std::vector<int32> & texCoordIndex);
!             virtual object_t insert_sphere(float radius);
  
              // Lights
!             virtual object_t insert_dir_light(float ambientIntensity,
!                                               float intensity,
!                                               const color & color,
!                                               const vec3f & direction);
!             virtual object_t insert_point_light(float ambientIntensity,
!                                                 const vec3f & attenuation,
!                                                 const color & color,
!                                                 float intensity,
!                                                 const vec3f & location,
!                                                 float radius);
!             virtual object_t insert_spot_light(float ambientIntensity,
!                                                const vec3f & attenuation,
!                                                float beamWidth,
!                                                const color & color,
!                                                float cutOffAngle,
!                                                const vec3f & direction,
!                                                float intensity,
!                                                const vec3f & location,
!                                                float radius);
  
  
!             virtual object_t insert_reference(object_t existing_object);
  
!             virtual void remove_object(object_t ref);
  
!             virtual void enable_lighting(bool);
  
              // Set attributes
!             virtual void set_color(const color & rgb, float a = 1.0);
  
!             virtual void set_fog(const color & color,
!                                  float visibilityRange,
!                                  const char * type);
  
!             virtual void set_material(float ambientIntensity,
!                                       const color & diffuseColor,
!                                       const color & emissiveColor,
!                                       float shininess,
!                                       const color & specularColor,
!                                       float transparency);
  
!             virtual void set_material_mode(size_t tex_components,
!                                            bool geometry_color);
  
!             virtual void set_sensitive(node * object);
  
!             virtual texture_object_t insert_texture(const image & img,
!                                                     bool repeat_s,
!                                                     bool repeat_t,
!                                                     bool retainHint = false);
  
              // Reference/remove a texture object
!             virtual void insert_texture_reference(texture_object_t ref,
!                                                   size_t components);
!             virtual void remove_texture_object(texture_object_t);
  
!             virtual void set_texture_transform(const vec2f & center,
!                                                float rotation,
!                                                const vec2f & scale,
!                                                const vec2f & translation);
  
!             virtual void set_viewpoint(const vec3f & position,
!                                        const openvrml::rotation & orientation,
!                                        float fieldOfView,
!                                        float avatarSize,
!                                        float visibilityLimit);
  
!             virtual void transform(const mat4f & mat);
  
!             virtual void transform_points(size_t nPoints, vec3f * point) const;
  
              virtual void
!             draw_bounding_sphere(const bounding_sphere & bs,
!                                  bounding_volume::intersection intersection);
! 
! 
! 
!             //
!             // Viewer callbacks (not for public consumption)
! 
!             // Update the model.
!             void update( double time = 0.0 );
! 
!             // Redraw the screen.
!             virtual void redraw();
!             void resize(size_t width, size_t height);
  
!             // user interaction
  
!             void input(event_info * e);
          };
      }
--- 154,325 ----
              virtual ~viewer() OPENVRML_NOTHROW;
  
!             //
!             // Viewer callbacks (not for public consumption)
  
!             // Update the model.
!             void update( double time = 0.0 );
! 
!             // Redraw the screen.
!             virtual void redraw();
!             void resize(size_t width, size_t height);
! 
!             // user interaction
! 
!             void input(event_info * e);
! 
!         private:
!             virtual rendering_mode do_mode();
!             virtual double do_frame_rate();
! 
!             virtual void do_reset_user_navigation();
  
              // Scope dirlights, open/close display lists
!             virtual object_t do_begin_object(const char * id, bool retain);
!             virtual void do_end_object();
  
              // Insert objects into the display list
              virtual object_t
!                 do_insert_background(const std::vector<float> & groundAngle,
!                                      const std::vector<color> & groundColor,
!                                      const std::vector<float> & skyAngle,
!                                      const std::vector<color> & skyColor,
!                                      const image & front,
!                                      const image & back,
!                                      const image & left,
!                                      const image & right,
!                                      const image & top,
!                                      const image & bottom);
  
  
!             virtual object_t do_insert_box(const vec3f & size);
!             virtual object_t do_insert_cone(float height, float radius,
!                                             bool bottom, bool side);
!             virtual object_t do_insert_cylinder(float height, float radius,
!                                                 bool bottom, bool side,
!                                                 bool top);
  
              virtual object_t
!                 do_insert_elevation_grid(unsigned int mask,
!                                          const std::vector<float> & height,
!                                          int32 xDimension,
!                                          int32 zDimension,
!                                          float xSpacing,
!                                          float zSpacing,
!                                          const std::vector<color> & color,
!                                          const std::vector<vec3f> & normal,
!                                          const std::vector<vec2f> & texCoord);
              virtual object_t
!                 do_insert_extrusion(
!                     unsigned int mask,
!                     const std::vector<vec3f> & spine,
!                     const std::vector<vec2f> & crossSection,
!                     const std::vector<openvrml::rotation> & orientation,
!                     const std::vector<vec2f> & scale);
              virtual object_t
!                 do_insert_line_set(const std::vector<vec3f> & coord,
!                                    const std::vector<int32> & coordIndex,
!                                    bool colorPerVertex,
!                                    const std::vector<color> & color,
!                                    const std::vector<int32> & colorIndex);
              virtual object_t
!                 do_insert_point_set(const std::vector<vec3f> & coord,
!                                     const std::vector<color> & color);
              virtual object_t
!                 do_insert_shell(unsigned int mask,
!                                 const std::vector<vec3f> & coord,
!                                 const std::vector<int32> & coordIndex,
!                                 const std::vector<color> & color,
!                                 const std::vector<int32> & colorIndex,
!                                 const std::vector<vec3f> & normal,
!                                 const std::vector<int32> & normalIndex,
!                                 const std::vector<vec2f> & texCoord,
!                                 const std::vector<int32> & texCoordIndex);
!             virtual object_t do_insert_sphere(float radius);
  
              // Lights
!             virtual object_t do_insert_dir_light(float ambientIntensity,
!                                                  float intensity,
!                                                  const color & color,
!                                                  const vec3f & direction);
!             virtual object_t do_insert_point_light(float ambientIntensity,
!                                                    const vec3f & attenuation,
!                                                    const color & color,
!                                                    float intensity,
!                                                    const vec3f & location,
!                                                    float radius);
!             virtual object_t do_insert_spot_light(float ambientIntensity,
!                                                   const vec3f & attenuation,
!                                                   float beamWidth,
!                                                   const color & color,
!                                                   float cutOffAngle,
!                                                   const vec3f & direction,
!                                                   float intensity,
!                                                   const vec3f & location,
!                                                   float radius);
  
  
!             virtual object_t do_insert_reference(object_t existing_object);
  
!             virtual void do_remove_object(object_t ref);
  
!             virtual void do_enable_lighting(bool);
  
              // Set attributes
!             virtual void do_set_color(const color & rgb, float a = 1.0);
  
!             virtual void do_set_fog(const color & color,
!                                     float visibilityRange,
!                                     const char * type);
  
!             virtual void do_set_material(float ambientIntensity,
!                                          const color & diffuseColor,
!                                          const color & emissiveColor,
!                                          float shininess,
!                                          const color & specularColor,
!                                          float transparency);
  
!             virtual void do_set_material_mode(size_t tex_components,
!                                               bool geometry_color);
  
!             virtual void do_set_sensitive(node * object);
  
!             virtual texture_object_t
!                 do_insert_texture(const image & img,
!                                   bool repeat_s,
!                                   bool repeat_t,
!                                   bool retainHint = false);
  
              // Reference/remove a texture object
!             virtual void do_insert_texture_reference(texture_object_t ref,
!                                                      size_t components);
!             virtual void do_remove_texture_object(texture_object_t);
  
!             virtual void do_set_texture_transform(const vec2f & center,
!                                                   float rotation,
!                                                   const vec2f & scale,
!                                                   const vec2f & translation);
  
!             virtual void do_set_viewpoint(const vec3f & position,
!                                           const openvrml::rotation & orientation,
!                                           float fieldOfView,
!                                           float avatarSize,
!                                           float visibilityLimit);
  
!             virtual void do_transform(const mat4f & mat);
  
!             virtual void do_transform_points(size_t nPoints,
!                                              vec3f * point) const;
  
              virtual void
!                 do_draw_bounding_sphere(
!                     const bounding_sphere & bs,
!                     bounding_volume::intersection intersection);
  
!             // Window system specific methods
  
!             virtual void post_redraw() = 0;
!             virtual void set_cursor(cursor_style c) = 0;
!             virtual void swap_buffers() = 0;
!             virtual void set_timer(double interval) = 0;
          };
      }

Index: viewer.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** viewer.cpp	18 Oct 2006 05:56:59 -0000	1.48
--- viewer.cpp	31 Oct 2006 03:43:07 -0000	1.49
***************
*** 1038,1042 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::begin_object(const char *, bool)
  {
      // Finish setup stuff before first object
--- 1038,1042 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_begin_object(const char *, bool)
  {
      // Finish setup stuff before first object
***************
*** 1062,1066 ****
   * @brief End of group scope.
   */
! void openvrml::gl::viewer::end_object()
  {
      // Decrement nesting level for group-scoped lights and get rid
--- 1062,1066 ----
   * @brief End of group scope.
   */
! void openvrml::gl::viewer::do_end_object()
  {
      // Decrement nesting level for group-scoped lights and get rid
***************
*** 1122,1126 ****
   * @return the rendering_mode.
   */
! openvrml::gl::viewer::rendering_mode openvrml::gl::viewer::mode()
  {
      return this->select_mode
--- 1122,1126 ----
   * @return the rendering_mode.
   */
! openvrml::gl::viewer::rendering_mode openvrml::gl::viewer::do_mode()
  {
      return this->select_mode
***************
*** 1134,1138 ****
   * @return the frame rate.
   */
! double openvrml::gl::viewer::frame_rate()
  {
      return 1.0 / this->render_time;
--- 1134,1138 ----
   * @return the frame rate.
   */
! double openvrml::gl::viewer::do_frame_rate()
  {
      return 1.0 / this->render_time;
***************
*** 1143,1147 ****
   *        bound Viewpoint node.
   */
! void openvrml::gl::viewer::reset_user_navigation()
  {
      assert(this->browser());
--- 1143,1147 ----
   *        bound Viewpoint node.
   */
! void openvrml::gl::viewer::do_reset_user_navigation()
  {
      assert(this->browser());
***************
*** 1167,1180 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_background(const std::vector<float> & groundAngle,
!                                         const std::vector<color> & groundColor,
!                                         const std::vector<float> & skyAngle,
!                                         const std::vector<color> & skyColor,
!                                         const image & front,
!                                         const image & back,
!                                         const image & left,
!                                         const image & right,
!                                         const image & top,
!                                         const image & bottom)
  {
      using std::vector;
--- 1167,1181 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::
! do_insert_background(const std::vector<float> & groundAngle,
!                      const std::vector<color> & groundColor,
!                      const std::vector<float> & skyAngle,
!                      const std::vector<color> & skyColor,
!                      const image & front,
!                      const image & back,
!                      const image & left,
!                      const image & right,
!                      const image & top,
!                      const image & bottom)
  {
      using std::vector;
***************
*** 1438,1442 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_box(const vec3f & size)
  {
      GLuint glid = 0;
--- 1439,1443 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_box(const vec3f & size)
  {
      GLuint glid = 0;
***************
*** 1581,1588 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_cone(const float height,
!                                   const float radius,
!                                   const bool bottom,
!                                   const bool side)
  {
      GLuint glid = 0;
--- 1582,1589 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_cone(const float height,
!                                      const float radius,
!                                      const bool bottom,
!                                      const bool side)
  {
      GLuint glid = 0;
***************
*** 1667,1675 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_cylinder(const float height,
!                                       const float radius,
!                                       const bool bottom,
!                                       const bool side,
!                                       const bool top)
  {
      GLuint glid = 0;
--- 1668,1676 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_cylinder(const float height,
!                                          const float radius,
!                                          const bool bottom,
!                                          const bool side,
!                                          const bool top)
  {
      GLuint glid = 0;
***************
*** 1813,1825 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_elevation_grid(const unsigned int mask,
!                                             const std::vector<float> & height,
!                                             const int32 xDimension,
!                                             const int32 zDimension,
!                                             const float xSpacing,
!                                             const float zSpacing,
!                                             const std::vector<color> & color,
!                                             const std::vector<vec3f> & normal,
!                                             const std::vector<vec2f> & texCoord)
  {
      int32 i, j;
--- 1814,1827 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::
! do_insert_elevation_grid(const unsigned int mask,
!                          const std::vector<float> & height,
!                          const int32 xDimension,
!                          const int32 zDimension,
!                          const float xSpacing,
!                          const float zSpacing,
!                          const std::vector<color> & color,
!                          const std::vector<vec3f> & normal,
!                          const std::vector<vec2f> & texCoord)
  {
      int32 i, j;
***************
*** 2387,2396 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_extrusion(
!     unsigned int mask,
!     const std::vector<vec3f> & spine,
!     const std::vector<vec2f> & crossSection,
!     const std::vector<openvrml::rotation> & orientation,
!     const std::vector<vec2f> & scale)
  {
      using std::vector;
--- 2389,2398 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::
! do_insert_extrusion(unsigned int mask,
!                     const std::vector<vec3f> & spine,
!                     const std::vector<vec2f> & crossSection,
!                     const std::vector<openvrml::rotation> & orientation,
!                     const std::vector<vec2f> & scale)
  {
      using std::vector;
***************
*** 2462,2470 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_line_set(const std::vector<vec3f> & coord,
!                                       const std::vector<int32> & coordIndex,
!                                       bool colorPerVertex,
!                                       const std::vector<color> & color,
!                                       const std::vector<int32> & colorIndex)
  {
      GLuint glid = 0;
--- 2464,2472 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_line_set(const std::vector<vec3f> & coord,
!                                          const std::vector<int32> & coordIndex,
!                                          bool colorPerVertex,
!                                          const std::vector<color> & color,
!                                          const std::vector<int32> & colorIndex)
  {
      GLuint glid = 0;
***************
*** 2540,2545 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_point_set(const std::vector<vec3f> & coord,
!                                        const std::vector<color> & color)
  {
      GLuint glid = 0;
--- 2542,2547 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_point_set(const std::vector<vec3f> & coord,
!                                           const std::vector<color> & color)
  {
      GLuint glid = 0;
***************
*** 2823,2835 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_shell(unsigned int mask,
!                                    const std::vector<vec3f> & coord,
!                                    const std::vector<int32> & coord_index,
!                                    const std::vector<color> & color,
!                                    const std::vector<int32> & color_index,
!                                    const std::vector<vec3f> & normal,
!                                    const std::vector<int32> & normal_index,
!                                    const std::vector<vec2f> & tex_coord,
!                                    const std::vector<int32> & tex_coord_index)
  {
      using std::vector;
--- 2825,2838 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::
! do_insert_shell(unsigned int mask,
!                 const std::vector<vec3f> & coord,
!                 const std::vector<int32> & coord_index,
!                 const std::vector<color> & color,
!                 const std::vector<int32> & color_index,
!                 const std::vector<vec3f> & normal,
!                 const std::vector<int32> & normal_index,
!                 const std::vector<vec2f> & tex_coord,
!                 const std::vector<int32> & tex_coord_index)
  {
      using std::vector;
***************
*** 3020,3024 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_sphere(const float radius)
  {
      GLuint glid = 0;
--- 3023,3027 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_sphere(const float radius)
  {
      GLuint glid = 0;
***************
*** 3083,3090 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_dir_light(const float ambientIntensity,
!                                        const float intensity,
!                                        const color & color,
!                                        const vec3f & direction)
  {
      float amb[4] = { ambientIntensity * color.r(),
--- 3086,3093 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_dir_light(const float ambientIntensity,
!                                           const float intensity,
!                                           const color & color,
!                                           const vec3f & direction)
  {
      float amb[4] = { ambientIntensity * color.r(),
***************
*** 3143,3152 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_point_light(const float ambientIntensity,
!                                          const vec3f & attenuation,
!                                          const color & color,
!                                          const float intensity,
!                                          const vec3f & location,
!                                          const float radius)
  {
      float amb[4] = { ambientIntensity * color.r(),
--- 3146,3155 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_point_light(const float ambientIntensity,
!                                             const vec3f & attenuation,
!                                             const color & color,
!                                             const float intensity,
!                                             const vec3f & location,
!                                             const float radius)
  {
      float amb[4] = { ambientIntensity * color.r(),
***************
*** 3208,3220 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_spot_light(const float ambientIntensity,
!                                         const vec3f & attenuation,
!                                         const float beamWidth,
!                                         const color & color,
!                                         const float cutOffAngle,
!                                         const vec3f & direction,
!                                         const float intensity,
!                                         const vec3f & location,
!                                         const float radius)
  {
      float amb[4] = { ambientIntensity * color.r(),
--- 3211,3223 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_spot_light(const float ambientIntensity,
!                                            const vec3f & attenuation,
!                                            const float beamWidth,
!                                            const color & color,
!                                            const float cutOffAngle,
!                                            const vec3f & direction,
!                                            const float intensity,
!                                            const vec3f & location,
!                                            const float radius)
  {
      float amb[4] = { ambientIntensity * color.r(),
***************
*** 3267,3271 ****
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::insert_reference(const object_t existing_object)
  {
      glCallList(GLuint(existing_object));
--- 3270,3274 ----
   */
  openvrml::gl::viewer::object_t
! openvrml::gl::viewer::do_insert_reference(const object_t existing_object)
  {
      glCallList(GLuint(existing_object));
***************
*** 3278,3282 ****
   * @param[in] ref   object handle.
   */
! void openvrml::gl::viewer::remove_object(const object_t ref)
  {
      glDeleteLists(GLuint(ref), 1);
--- 3281,3285 ----
   * @param[in] ref   object handle.
   */
! void openvrml::gl::viewer::do_remove_object(const object_t ref)
  {
      glDeleteLists(GLuint(ref), 1);
***************
*** 3288,3292 ****
   * @param[in] val whether lighting should be enabled.
   */
! void openvrml::gl::viewer::enable_lighting(const bool val)
  {
      if (val) {
--- 3291,3295 ----
   * @param[in] val whether lighting should be enabled.
   */
! void openvrml::gl::viewer::do_enable_lighting(const bool val)
  {
      if (val) {
***************
*** 3305,3309 ****
   * @param[in] a     alpha (transparency) component.
   */
! void openvrml::gl::viewer::set_color(const color & rgb, const float a)
  {
      glColor4f(rgb.r(), rgb.g(), rgb.b(), a);
--- 3308,3312 ----
   * @param[in] a     alpha (transparency) component.
   */
! void openvrml::gl::viewer::do_set_color(const color & rgb, const float a)
  {
      glColor4f(rgb.r(), rgb.g(), rgb.b(), a);
***************
*** 3318,3324 ****
   * @param[in] type              fog type.
   */
! void openvrml::gl::viewer::set_fog(const color & color,
!                                    const float visibilityRange,
!                                    const char * const type)
  {
      static const std::string exponential("EXPONENTIAL");
--- 3321,3327 ----
   * @param[in] type              fog type.
   */
! void openvrml::gl::viewer::do_set_fog(const color & color,
!                                       const float visibilityRange,
!                                       const char * const type)
  {
      static const std::string exponential("EXPONENTIAL");
***************
*** 3345,3354 ****
   * @param[in] transparency      transparency.
   */
! void openvrml::gl::viewer::set_material(const float ambientIntensity,
!                                         const color & diffuseColor,
!                                         const color & emissiveColor,
!                                         const float shininess,
!                                         const color & specularColor,
!                                         const float transparency)
  {
      const float alpha = 1.0f - transparency;
--- 3348,3357 ----
   * @param[in] transparency      transparency.
   */
! void openvrml::gl::viewer::do_set_material(const float ambientIntensity,
!                                            const color & diffuseColor,
!                                            const color & emissiveColor,
!                                            const float shininess,
!                                            const color & specularColor,
!                                            const float transparency)
  {
      const float alpha = 1.0f - transparency;
***************
*** 3399,3404 ****
   * @param[in] geometry_color    geometry color.
   */
! void openvrml::gl::viewer::set_material_mode(const size_t tex_components,
!                                              const bool geometry_color)
  {
      if (tex_components && this->texture && !this->wireframe) {
--- 3402,3407 ----
   * @param[in] geometry_color    geometry color.
   */
! void openvrml::gl::viewer::do_set_material_mode(const size_t tex_components,
!                                                 const bool geometry_color)
  {
      if (tex_components && this->texture && !this->wireframe) {
***************
*** 3429,3433 ****
   * @param[in] object    a node.
   */
! void openvrml::gl::viewer::set_sensitive(node * object)
  {
      if (object) {
--- 3432,3436 ----
   * @param[in] object    a node.
   */
! void openvrml::gl::viewer::do_set_sensitive(node * object)
  {
      if (object) {
***************
*** 3466,3473 ****
   */
  openvrml::gl::viewer::texture_object_t
! openvrml::gl::viewer::insert_texture(const image & img,
!                                      bool repeat_s,
!                                      bool repeat_t,
!                                      bool retainHint)
  {
      using std::vector;
--- 3469,3476 ----
   */
  openvrml::gl::viewer::texture_object_t
! openvrml::gl::viewer::do_insert_texture(const image & img,
!                                         bool repeat_s,
!                                         bool repeat_t,
!                                         bool retainHint)
  {
      using std::vector;
***************
*** 3576,3581 ****
   * @param[in] components    number of components.
   */
! void openvrml::gl::viewer::insert_texture_reference(const texture_object_t ref,
!                                                     const size_t components)
  {
  #if USE_TEXTURE_DISPLAY_LISTS
--- 3579,3585 ----
   * @param[in] components    number of components.
   */
! void
! openvrml::gl::viewer::do_insert_texture_reference(const texture_object_t ref,
!                                                   const size_t components)
  {
  #if USE_TEXTURE_DISPLAY_LISTS
***************
*** 3594,3598 ****
   * @param[in] ref   texture handle.
   */
! void openvrml::gl::viewer::remove_texture_object(const texture_object_t ref)
  {
  #if USE_TEXTURE_DISPLAY_LISTS
--- 3598,3602 ----
   * @param[in] ref   texture handle.
   */
! void openvrml::gl::viewer::do_remove_texture_object(const texture_object_t ref)
  {
  #if USE_TEXTURE_DISPLAY_LISTS
***************
*** 3613,3620 ****
   * @param[in] translation   translation.
   */
! void openvrml::gl::viewer::set_texture_transform(const vec2f & center,
!                                                  float rotation,
!                                                  const vec2f & scale,
!                                                  const vec2f & translation)
  {
      glMatrixMode(GL_TEXTURE);
--- 3617,3624 ----
   * @param[in] translation   translation.
   */
! void openvrml::gl::viewer::do_set_texture_transform(const vec2f & center,
!                                                     float rotation,
!                                                     const vec2f & scale,
!                                                     const vec2f & translation)
  {
      glMatrixMode(GL_TEXTURE);
***************
*** 3678,3686 ****
   * @param[in] visibilityLimit   visiblity limit.
   */
! void openvrml::gl::viewer::set_viewpoint(const vec3f & position,
!                                          const openvrml::rotation & orientation,
!                                          const float fieldOfView,
!                                          const float avatarSize,
!                                          const float visibilityLimit)
  {
      glMatrixMode( GL_PROJECTION );
--- 3682,3691 ----
   * @param[in] visibilityLimit   visiblity limit.
   */
! void
! openvrml::gl::viewer::do_set_viewpoint(const vec3f & position,
!                                        const openvrml::rotation & orientation,
!                                        const float fieldOfView,
!                                        const float avatarSize,
!                                        const float visibilityLimit)
  {
      glMatrixMode( GL_PROJECTION );
***************
*** 3719,3724 ****
   * @param[in] point     pointer to the first point in an array.
   */
! void openvrml::gl::viewer::transform_points(const size_t nPoints,
!                                             vec3f * point) const
  {
      mat4f m;
--- 3724,3729 ----
   * @param[in] point     pointer to the first point in an array.
   */
! void openvrml::gl::viewer::do_transform_points(const size_t nPoints,
!                                                vec3f * point) const
  {
      mat4f m;
***************
*** 3733,3737 ****
   * @param[in] mat   a matrix.
   */
! void openvrml::gl::viewer::transform(const mat4f & mat)
  {
      glMultMatrixf(&mat[0][0]);
--- 3738,3742 ----
   * @param[in] mat   a matrix.
   */
! void openvrml::gl::viewer::do_transform(const mat4f & mat)
  {
      glMultMatrixf(&mat[0][0]);
***************
*** 4417,4421 ****
   */
  void
! openvrml::gl::viewer::draw_bounding_sphere(
      const bounding_sphere & bs,
      const bounding_volume::intersection intersection)
--- 4422,4426 ----
   */
  void
! openvrml::gl::viewer::do_draw_bounding_sphere(
      const bounding_sphere & bs,
      const bounding_volume::intersection intersection)