Changeset 2877 for trunk/packages/vizservers/nanovis/ConvexPolygon.h

Timestamp:

Mar 23, 2012, 1:31:05 AM (13 years ago)

Author:

ldelgass

Message:

Some minor refactoring, also add some more fine grained config.h defines
(e.g. replace NV40 define with feature defines). Add tests for some required
OpenGL extensions (should always check for extensions or base version before
calling entry points from the extension). Also, clamp diffuse and specular
values on input and warn when they are out of range.

File:

• trunk/packages/vizservers/nanovis/ConvexPolygon.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/ConvexPolygon.h

@@ -29 +29 @@
 {
 public:
-    VertexVector vertices;
-    TexVector texcoords;
-    int volume_id;      //which volume this polygon slice belongs to
-
     ConvexPolygon()
     {}
@@ -43 +39 @@
 
     // Clips the polygon, retaining the portion where ax + by + cz + d >= 0
-    void clip(Plane& clipPlane, bool copy_to_texcoords);
+    void clip(Plane& clipPlane, bool copyToTexcoords);
 
-    void Emit(bool use_texture);
+    void emit(bool useTexture);
 
-    void Emit(bool use_texture, const Vector3& shift, const Vector3& scale);
+    void emit(bool useTexture, const Vector3& shift, const Vector3& scale);
 
-    void copy_vertices_to_texcoords();
+    void copyVerticesToTexcoords();
 
-    void set_id(int v_id)
+    void setId(int id)
     { 
-        volume_id = v_id; 
+        volumeId = id; 
     }
 
-    void append_vertex(const Vector4& vert)
+    void appendVertex(const Vector4& vert)
     {
         vertices.push_back(vert);
     }
 
-    void insert_vertex(unsigned int index, const Vector4& vert)
+    void insertVertex(unsigned int index, const Vector4& vert)
     {
-        assert(index<vertices.size());
+        assert(index < vertices.size());
         vertices.insert(vertices.begin() + index, vert);
     }
 
-    bool is_retained(const Vector4& point, const Vector4& plane)
+    bool isRetained(const Vector4& point, const Vector4& plane)
     {
         return ((point * plane) >= 0);  
     }
+
+    VertexVector vertices;
+    TexVector texcoords;
+    int volumeId;       //which volume this polygon slice belongs to
 };