[Plib-cvs] plib/examples/src/ssg/water water.cxx,1.18,1.19

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

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

Modified Files:
	water.cxx 
Log Message:
A *very* early attempt at fire.


Index: water.cxx
===================================================================
RCS file: /cvsroot/plib/plib/examples/src/ssg/water/water.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- water.cxx	24 Aug 2002 16:56:52 -0000	1.18
+++ water.cxx	28 Aug 2002 00:14:33 -0000	1.19
@@ -45,11 +45,13 @@
 ssgaLensFlare      *sun_obj      = NULL ;
 ssgTransform       *sun          = NULL ;
 ssgTransform       *teapot       = NULL ;
+ssgTransform       *fire         = NULL ;
 ssgTransform       *pedestal     = NULL ;
 ssgaWaveSystem     *ocean        = NULL ;
 ssgaParticleSystem *fountain     = NULL ;
 ssgaCube           *ped_obj      = NULL ;
 ssgaTeapot         *tpt_obj      = NULL ;
+ssgaFire           *fire_obj     = NULL ;
 
 ssgSimpleState     *sea_state    = NULL ;
 ssgSimpleState     *splash_state = NULL ;
@@ -442,6 +444,7 @@
   ocean -> updateAnimation ( t ) ;
 
   fountain -> update ( dt ) ;
+  fire_obj -> update ( dt ) ;
 
   dt = ck . getDeltaTime () ;
 
@@ -452,6 +455,8 @@
   sgSetCoord ( & tptpos, 0.0f,  0.0f, 0.6f, t * 60, 0.0f, 0.0f ) ;
   ssgSetCamera ( & campos ) ;
   teapot  -> setTransform ( & tptpos ) ;
+  sgSetCoord ( & tptpos, 0.0f,  0.0f, 2.0f, 0.0f, 0.0f, 0.0f ) ;
+  fire    -> setTransform ( & tptpos ) ;
 }
 
 
@@ -729,6 +734,8 @@
   tpt_obj -> setKidState      ( teapot_state ) ;
   tpt_obj -> regenerate       () ;
 
+  fire_obj =  new ssgaFire ( 300, 1, 60.0f, 100000.0f ) ;
+
   /* Build the scene graph */
 
   teapot   =  new ssgTransform ;
@@ -745,10 +752,14 @@
   sun      -> setTransform    ( sunpos ) ;
   sun      -> addKid          ( sun_obj  ) ;
 
+  fire     =  new ssgTransform ;
+  fire     -> addKid          ( fire_obj  ) ;
+
   scene    =  new ssgRoot ;
   scene    -> addKid          ( ocean    ) ;
   scene    -> addKid          ( pedestal ) ;
   scene    -> addKid          ( teapot   ) ;
+  scene    -> addKid          ( fire     ) ;
   scene    -> addKid          ( sun      ) ;
 }