Changeset 3492 for trunk/packages/vizservers/nanovis/ConvexPolygon.cpp

Timestamp:

Mar 13, 2013, 9:57:03 AM (12 years ago)

Author:

ldelgass

Message:

Fix camera reset for nanovis. Includes refactoring of vector/matrix classes
in nanovis to consolidate into vrmath library. Also add preliminary canonical
view control to clients for testing.

File:

• trunk/packages/vizservers/nanovis/ConvexPolygon.cpp (modified) (9 diffs)

trunk/packages/vizservers/nanovis/ConvexPolygon.cpp

@@ -21 +21 @@
 #include "Trace.h"
 
+using namespace vrmath;
+
 ConvexPolygon::ConvexPolygon(VertexVector newvertices)
 {
@@ -27 +29 @@
 
 void
-ConvexPolygon::transform(const Mat4x4& mat)
+ConvexPolygon::transform(const Matrix4x4d& mat)
 {
     VertexVector tmp = vertices;
@@ -33 +35 @@
 
     for (unsigned int i = 0; i < tmp.size(); i++) {
-        Vector4 vec = tmp[i];
+        Vector4f vec = tmp[i];
         vertices.push_back(mat.transform(vec));
     }
@@ -39 +41 @@
 
 void
-ConvexPolygon::translate(const Vector4& shift)
+ConvexPolygon::translate(const Vector4f& shift)
 {
     VertexVector tmp = vertices;
@@ -45 +47 @@
 
     for (unsigned int i = 0; i < tmp.size(); i++) {
-        Vector4 vec = tmp[i];
-        vertices.push_back(vec+shift);
+        Vector4f vec = tmp[i];
+        vertices.push_back(vec + shift);
     }
 }
@@ -54 +56 @@
 
 bool
-ConvexPolygon::clip(Plane& clipPlane, bool copyToTexcoord)
+ConvexPolygon::clip(nv::Plane& clipPlane, bool copyToTexcoord)
 {
     if (vertices.size() == 0) {
@@ -74 +76 @@
     // add it to the new list as well.
 
-    Vector4 plane = clipPlane.getCoeffs();
+    Vector4f plane = clipPlane.getCoeffs();
 
     // This implementation is based on the Mesa 3D library (MIT license)
@@ -149 +151 @@
 
 void 
-ConvexPolygon::emit(bool useTexture, const Vector3& shift, const Vector3& scale) 
+ConvexPolygon::emit(bool useTexture, const Vector3f& shift, const Vector3f& scale) 
 {
     if (vertices.size() >= 3) {
@@ -156 +158 @@
                 glTexCoord4fv((float *)&(vertices[i]));
             }
-            Vector4 tmp = (vertices[i]);
-            Vector4 shift_4d = Vector4(shift.x, shift.y, shift.z, 0);
+            Vector4f tmp = (vertices[i]);
+            Vector4f shift_4d = Vector4f(shift.x, shift.y, shift.z, 0);
             tmp = tmp + shift_4d;
             tmp.x = tmp.x * scale.x;