Changeset 176 for trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

Timestamp:

07/15/05 18:21:11 (19 years ago)

Author:

bittner

Message:

cosine sampling bug fixed

File:

• trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp (modified) (5 diffs)

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -23 +23 @@
 }
 
+
 bool
-X3dExporter::ExportRays(const vector<Ray> &rays, const float length)
+X3dExporter::ExportRays(const vector<Ray> &rays,
+                        const float length,
+                        const RgbColor &color)
 {
   vector<Ray>::const_iterator ri = rays.begin();
   stream<<"<Shape>"<<endl;
+  stream<<"<Appearance>"<<endl;
+  stream<<"<Material ambientColor=\""<<color.r<<" "<<color.g<<" "<<color.b<<
+    "\" />"<<endl;
+  stream<<"</Appearance>"<<endl;
+  
   stream<<"<IndexedLineSet ccw=\"TRUE\" coordIndex=\""<<endl;
 
@@ -43 +51 @@
   for (; ri != rays.end(); ri++) {
     Vector3 a = (*ri).GetLoc();
-    Vector3 b = (*ri).GetLoc() + length*(*ri).GetDir();
+    
+    Vector3 b;
+    if (length < 0)
+      b = (*ri).GetLoc() - length*(*ri).GetDir();
+    else
+      if ((*ri).intersections.size()==0)
+        b = (*ri).GetLoc() + length*(*ri).GetDir();
+      else
+        b = (*ri).Extrap((*ri).intersections[0].mT);
     
     stream<<a.x<<" "<<a.y<<" "<<a.z<<" ,";
@@ -66 +82 @@
   
   
-  MeshContainer::const_iterator mi = node->mGeometry.begin();
+  ObjectContainer::const_iterator mi = node->mGeometry.begin();
   for (; mi != node->mGeometry.end(); mi++) {
     // export the transform...
-    ExportMesh((*mi)->GetMesh());
+    ExportIntersectable(*mi);
   }
   
   stream<<"</Group>"<<endl;
 
+}
+void
+X3dExporter::ExportIntersectable(Intersectable *object)
+{
+  switch (object->Type()) {
+  case Intersectable::MESH_INSTANCE:
+  case Intersectable::TRANSFORMED_MESH_INSTANCE:
+    ExportMeshInstance((MeshInstance *)object);
+    break;
+  default:
+    cerr<<"Sorry the export for object not yet defined"<<endl;
+    break;
+  }
+}
+
+void
+X3dExporter::ExportMeshInstance(MeshInstance *object)
+{
+  // $$JB$$
+  // in the future check whether the mesh was not already exportet
+  // and use a reference to the that mesh instead
+  ExportMesh(object->GetMesh());
 }
 
@@ -82 +120 @@
   stream<<"<Shape>"<<endl;
   stream<<"<Appearance>"<<endl;
-
+  
   // $$ tmp -> random material
   
   float r, g, b;
 
-  if (mesh->mMaterial) {
-    r = mesh->mMaterial->mDiffuseColor.r;
-    g = mesh->mMaterial->mDiffuseColor.g;
-    b = mesh->mMaterial->mDiffuseColor.b;
-  } else {
-    r = RandomValue(0.5, 1.0);
-    g = RandomValue(0.5, 1.0);
-    b = RandomValue(0.5, 1.0);
-  }
+  if (mUseForcedMaterial) {
+    r = mForcedMaterial.mDiffuseColor.r;
+    g = mForcedMaterial.mDiffuseColor.g;
+    b = mForcedMaterial.mDiffuseColor.b;
+    
+  } else
+    if (mesh->mMaterial) {
+      r = mesh->mMaterial->mDiffuseColor.r;
+      g = mesh->mMaterial->mDiffuseColor.g;
+      b = mesh->mMaterial->mDiffuseColor.b;
+    } else {
+      r = RandomValue(0.5, 1.0);
+      g = RandomValue(0.5, 1.0);
+      b = RandomValue(0.5, 1.0);
+    }
   stream<<"<Material diffuseColor=\""<<r<<" "<<g<<" "<<b<<
     "\" specularColor=\"0.0 0.0 0.0\"/>"<<endl;
@@ -205 +249 @@
 
 
-void
-X3dExporter::ExportMeshInstance(MeshInstance *mi)
-{
-  ExportMesh(mi->GetMesh());
-}