Text archives Help

---

Author: thiago
Date: Tue Sep 11 07:32:03 2007
New Revision: 1719

Modified:
   trunk/scenes/vorpal.cc
Log:
made it compile again. Commented out the hardcoded files so this can be run 
on machines that don't mount those directories.

Modified: trunk/scenes/vorpal.cc
==============================================================================
--- trunk/scenes/vorpal.cc      (original)
+++ trunk/scenes/vorpal.cc      Tue Sep 11 07:32:03 2007
@@ -103,41 +103,41 @@
 
   Group *particles1 = readParticles(particles_filename, maxBound, heightMap);
 
-  string particles2_filename = 
"/home/sci/thiago/work/Fusion/vorpal/code/cropped_particles_5e10_intel";
-  Group *particles2 = readParticles(particles_filename, maxBound, heightMap);
+//   string particles2_filename = 
"/home/sci/thiago/work/Fusion/vorpal/code/cropped_particles_5e10_intel";
+//   Group *particles2 = readParticles(particles_filename, maxBound, 
heightMap);
 
-  string particles3_filename = 
"/home/sci/thiago/work/Fusion/vorpal/code/cropped_particles_1e11_intel";
-  Group *particles3 = readParticles(particles_filename, maxBound, heightMap);
+//   string particles3_filename = 
"/home/sci/thiago/work/Fusion/vorpal/code/cropped_particles_1e11_intel";
+//   Group *particles3 = readParticles(particles_filename, maxBound, 
heightMap);
 
   Heightfield* heightfield = new Heightfield(NULL, 
heightfield_filename.c_str(), minBound, maxBound);
   heightfield->setMaterial(new Lambertian(heightMap));
 
-  string heightfield2_filename = 
"/home/sci/thiago/work/Fusion/vorpal/code/vorpal_10k_rand1.hf";
-  Heightfield* heightfield2 = new Heightfield(NULL, 
heightfield2_filename.c_str(), minBound, maxBound);
-  heightfield2->setMaterial(new Lambertian(heightMap));
-
-  string heightfield3_filename = 
"/home/sci/thiago/work/Fusion/vorpal/code/vorpal_10k_rand2.hf";
-  Heightfield* heightfield3 = new Heightfield(NULL, 
heightfield3_filename.c_str(), minBound, maxBound);
-  heightfield3->setMaterial(new Lambertian(heightMap));
+//   string heightfield2_filename = 
"/home/sci/thiago/work/Fusion/vorpal/code/vorpal_10k_rand1.hf";
+//   Heightfield* heightfield2 = new Heightfield(NULL, 
heightfield2_filename.c_str(), minBound, maxBound);
+//   heightfield2->setMaterial(new Lambertian(heightMap));
+
+//   string heightfield3_filename = 
"/home/sci/thiago/work/Fusion/vorpal/code/vorpal_10k_rand2.hf";
+//   Heightfield* heightfield3 = new Heightfield(NULL, 
heightfield3_filename.c_str(), minBound, maxBound);
+//   heightfield3->setMaterial(new Lambertian(heightMap));
 
   BBox bbox;
   PreprocessContext preprocessContext;
   heightfield->computeBounds(preprocessContext, bbox);
-  heightfield2->computeBounds(preprocessContext, bbox);
-  heightfield3->computeBounds(preprocessContext, bbox);
+//   heightfield2->computeBounds(preprocessContext, bbox);
+//   heightfield3->computeBounds(preprocessContext, bbox);
 
   heightMap->setRange(bbox.getMin().z(), bbox.getMax().z());
 
 
-  KeyFrameAnimation *particle_animation = new 
KeyFrameAnimation(KeyFrameAnimation::linear);
+  KeyFrameAnimation *particle_animation = new 
KeyFrameAnimation(KeyFrameAnimation::truncate);
 
   particles1->add(heightfield);
-  particles2->add(heightfield2);
-  particles3->add(heightfield3);
+//   particles2->add(heightfield2);
+//   particles3->add(heightfield3);
 
   particle_animation->push_back(particles1);
-  particle_animation->push_back(particles2);
-  particle_animation->push_back(particles3);
+//   particle_animation->push_back(particles2);
+//   particle_animation->push_back(particles3);
   particle_animation->setDuration(10);
   particle_animation->useAccelerationStructure(new DynBVH());
 
@@ -189,7 +189,8 @@
 //   particle_animation->pauseAnimation();
 
   AccelerationStructure *fullScene = new DynBVH();
-  fullScene->rebuild(group);
+  fullScene->setGroup(group);
+  fullScene->rebuild();
   Group *sceneGroup = new Group();
   sceneGroup->add(fullScene);
 

---

• [Manta] r1719 - trunk/scenes, thiago, 09/11/2007

---

Archive powered by MHonArc 2.6.16.