[Plib-cvs] plib/src/ssg ssgLoad3ds.cxx,1.33,1.34 ssgLoadAC.cxx,1.26,1.27 ssgLoadATG.cxx,1.15,1.16 ssgLoadFLT.cxx,1.29,1.30 ssgLoadIV.cxx,1.7,1.8 ssgLoadMD2.cxx,1.12,1.13 ssgLoadOFF.cxx,1.9,1.10 ssgLoadVRML1.cxx,1.7,1.8 ssgLoadX.cxx,1.17,1.18

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

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

Modified Files:
	ssgLoad3ds.cxx ssgLoadAC.cxx ssgLoadATG.cxx ssgLoadFLT.cxx 
	ssgLoadIV.cxx ssgLoadMD2.cxx ssgLoadOFF.cxx ssgLoadVRML1.cxx 
	ssgLoadX.cxx 
Log Message:
Cleanups in loader code

Index: ssgLoad3ds.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoad3ds.cxx,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ssgLoad3ds.cxx	24 Mar 2002 15:11:36 -0000	1.33
+++ ssgLoad3ds.cxx	10 Jun 2002 16:34:29 -0000	1.34
@@ -75,7 +75,7 @@
 #endif
 
 #ifdef DEBUG
-char debug_indent[256];
+static char debug_indent[256];
 #endif
 
 /* this is the minimum value of the dot product for

Index: ssgLoadAC.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadAC.cxx,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ssgLoadAC.cxx	10 Jun 2002 14:15:13 -0000	1.26
+++ ssgLoadAC.cxx	10 Jun 2002 16:34:29 -0000	1.27
@@ -52,27 +52,27 @@
 static sgVec2 texrep ;
 static sgVec2 texoff ;
 
-int do_material ( char *s ) ;
-int do_object   ( char *s ) ;
-int do_name     ( char *s ) ;
-int do_data     ( char *s ) ;
-int do_texture  ( char *s ) ;
-int do_texrep   ( char *s ) ;
-int do_texoff   ( char *s ) ;
-int do_rot      ( char *s ) ;
[...261 lines suppressed...]
-int do_refs     ( char *s )
+static int do_refs     ( char *s )
 {
   int nrefs = strtol ( s, NULL, 0 ) ;
   char buffer [ 1024 ] ;
@@ -591,7 +591,7 @@
   return PARSE_POP ;
 }
 
-int do_kids ( char *s )
+static int do_kids ( char *s )
 {
   last_num_kids = strtol ( s, NULL, 0 ) ;
 
@@ -686,5 +686,4 @@
 
   return current_branch ;
 }
-
 

Index: ssgLoadATG.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadATG.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ssgLoadATG.cxx	23 Mar 2002 15:06:45 -0000	1.15
+++ ssgLoadATG.cxx	10 Jun 2002 16:34:30 -0000	1.16
@@ -124,7 +124,7 @@
 static char * _current_usemtl = NULL, * _last_usemtl = NULL;
 static int _current_material_index = -1;
 
-double _ssg_gbs_x = 0.0, _ssg_gbs_y = 0.0, _ssg_gbs_z = 1.0, _ssg_gbs_r = 0.0;
+static double _ssg_gbs_x = 0.0, _ssg_gbs_y = 0.0, _ssg_gbs_z = 1.0, _ssg_gbs_r = 0.0;
 
 void ssgGetValuesFromLastATGFile(double *x, double *y, double *z, double *r)
 // These values are the values from the "# gbs" line from the last loaded

Index: ssgLoadFLT.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadFLT.cxx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ssgLoadFLT.cxx	27 Feb 2002 20:05:11 -0000	1.29
+++ ssgLoadFLT.cxx	10 Jun 2002 16:34:30 -0000	1.30
@@ -339,7 +339,7 @@
 
 typedef int (*sfunc)(const void *key1, const void *key2);
 
-struct snode *splay(struct snode *t, const void *key, sfunc comp)
+static struct snode *splay(struct snode *t, const void *key, sfunc comp)
 {
    struct snode N, *l, *r, *y;
      

Index: ssgLoadIV.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadIV.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ssgLoadIV.cxx	18 Dec 2001 16:35:59 -0000	1.7
+++ ssgLoadIV.cxx	10 Jun 2002 16:34:32 -0000	1.8
@@ -44,7 +44,7 @@
 static bool iv_parseIndexedFaceSet( ssgBranch *parentBranch, _traversalState *parentData, char *defName );
 static bool iv_parseTexture2( ssgBranch *parentBranch, _traversalState *currentData, char *defName );
 
-_parseTag ivTags [] =
+static _parseTag ivTags [] =
 {
      { "Separator", iv_parseSeparator },
      { "Switch", iv_parseSwitch },
@@ -329,7 +329,7 @@
    return TRUE;
 }
 
-bool iv_parseTexture2( ssgBranch *parentBranch, _traversalState *currentData, char *defName )
+static bool iv_parseTexture2( ssgBranch *parentBranch, _traversalState *currentData, char *defName )
 {
    char *token;
    char *fileName = NULL; bool wrapU = FALSE, wrapV = FALSE;

Index: ssgLoadMD2.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadMD2.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ssgLoadMD2.cxx	8 May 2002 22:40:10 -0000	1.12
+++ ssgLoadMD2.cxx	10 Jun 2002 16:34:32 -0000	1.13
@@ -104,7 +104,7 @@
 	
 */
 
