diff options
Diffstat (limited to 'extern/mantaflow/preprocessed/mesh.h')
-rw-r--r-- | extern/mantaflow/preprocessed/mesh.h | 117 |
1 files changed, 57 insertions, 60 deletions
diff --git a/extern/mantaflow/preprocessed/mesh.h b/extern/mantaflow/preprocessed/mesh.h index f49619515ce..4235b9508af 100644 --- a/extern/mantaflow/preprocessed/mesh.h +++ b/extern/mantaflow/preprocessed/mesh.h @@ -240,215 +240,214 @@ class Mesh : public PbClass { } } - void load(std::string name, bool append = false); + void fromShape(Shape &shape, bool append = false); static PyObject *_W_2(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { PbArgs _args(_linargs, _kwds); Mesh *pbo = dynamic_cast<Mesh *>(Pb::objFromPy(_self)); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); - pbPreparePlugin(pbo->getParent(), "Mesh::load", !noTiming); + pbPreparePlugin(pbo->getParent(), "Mesh::fromShape", !noTiming); PyObject *_retval = 0; { ArgLocker _lock; - std::string name = _args.get<std::string>("name", 0, &_lock); + Shape &shape = *_args.getPtr<Shape>("shape", 0, &_lock); bool append = _args.getOpt<bool>("append", 1, false, &_lock); pbo->_args.copy(_args); _retval = getPyNone(); - pbo->load(name, append); + pbo->fromShape(shape, append); pbo->_args.check(); } - pbFinalizePlugin(pbo->getParent(), "Mesh::load", !noTiming); + pbFinalizePlugin(pbo->getParent(), "Mesh::fromShape", !noTiming); return _retval; } catch (std::exception &e) { - pbSetError("Mesh::load", e.what()); + pbSetError("Mesh::fromShape", e.what()); return 0; } } - void fromShape(Shape &shape, bool append = false); + void advectInGrid(FlagGrid &flags, MACGrid &vel, int integrationMode); static PyObject *_W_3(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { PbArgs _args(_linargs, _kwds); Mesh *pbo = dynamic_cast<Mesh *>(Pb::objFromPy(_self)); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); - pbPreparePlugin(pbo->getParent(), "Mesh::fromShape", !noTiming); + pbPreparePlugin(pbo->getParent(), "Mesh::advectInGrid", !noTiming); PyObject *_retval = 0; { ArgLocker _lock; - Shape &shape = *_args.getPtr<Shape>("shape", 0, &_lock); - bool append = _args.getOpt<bool>("append", 1, false, &_lock); + FlagGrid &flags = *_args.getPtr<FlagGrid>("flags", 0, &_lock); + MACGrid &vel = *_args.getPtr<MACGrid>("vel", 1, &_lock); + int integrationMode = _args.get<int>("integrationMode", 2, &_lock); pbo->_args.copy(_args); _retval = getPyNone(); - pbo->fromShape(shape, append); + pbo->advectInGrid(flags, vel, integrationMode); pbo->_args.check(); } - pbFinalizePlugin(pbo->getParent(), "Mesh::fromShape", !noTiming); + pbFinalizePlugin(pbo->getParent(), "Mesh::advectInGrid", !noTiming); return _retval; } catch (std::exception &e) { - pbSetError("Mesh::fromShape", e.what()); + pbSetError("Mesh::advectInGrid", e.what()); return 0; } } - void save(std::string name); + void scale(Vec3 s); static PyObject *_W_4(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { PbArgs _args(_linargs, _kwds); Mesh *pbo = dynamic_cast<Mesh *>(Pb::objFromPy(_self)); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); - pbPreparePlugin(pbo->getParent(), "Mesh::save", !noTiming); + pbPreparePlugin(pbo->getParent(), "Mesh::scale", !noTiming); PyObject *_retval = 0; { ArgLocker _lock; - std::string name = _args.get<std::string>("name", 0, &_lock); + Vec3 s = _args.get<Vec3>("s", 0, &_lock); pbo->_args.copy(_args); _retval = getPyNone(); - pbo->save(name); + pbo->scale(s); pbo->_args.check(); } - pbFinalizePlugin(pbo->getParent(), "Mesh::save", !noTiming); + pbFinalizePlugin(pbo->getParent(), "Mesh::scale", !noTiming); return _retval; } catch (std::exception &e) { - pbSetError("Mesh::save", e.what()); + pbSetError("Mesh::scale", e.what()); return 0; } } - void advectInGrid(FlagGrid &flags, MACGrid &vel, int integrationMode); + void offset(Vec3 o); static PyObject *_W_5(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { PbArgs _args(_linargs, _kwds); Mesh *pbo = dynamic_cast<Mesh *>(Pb::objFromPy(_self)); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); - pbPreparePlugin(pbo->getParent(), "Mesh::advectInGrid", !noTiming); + pbPreparePlugin(pbo->getParent(), "Mesh::offset", !noTiming); PyObject *_retval = 0; { ArgLocker _lock; - FlagGrid &flags = *_args.getPtr<FlagGrid>("flags", 0, &_lock); - MACGrid &vel = *_args.getPtr<MACGrid>("vel", 1, &_lock); - int integrationMode = _args.get<int>("integrationMode", 2, &_lock); + Vec3 o = _args.get<Vec3>("o", 0, &_lock); pbo->_args.copy(_args); _retval = getPyNone(); - pbo->advectInGrid(flags, vel, integrationMode); + pbo->offset(o); pbo->_args.check(); } - pbFinalizePlugin(pbo->getParent(), "Mesh::advectInGrid", !noTiming); + pbFinalizePlugin(pbo->getParent(), "Mesh::offset", !noTiming); return _retval; } catch (std::exception &e) { - pbSetError("Mesh::advectInGrid", e.what()); + pbSetError("Mesh::offset", e.what()); return 0; } } - void scale(Vec3 s); + void rotate(Vec3 thetas); static PyObject *_W_6(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { PbArgs _args(_linargs, _kwds); Mesh *pbo = dynamic_cast<Mesh *>(Pb::objFromPy(_self)); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); - pbPreparePlugin(pbo->getParent(), "Mesh::scale", !noTiming); + pbPreparePlugin(pbo->getParent(), "Mesh::rotate", !noTiming); PyObject *_retval = 0; { ArgLocker _lock; - Vec3 s = _args.get<Vec3>("s", 0, &_lock); + Vec3 thetas = _args.get<Vec3>("thetas", 0, &_lock); pbo->_args.copy(_args); _retval = getPyNone(); - pbo->scale(s); + pbo->rotate(thetas); pbo->_args.check(); } - pbFinalizePlugin(pbo->getParent(), "Mesh::scale", !noTiming); + pbFinalizePlugin(pbo->getParent(), "Mesh::rotate", !noTiming); return _retval; } catch (std::exception &e) { - pbSetError("Mesh::scale", e.what()); + pbSetError("Mesh::rotate", e.what()); return 0; } } - void offset(Vec3 o); + void computeVelocity(Mesh &oldMesh, MACGrid &vel); static PyObject *_W_7(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { PbArgs _args(_linargs, _kwds); Mesh *pbo = dynamic_cast<Mesh *>(Pb::objFromPy(_self)); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); - pbPreparePlugin(pbo->getParent(), "Mesh::offset", !noTiming); + pbPreparePlugin(pbo->getParent(), "Mesh::computeVelocity", !noTiming); PyObject *_retval = 0; { ArgLocker _lock; - Vec3 o = _args.get<Vec3>("o", 0, &_lock); + Mesh &oldMesh = *_args.getPtr<Mesh>("oldMesh", 0, &_lock); + MACGrid &vel = *_args.getPtr<MACGrid>("vel", 1, &_lock); pbo->_args.copy(_args); _retval = getPyNone(); - pbo->offset(o); + pbo->computeVelocity(oldMesh, vel); pbo->_args.check(); } - pbFinalizePlugin(pbo->getParent(), "Mesh::offset", !noTiming); + pbFinalizePlugin(pbo->getParent(), "Mesh::computeVelocity", !noTiming); return _retval; } catch (std::exception &e) { - pbSetError("Mesh::offset", e.what()); + pbSetError("Mesh::computeVelocity", e.what()); return 0; } } - void rotate(Vec3 thetas); + //! file io + int load(std::string name, bool append = false); static PyObject *_W_8(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { PbArgs _args(_linargs, _kwds); Mesh *pbo = dynamic_cast<Mesh *>(Pb::objFromPy(_self)); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); - pbPreparePlugin(pbo->getParent(), "Mesh::rotate", !noTiming); + pbPreparePlugin(pbo->getParent(), "Mesh::load", !noTiming); PyObject *_retval = 0; { ArgLocker _lock; - Vec3 thetas = _args.get<Vec3>("thetas", 0, &_lock); + std::string name = _args.get<std::string>("name", 0, &_lock); + bool append = _args.getOpt<bool>("append", 1, false, &_lock); pbo->_args.copy(_args); - _retval = getPyNone(); - pbo->rotate(thetas); + _retval = toPy(pbo->load(name, append)); pbo->_args.check(); } - pbFinalizePlugin(pbo->getParent(), "Mesh::rotate", !noTiming); + pbFinalizePlugin(pbo->getParent(), "Mesh::load", !noTiming); return _retval; } catch (std::exception &e) { - pbSetError("Mesh::rotate", e.what()); + pbSetError("Mesh::load", e.what()); return 0; } } - void computeVelocity(Mesh &oldMesh, MACGrid &vel); + int save(std::string name); static PyObject *_W_9(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { PbArgs _args(_linargs, _kwds); Mesh *pbo = dynamic_cast<Mesh *>(Pb::objFromPy(_self)); bool noTiming = _args.getOpt<bool>("notiming", -1, 0); - pbPreparePlugin(pbo->getParent(), "Mesh::computeVelocity", !noTiming); + pbPreparePlugin(pbo->getParent(), "Mesh::save", !noTiming); PyObject *_retval = 0; { ArgLocker _lock; - Mesh &oldMesh = *_args.getPtr<Mesh>("oldMesh", 0, &_lock); - MACGrid &vel = *_args.getPtr<MACGrid>("vel", 1, &_lock); + std::string name = _args.get<std::string>("name", 0, &_lock); pbo->_args.copy(_args); - _retval = getPyNone(); - pbo->computeVelocity(oldMesh, vel); + _retval = toPy(pbo->save(name)); pbo->_args.check(); } - pbFinalizePlugin(pbo->getParent(), "Mesh::computeVelocity", !noTiming); + pbFinalizePlugin(pbo->getParent(), "Mesh::save", !noTiming); return _retval; } catch (std::exception &e) { - pbSetError("Mesh::computeVelocity", e.what()); + pbSetError("Mesh::save", e.what()); return 0; } } @@ -1564,7 +1563,7 @@ template<class T> class MeshDataImpl : public MeshDataBase { } //! file io - void save(const std::string name); + int save(const std::string name); static PyObject *_W_41(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { @@ -1577,8 +1576,7 @@ template<class T> class MeshDataImpl : public MeshDataBase { ArgLocker _lock; const std::string name = _args.get<std::string>("name", 0, &_lock); pbo->_args.copy(_args); - _retval = getPyNone(); - pbo->save(name); + _retval = toPy(pbo->save(name)); pbo->_args.check(); } pbFinalizePlugin(pbo->getParent(), "MeshDataImpl::save", !noTiming); @@ -1590,7 +1588,7 @@ template<class T> class MeshDataImpl : public MeshDataBase { } } - void load(const std::string name); + int load(const std::string name); static PyObject *_W_42(PyObject *_self, PyObject *_linargs, PyObject *_kwds) { try { @@ -1603,8 +1601,7 @@ template<class T> class MeshDataImpl : public MeshDataBase { ArgLocker _lock; const std::string name = _args.get<std::string>("name", 0, &_lock); pbo->_args.copy(_args); - _retval = getPyNone(); - pbo->load(name); + _retval = toPy(pbo->load(name)); pbo->_args.check(); } pbFinalizePlugin(pbo->getParent(), "MeshDataImpl::load", !noTiming); |