[Plib-cvs] plib/src/ssg ssg.cxx,1.52,1.53 ssg.h,1.136,1.137 ssgLoadAC.cxx,1.25,1.26 ssgLoadASE.cxx,1
Brought to you by:
sjbaker
Menu
▾
▴
[Plib-cvs] plib/src/ssg ssg.cxx,1.52,1.53 ssg.h,1.136,1.137 ssgLoadAC.cxx,1.25,1.26 ssgLoadASE.cxx,1.42,1.43 ssgLoadBMP.cxx,1.14,1.15 ssgLoadDXF.cxx,1.24,1.25 ssgLoadMDL.cxx,1.39,1.40 ssgLoadOBJ.cxx,1.20,1.21 ssgLoadOFF.cxx,1.8,1.9 ssgLoadVRML.h,1.9,1.10 ssgLoadX.cxx,1.16,1.17 ssgTween.cxx,1.7,1.8 ssgTweenController.cxx,1.3,1.4
|
From: Sebastian U. <ud...@us...> - 2002-06-10 14:15:18
|
Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv1997
Modified Files:
ssg.cxx ssg.h ssgLoadAC.cxx ssgLoadASE.cxx ssgLoadBMP.cxx
ssgLoadDXF.cxx ssgLoadMDL.cxx ssgLoadOBJ.cxx ssgLoadOFF.cxx
ssgLoadVRML.h ssgLoadX.cxx ssgTween.cxx ssgTweenController.cxx
Log Message:
Solved some compiler warnings
Index: ssg.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.cxx,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- ssg.cxx 9 Jun 2002 15:30:39 -0000 1.52
+++ ssg.cxx 10 Jun 2002 14:15:13 -0000 1.53
@@ -70,7 +70,7 @@
int ssgGetFrameCounter () { return _ssgFrameCounter ; }
void ssgSetFrameCounter ( int fc ) { _ssgFrameCounter = fc ; }
-char *ssgGetVersion ()
+const char *ssgGetVersion ()
{
#ifdef VERSION
return VERSION ;
@@ -300,35 +300,35 @@
}
-char *ssgAxisTransform::getTypeName (void) { return "ssgAxisTransform" ; }
-char *ssgBase ::getTypeName (void) { return "ssgBase" ; }
-char *ssgTexture ::getTypeName (void) { return "ssgTexture" ; }
-char *ssgState ::getTypeName (void) { return "ssgState" ; }
-char *ssgSimpleState ::getTypeName (void) { return "ssgSimpleState" ; }
-char *ssgStateSelector::getTypeName (void) { return "ssgStateSelector" ; }
-char *ssgEntity ::getTypeName (void) { return "ssgEntity" ; }
-char *ssgLeaf ::getTypeName (void) { return "ssgLeaf" ; }
-char *ssgVTable ::getTypeName (void) { return "ssgVTable" ; }
-char *ssgVtxTable ::getTypeName (void) { return "ssgVtxTable" ; }
-char *ssgVtxArray ::getTypeName (void) { return "ssgVtxArray" ; }
-char *ssgBranch ::getTypeName (void) { return "ssgBranch" ; }
-char *ssgSelector ::getTypeName (void) { return "ssgSelector" ; }
-char *ssgRangeSelector::getTypeName (void) { return "ssgRangeSelector" ; }
-char *ssgTimedSelector::getTypeName (void) { return "ssgTimedSelector" ; }
-char *ssgBaseTransform::getTypeName (void) { return "ssgBaseTransform" ; }
-char *ssgTransform ::getTypeName (void) { return "ssgTransform" ; }
-char *ssgTexTrans ::getTypeName (void) { return "ssgTexTrans" ; }
-char *ssgCutout ::getTypeName (void) { return "ssgCutout" ; }
-char *ssgRoot ::getTypeName (void) { return "ssgRoot" ; }
+const char *ssgAxisTransform::getTypeName (void) { return "ssgAxisTransform" ; }
+const char *ssgBase ::getTypeName (void) { return "ssgBase" ; }
+const char *ssgTexture ::getTypeName (void) { return "ssgTexture" ; }
+const char *ssgState ::getTypeName (void) { return "ssgState" ; }
+const char *ssgSimpleState ::getTypeName (void) { return "ssgSimpleState" ; }
+const char *ssgStateSelector::getTypeName (void) { return "ssgStateSelector" ; }
+const char *ssgEntity ::getTypeName (void) { return "ssgEntity" ; }
+const char *ssgLeaf ::getTypeName (void) { return "ssgLeaf" ; }
+const char *ssgVTable ::getTypeName (void) { return "ssgVTable" ; }
+const char *ssgVtxTable ::getTypeName (void) { return "ssgVtxTable" ; }
+const char *ssgVtxArray ::getTypeName (void) { return "ssgVtxArray" ; }
+const char *ssgBranch ::getTypeName (void) { return "ssgBranch" ; }
+const char *ssgSelector ::getTypeName (void) { return "ssgSelector" ; }
+const char *ssgRangeSelector::getTypeName (void) { return "ssgRangeSelector" ; }
+const char *ssgTimedSelector::getTypeName (void) { return "ssgTimedSelector" ; }
+const char *ssgBaseTransform::getTypeName (void) { return "ssgBaseTransform" ; }
+const char *ssgTransform ::getTypeName (void) { return "ssgTransform" ; }
+const char *ssgTexTrans ::getTypeName (void) { return "ssgTexTrans" ; }
+const char *ssgCutout ::getTypeName (void) { return "ssgCutout" ; }
+const char *ssgRoot ::getTypeName (void) { return "ssgRoot" ; }
-char *ssgSimpleList ::getTypeName (void) { return "ssgSimpleList" ; }
-char *ssgColourArray ::getTypeName (void) { return "ssgColourArray" ; }
-char *ssgIndexArray ::getTypeName (void) { return "ssgIndexArray" ; }
-char *ssgTransformArray::getTypeName (void) { return "ssgTransformArray" ; }
-char *ssgTexCoordArray::getTypeName (void) { return "ssgTexCoordArray" ; }
-char *ssgVertexArray ::getTypeName (void) { return "ssgVertexArray" ; }
-char *ssgNormalArray ::getTypeName (void) { return "ssgNormalArray" ; }
-char *ssgInterleavedArray::getTypeName (void) { return "ssgInterleavedArray"; }
+const char *ssgSimpleList ::getTypeName (void) { return "ssgSimpleList" ; }
+const char *ssgColourArray ::getTypeName (void) { return "ssgColourArray" ; }
+const char *ssgIndexArray ::getTypeName (void) { return "ssgIndexArray" ; }
+const char *ssgTransformArray::getTypeName (void) { return "ssgTransformArray" ; }
+const char *ssgTexCoordArray::getTypeName (void) { return "ssgTexCoordArray" ; }
+const char *ssgVertexArray ::getTypeName (void) { return "ssgVertexArray" ; }
+const char *ssgNormalArray ::getTypeName (void) { return "ssgNormalArray" ; }
+const char *ssgInterleavedArray::getTypeName (void) { return "ssgInterleavedArray"; }
Index: ssg.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.h,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- ssg.h 9 Jun 2002 15:30:39 -0000 1.136
+++ ssg.h 10 Jun 2002 14:15:13 -0000 1.137
@@ -300,7 +300,7 @@
/* Type checking mechanism */
- virtual char *getTypeName(void) ;
+ virtual const char *getTypeName(void) ;
int getType (void) { return type ; }
int isA ( int ty ) { return getType() == ty ; }
@@ -456,7 +456,7 @@
virtual void print ( FILE *fd = stderr, char *indent = "", int how_much = 2 ) ;
virtual int load ( FILE *fd ) ;
[...247 lines suppressed...]
virtual int save ( FILE *fd ) ;
virtual void cull ( sgFrustum *f, sgMat4 m, int test_needed ) ;
@@ -2045,7 +2045,7 @@
virtual ssgBase *clone ( int clone_flags = 0 ) ;
ssgRoot (void) ;
virtual ~ssgRoot (void) ;
- virtual char *getTypeName(void) ;
+ virtual const char *getTypeName(void) ;
virtual int load ( FILE *fd ) ;
virtual int save ( FILE *fd ) ;
} ;
@@ -2703,7 +2703,7 @@
char *ssgShowStats () ;
void ssgDelete ( ssgBranch *br ) ;
-char *ssgGetVersion () ;
+const char *ssgGetVersion () ;
void ssgSetLoadOFFTranslucent ( int i );
Index: ssgLoadAC.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadAC.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- ssgLoadAC.cxx 3 Apr 2002 11:31:07 -0000 1.25
+++ ssgLoadAC.cxx 10 Jun 2002 14:15:13 -0000 1.26
@@ -79,7 +79,7 @@
struct Tag
{
- char *token ;
+ const char *token ;
int (*func) ( char *s ) ;
} ;
Index: ssgLoadASE.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadASE.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ssgLoadASE.cxx 23 Mar 2002 15:06:45 -0000 1.42
+++ ssgLoadASE.cxx 10 Jun 2002 14:15:13 -0000 1.43
@@ -165,7 +165,7 @@
};
-enum { MAX_MATERIALS = 1000 };
+#define MAX_MATERIALS 1000
static aseMaterial** materials ;
static u32 num_materials ;
@@ -738,7 +738,7 @@
}
else if (!strcmp(token,"*MESH_VERTEXNORMAL"))
{
- int nverts = mesh -> num_verts;
+ //int nverts = mesh -> num_verts;
if ( mesh_face_normal_index >= mesh -> num_faces )
parser.error("bad mesh_face_normal_index #");
Index: ssgLoadBMP.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadBMP.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ssgLoadBMP.cxx 10 Jun 2002 13:11:32 -0000 1.14
+++ ssgLoadBMP.cxx 10 Jun 2002 14:15:14 -0000 1.15
@@ -47,7 +47,7 @@
(( *x << 24 ) & 0xFF000000 ) ;
}
-static void swab_int_array ( int *x, int leng )
+/*static void swab_int_array ( int *x, int leng )
{
if ( ! isSwapped )
return ;
@@ -60,7 +60,7 @@
(( *x << 24 ) & 0xFF000000 ) ;
x++ ;
}
-}
+}*/
static unsigned char readByte ()
Index: ssgLoadDXF.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadDXF.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ssgLoadDXF.cxx 28 Feb 2002 07:54:23 -0000 1.24
+++ ssgLoadDXF.cxx 10 Jun 2002 14:15:14 -0000 1.25
@@ -358,11 +358,11 @@
}
-static void copy_vert ( dxfVert& dst, const dxfVert& src )
+/*static void copy_vert ( dxfVert& dst, const dxfVert& src )
{
dst.color_index = src.color_index ;
sgCopyVec3 ( dst.pos, src.pos ) ;
-}
+}*/
static void add_tri ( const dxfVert* p, const dxfVert* q, const dxfVert* r )
{
Index: ssgLoadMDL.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadMDL.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- ssgLoadMDL.cxx 9 Jun 2002 15:30:39 -0000 1.39
+++ ssgLoadMDL.cxx 10 Jun 2002 14:15:14 -0000 1.40
@@ -98,9 +98,9 @@
static int curr_var_;
static bool has_normals_, vtx_dirty_, tex_vtx_dirty_;
-static bool join_children_, override_normals_;
+//static bool join_children_, override_normals_;
-static char *tex_fmt_;
+//static char *tex_fmt_;
//===========================================================================
Index: ssgLoadOBJ.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadOBJ.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- ssgLoadOBJ.cxx 7 Nov 2001 23:51:10 -0000 1.20
+++ ssgLoadOBJ.cxx 10 Jun 2002 14:15:14 -0000 1.21
@@ -154,7 +154,7 @@
return st ;
}
-static int leqi ( char* string1, char* string2 )
+static int leqi ( const char* string1, const char* string2 )
//LEQI compares two strings for equality, disregarding case.
{
int i;
Index: ssgLoadOFF.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadOFF.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ssgLoadOFF.cxx 7 Nov 2001 23:51:10 -0000 1.8
+++ ssgLoadOFF.cxx 10 Jun 2002 14:15:14 -0000 1.9
@@ -73,7 +73,7 @@
static _ssgParser parser;
static ssgBranch* top_branch;
-static int Ascii2Int(int &retVal, const char *token, const char* name )
+/*static int Ascii2Int(int &retVal, const char *token, const char* name )
// returns TRUE on success
{
char *endptr;
@@ -84,7 +84,7 @@
{ parser.error("The field %s should contain an integer number but contains %s",name, token) ;
return FALSE;
}
-}
+}*/
static int Ascii2UInt(unsigned int &retVal, const char *token, const char* name )
// returns TRUE on success
Index: ssgLoadVRML.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadVRML.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ssgLoadVRML.h 18 Dec 2001 16:35:59 -0000 1.9
+++ ssgLoadVRML.h 10 Jun 2002 14:15:14 -0000 1.10
@@ -125,7 +125,7 @@
// tags for functions which may actually modify the scene graph
struct _parseTag
{
- char *token ;
+ const char *token ;
bool (*func) ( ssgBranch *parentBranch, _traversalState *parentData, char *defName ) ;
} ;
Index: ssgLoadX.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgLoadX.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ssgLoadX.cxx 7 Nov 2001 23:51:10 -0000 1.16
+++ ssgLoadX.cxx 10 Jun 2002 14:15:14 -0000 1.17
@@ -42,7 +42,7 @@
struct EntityType
{
- char * sName;
+ const char * sName;
HandlerFunctionType *HandleEntity;
int bMayBeIgnored;
} ;
Index: ssgTween.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgTween.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ssgTween.cxx 19 Jan 2002 20:37:21 -0000 1.7
+++ ssgTween.cxx 10 Jun 2002 14:15:14 -0000 1.8
@@ -28,7 +28,7 @@
static float current_tween_state = 0.0f ;
-char *ssgTween::getTypeName (void) { return "ssgTween" ; }
+const char *ssgTween::getTypeName (void) { return "ssgTween" ; }
float _ssgGetCurrentTweenState () { return current_tween_state ; }
Index: ssgTweenController.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgTweenController.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ssgTweenController.cxx 19 Jan 2002 20:37:21 -0000 1.3
+++ ssgTweenController.cxx 10 Jun 2002 14:15:14 -0000 1.4
@@ -25,7 +25,7 @@
#include "ssgLocal.h"
-char *ssgTweenController::getTypeName (void) { return "ssgTweenController" ; }
+const char *ssgTweenController::getTypeName (void) { return "ssgTweenController" ; }
void ssgTweenController::copy_from ( ssgTweenController *src, int clone_flags )
{
|
