plib-cvs

[Steve B. <sj...@us...>]

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

Modified Files:
	ssg.cxx ssg.h ssgContext.cxx ssgIsect.cxx 
Log Message:
Relaxed some class restrictions where ssgRoot was required to allow
a mere ssgBranch to stand in for it.
Cleaned up ulStrEqual a little.


Index: ssg.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.cxx,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- ssg.cxx	17 Oct 2002 12:05:00 -0000	1.59
+++ ssg.cxx	26 Oct 2002 19:00:55 -0000	1.60
@@ -205,7 +205,7 @@
 
 
 
-void ssgCullAndPick ( ssgRoot *r, sgVec2 botleft, sgVec2 topright )
+void ssgCullAndPick ( ssgBranch *r, sgVec2 botleft, sgVec2 topright )
 {
   if ( _ssgCurrentContext == NULL )
   {
@@ -259,7 +259,7 @@
 }
 
 
-void ssgCullAndDraw ( ssgRoot *r )
+void ssgCullAndDraw ( ssgBranch *r )
 {
   if ( _ssgCurrentContext == NULL )
   {

Index: ssg.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.h,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- ssg.h	24 Oct 2002 14:21:22 -0000	1.152
+++ ssg.h	26 Oct 2002 19:00:55 -0000	1.153
@@ -2341,7 +2341,7 @@
   int  isOrtho () { return frustum -> isOrtho () ; } // is orthographic
 
   ssgSimpleState *getState () { return currentState ; }
-  void cull ( ssgRoot *r ) ;
+  void cull ( ssgBranch *r ) ;
 
   void getCameraPosition ( sgVec3 pos ) ;
   void setCamera ( sgMat4 mat ) ;
@@ -2487,11 +2487,11 @@
 
 void ssgInit () ;
 
-void ssgCullAndDraw ( ssgRoot *root ) ;
-void ssgCullAndPick ( ssgRoot *root, sgVec2 botleft, sgVec2 topright ) ;
-int  ssgIsect       ( ssgRoot *root, sgSphere *s, sgMat4 m, ssgHit **results ) ;
-int  ssgHOT         ( ssgRoot *root, sgVec3    s, sgMat4 m, ssgHit **results ) ;
-int  ssgLOS         ( ssgRoot *root, sgVec3    s, sgMat4 m, ssgHit **results ) ;
+void ssgCullAndDraw ( ssgBranch *root ) ;
+void ssgCullAndPick ( ssgBranch *root, sgVec2 botleft, sgVec2 topright ) ;
+int  ssgIsect       ( ssgBranch *root, sgSphere*s,sgMat4 m, ssgHit **results ) ;
+int  ssgHOT         ( ssgBranch *root, sgVec3  s, sgMat4 m, ssgHit **results ) ;
+int  ssgLOS         ( ssgBranch *root, sgVec3  s, sgMat4 m, ssgHit **results ) ;
 
 /* Load/Save functions */
 

Index: ssgContext.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgContext.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ssgContext.cxx	9 Sep 2002 09:08:29 -0000	1.16
+++ ssgContext.cxx	26 Oct 2002 19:00:55 -0000	1.17
@@ -245,7 +245,7 @@
   glLoadMatrixf ( (float *) mat ) ;
 }
 
-void ssgContext::cull ( ssgRoot *r )
+void ssgContext::cull ( ssgBranch *r )
 {
   r -> cull ( frustum, cameraMatrix, TRUE ) ;
 }

Index: ssgIsect.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgIsect.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ssgIsect.cxx	2 Sep 2002 06:05:48 -0000	1.5
+++ ssgIsect.cxx	26 Oct 2002 19:00:55 -0000	1.6
@@ -69,7 +69,7 @@
 }
 
 
-int ssgIsect ( ssgRoot *root, sgSphere *s, sgMat4 mat, ssgHit **results )
+int ssgIsect ( ssgBranch *root, sgSphere *s, sgMat4 mat, ssgHit **results )
 {
   _ssgIsHotTest = FALSE ;
   _ssgIsLosTest = FALSE ;
@@ -81,7 +81,7 @@
 }
 
 
-int ssgHOT ( ssgRoot *root, sgVec3 s, sgMat4 mat, ssgHit **results )
+int ssgHOT ( ssgBranch *root, sgVec3 s, sgMat4 mat, ssgHit **results )
 {
   _ssgIsHotTest = TRUE ;
   _ssgIsLosTest = FALSE ;
@@ -93,7 +93,7 @@
 }
 
 
-int ssgLOS ( ssgRoot *root, sgVec3 s, sgMat4 mat, ssgHit **results )
+int ssgLOS ( ssgBranch *root, sgVec3 s, sgMat4 mat, ssgHit **results )
 {
   _ssgIsHotTest = FALSE ;
   _ssgIsLosTest = TRUE ;