[Plib-cvs] plib/demos/exposer/src boneGUI.cxx,1.1,1.2 bones.cxx,1.14,1.15 exposer.cxx,1.19,1.20 load_save.cxx,1.9,1.10 merge_tweens.cxx,1.2,1.3 model.cxx,1.6,1.7 timebox.cxx,1.4,1.5 vertices.cxx,1.1,1.2

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

Update of /cvsroot/plib/plib/demos/exposer/src
In directory usw-pr-cvs1:/tmp/cvs-serv554

Modified Files:
	boneGUI.cxx bones.cxx exposer.cxx load_save.cxx 
	merge_tweens.cxx model.cxx timebox.cxx vertices.cxx 
Log Message:
Cleanups

Index: boneGUI.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/src/boneGUI.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- boneGUI.cxx	22 Jul 2001 18:49:15 -0000	1.1
+++ boneGUI.cxx	10 Jun 2002 22:43:20 -0000	1.2
@@ -1,14 +1,14 @@
 #include "exposer.h"
 
-puSlider *XtranslateSlider ;
-puSlider *YtranslateSlider ;
-puSlider *ZtranslateSlider ;
-puInput  *XtranslateInput  ;
-puInput  *YtranslateInput  ;
-puInput  *ZtranslateInput  ;
+static puSlider *XtranslateSlider ;
+static puSlider *YtranslateSlider ;
+static puSlider *ZtranslateSlider ;
[...71 lines suppressed...]
   float v = (((puSlider *)sl) -> getFloatValue () - 0.5 ) * 5.0f ;
 
@@ -163,7 +163,7 @@
 
 
 
