Changeset 2353 for GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.h

Timestamp:

05/08/07 13:04:43 (17 years ago)

Author:

mattausch

Message:

cleaned up project files

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.h (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/VssRay.h

@@ -22 +22 @@
 #define VSS_STORE_VIEWCELLS 1
 
-#ifdef USE_SSE
-
-struct RayPacket
-{
-        union { float mOriginX[4]; __m128 mOriginX4; };
-        union { float mOriginY[4]; __m128 mOriginY4; };
-        union { float mOriginZ[4]; __m128 mOriginZ4; };
-
-        union { float mTerminationX[4]; __m128 mTerminationX4; };
-        union { float mTerminationY[4]; __m128 mTerminationY4; };
-        union { float mTerminationZ[4]; __m128 mTerminationZ4; };
-
-        ViewCellContainer mViewCells[4];
-};
-
-
-#endif
 
 
@@ -345 +328 @@
   void PrintStatistics(std::ostream &s);
   int SelectRays(const int number, VssRayContainer &selected, const bool copy=false) const;
-  int
-  GetContributingRays(VssRayContainer &selected,
-                                          const int minPass
-                                          ) const;
-  
-};
-
-/*
-struct VssRayDistribution {
-  VssRayDistribution() { mContribution = -1.0f; }
-  SimpleRayContainer mRays;
-  vector<VssRayContainer> mVssRays;
-  float mContribution;
-  float mTime;
-};
-
-struct VssRayDistributionMixture {
-  VssRayDistributionMixture() {}
-  
-  vector<VssRayDistribution> distributions;
-};
-*/
-
-};
-
-#endif
+  int GetContributingRays(VssRayContainer &selected, const int minPass) const;
+  
+};
+
+
+struct RayPacket
+{
+        RayPacket(const VssRayContainer &rays)
+        {
+                for (int i = 0; i < 4; ++ i)
+                        mOriginX[i] = rays[i]->mOrigin[0];
+
+                for (int i = 0; i < 4; ++ i)
+                        mOriginY[i] = rays[i]->mOrigin[1];
+
+                for (int i = 0; i < 4; ++ i)
+                        mOriginZ[i] = rays[i]->mOrigin[2];
+        }
+#ifdef USE_SSE  
+        union { float mOriginX[4]; __m128 mOriginX4; };
+        union { float mOriginY[4]; __m128 mOriginY4; };
+        union { float mOriginZ[4]; __m128 mOriginZ4; };
+
+        union { float mTerminationX[4]; __m128 mTerminationX4; };
+        union { float mTerminationY[4]; __m128 mTerminationY4; };
+        union { float mTerminationZ[4]; __m128 mTerminationZ4; };
+#else
+        float mOriginX[4];
+        float mOriginY[4];
+        float mOriginZ[4];
+
+        float mTerminationX[4];
+        float mTerminationY[4];
+        float mTerminationZ[4];
+#endif
+        ViewCellContainer mViewCells[4];
+};
+
+
+};
+
+#endif