yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #03142
[Branch ~yade-dev/yade/trunk] Rev 1985: -Add missing members declarations (forgot to commit the header with a previous commit)
------------------------------------------------------------
revno: 1985
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Fri 2010-01-22 15:45:10 +0100
message:
-Add missing members declarations (forgot to commit the header with a previous commit)
modified:
pkg/dem/Engine/GlobalEngine/TesselationWrapper.hpp
--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.
=== modified file 'pkg/dem/Engine/GlobalEngine/TesselationWrapper.hpp'
--- pkg/dem/Engine/GlobalEngine/TesselationWrapper.hpp 2010-01-21 07:53:17 +0000
+++ pkg/dem/Engine/GlobalEngine/TesselationWrapper.hpp 2010-01-22 14:45:10 +0000
@@ -12,7 +12,6 @@
#include <utility>
#include<yade/core/Scene.hpp>
#include<yade/lib-triangulation/Tesselation.h>
-//#include<yade/lib-pyutil/numpy.hpp>
#include<boost/python.hpp>
#include<yade/pkg-dem/MicroMacroAnalyser.hpp>
#include<yade/extra/boost_python_len.hpp>
@@ -38,13 +37,15 @@
unsigned int n_spheres;
bool rad_divided;
bool bounded;
+ CGT::Point Pmin;
+ CGT::Point Pmax;
TesselationWrapper();
~TesselationWrapper();
/// Insert a sphere, "id" will be used by some getters to retrieve spheres
bool insert(double x, double y, double z, double rad, unsigned int id);
- /// A faster version of insert
+ /// A faster version of insert, inserting all spheres in scene
bool insertSceneSpheres(const Scene* scene);
/// Move one sphere to the new position (x,y,z) and maintain triangulation (invalidates the tesselation)
bool move (double x, double y, double z, double rad, unsigned int id);