Changeset 2822 for trunk/packages/vizservers/nanovis/Vector4.h

Timestamp:

Mar 7, 2012, 12:21:30 PM (13 years ago)

Author:

ldelgass

Message:

Const correctness fixes, pass vector/matrix objects by reference, various
formatting and style cleanups, don't spam syslog and uncomment openlog() call.
Still needs to be compiled with -DWANT_TRACE to get tracing, but now trace
output will be output to file in /tmp.

File:

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

trunk/packages/vizservers/nanovis/Vector4.h

@@ -17 +17 @@
 #define _VECTOR4_H_
 
-#include <stdio.h>
-#include <Trace.h>
+#include "Trace.h"
 
 class Vector4  
@@ -25 +24 @@
     float x, y, z, w;
 
-    Vector4(void) {
-        /*empty*/
-    }
-    Vector4(float x_val, float y_val, float z_val, float w_val) {
-        set(x_val, y_val, z_val, w_val);
-    }
-    void perspective_devide(void) {
-        /* Divide vector by w */
-        x /= w, y /= w, z /= w, w = 1.;
+    Vector4()
+    {}
+
+    Vector4(float x_val, float y_val, float z_val, float w_val)
+    {
+        set(x_val, y_val, z_val, w_val);
     }
 
-    void print(void) {
-        TRACE("Vector4: (%.3f, %.3f, %.3f, %.3f)\n", x, y, z, w);
+    void set(float x_val, float y_val, float z_val, float w_val)
+    {
+        x = x_val, y = y_val, z = z_val, w = w_val;
     }
 
-    Vector4 operator +(Vector4 &op2){
-        return Vector4(x + op2.x, y + op2.y, z + op2.z, w + op2.w);
+    void perspective_divide()
+    {
+        /* Divide vector by w */
+        x /= w, y /= w, z /= w, w = 1.;
     }
 
-    Vector4 operator -(Vector4 &op2){
-        return Vector4(x - op2.x, y - op2.y, z - op2.z, w - op2.w);
+    void print() const
+    {
+        TRACE("Vector4: (%.3f, %.3f, %.3f, %.3f)\n", x, y, z, w);
     }
 
-    float operator *(Vector4 &op2) {
-        return (x * op2.x) + (y * op2.y) + (z * op2.z) + (w * op2.w);
+    Vector4 operator +(const Vector4& op2) const
+    {
+        return Vector4(x + op2.x, y + op2.y, z + op2.z, w + op2.w);
     }
 
-    Vector4 operator *(float op2){
-        return Vector4(x * op2, y * op2, z * op2, w * op2);
+    Vector4 operator -(const Vector4& op2) const
+    {
+        return Vector4(x - op2.x, y - op2.y, z - op2.z, w - op2.w);
     }
 
-    Vector4 operator /(float op2) {
-        return Vector4(x / op2, y / op2, z / op2, w / op2);
+    float operator *(const Vector4& op2) const
+    {
+        return (x * op2.x) + (y * op2.y) + (z * op2.z) + (w * op2.w);
     }
 
-    void operator <(Vector4 &op2) {
-        set(op2.x, op2.y, op2.z, op2.w);
+    Vector4 operator *(float op2) const
+    {
+        return Vector4(x * op2, y * op2, z * op2, w * op2);
     }
-    void set(float x_val, float y_val, float z_val, float w_val) {
-        x = x_val, y = y_val, z = z_val, w = w_val;
+
+    Vector4 operator /(float op2) const
+    {
+        return Vector4(x / op2, y / op2, z / op2, w / op2);
     }
 };