-int seq_frames[] = {
+static int seq_frames[] = {
 	40,
 	6,
 	8,
@@ -197,12 +197,12 @@
 static t_model header;
 
 
-void read_header()
+static void read_header()
 {
 	fread(&header, sizeof(t_model), 1, loader_fd);	
 }
 	
-void read_frames(int offset)
+static void read_frames(int offset)
 {
 	fseek(loader_fd, offset, SEEK_SET);	
 		
@@ -217,7 +217,7 @@
 	}
 }
 
-void read_uvcoords(int offset)
+static void read_uvcoords(int offset)
 {
 	fseek(loader_fd, offset, SEEK_SET);
 	
@@ -225,7 +225,7 @@
 	fread(uvs, sizeof(t_tcoord), header.numTexCoords, loader_fd);
 }
 
-void read_triangles(int offset)
+static void read_triangles(int offset)
 {
 	fseek(loader_fd, offset, SEEK_SET);
 
@@ -233,7 +233,7 @@
 	fread(triangles, sizeof(t_triangle), header.numTriangles, loader_fd);
 }
 
-void read_skins(int offset)
+static void read_skins(int offset)
 {
 	fseek(loader_fd, offset, SEEK_SET);
 	char buffer[64];
@@ -251,7 +251,7 @@
 			strcpy(skins[i], start);
 	}
 }
-void read_glcommands(int offset)
+static void read_glcommands(int offset)
 {
 	fseek(loader_fd, offset, SEEK_SET);
 }
@@ -261,7 +261,7 @@
  * they can share UVs properly
  * Right now, it does this really naively, (it dups them all)
  */
-ssgEntity * convert_to_ssg()
+static ssgEntity * convert_to_ssg()
 {
 	sgVec3 vert;
 	sgVec2 uv;

Index: ssgLoadOFF.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadOFF.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ssgLoadOFF.cxx	10 Jun 2002 14:15:14 -0000	1.9
+++ ssgLoadOFF.cxx	10 Jun 2002 16:34:32 -0000	1.10
@@ -44,7 +44,7 @@
 
 #define u32 unsigned int
 
-int _ssgLoadTranslucent=TRUE;
+static int _ssgLoadTranslucent=TRUE;
 
 extern sgVec4 currentDiffuse;
 
@@ -117,7 +117,7 @@
 
 #define MAX_NO_VERTICES_PER_FACE 1000
 
-class ssgLoaderWriterMesh theMesh;
+static class ssgLoaderWriterMesh theMesh;
 
 
 

Index: ssgLoadVRML1.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadVRML1.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ssgLoadVRML1.cxx	18 Dec 2001 16:35:59 -0000	1.7
+++ ssgLoadVRML1.cxx	10 Jun 2002 16:34:32 -0000	1.8
@@ -59,7 +59,7 @@
 static bool vrml1_parseIndexedFaceSet( ssgBranch *parentBranch, _traversalState *currentData, char *defName );
 static bool vrml1_parseTexture2( ssgBranch *parentBranch, _traversalState *currentData, char *defName );
 
-_parseTag vrmlTags [] =
+static _parseTag vrmlTags [] =
 {
      { "Separator", vrml1_parseSeparator },
      { "Switch", vrml1_parseSwitch },

Index: ssgLoadX.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadX.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ssgLoadX.cxx	10 Jun 2002 14:15:14 -0000	1.17
+++ ssgLoadX.cxx	10 Jun 2002 16:34:32 -0000	1.18
@@ -36,7 +36,7 @@
 typedef int HandlerFunctionType(const char *sName, const char *firstToken);
 
 
-char *globEmpty="";
+static char *globEmpty="";
 
 static ssgBranch *curr_branch_;
 
@@ -105,7 +105,7 @@
 	}
 }
[...86 lines suppressed...]
 	u32 i, nFaceIndexes, nMaterialsRead = 0, nMaterials;
 	  
@@ -481,7 +481,7 @@
 }
 
 
-int HandleMesh(const char * /* sName */, const char *firstToken)
+static int HandleMesh(const char * /* sName */, const char *firstToken)
 { u32 i, j, nNoOfVertices, nNoOfVerticesForThisFace, nNoOfFaces;
 	int iVertex, aiVertices[MAX_NO_VERTICES_PER_FACE];
 	
@@ -580,7 +580,7 @@
 	return TRUE;
 }
 
-static int TwoCharsToInt(char char1, char char2)
+inline int TwoCharsToInt(char char1, char char2)
 {
   return ((int)(char1-'0'))*256+char2-'0';
 }