Changeset 978 for trunk/vizservers/nanovis/ConvexPolygon.cpp

Timestamp:

Apr 2, 2008, 8:07:53 AM (17 years ago)

Author:

gah

Message:

 

File:

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

trunk/vizservers/nanovis/ConvexPolygon.cpp

@@ +1 @@
+ 
 /*
  * ----------------------------------------------------------------------
@@ -14 +15 @@
  */
 #include "ConvexPolygon.h"
-#include <GL/glut.h>
+#include <GL/gl.h>
 #include <assert.h>
 
 ConvexPolygon::ConvexPolygon(){}
 
-ConvexPolygon::ConvexPolygon(VertexVector vertices){
-    this->vertices.insert(this->vertices.begin(),
-                                vertices.begin(),
-                                vertices.end());
-}
-
-void ConvexPolygon::set_id(int v_id) { volume_id = v_id; };
-
-void ConvexPolygon::append_vertex(Vector4 vert){
-    vertices.push_back(vert);
-}
-
-void ConvexPolygon::insert_vertex(unsigned int index, Vector4 vert) {
-        assert(index<vertices.size());
-        vertices.insert(vertices.begin() + index, vert);
-}
-
-bool is_retained(Vector4 point, Vector4 plane){
-        return ( point * plane>=0 ) ;  
+ConvexPolygon::ConvexPolygon(VertexVector newvertices){
+    vertices.insert(vertices.begin(), newvertices.begin(), newvertices.end());
 }
 
@@ -48 +32 @@
 //
 // http://astronomy.swin.edu.au/pbourke/geometry/planeline/
-bool findIntersection(Vector4 p1, Vector4 p2, Vector4 plane, Vector4 &ret){
-        float a = plane.x;
-        float b = plane.y;
-        float c = plane.z;
-        float d = plane.w;
-
-        p1.perspective_devide();
+bool 
+findIntersection(Vector4 p1, Vector4 p2, Vector4 plane, Vector4 &ret){
+    float a = plane.x;
+    float b = plane.y;
+    float c = plane.z;
+    float d = plane.w;
+
+    p1.perspective_devide();
     float x1 = p1.x;
     float y1 = p1.y;
     float z1 = p1.z;
 
-        p2.perspective_devide();
+    p2.perspective_devide();
     float x2 = p2.x;
     float y2 = p2.y;
@@ -68 +53 @@
 
     if (uDenom == 0){ 
-                //plane parallel to line
-                fprintf(stderr, "Unexpected code path: ConvexPolygon.cpp\n");
-                if (uNumer == 0){
-                        for (int i = 0; i < 4; i++) 
-                                ret < p1;
-                                return true;
-                }
-                return false;
+        //plane parallel to line
+        fprintf(stderr, "Unexpected code path: ConvexPolygon.cpp\n");
+        if (uNumer == 0){
+            for (int i = 0; i < 4; i++) 
+                ret < p1;
+            return true;
+        }
+        return false;
     }
 
@@ -83 +68 @@
     ret.z = z1 + u * (z2 - z1);
     ret.w = 1;
-        return true;
-}
-
-void ConvexPolygon::transform(Mat4x4 mat){
-        VertexVector tmp = vertices;
-        vertices.clear();
-
-        for (unsigned int i = 0; i < tmp.size(); i++) {
-                Vector4 vec = tmp[i];
-                vertices.push_back(mat.transform(vec));
-    }
-}
-
-
-void ConvexPolygon::translate(Vector4 shift){
-        VertexVector tmp = vertices;
-        vertices.clear();
-
-        for (unsigned int i = 0; i < tmp.size(); i++) {
-                Vector4 vec = tmp[i];
-                vertices.push_back(vec+shift);
-    }
-}
-
-void ConvexPolygon::clip(Plane &clipPlane, bool copy_to_texcoord) {
-        if (vertices.size() == 0) {
-                //fprintf(stderr, "ConvexPolygon: polygon has no vertices\n");  
-                return;
-        }
+    return true;
+}
+
+void 
+ConvexPolygon::transform(Mat4x4 mat){
+    VertexVector tmp = vertices;
+    vertices.clear();
+
+    for (unsigned int i = 0; i < tmp.size(); i++) {
+        Vector4 vec = tmp[i];
+        vertices.push_back(mat.transform(vec));
+    }
+}
+
+
+void 
+ConvexPolygon::translate(Vector4 shift){
+    VertexVector tmp = vertices;
+    vertices.clear();
+
+    for (unsigned int i = 0; i < tmp.size(); i++) {
+        Vector4 vec = tmp[i];
+        vertices.push_back(vec+shift);
+    }
+}
+
+void 
+ConvexPolygon::clip(Plane &clipPlane, bool copy_to_texcoord) {
+    if (vertices.size() == 0) {
+        //fprintf(stderr, "ConvexPolygon: polygon has no vertices\n");  
+        return;
+    }
     
     VertexVector clippedVerts;
@@ -131 +119 @@
     bool prevRetained = is_retained(vertices[0], plane);
     if (prevRetained) 
-                clippedVerts.push_back(vertices[0]);
+        clippedVerts.push_back(vertices[0]);
 
     for (unsigned int i = 1; i < vertices.size(); i++) {
-                bool retained = is_retained(vertices[i], plane);
-                if (retained != prevRetained) {
-                        bool found = findIntersection(vertices[i - 1], vertices[i], 
-                                          plane, intersect);
-                        if (!found) 
-                                assert(false);
-                        clippedVerts.push_back(intersect);
-                }
-                if (retained) {
-                        clippedVerts.push_back(vertices[i]);
-                }
-                prevRetained = retained;
+        bool retained = is_retained(vertices[i], plane);
+        if (retained != prevRetained) {
+            bool found = findIntersection(vertices[i - 1], vertices[i], 
+                                          plane, intersect);
+            assert(found);
+            clippedVerts.push_back(intersect);
+        }
+        if (retained) {
+            clippedVerts.push_back(vertices[i]);
+        }
+        prevRetained = retained;
     }
 
     bool retained = is_retained(vertices[0], plane);
     if (retained != prevRetained) {
-                bool found = findIntersection(vertices[vertices.size() - 1], vertices[0], 
-                                      plane, intersect);
-                if (!found) 
-                        assert(false);
-                clippedVerts.push_back(intersect);
+        bool found = findIntersection(vertices[vertices.size() - 1], 
+                                      vertices[0], plane, intersect);
+        assert(found);
+        clippedVerts.push_back(intersect);
     }
 
     vertices.clear();
     vertices.insert(vertices.begin(), 
-                    clippedVerts.begin(),
-                    clippedVerts.end());
+                    clippedVerts.begin(),
+                    clippedVerts.end());
 
     if(copy_to_texcoord)
-      copy_vertices_to_texcoords();
-}
-
-void ConvexPolygon::copy_vertices_to_texcoords(){
+        copy_vertices_to_texcoords();
+}
+
+void 
+ConvexPolygon::copy_vertices_to_texcoords(){
     if(texcoords.size()>0)
-      texcoords.clear();
+        texcoords.clear();
 
     for (unsigned int i=0; i<vertices.size(); i++) {
-        texcoords.push_back(vertices[i]);
-    }
-}
-
-
-void ConvexPolygon::Emit(bool use_texture) 
+        texcoords.push_back(vertices[i]);
+    }
+}
+
+void 
+ConvexPolygon::Emit(bool use_texture) 
 {
-        if (vertices.size() >= 3) 
-        {
-                for (unsigned int i = 0; i<vertices.size(); i++) 
-                {
-                        if(use_texture){
-                                glTexCoord4fv((float *)&(texcoords[i]));
-                                //glTexCoord4fv((float *)&(vertices[i]));
-                        }
-                        glVertex4fv((float *)&(vertices[i]));
-                        /*
-                        //debug
-                        fprintf(stderr, "(%f %f %f %f)", 
-                                        vertices[i].x,
-                                        vertices[i].y,
-                                        vertices[i].z,
-                                        vertices[i].w );
-                        */
-                }
-         } 
-        //fprintf(stderr, " "); 
-}
-
-
-void ConvexPolygon::Emit(bool use_texture, Vector3& shift, Vector3& scale) 
+    if (vertices.size() >= 3) {
+        for (unsigned int i = 0; i<vertices.size(); i++) {
+            if(use_texture) {
+                glTexCoord4fv((float *)&(texcoords[i]));
+                //glTexCoord4fv((float *)&(vertices[i]));
+            }
+            glVertex4fv((float *)&(vertices[i]));
+            /*
+            //debug
+            fprintf(stderr, "(%f %f %f %f)", 
+            vertices[i].x,
+            vertices[i].y,
+            vertices[i].z,
+            vertices[i].w );
+            */
+        }
+    } 
+    //fprintf(stderr, " "); 
+}
+
+
+void 
+ConvexPolygon::Emit(bool use_texture, Vector3& shift, Vector3& scale) 
 {
-        if (vertices.size() >= 3) 
-        {
-                for (unsigned int i = 0; i<vertices.size(); i++) 
-                {
-                        if(use_texture)
-                                glTexCoord4fv((float *)&(vertices[i]));
-
-                        Vector4 tmp = (vertices[i]);
-                        Vector4 shift_4d = Vector4(shift.x, shift.y, shift.z, 0);
-                        tmp = tmp + shift_4d;
-                        tmp.x = tmp.x * scale.x;
-                        tmp.y = tmp.y * scale.y;
-                        tmp.z = tmp.z * scale.z;
-                        glVertex4fv((float *)(&tmp));
-                }
-         }
-}
+    if (vertices.size() >= 3) {
+        for (unsigned int i = 0; i<vertices.size(); i++) {
+            if(use_texture) {
+                glTexCoord4fv((float *)&(vertices[i]));
+            }
+            Vector4 tmp = (vertices[i]);
+            Vector4 shift_4d = Vector4(shift.x, shift.y, shift.z, 0);
+            tmp = tmp + shift_4d;
+            tmp.x = tmp.x * scale.x;
+            tmp.y = tmp.y * scale.y;
+            tmp.z = tmp.z * scale.z;
+            glVertex4fv((float *)(&tmp));
+        }
+    }
+}