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

Timestamp:

Mar 23, 2012, 1:31:05 AM (12 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.cpp (modified) (6 diffs)

trunk/packages/vizservers/nanovis/ConvexPolygon.cpp

@@ -100 +100 @@
 
 void
-ConvexPolygon::clip(Plane& clipPlane, bool copy_to_texcoord)
+ConvexPolygon::clip(Plane& clipPlane, bool copyToTexcoord)
 {
     if (vertices.size() == 0) {
@@ -123 +123 @@
     Vector4 plane = clipPlane.get_coeffs();
 
-    bool prevRetained = is_retained(vertices[0], plane);
+    bool prevRetained = isRetained(vertices[0], plane);
     if (prevRetained) 
         clippedVerts.push_back(vertices[0]);
 
     for (unsigned int i = 1; i < vertices.size(); i++) {
-        bool retained = is_retained(vertices[i], plane);
+        bool retained = isRetained(vertices[i], plane);
         if (retained != prevRetained) {
             bool found = findIntersection(vertices[i - 1], vertices[i], 
@@ -141 +141 @@
     }
 
-    bool retained = is_retained(vertices[0], plane);
+    bool retained = isRetained(vertices[0], plane);
     if (retained != prevRetained) {
         bool found = findIntersection(vertices[vertices.size() - 1], 
@@ -154 +154 @@
                     clippedVerts.end());
 
-    if (copy_to_texcoord)
-        copy_vertices_to_texcoords();
-}
-
-void
-ConvexPolygon::copy_vertices_to_texcoords()
+    if (copyToTexcoord)
+        copyVerticesToTexcoords();
+}
+
+void
+ConvexPolygon::copyVerticesToTexcoords()
 {
     if (texcoords.size() > 0)
@@ -170 +170 @@
 
 void
-ConvexPolygon::Emit(bool use_texture)
+ConvexPolygon::emit(bool useTexture)
 {
     if (vertices.size() >= 3) {
         for (unsigned int i = 0; i < vertices.size(); i++) {
-            if (use_texture) {
+            if (useTexture) {
                 glTexCoord4fv((float *)&(texcoords[i]));
                 //glTexCoord4fv((float *)&(vertices[i]));
@@ -184 +184 @@
 
 void 
-ConvexPolygon::Emit(bool use_texture, const Vector3& shift, const Vector3& scale) 
+ConvexPolygon::emit(bool useTexture, const Vector3& shift, const Vector3& scale) 
 {
     if (vertices.size() >= 3) {
         for (unsigned int i = 0; i < vertices.size(); i++) {
-            if (use_texture) {
+            if (useTexture) {
                 glTexCoord4fv((float *)&(vertices[i]));
             }