[Plib-cvs] plib/src/ssg ssg.cxx,1.51,1.52 ssg.h,1.135,1.136 ssgLoadBGL.cxx,1.3,1.4 ssgLoadMDL.cxx,1.38,1.39 ssgLoadMDL.h,1.7,1.8

[Sebastian U. <ud...@us...>]

Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv677

Modified Files:
	ssg.cxx ssg.h ssgLoadBGL.cxx ssgLoadMDL.cxx ssgLoadMDL.h 
Log Message:
Minor changes

Index: ssg.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.cxx,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- ssg.cxx	9 Jun 2002 11:25:48 -0000	1.51
+++ ssg.cxx	9 Jun 2002 15:30:39 -0000	1.52
@@ -172,7 +172,7 @@
   ssgAddTextureFormat ( ".bw" ,    ssgLoadSGI ) ;
 #endif
 
-#ifdef SSG_LOAD_MDL_SUPPORTED || SSG_LOAD_BGL_SUPPORTED || SSG_LOAD_MDL_BGL_TEXTURE_SUPPORTED
+#if defined(SSG_LOAD_MDL_SUPPORTED) || defined(SSG_LOAD_BGL_SUPPORTED) || defined(SSG_LOAD_MDL_BGL_TEXTURE_SUPPORTED)
   ssgAddTextureFormat ( ".0af" ,   ssgLoadMDLTexture ) ;
   ssgAddTextureFormat ( ".1af" ,   ssgLoadMDLTexture ) ;
   ssgAddTextureFormat ( ".2af" ,   ssgLoadMDLTexture ) ;

Index: ssg.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.h,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- ssg.h	9 Jun 2002 11:25:48 -0000	1.135
+++ ssg.h	9 Jun 2002 15:30:39 -0000	1.136
@@ -878,7 +878,7 @@
     }
   }
 
-  virtual void  setTexture ( char *fname,
+  virtual void  setTexture ( const char *fname,
     int _wrapu = TRUE, int _wrapv = TRUE, int _mipmap = TRUE )
   {
     mipmap = _mipmap ;

Index: ssgLoadBGL.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadBGL.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ssgLoadBGL.cxx	9 Jun 2002 11:29:54 -0000	1.3
+++ ssgLoadBGL.cxx	9 Jun 2002 15:30:39 -0000	1.4
@@ -113,9 +113,9 @@
 static ssgTexCoordArray         *tex_coords_;
 
 // Current part (index array)
-static ssgLeaf                  *curr_part_=0;
+static ssgLeaf                  *curr_part_;
 static ssgBranch                *model_;
-static ssgTransform             *curr_branch_=0;
+static ssgTransform             *curr_branch_;
 
 // Moving parts
 static ssgBranch                *ailerons_grp_, *elevator_grp_, *rudder_grp_;
@@ -140,12 +140,12 @@
 
 
 static bool                     has_normals_;
-static bool                     join_children_, override_normals_;
+//static bool                   join_children_, override_normals_;
 
-static char                     *tex_fmt_;
+//static char                   *tex_fmt_;
 // john ....
 static bool                     poly_from_line;
-unsigned short                  poly_from_line_numverts;
+static unsigned short           poly_from_line_numverts;
 
 //john ........
 static ssgTransform             *building = NULL;
@@ -190,7 +190,7 @@
 
 //===========================================================================
 
-int getVariableValue(int var, int *val)
+static int getVariableValue(int var, int *val)
 {
 for (int i=0; vardef[i].var != 0; i++){
   if (vardef[i].var == var ) {
@@ -203,7 +203,7 @@
 
 //===========================================================================
 
-static void initLoader()
+/*static void initLoader()
 {
   join_children_    = true;
   override_normals_ = true;
@@ -212,7 +212,7 @@
 #ifdef EXPERIMENTAL_CULL_FACE_CODE
   curr_cull_face_   = false ;
 #endif
-}
+}*/
 
 //===========================================================================
 

Index: ssgLoadMDL.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadMDL.cxx,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- ssgLoadMDL.cxx	9 Jun 2002 11:29:54 -0000	1.38
+++ ssgLoadMDL.cxx	9 Jun 2002 15:30:39 -0000	1.39
@@ -104,7 +104,7 @@
 
 //===========================================================================
 
-static void initLoader()
+/*static void initLoader()
 {
   start_idx_        = 0;
   join_children_    = true;
@@ -114,7 +114,7 @@
 #ifdef EXPERIMENTAL_CULL_FACE_CODE
   curr_cull_face_   = false ;    
 #endif
-}
+}*/
 
 //===========================================================================
 

Index: ssgLoadMDL.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadMDL.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ssgLoadMDL.h	9 Jun 2002 11:29:54 -0000	1.7
+++ ssgLoadMDL.h	9 Jun 2002 15:30:39 -0000	1.8
@@ -232,7 +232,7 @@
 
 struct _ssgBGLOpCode {
   unsigned short opcode;
-  char           *name;
+  const char     *name;
   int            size;   /* size includes opcode (2 bytes)
 			    -1 indicates that special treatment is needed
 			    to find the size */