diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-07-28 20:55:48 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-07-28 20:55:48 +0400 |
commit | 8b77b54469acd44599dd659a08a257da179cc5b8 (patch) | |
tree | 12b3630e3e66ff832946a875aee5d32febbc2034 /intern/elbeem | |
parent | d63a3f7a7c82c443ca2f2d8d1e3fff42fdbfc107 (diff) |
WIP commit, completely untested (should introduce: 1. copy of modifier settings work, 2. reverse domain, 3. reverse control)
Diffstat (limited to 'intern/elbeem')
-rw-r--r-- | intern/elbeem/intern/controlparticles.cpp | 6 | ||||
-rw-r--r-- | intern/elbeem/intern/elbeem.cpp | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/intern/elbeem/intern/controlparticles.cpp b/intern/elbeem/intern/controlparticles.cpp index 90bc99cada7..c08501d5847 100644 --- a/intern/elbeem/intern/controlparticles.cpp +++ b/intern/elbeem/intern/controlparticles.cpp @@ -184,6 +184,12 @@ int ControlParticles::initFromObject(ntlGeometryObjModel *model) { delete genscene; delete glob; + // do reverse here + if(model->getGeoPartSlipValue()) + { + mirrorTime(); + } + return 1; } diff --git a/intern/elbeem/intern/elbeem.cpp b/intern/elbeem/intern/elbeem.cpp index c9e6bc7989b..f7923322d5b 100644 --- a/intern/elbeem/intern/elbeem.cpp +++ b/intern/elbeem/intern/elbeem.cpp @@ -217,7 +217,13 @@ int elbeemAddMesh(elbeemMesh *mesh) { obj->setGeoInitId( mesh->parentDomainId+1 ); obj->setGeoInitIntersect(true); obj->setGeoInitType(initType); - obj->setGeoPartSlipValue(mesh->obstaclePartslip); + + // abuse partslip value for control fluid: reverse control keys or not + if(initType == FGI_CONTROL) + obj->setGeoPartSlipValue(mesh->obstacleType); + else + obj->setGeoPartSlipValue(mesh->obstaclePartslip); + obj->setGeoImpactFactor(mesh->obstacleImpactFactor); /* fluid control features */ |