-void currTranslateYCB ( puObject *sl )
+static void currTranslateYCB ( puObject *sl )
 {
   float v = (((puSlider *)sl) -> getFloatValue () - 0.5 ) * 5.0f ;
 
@@ -180,7 +180,7 @@
 
 
 
-void currTranslateZCB ( puObject *sl )
+static void currTranslateZCB ( puObject *sl )
 {
   float v = (((puSlider *)sl) -> getFloatValue () - 0.5 ) * 5.0f ;
 

Index: bones.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/src/bones.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bones.cxx	19 Jan 2002 20:37:20 -0000	1.14
+++ bones.cxx	10 Jun 2002 22:43:22 -0000	1.15
@@ -1,9 +1,9 @@
 #include "exposer.h"
 
-sgVec3          curr_translate = { 0.0f, 0.0f, 0.0f } ;
+static sgVec3          curr_translate = { 0.0f, 0.0f, 0.0f } ;
 
-ssgSimpleState *boneState      = NULL ;
-Bone           *bone           = NULL ;
+static ssgSimpleState *boneState      = NULL ;
+static Bone           *bone           = NULL ;
 
 ssgSimpleState *getBoneState ()     { return boneState ;        }
 float          *getCurrTranslate () { return curr_translate ;   }
@@ -181,7 +181,7 @@
 
 #define NUM_COLOURS 13
 
-sgVec4 colourTable [] =
+static sgVec4 colourTable [] =
 {
   { 1, 0, 0, 0.3f }, { 0, 1, 0, 0.3f }, { 0, 0, 1, 0.3f },
   { 1, 1, 0, 0.3f }, { 1, 0, 1, 0.3f }, { 0, 1, 1, 0.3f },

Index: exposer.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/src/exposer.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- exposer.cxx	19 Jan 2002 20:46:08 -0000	1.19
+++ exposer.cxx	10 Jun 2002 22:43:23 -0000	1.20
@@ -1,7 +1,7 @@
 #include "exposer.h"
 
-int curr_button = 0 ;
-int scroll_controllers = 0 ;
+static int curr_button = 0 ;
+static int scroll_controllers = 0 ;
 
 EventList * eventList = NULL ;
 TimeBox   *   timebox = NULL ;
@@ -11,29 +11,29 @@
 ssgRoot   * boneScene = NULL ;
[...154 lines suppressed...]
-                                  NULL,
-                                  reverseRegionCB,
-                                  deleteRegionAndCompressCB,
-                                  deleteRegionCB,
-                                  deleteEventCB,
-                                  addNewEventCB,
-                                  NULL } ;
+static puCallback time_submenu_cb [] = { add_5_CB,
+                                         add_2_CB,
+                                         add_1_CB,
+                                         NULL,
+                                         reverseRegionCB,
+                                         deleteRegionAndCompressCB,
+                                         deleteRegionCB,
+                                         deleteEventCB,
+                                         addNewEventCB,
+                                         NULL } ;
 
 
 static void init_graphics ()

Index: load_save.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/src/load_save.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- load_save.cxx	8 Jun 2002 00:00:32 -0000	1.9
+++ load_save.cxx	10 Jun 2002 22:43:24 -0000	1.10
@@ -3,24 +3,24 @@
 #define FILE_SELECTOR_ARGS  (640-320)/2,(480-270)/2,320,270,1
 
 
-float tweeninterval = 1.0f/8.0f ;
+static float tweeninterval = 1.0f/8.0f ;
 
 void  setTweenInterval ( float t ) { tweeninterval = t ;    }
 float getTweenInterval ()          { return tweeninterval ; }
 
 
-puFileSelector *file_selector = NULL ;
[...62 lines suppressed...]
   char path  [ PUSTRING_MAX ] ;
 
@@ -348,7 +348,7 @@
 
 
 
-void scpickfn ( puObject * )
+static void scpickfn ( puObject * )
 {
   char path  [ PUSTRING_MAX ] ;
   char fname [ PUSTRING_MAX ] ;
@@ -398,7 +398,7 @@
 }
 
 
-void pickfn ( puObject * )
+static void pickfn ( puObject * )
 {
   char path  [ PUSTRING_MAX ] ;
 

Index: merge_tweens.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/src/merge_tweens.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- merge_tweens.cxx	7 Jun 2002 23:57:54 -0000	1.2
+++ merge_tweens.cxx	10 Jun 2002 22:43:24 -0000	1.3
@@ -16,11 +16,11 @@
 }
 
 
-int   numBones     =   0  ;
-int   totalEvents  =   0  ;
-float totalTime    = 0.0f ;
-float floor_z      = 0.0f ;
-float ground_speed = 0.0f ;
+static int   numBones     =   0  ;
+static int   totalEvents  =   0  ;
+static float totalTime    = 0.0f ;
+static float floor_z      = 0.0f ;
+static float ground_speed = 0.0f ;
 
 int main ( int argc, char **argv )
 {

Index: model.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/src/model.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- model.cxx	22 Jul 2001 23:45:03 -0000	1.6
+++ model.cxx	10 Jun 2002 22:43:24 -0000	1.7
@@ -1,11 +1,11 @@
 #include "exposer.h"
 
-int rootBone = -1  ;
-int nextBone =  0  ;
+static int rootBone = -1  ;
+static int nextBone =  0  ;
 
 int getNumBones () { return nextBone ; }                                  
 
-void findChildBones ( int root )
+static void findChildBones ( int root )
 {
   float *v0 = getBone ( root ) -> vx[0] ;
   float *v1 = getBone ( root ) -> vx[1] ;
@@ -146,7 +146,7 @@
 }
 
 
-void tweenify ( ssgBranch *root )
+static void tweenify ( ssgBranch *root )
 {
   for ( int i = 0 ; i < root -> getNumKids () ; i++ )
   {
@@ -196,7 +196,7 @@
 }
 
 
-void walkBones ( ssgBranch *root, sgMat4 mat )
+static void walkBones ( ssgBranch *root, sgMat4 mat )
 {
   if ( root == NULL )
     return ;
@@ -349,7 +349,7 @@
 }
 
 
-void walkTransforms ( ssgBranch *root, sgMat4 mat )
+static void walkTransforms ( ssgBranch *root, sgMat4 mat )
 {
   if ( root == NULL )
     return ;

Index: timebox.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/src/timebox.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- timebox.cxx	22 Jul 2001 16:41:34 -0000	1.4
+++ timebox.cxx	10 Jun 2002 22:43:24 -0000	1.5
@@ -12,44 +12,44 @@
 
 /* GUI callback functions. */
 
-void vcr_fastReverse ( puObject *ob )
+static void vcr_fastReverse ( puObject *ob )
 {
   TimeBox *timebox = (TimeBox *) ob -> getUserData () ;
   timebox -> setReplaySpeed (-3.0f);
 }
 
-void vcr_reverse ( puObject *ob )
+static void vcr_reverse ( puObject *ob )
 {
   TimeBox *timebox = (TimeBox *) ob -> getUserData () ;
   timebox -> setReplaySpeed (-1.0f);
 }
 
-void vcr_stop ( puObject *ob )
+static void vcr_stop ( puObject *ob )
 {
   TimeBox *timebox = (TimeBox *) ob -> getUserData () ;
   timebox -> setReplaySpeed ( 0.0f);
 }
 
-void vcr_play ( puObject *ob )
+static void vcr_play ( puObject *ob )
 {
   TimeBox *timebox = (TimeBox *) ob -> getUserData () ;
   timebox -> setReplaySpeed ( 1.0f);
 }
 
-void vcr_fastPlay ( puObject *ob )
+static void vcr_fastPlay ( puObject *ob )
 {
   TimeBox *timebox = (TimeBox *) ob -> getUserData () ;
   timebox -> setReplaySpeed ( 3.0f);
 }
 
-void vcr_groundSpeed ( puObject *ob )
+static void vcr_groundSpeed ( puObject *ob )
 {
   TimeBox *timebox = (TimeBox *) ob -> getUserData () ;
   timebox -> setGroundSpeed ( ob -> getFloatValue () ) ;
 }                                                              
 
 
-void timescrollerCB ( puObject *ob )
+static void timescrollerCB ( puObject *ob )
 {
   TimeBox *timebox = (TimeBox *) ob -> getUserData () ;
 

Index: vertices.cxx
===================================================================
RCS file: /cvsroot/plib/plib/demos/exposer/src/vertices.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vertices.cxx	22 Jul 2001 18:49:15 -0000	1.1
+++ vertices.cxx	10 Jun 2002 22:43:24 -0000	1.2
@@ -13,11 +13,11 @@
 } ;
                                                                                 
 
-int nextVertex = 0 ;
+static int nextVertex = 0 ;
 
 #define MAX_VERTICES  (64*1024)                                                 
 
-Vertex vertex [ MAX_VERTICES ] ;
+static Vertex vertex [ MAX_VERTICES ] ;