* Enabled rna access to fluid sim velocity vectors

[blender-staging.git] / source / blender / render / intern / source / convertblender.c

diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 74ce7957dd757e491b5faa6f1a248b61d861abe2..c1c2fb60abda93f44145b84acf2d1d396194903c 100644 (file)
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -5387,7 +5387,7 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float *
        float imat[4][4];
        FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(fsob, eModifierType_Fluidsim);
        FluidsimSettings *fss;
        float imat[4][4];
        FluidsimModifierData *fluidmd = (FluidsimModifierData *)modifiers_findByType(fsob, eModifierType_Fluidsim);
        FluidsimSettings *fss;

-       float *velarray = NULL;
+       FluidVertexVelocity *velarray = NULL;

        
        /* only one step needed */
        if(step) return 1;
        
        /* only one step needed */
        if(step) return 1;


@@ -5401,14 +5401,14 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float *
        invert_m4_m4(imat, mat);
 
        /* set first vertex OK */
        invert_m4_m4(imat, mat);
 
        /* set first vertex OK */

-       if(!fss->meshSurfNormals) return 0;
+       if(!fss->meshVelocities) return 0;

        
        

-       if( obr->totvert != GET_INT_FROM_POINTER(fss->meshSurface) ) {
+       if( obr->totvert != fss->totvert) {

                //fprintf(stderr, "load_fluidsimspeedvectors - modified fluidsim mesh, not using speed vectors (%d,%d)...\n", obr->totvert, fsob->fluidsimSettings->meshSurface->totvert); // DEBUG
                return 0;
        }
        
                //fprintf(stderr, "load_fluidsimspeedvectors - modified fluidsim mesh, not using speed vectors (%d,%d)...\n", obr->totvert, fsob->fluidsimSettings->meshSurface->totvert); // DEBUG
                return 0;
        }
        

-       velarray = (float *)fss->meshSurfNormals;
+       velarray = fss->meshVelocities;

 
        if(obi->flag & R_TRANSFORMED)
                mul_m4_m4m4(winmat, obi->mat, re->winmat);
 
        if(obi->flag & R_TRANSFORMED)
                mul_m4_m4m4(winmat, obi->mat, re->winmat);


@@ -5420,7 +5420,7 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float *
        so that also small drops/little water volumes return a velocity != 0. 
        But I had no luck in fixing that function - DG */
        for(a=0; a<obr->totvert; a++) {
        so that also small drops/little water volumes return a velocity != 0. 
        But I had no luck in fixing that function - DG */
        for(a=0; a<obr->totvert; a++) {

-               for(j=0;j<3;j++) avgvel[j] += velarray[3*a + j];
+               for(j=0;j<3;j++) avgvel[j] += velarray[a].vel[j];

                
        }
        for(j=0;j<3;j++) avgvel[j] /= (float)(obr->totvert);
                
        }
        for(j=0;j<3;j++) avgvel[j] /= (float)(obr->totvert);


@@ -5435,7 +5435,7 @@ static int load_fluidsimspeedvectors(Render *re, ObjectInstanceRen *obi, float *
                // get fluid velocity
                fsvec[3] = 0.; 
                //fsvec[0] = fsvec[1] = fsvec[2] = fsvec[3] = 0.; fsvec[2] = 2.; // NT fixed test
                // get fluid velocity
                fsvec[3] = 0.; 
                //fsvec[0] = fsvec[1] = fsvec[2] = fsvec[3] = 0.; fsvec[2] = 2.; // NT fixed test

-               for(j=0;j<3;j++) fsvec[j] = velarray[3*a + j];
+               for(j=0;j<3;j++) fsvec[j] = velarray[a].vel[j];

                
                /* (bad) HACK insert average velocity if none is there (see previous comment) */
                if((fsvec[0] == 0.0) && (fsvec[1] == 0.0) && (fsvec[2] == 0.0))
                
                /* (bad) HACK insert average velocity if none is there (see previous comment) */
                if((fsvec[0] == 0.0) && (fsvec[1] == 0.0) && (fsvec[2] == 0.0))