[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15474] branches/fluidcontrol: Some channel fixes for fc

[Daniel Genrich]

Revision: 15474
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15474
Author:   genscher
Date:     2008-07-07 22:28:56 +0200 (Mon, 07 Jul 2008)

Log Message:
-----------
Some channel fixes for fc

Modified Paths:
--------------
    branches/fluidcontrol/intern/elbeem/intern/elbeem.cpp
    branches/fluidcontrol/intern/elbeem/intern/ntl_geometryobject.cpp
    branches/fluidcontrol/source/blender/src/fluidsim.c

Modified: branches/fluidcontrol/intern/elbeem/intern/elbeem.cpp
===================================================================
--- branches/fluidcontrol/intern/elbeem/intern/elbeem.cpp	2008-07-07 17:27:22 UTC (rev 15473)
+++ branches/fluidcontrol/intern/elbeem/intern/elbeem.cpp	2008-07-07 20:28:56 UTC (rev 15474)
@@ -219,6 +219,7 @@
 	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, 

Modified: branches/fluidcontrol/intern/elbeem/intern/ntl_geometryobject.cpp
===================================================================
--- branches/fluidcontrol/intern/elbeem/intern/ntl_geometryobject.cpp	2008-07-07 17:27:22 UTC (rev 15473)
+++ branches/fluidcontrol/intern/elbeem/intern/ntl_geometryobject.cpp	2008-07-07 20:28:56 UTC (rev 15474)
@@ -351,10 +351,10 @@
 	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();
 	

Modified: branches/fluidcontrol/source/blender/src/fluidsim.c
===================================================================
--- branches/fluidcontrol/source/blender/src/fluidsim.c	2008-07-07 17:27:22 UTC (rev 15473)
+++ branches/fluidcontrol/source/blender/src/fluidsim.c	2008-07-07 20:28:56 UTC (rev 15474)
@@ -1065,7 +1065,7 @@
 				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 @@
 					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 =