Changeset 1135 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

07/17/06 09:59:26 (18 years ago)

Author:

mattausch

Message:

uaing rays for osp

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (4 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

@@ -39 +39 @@
                 for (int j = 0; j < n; ++ j)
                 {
-                        const Vector3 scale2((float)j * 0.8 / n + 0.1,  0.05, (float)i * 0.8  / (float)n + 0.1);
+                        const Vector3 scale2((float)j * 0.8f / n + 0.1f,  0.05f, (float)i * 0.8f  / (float)n + 0.1f);
                 
                         const Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
@@ -58 +58 @@
                 for (int j = 0; j < n; ++ j)
                 {
-                        const Vector3 scale2(0.15, (float)j * 0.8 / n + 0.1, (float)i * 0.8  / (float)n + 0.1);
+                        const Vector3 scale2(0.15f, (float)j * 0.8f / n + 0.1f, (float)i * 0.8f  / (float)n + 0.1f);
                 
                         Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
                 
-                        Vector3 boxSize = sceneBox.Size() * Vector3(0.0025, 0.01, 0.0025);
+                        Vector3 boxSize = sceneBox.Size() * Vector3(0.0025f, 0.01f, 0.0025f);
                         AxisAlignedBox3 box(pt2, pt2 + boxSize);
                         Mesh *mesh = CreateMeshFromBox(box);
@@ -75 +75 @@
         for (int i = 0; i < n; ++ i)
         {
-                const Vector3 scale2(2, 0.2, (float)i * 0.8  / (float)n + 0.1);
+                const Vector3 scale2(2, 0.2f, (float)i * 0.8f  / (float)n + 0.1f);
                 
                 Vector3 pt2 = sceneBox.Min() + scale2 * (sceneBox.Max() - sceneBox.Min());
                 
                 //Vector3 boxSize = sceneBox.Size() * Vector3(0.0025, 0.01, 0.0025);
-                Vector3 boxSize = sceneBox.Size() * Vector3(0.005, 0.02, 0.005);
-
-                AxisAlignedBox3 box(pt2 + 0.1, pt2 + boxSize);
+                Vector3 boxSize = sceneBox.Size() * Vector3(0.005f, 0.02f, 0.005f);
+
+                AxisAlignedBox3 box(pt2 + 0.1f, pt2 + boxSize);
                 Mesh *mesh = CreateMeshFromBox(box);
 
@@ -97 +97 @@
         if (1)
         {
-                const Vector3 scale(1.0, 0.0, 0);
+                const Vector3 scale(1.0f, 0.0, 0);
 
                 Vector3 pt = sceneBox.Min() + scale * (sceneBox.Max() - sceneBox.Min());