Some channel fixes for fc
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 7 Jul 2008 20:28:56 +0000 (20:28 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 7 Jul 2008 20:28:56 +0000 (20:28 +0000)
intern/elbeem/intern/elbeem.cpp
intern/elbeem/intern/ntl_geometryobject.cpp
source/blender/src/fluidsim.c

index b27fefd..00fc9ef 100644 (file)
@@ -219,6 +219,7 @@ int elbeemAddMesh(elbeemMesh *mesh) {
        if((mesh->volumeInitType<VOLUMEINIT_VOLUME)||(mesh->volumeInitType>VOLUMEINIT_BOTH)) mesh->volumeInitType = VOLUMEINIT_VOLUME;
        obj->setVolumeInit(mesh->volumeInitType);
        // use channel instead, obj->setInitialVelocity( ntlVec3Gfx(mesh->iniVelocity[0], mesh->iniVelocity[1], mesh->iniVelocity[2]) );
+       
        obj->initChannels(
                        mesh->channelSizeTranslation, mesh->channelTranslation, 
                        mesh->channelSizeRotation,    mesh->channelRotation, 
index f64dbf1..32433df 100644 (file)
@@ -351,10 +351,10 @@ void ntlGeometryObject::initChannels(
        if((ivel)&&(nIvel>0)) {    ADD_CHANNEL_VEC(mcInitialVelocity, nIvel, ivel); }
        
        /* fluid control channels */
-       if((attrFStr)&&(nAttrFStr>0)) {   printf("added!\n");   ADD_CHANNEL_FLOAT(mcAttrFStr, nAttrFStr, attrFStr); }
-       if((attrFRad)&&(nAttrFRad>0)) {      ADD_CHANNEL_FLOAT(mcAttrFRad, nAttrFRad, attrFRad); }
-       if((velFStr)&&(nVelFStr>0)) {      ADD_CHANNEL_FLOAT(mcVelFStr, nAct, velFStr); }
-       if((velFRad)&&(nVelFRad>0)) {      ADD_CHANNEL_FLOAT(mcVelFRad, nVelFRad, velFRad); }
+       if((attrFStr)&&(nAttrFStr>0)) { ADD_CHANNEL_FLOAT(mcAttrFStr, nAttrFStr, attrFStr); }
+       if((attrFRad)&&(nAttrFRad>0)) { ADD_CHANNEL_FLOAT(mcAttrFRad, nAttrFRad, attrFRad); }
+       if((velFStr)&&(nVelFStr>0)) {   ADD_CHANNEL_FLOAT(mcVelFStr, nAct, velFStr); }
+       if((velFRad)&&(nVelFRad>0)) {   ADD_CHANNEL_FLOAT(mcVelFRad, nVelFRad, velFRad); }
 
        checkIsAnimated();
        
index 3bc1ac4..0d38e8b 100644 (file)
@@ -1065,7 +1065,7 @@ void fluidsimBake(struct Object *ob)
                                fsmesh.obstaclePartslip = obit->fluidsimSettings->partSlipValue;
                                fsmesh.volumeInitType = obit->fluidsimSettings->volumeInitType;
                                fsmesh.obstacleImpactFactor = obit->fluidsimSettings->surfaceSmoothing; // misused value
-                               
+                               /*
                                if(fsmesh.type == OB_FLUIDSIM_CONTROL)
                                {
                                        // control fluids will get exported as whole
@@ -1079,12 +1079,12 @@ void fluidsimBake(struct Object *ob)
                                        fsmesh.channelSizeVelocityforceRadius = 
                                        fsmesh.channelSizeAttractforceStrength = allchannelSize;
                                        
-                                       fsmesh.channelAttractforceRadius = channelAttractforceStrength[o];
+                                       fsmesh.channelAttractforceStrength = channelAttractforceStrength[o];
                                        fsmesh.channelAttractforceRadius = channelAttractforceRadius[o];
                                        fsmesh.channelVelocityforceStrength = channelVelocityforceStrength[o];
                                        fsmesh.channelVelocityforceRadius = channelVelocityforceRadius[o];
                                }
-                               else
+                               else*/
                                {
                                        // set channels to 0
                                        fsmesh.channelAttractforceStrength =