Smoke:
[blender.git] / intern / smoke / intern / WTURBULENCE.h
index d4e6b0c6a17278a26650e1dd60b64dea7ba0d7e3..c21e002ad4873f128bfbd668cd5031eb28f07c06 100644 (file)
@@ -49,7 +49,7 @@ class WTURBULENCE
                void stepTurbulenceFull(float dt, float* xvel, float* yvel, float* zvel, unsigned char *obstacles);
        
                // texcoord functions
-               void advectTextureCoordinates(float dtOrg, float* xvel, float* yvel, float* zvel);
+               void advectTextureCoordinates (float dtOrg, float* xvel, float* yvel, float* zvel, float *_tempBig1, float *_tempBig2);
                void resetTextureCoordinates();
 
                void computeEnergy(float* xvel, float* yvel, float* zvel, unsigned char *obstacles);
@@ -73,7 +73,7 @@ class WTURBULENCE
                // is accessed on through rna gui
                float *_strength;
 
-       protected:
+       // protected:
                // enlargement factor from original velocity field / simulation
                // _Big = _amplify * _Sm
                int _amplify;
@@ -111,26 +111,17 @@ class WTURBULENCE
                float* _densityBig;
                float* _densityBigOld;
 
-               // big velocity macCormack fields
-               float* _bigUx;
-               float* _bigUy;
-               float* _bigUz;
-               // temp arrays for BFECC and MacCormack - they have more convenient
-               // names in the actual implementations
-               float* _tempBig1;
-               float* _tempBig2;
-
                // texture coordinates for noise
                float* _tcU;
                float* _tcV;
                float* _tcW;
                float* _tcTemp;
 
-               float* _eigMin;
-               float* _eigMax;
+               float* _eigMin; // no save -dg
+               float* _eigMax; // no save -dg
 
                // wavelet decomposition of velocity energies
-               float* _energy;
+               float* _energy; // no save -dg
 
                // noise data
                float* _noiseTile;
@@ -140,7 +131,7 @@ class WTURBULENCE
                int _totalStepsBig;
 
                // highest frequency component of wavelet decomposition
-               float* _highFreqEnergy;
+               float* _highFreqEnergy; // no save -dg
                
                void computeEigenvalues();
                void decomposeEnergy();