Changeset 526

Timestamp:

01/12/06 14:33:37 (18 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibilityPreprocessor

Files:

• scripts/default.env (modified) (2 diffs)
• src/Beam.cpp (modified) (1 diff)
• src/GlRenderer.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibilityPreprocessor/scripts/default.env

@@ -9 +9 @@
 #       filename vienna.x3d
 #       filename ../data/vienna/vienna-simple.x3d
-        filename ../data/vienna/vienna-buildings.x3d
+#       filename ../data/vienna/vienna-buildings.x3d
 #filename ../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d
 #;../data/vienna/vienna-plane.x3d
@@ -15 +15 @@
 #       filename ../data/atlanta/atlanta2.x3d
 #       filename ../data/soda/soda.dat
-#       filename ../data/soda/soda5.dat
+        filename ../data/soda/soda5.dat
 }
 

trunk/VUT/GtpVisibilityPreprocessor/src/Beam.cpp

@@ -89 +89 @@
          Vector3 directions[4];
          
-         directions[0] = VssRay::GetDirection(dBox.Min().x, dBox.Min().y);
+        /* directions[0] = VssRay::GetDirection(dBox.Min().x, dBox.Min().y);
          directions[1] = VssRay::GetDirection(dBox.Max().x, dBox.Min().y);
          directions[2] = VssRay::GetDirection(dBox.Max().x, dBox.Max().y);
          directions[3] = VssRay::GetDirection(dBox.Min().x, dBox.Max().y);
-
-        return Normalize(direction[0], direction[1], direction[2], direction[3]);
+*/
+        const Vector3 mainDir = directions[0] + directions[1] + directions[2] + directions[3];
+        return Normalize(mainDir);
 }

trunk/VUT/GtpVisibilityPreprocessor/src/GlRenderer.cpp

@@ -157 +157 @@
   sCgContext = cgCreateContext();
 
-  sCgFragmentProgram = cgCreateProgramFromFile(sCgContext,              
+  /*sCgFragmentProgram = cgCreateProgramFromFile(sCgContext,            
                                                                                            CG_SOURCE, "../src/dual_depth.cg",
                                                                                            sCgFragmentProfile,
                                                                                            NULL, 
-                                                                                           NULL);
+                                                                                           NULL);*/
 }
 
@@ -800 +800 @@
         glFrustum(left, right, bottom, top, znear, zfar);
 
-    const Vector3 eye = viewPoint + beam.GetMainDirection;
-        const Vector3 up = AbitraryNormal(eye);
-
-        gluLookAt(eye, viewPoint, up);
+    const Vector3 eye = viewPoint + beam.GetMainDirection();
+        const Vector3 up;//AbitraryNormal(eye);
+
+        gluLookAt(eye.x, eye.y, eye.z, 
+                          viewPoint.x, viewPoint.y, viewPoint.z, 
+                          up.x, up.y, up.z);
 }