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

Timestamp:

11/07/05 11:27:38 (19 years ago)

Author:

bittner

Message:

VssPreprocessor? updates - directional rays, x3dexporter updates - removed duplicated code for ray exports

File:

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

trunk/VUT/GtpVisibilityPreprocessor/src/X3dExporter.cpp

@@ -8 +8 @@
 #include "ViewCell.h"
 #include "Polygon3.h"
+#include "VssRay.h"
 
 X3dExporter::X3dExporter(const string filename):Exporter(filename)
@@ -26 +27 @@
 
 
-bool
-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 coordIndex=\""<<endl;
-
-  int index = 0;
-  for (; ri != rays.end(); ri++) {
-    stream<<index<<" "<<index+1<<" -1\n";
-    index+=2;
-  }
-  
-  stream<<"\" >"<<endl;
-  
-  stream<<"<Coordinate  point=\""<<endl;
-  
-  ri = rays.begin();
-  for (; ri != rays.end(); ri++) {
-    Vector3 a = (*ri).GetLoc();
+//  bool
+//  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 coordIndex=\""<<endl;
+
+//    int index = 0;
+//    for (; ri != rays.end(); ri++) {
+//      stream<<index<<" "<<index+1<<" -1\n";
+//      index+=2;
+//    }
+  
+//    stream<<"\" >"<<endl;
+  
+//    stream<<"<Coordinate  point=\""<<endl;
+  
+//    ri = rays.begin();
+//    for (; ri != rays.end(); ri++) {
+//      Vector3 a = (*ri).GetLoc();
     
-    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);
+//      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<<" ,";
-    stream<<b.x<<" "<<b.y<<" "<<b.z<<" ,\n";
-  }
-  
-  stream<<"\" >"<<endl;
-  stream<<"</Coordinate>"<<endl;
-  stream<<"</IndexedLineSet>"<<endl;
-  stream<<"</Shape>"<<endl;
-  return true;
-}
+//      stream<<a.x<<" "<<a.y<<" "<<a.z<<" ,";
+//      stream<<b.x<<" "<<b.y<<" "<<b.z<<" ,\n";
+//    }
+  
+//    stream<<"\" >"<<endl;
+//    stream<<"</Coordinate>"<<endl;
+//    stream<<"</IndexedLineSet>"<<endl;
+//    stream<<"</Shape>"<<endl;
+//    return true;
+//  }
+
 
 bool
 X3dExporter::ExportRays(const RayContainer &rays,
-                                                const float length,
-                                                const RgbColor &color)
+                                                                                                const float length,
+                                                                                                const RgbColor &color)
 {
   RayContainer::const_iterator ri = rays.begin();
@@ -121 +123 @@
   stream<<"</Shape>"<<endl;
 
+  return true;
+}
+
+bool
+X3dExporter::ExportRays(const VssRayContainer &rays,
+                                                                                                const RgbColor &color)
+{
+  VssRayContainer::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 coordIndex=\""<<endl;
+
+  int index = 0;
+  for (; ri != rays.end(); ri++) {
+    stream<<index<<" "<<index+1<<" -1\n";
+    index+=2;
+  }
+  
+  stream<<"\" >"<<endl;
+  
+  stream<<"<Coordinate  point=\""<<endl;
+  
+  ri = rays.begin();
+  for (; ri != rays.end(); ri++) {
+    Vector3 a = (*ri)->GetOrigin();
+    
+    Vector3 b = (*ri)->GetTermination();
+    stream<<a.x<<" "<<a.y<<" "<<a.z<<" ,";
+    stream<<b.x<<" "<<b.y<<" "<<b.z<<" ,\n";
+  }
+  
+  stream<<"\" >"<<endl;
+  stream<<"</Coordinate>"<<endl;
+  stream<<"</IndexedLineSet>"<<endl;
+  stream<<"</Shape>"<<endl;
+        
   return true;
 }