Changeset 2176 for GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

Timestamp:

02/28/07 19:38:47 (17 years ago)

Author:

mattausch

Message:

removed using namespace std from .h

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/VspTree.cpp

@@ -22 +22 @@
 #include "OspTree.h"
 
+#if USE_SSE
+#include <xmmintrin.h>
+#endif
 
 
@@ -3500 +3503 @@
 }
 
-
-}
+#if 0
+void VspTree::TraverseRayPacket(RayBundle &rays);
+{
+        float splitPos [3];
+        float dist[3];
+
+        const int allValid = 1xf;
+        int mask = all_valid;
+
+        int comparisonResult = 0;
+
+        while (!node->IsLeaf())
+        {
+                comparisonResult = 0;
+
+                for (int i = 0; i < 4; ++ i)
+                {
+                        splitPos[i] = node->splitPos;
+                        dist[i] = (splitpos[i] – rp.origin[i][axis]) / (rp.dir[i][axis]);
+
+                        comparisonresult |= ((dist[i] <= tnear[i]) << i);
+                }
+                
+                comparisonresult &= mask;
+
+                if (comparisonresult == allValid)
+                { 
+                        node = node->far;
+                        continue
+                }
+
+                comparisonresult = 0;
+
+                for (int i = 0; i < 4; ++ i){
+            
+                        comparisonresult |= (dist[i] >= tfar[i]);
+                }
+        
+                comparisonresult &= mask;
+        
+                if (comparisonresult == allValid)
+                {
+                        node = node->near;
+                        continue;
+                }
+                
+                if (comparisonresult)   
+                {
+                
+                        Push( node->far, dist[0...3], tfar[0...3] )
+                
+                        node = node->near;
+
+                        mask = 0;
+
+                        for (int i = 0; i < 4; ++ i)
+                        {
+                                bool b = (tnear[i] < tfar[i]);
+                                mask |= b;
+                
+                                if (b)
+                                {
+                                        tfar[i] = dist[i];
+                                }
+
+                        }
+
+                }
+}
+#endif
+/*
+struct RayPacket
+{
+        union { float ox[4]; __m128 ox4; };
+        union { float oy[4]; __m128 oy4; };
+        union { float oz[4]; __m128 oz4; };
+        union { float dx[4]; __m128 dx4; };
+        union { float dy[4]; __m128 dy4; };
+        union { float dz[4]; __m128 dz4; };
+};
+*/
+void VspTree::TraverseRayPacket()//RayBundle &rays)
+{
+#if USE_SSE
+        VspNode *node;
+
+        RayPacket rp;
+
+        __m128 mask;
+        __m128 tf4;
+        __m128 tn4;
+        //const int offs[4] = { (RP->dcell[0] >= 0)?1:0,  (RP->dcell[4] >= 0)?1:0,  (RP->dcell[8] >= 0)?1:0, 0 };
+        
+        const int offs[4] = { 0, 0, 0, 0 };
+
+        while (!node->IsLeaf())
+        {
+                VspInterior *interior = static_cast<VspInterior *>(node);
+
+                float pos = interior->GetPosition();
+                const __m128 spos = _mm_load_ps(&pos);
+                
+                const int aidx = interior->GetAxis();
+                const __m128 d4;// = _mm_mul_ps( _mm_sub_ps( spos, RP->oc4[aidx] ), RP->rdc4[aidx] );
+                
+                VspNode* ln = interior->GetBack();// + offs[aidx];
+                
+                if (!_mm_movemask_ps( _mm_and_ps( _mm_cmpgt_ps( d4, tn4 ), mask ) )) 
+                { 
+                        node = ln; 
+                        continue; 
+                }
+                
+                node = interior->GetBack();// + (offs[aidx]^1);
+                
+                if (_mm_movemask_ps( _mm_and_ps( _mm_cmplt_ps( d4, tf4 ), mask ) ))
+                {
+                        const __m128 mask2 = _mm_cmpgt_ps( d4, tn4 );
+                        const __m128 mask3 = _mm_cmplt_ps( d4, tf4 );
+                        
+                        //m_Stack[stackptr].tf4 = tf4;
+
+                        tf4 = _mm_or_ps( _mm_and_ps( mask3, d4 ), _mm_andnot_ps( mask3, tf4 ) );
+
+                        //m_Stack[stackptr].node = (KdTreeNode*)ln;
+                        //m_Stack[stackptr].mask = mask;
+                        //m_Stack[stackptr++].tn4 = _mm_or_ps( _mm_and_ps( mask2, d4 ), _mm_andnot_ps( mask2, tn4 ) );
+                        mask = _mm_cmplt_ps( tn4, tf4 );
+                }
+        }
+#endif
+
+}
+
+}