[openvrml-commit] openvrml/src/libopenvrml-gl/openvrml/gl viewer.cpp,1.37,1.38

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

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

Modified Files:
	viewer.cpp 
Log Message:
Added missing instances of OPENVRML_GL_LOCAL.

Index: viewer.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** viewer.cpp	11 Aug 2005 22:50:14 -0000	1.37
--- viewer.cpp	6 Feb 2006 00:50:36 -0000	1.38
***************
*** 862,868 ****
      //
      OPENVRML_GL_LOCAL const rotation trackball(float p1x,
!                                             float p1y,
!                                             float p2x,
!                                             float p2y)
      {
          //
--- 862,868 ----
      //
      OPENVRML_GL_LOCAL const rotation trackball(float p1x,
!                                                float p1y,
!                                                float p2x,
!                                                float p2y)
      {
          //
***************
*** 980,984 ****
  
      // Call this after each frame for debugging...
!     void checkErrors(const std::string & s)
      {
          GLenum glerr;
--- 980,984 ----
  
      // Call this after each frame for debugging...
!     OPENVRML_GL_LOCAL void checkErrors(const std::string & s)
      {
          GLenum glerr;
***************
*** 1523,1532 ****
       * world creator could just as easily do that with DEF/USE ...).
       */
!     void computeCylinder(const double height,
!                          const double radius,
!                          const int numFacets,
!                          float c[][3],
!                          float tc[][3],
!                          int faces[])
      {
          double angle, x, y;
--- 1523,1532 ----
       * world creator could just as easily do that with DEF/USE ...).
       */
!     OPENVRML_GL_LOCAL void computeCylinder(const double height,
!                                            const double radius,
!                                            const int numFacets,
!                                            float c[][3],
!                                            float tc[][3],
!                                            int faces[])
      {
          double angle, x, y;
***************
*** 1760,1764 ****
      // Compute a normal at vert i,j of an ElevationGrid.
  
!     const vec3f elevationVertexNormal(
              const int i, const int j,
              const int nx, const int nz,
--- 1760,1764 ----
      // Compute a normal at vert i,j of an ElevationGrid.
  
!     OPENVRML_GL_LOCAL const vec3f elevationVertexNormal(
              const int i, const int j,
              const int nx, const int nz,
***************
*** 1935,1939 ****
      // Extrusion cap tessellation for non-convex shapes
  
!     struct TessExtrusion {
          const float * c; // coordinates array [nVerts * 3]
          const float * crossSection; // crossSection coordinates [nCrossSection * 2]
--- 1935,1939 ----
      // Extrusion cap tessellation for non-convex shapes
  
!     struct OPENVRML_GL_LOCAL TessExtrusion {
          const float * c; // coordinates array [nVerts * 3]
          const float * crossSection; // crossSection coordinates [nCrossSection * 2]
***************
*** 2007,2015 ****
  namespace {
  
!     void insertExtrusionCaps(GLUtesselator & tesselator,
!                              const unsigned int mask,
!                              const size_t nSpine,
!                              const std::vector<vec3f> & c,
!                              const std::vector<vec2f> & cs)
      {
          using std::vector;
--- 2007,2015 ----
  namespace {
  
!     OPENVRML_GL_LOCAL void insertExtrusionCaps(GLUtesselator & tesselator,
!                                                const unsigned int mask,
!                                                const size_t nSpine,
!                                                const std::vector<vec3f> & c,
!                                                const std::vector<vec2f> & cs)
      {
          using std::vector;
***************
*** 2144,2153 ****
       * @retval tc
       */
!     void computeExtrusion_(const std::vector<rotation> & orientation,
!                            const std::vector<vec2f> & scale,
!                            const std::vector<vec2f> & crossSection,
!                            const std::vector<vec3f> & spine,
!                            std::vector<vec3f> & c,
!                            std::vector<vec2f> & tc)
      {
          size_t i, j, ci;
--- 2144,2154 ----
       * @retval tc
       */
!     OPENVRML_GL_LOCAL void
!     computeExtrusion_(const std::vector<rotation> & orientation,
!                       const std::vector<vec2f> & scale,
!                       const std::vector<vec2f> & crossSection,
!                       const std::vector<vec3f> & spine,
!                       std::vector<vec3f> & c,
!                       std::vector<vec2f> & tc)
      {
          size_t i, j, ci;
***************
*** 2329,2339 ****
       * @retval faces
       */
!     void computeExtrusion_(const std::vector<rotation> & orientation,
!                            const std::vector<vec2f> & scale,
!                            const std::vector<vec2f> & crossSection,
!                            const std::vector<vec3f> & spine,
!                            std::vector<vec3f> & c,
!                            std::vector<vec2f> & tc,
!                            std::vector<int32> & faces)
      {
          computeExtrusion_(orientation, scale, crossSection, spine, c, tc);
--- 2330,2341 ----
       * @retval faces
       */
!     OPENVRML_GL_LOCAL void
!     computeExtrusion_(const std::vector<rotation> & orientation,
!                       const std::vector<vec2f> & scale,
!                       const std::vector<vec2f> & crossSection,
!                       const std::vector<vec3f> & spine,
!                       std::vector<vec3f> & c,
!                       std::vector<vec2f> & tc,
!                       std::vector<int32> & faces)
      {
          computeExtrusion_(orientation, scale, crossSection, spine, c, tc);
***************
*** 2554,2560 ****
  namespace {
  
!     void computeBounds(size_t npoints,
!                        const float * points,
!                        float (&bounds)[6])
      {
          if (npoints == 0) {
--- 2556,2562 ----
  namespace {
  
!     OPENVRML_GL_LOCAL void computeBounds(size_t npoints,
!                                          const float * points,
!                                          float (&bounds)[6])
      {
          if (npoints == 0) {
***************
*** 2577,2583 ****
      }
  
!     void texGenParams(float bounds[],  // xmin,xmax, ymin,ymax, zmin,zmax
!                       int axes[2],     // s, t
!                       float params[4]) // s0, 1/sSize, t0, 1/tSize
      {
          axes[0] = 0;
--- 2579,2585 ----
      }
  
!     OPENVRML_GL_LOCAL void texGenParams(float bounds[],  // xmin,xmax, ymin,ymax, zmin,zmax
!                                         int axes[2],     // s, t
!                                         float params[4]) // s0, 1/sSize, t0, 1/tSize
      {
          axes[0] = 0;
***************
*** 2611,2615 ****
      }
  
!     void insertShellConvex(ShellData * const s)
      {
          vec3f N;
--- 2613,2617 ----
      }
  
!     OPENVRML_GL_LOCAL void insertShellConvex(ShellData * const s)
      {
          vec3f N;
***************
*** 2711,2723 ****
      }
  
!     void insertShellTess(GLUtesselator & tessobj,
!                          const std::vector<vertex_data> & vertices,
!                          const std::vector<int32> & coord_index,
!                          const bool color_per_face,
!                          const std::vector<openvrml::color> & color,
!                          const std::vector<int32> & color_index,
!                          const bool normal_per_face,
!                          const std::vector<vec3f> & normal,
!                          const std::vector<int32> & normal_index)
      {
          using std::vector;
--- 2713,2726 ----
      }
  
!     OPENVRML_GL_LOCAL void
!     insertShellTess(GLUtesselator & tessobj,
!                     const std::vector<vertex_data> & vertices,
!                     const std::vector<int32> & coord_index,
!                     const bool color_per_face,
!                     const std::vector<openvrml::color> & color,
!                     const std::vector<int32> & color_index,
!                     const bool normal_per_face,
!                     const std::vector<vec3f> & normal,
!                     const std::vector<int32> & normal_index)
      {
          using std::vector;
***************
*** 2940,2948 ****
  namespace {
  
!     void computeSphere(const double radius,
!                        const int numLatLong,
!                        float c[][3],
!                        float tc[][3],
!                        int *faces)
      {
          double r, angle, x, y, z;
--- 2943,2951 ----
  namespace {
  
!     OPENVRML_GL_LOCAL void computeSphere(const double radius,
!                                          const int numLatLong,
!                                          float c[][3],
!                                          float tc[][3],
!                                          int *faces)
      {
          double r, angle, x, y, z;
***************
*** 3422,3426 ****
  namespace {
  
!     inline bool power_of_2(unsigned long n)
      {
          return !(n & (n - 1));
--- 3425,3429 ----
  namespace {
  
!     OPENVRML_GL_LOCAL inline bool power_of_2(unsigned long n)
      {
          return !(n & (n - 1));
***************
*** 3610,3618 ****
       * Compute a target and up vector from position/orientation/distance.
       */
!     void computeView(const vec3f & position,
!                      const rotation & orientation,
!                      const float distance,
!                      vec3f & target,
!                      vec3f & up)
      {
          // Graphics Gems, p 466. Convert between axis/angle and rotation matrix
--- 3613,3621 ----
       * Compute a target and up vector from position/orientation/distance.
       */
!     OPENVRML_GL_LOCAL void computeView(const vec3f & position,
!                                        const rotation & orientation,
!                                        const float distance,
!                                        vec3f & target,
!                                        vec3f & up)
      {
          // Graphics Gems, p 466. Convert between axis/angle and rotation matrix