Changeset 3023 for branches/nanovis2/packages/vizservers/nanovis/Vector3.h

Timestamp:

Jun 5, 2012, 12:08:41 PM (12 years ago)

Author:

ldelgass

Message:

Protocol, control for two-sided lighting in volume shader. Cutplane rendering
changes -- don't need to clip cutplanes, use simplified cutplane shader instead of switch in main volume shader. Still need to fix cutplanes of zincblende
volumes.

File:

• branches/nanovis2/packages/vizservers/nanovis/Vector3.h (modified) (3 diffs)

branches/nanovis2/packages/vizservers/nanovis/Vector3.h

@@ -26 +26 @@
 {
 public:
-    float x, y, z;
-
     Vector3()
     {}
@@ -177 +175 @@
     }
 
+    float x, y, z;
+
 private:
     float radians(float degree) const
@@ -186 +186 @@
 typedef std::vector<Vector3> Vector3Array;
 
+/**
+ * \brief Linear interpolation of 2 vectors
+ */
+inline Vector3 vlerp(const Vector3& v1, const Vector3& v2, double t)
+{
+    return Vector3(v1.x * (1.0-t) + v2.x * t,
+                   v1.y * (1.0-t) + v2.y * t,
+                   v1.z * (1.0-t) + v2.z * t);
+}
+
 #endif