yade-dev team mailing list archive

[eudoxos at BerliOS <eudoxos@xxxxxxxxxxxxxxx>]

Author: eudoxos
Date: 2009-08-03 13:02:11 +0200 (Mon, 03 Aug 2009)
New Revision: 1911

Modified:
   trunk/SConstruct
   trunk/core/BexContainer.hpp
   trunk/core/Body.cpp
   trunk/core/Body.hpp
   trunk/core/BodyContainer.cpp
   trunk/core/BodyContainer.hpp
   trunk/core/BoundingVolume.hpp
   trunk/core/DisplayParameters.hpp
   trunk/core/Engine.hpp
   trunk/core/EngineUnit.hpp
   trunk/core/FileGenerator.hpp
   trunk/core/GeometricalModel.hpp
   trunk/core/GroupRelationData.hpp
   trunk/core/InteractingGeometry.cpp
   trunk/core/InteractingGeometry.hpp
   trunk/core/Interaction.hpp
   trunk/core/InteractionContainer.hpp
   trunk/core/InteractionGeometry.hpp
   trunk/core/InteractionPhysics.hpp
   trunk/core/MetaBody.cpp
   trunk/core/Omega.cpp
   trunk/core/Omega.hpp
   trunk/core/PhysicalParameters.hpp
   trunk/core/Preferences.hpp
   trunk/core/containers/BodyAssocVector.cpp
   trunk/core/containers/BodyRedirectionVector.cpp
   trunk/core/containers/InteractionHashMap.cpp
   trunk/core/containers/InteractionVecMap.cpp
   trunk/gui/qt3/QtGUIPreferences.hpp
   trunk/gui/qt3/SimulationController.cpp
   trunk/gui/qt3/SimulationController.hpp
   trunk/gui/qt3/SnapshotEngine.cpp
   trunk/lib/base/yadeWm3Extra.hpp
   trunk/lib/factory/ClassFactory.hpp
   trunk/lib/multimethods/DynLibDispatcher.hpp
   trunk/lib/serialization/IOFormatManager.cpp
   trunk/lib/serialization/Serializable.hpp
   trunk/pkg/common/DataClass/BoundingVolume/AABB.cpp
   trunk/pkg/common/DataClass/BoundingVolume/AABB.hpp
   trunk/pkg/common/DataClass/BoundingVolume/BoundingSphere.cpp
   trunk/pkg/common/DataClass/GeometricalModel/Box.cpp
   trunk/pkg/common/DataClass/GeometricalModel/BshTube.cpp
   trunk/pkg/common/DataClass/GeometricalModel/Facet.cpp
   trunk/pkg/common/DataClass/GeometricalModel/Mesh2D.cpp
   trunk/pkg/common/DataClass/GeometricalModel/Quadrilateral.cpp
   trunk/pkg/common/DataClass/GeometricalModel/Sphere.cpp
   trunk/pkg/common/DataClass/GeometricalModel/Tetrahedron.cpp
   trunk/pkg/common/DataClass/InteractingGeometry/BssSweptSphereLineSegment.cpp
   trunk/pkg/common/DataClass/InteractingGeometry/InteractingBox.cpp
   trunk/pkg/common/DataClass/InteractingGeometry/InteractingFacet.cpp
   trunk/pkg/common/DataClass/InteractingGeometry/InteractingNode.cpp
   trunk/pkg/common/DataClass/InteractingGeometry/InteractingSphere.cpp
   trunk/pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.cpp
   trunk/pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.hpp
   trunk/pkg/common/DataClass/InteractionGeometry/ClosestFeatures.cpp
   trunk/pkg/common/DataClass/InteractionPhysics/NormalShearInteractions.cpp
   trunk/pkg/common/DataClass/InteractionPhysics/NormalShearInteractions.hpp
   trunk/pkg/common/DataClass/PhysicalParameters/BcpConnection.cpp
   trunk/pkg/common/DataClass/PhysicalParameters/ElasticBodyParameters.cpp
   trunk/pkg/common/DataClass/PhysicalParameters/ParticleParameters.cpp
   trunk/pkg/common/DataClass/PhysicalParameters/RigidBodyParameters.cpp
   trunk/pkg/common/DataClass/Widgets/ColorScale.cpp
   trunk/pkg/common/Engine/DeusExMachina/DisplacementEngine.cpp
   trunk/pkg/common/Engine/DeusExMachina/DisplacementToForceEngine.cpp
   trunk/pkg/common/Engine/DeusExMachina/FixedOrientationEngine.cpp
   trunk/pkg/common/Engine/DeusExMachina/FixedPositionEngine.cpp
   trunk/pkg/common/Engine/DeusExMachina/ForceEngine.cpp
   trunk/pkg/common/Engine/DeusExMachina/GravityEngines.cpp
   trunk/pkg/common/Engine/DeusExMachina/JumpChangeSe3.cpp
   trunk/pkg/common/Engine/DeusExMachina/MomentEngine.cpp
   trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.cpp
   trunk/pkg/common/Engine/DeusExMachina/RotationEngine.cpp
   trunk/pkg/common/Engine/DeusExMachina/Se3Interpolator.cpp
   trunk/pkg/common/Engine/DeusExMachina/StaticAttractionEngine.cpp
   trunk/pkg/common/Engine/DeusExMachina/TranslationEngine.cpp
   trunk/pkg/common/Engine/EngineUnit/CundallNonViscousDamping.cpp
   trunk/pkg/common/Engine/EngineUnit/ElasticBodySimpleRelationship.cpp
   trunk/pkg/common/Engine/EngineUnit/InteractingBox2AABB.cpp
   trunk/pkg/common/Engine/EngineUnit/InteractingFacet2AABB.cpp
   trunk/pkg/common/Engine/EngineUnit/InteractingSphere2AABB.cpp
   trunk/pkg/common/Engine/EngineUnit/LeapFrogOrientationIntegrator.cpp
   trunk/pkg/common/Engine/EngineUnit/LeapFrogPositionIntegrator.cpp
   trunk/pkg/common/Engine/EngineUnit/MetaInteractingGeometry2AABB.cpp
   trunk/pkg/common/Engine/EngineUnit/NewtonsForceLaw.cpp
   trunk/pkg/common/Engine/EngineUnit/NewtonsMomentumLaw.cpp
   trunk/pkg/common/Engine/EngineUnit/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp
   trunk/pkg/common/Engine/EngineUnit/ef2_BssSweptSphereLineSegment_AABB_makeAABB.cpp
   trunk/pkg/common/Engine/FilterEngine/ColorizedLayerFilter.cpp
   trunk/pkg/common/Engine/FilterEngine/ColorizedTimeFilter.cpp
   trunk/pkg/common/Engine/FilterEngine/ColorizedVelocityFilter.cpp
   trunk/pkg/common/Engine/FilterEngine/FilterEngine.hpp
   trunk/pkg/common/Engine/FilterEngine/PythonRunnerFilter.cpp
   trunk/pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.cpp
   trunk/pkg/common/Engine/MetaEngine/ConstitutiveLawDispatcher.cpp
   trunk/pkg/common/Engine/MetaEngine/GeometricalModelMetaEngine.cpp
   trunk/pkg/common/Engine/MetaEngine/InteractingGeometryMetaEngine.cpp
   trunk/pkg/common/Engine/MetaEngine/InteractionDispatchers.cpp
   trunk/pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.cpp
   trunk/pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.cpp
   trunk/pkg/common/Engine/MetaEngine/PhysicalActionApplier.cpp
   trunk/pkg/common/Engine/MetaEngine/PhysicalActionDamper.cpp
   trunk/pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.cpp
   trunk/pkg/common/Engine/ParallelEngine.cpp
   trunk/pkg/common/Engine/StandAloneEngine/DistantPersistentSAPCollider.cpp
   trunk/pkg/common/Engine/StandAloneEngine/InsertionSortCollider.cpp
   trunk/pkg/common/Engine/StandAloneEngine/PeriodicPythonRunner.cpp
   trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp
   trunk/pkg/common/Engine/StandAloneEngine/PersistentTriangulationCollider.cpp
   trunk/pkg/common/Engine/StandAloneEngine/PhysicalActionContainerReseter.cpp
   trunk/pkg/common/Engine/StandAloneEngine/ResetPositionEngine.cpp
   trunk/pkg/common/Engine/StandAloneEngine/SpatialQuickSortCollider.cpp
   trunk/pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawAABB.cpp
   trunk/pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.cpp
   trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawBox.cpp
   trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawFacet.cpp
   trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawMesh2D.cpp
   trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawQuadrilateral.cpp
   trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp
   trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp
   trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTetrahedron.cpp
   trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTube.cpp
   trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawBssSweptSphereLineSegment.cpp
   trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingBox.cpp
   trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingFacet.cpp
   trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp
   trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawMetaInteractingGeometry.cpp
   trunk/pkg/common/RenderingEngine/GLDrawInteractionGeometry/GLDrawClosestFeatures.cpp
   trunk/pkg/common/RenderingEngine/GLDrawInteractionPhysics/GLDrawNormalInteraction.cpp
   trunk/pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawBoxShadowVolume.cpp
   trunk/pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawSphereShadowVolume.cpp
   trunk/pkg/common/RenderingEngine/GLDrawState/GLDrawParticleState.cpp
   trunk/pkg/common/RenderingEngine/GLDrawState/GLDrawRigidBodyState.cpp
   trunk/pkg/common/RenderingEngine/GLDrawWidgets/GLDrawColorScale.cpp
   trunk/pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp
   trunk/pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.hpp
   trunk/pkg/dem/DataClass/Clump.cpp
   trunk/pkg/dem/DataClass/InteractingGeometry/InteractingMyTetrahedron.cpp
   trunk/pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_FacetSphere.cpp
   trunk/pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_SphereSphere.cpp
   trunk/pkg/dem/DataClass/InteractionGeometry/DemXDofGeom.cpp
   trunk/pkg/dem/DataClass/InteractionGeometry/InteractionOfMyTetrahedron.cpp
   trunk/pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.cpp
   trunk/pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.hpp
   trunk/pkg/dem/DataClass/InteractionPhysics/CohesiveFrictionalContactInteraction.cpp
   trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.cpp
   trunk/pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.cpp
   trunk/pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.cpp
   trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp
   trunk/pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.cpp
   trunk/pkg/dem/DataClass/PhysicalParameters/CohesiveFrictionalBodyParameters.cpp
   trunk/pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp
   trunk/pkg/dem/Engine/DeusExMachina/CapillaryPressureEngine.cpp
   trunk/pkg/dem/Engine/DeusExMachina/CapillaryRecorder.cpp
   trunk/pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.cpp
   trunk/pkg/dem/Engine/DeusExMachina/ContactStressRecorder.cpp
   trunk/pkg/dem/Engine/DeusExMachina/FlowEngine.cpp
   trunk/pkg/dem/Engine/DeusExMachina/HydraulicForceEngine.cpp
   trunk/pkg/dem/Engine/DeusExMachina/StaticSpheresAttractionEngine.cpp
   trunk/pkg/dem/Engine/DeusExMachina/ThreeDTriaxialEngine.cpp
   trunk/pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp
   trunk/pkg/dem/Engine/DeusExMachina/TriaxialStateRecorder.cpp
   trunk/pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp
   trunk/pkg/dem/Engine/DeusExMachina/WallStressRecorder.cpp
   trunk/pkg/dem/Engine/EngineUnit/BasicViscoelasticRelationships.cpp
   trunk/pkg/dem/Engine/EngineUnit/CL1Relationships.cpp
   trunk/pkg/dem/Engine/EngineUnit/CohesiveFrictionalRelationships.cpp
   trunk/pkg/dem/Engine/EngineUnit/InteractingBox2InteractingSphere4SpheresContactGeometry.cpp
   trunk/pkg/dem/Engine/EngineUnit/InteractingFacet2InteractingSphere4SpheresContactGeometry.cpp
   trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2AABB.cpp
   trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2InteractingBox4InteractionOfMyTetrahedron.cpp
   trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2InteractingMyTetrahedron4InteractionOfMyTetrahedron.cpp
   trunk/pkg/dem/Engine/EngineUnit/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp
   trunk/pkg/dem/Engine/EngineUnit/InteractingSphere2InteractingSphere4SpheresContactGeometry.cpp
   trunk/pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.cpp
   trunk/pkg/dem/Engine/EngineUnit/SimpleElasticRelationships.cpp
   trunk/pkg/dem/Engine/EngineUnit/SimpleElasticRelationshipsWater.cpp
   trunk/pkg/dem/Engine/EngineUnit/SimpleViscoelasticRelationships.cpp
   trunk/pkg/dem/Engine/EngineUnit/Tetrahedron2InteractingMyTetrahedron.cpp
   trunk/pkg/dem/Engine/EngineUnit/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp
   trunk/pkg/dem/Engine/EngineUnit/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/AveragePositionRecorder.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/CohesiveFrictionalContactLaw.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/ContactLaw1.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/ElasticCriterionTimeStepper.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/FacetTopologyAnalyzer.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/ForceRecorder.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/GeometricalModelForceColorizer.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/MGPRecorder.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/MyTetrahedronLaw.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/NewtonsDampedLaw.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/PositionOrientationRecorder.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/RigidBodyRecorder.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/SQLiteRecorder.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/UniaxialStrainer.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/VelocityRecorder.cpp
   trunk/pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp
   trunk/pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp
   trunk/pkg/dem/PreProcessor/Funnel.cpp
   trunk/pkg/dem/PreProcessor/HydraulicTest.cpp
   trunk/pkg/dem/PreProcessor/MembraneTest.cpp
   trunk/pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp
   trunk/pkg/dem/PreProcessor/SDECImpactTest.cpp
   trunk/pkg/dem/PreProcessor/SDECLinkedSpheres.cpp
   trunk/pkg/dem/PreProcessor/SDECMovingWall.cpp
   trunk/pkg/dem/PreProcessor/SDECSpheresPlane.cpp
   trunk/pkg/dem/PreProcessor/STLImporterTest.cpp
   trunk/pkg/dem/PreProcessor/SimpleScene.cpp
   trunk/pkg/dem/PreProcessor/TetraTestGen.cpp
   trunk/pkg/dem/PreProcessor/TetrahedronsTest.cpp
   trunk/pkg/dem/PreProcessor/ThreePointBending.cpp
   trunk/pkg/dem/PreProcessor/TriaxialTest.cpp
   trunk/pkg/dem/PreProcessor/TriaxialTestWater.cpp
   trunk/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp
   trunk/pkg/dem/RenderingEngine/GLDrawElasticContactInteraction/GLDrawElasticContactInteraction.cpp
   trunk/pkg/dem/RenderingEngine/GLDrawInteractingMyTetrahedron/GLDrawInteractingMyTetrahedron.cpp
   trunk/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp
   trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp
   trunk/pkg/dem/meta/ConcretePM.cpp
   trunk/pkg/dem/meta/ConcretePM.hpp
   trunk/pkg/dem/meta/RockPM.cpp
   trunk/pkg/dem/meta/Tetra.cpp
   trunk/pkg/fem/DataClass/GeometricalModel/FEMSetGeometry.cpp
   trunk/pkg/fem/DataClass/PhysicalParameters/FEMNodeData.cpp
   trunk/pkg/fem/DataClass/PhysicalParameters/FEMSetParameters.cpp
   trunk/pkg/fem/DataClass/PhysicalParameters/FEMTetrahedronData.cpp
   trunk/pkg/fem/Engine/EngineUnit/FEMSet2Tetrahedrons.cpp
   trunk/pkg/fem/Engine/EngineUnit/FEMSetTextLoader.cpp
   trunk/pkg/fem/Engine/EngineUnit/FEMTetrahedronStiffness.cpp
   trunk/pkg/fem/Engine/StandAloneEngine/FEMLaw.cpp
   trunk/pkg/fem/PreProcessor/FEMBeam.cpp
   trunk/pkg/lattice/DataClass/GeometricalModel/LatticeSetGeometry.cpp
   trunk/pkg/lattice/DataClass/GeometricalModel/LineSegment.cpp
   trunk/pkg/lattice/DataClass/InteractingGeometry/LatticeInteractingGeometry.cpp
   trunk/pkg/lattice/DataClass/InteractionPhysics/LatticeBeamAngularSpring.cpp
   trunk/pkg/lattice/DataClass/InteractionPhysics/NonLocalDependency.cpp
   trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeBeamParameters.cpp
   trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeNodeParameters.cpp
   trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeSetParameters.cpp
   trunk/pkg/lattice/Engine/EngineUnit/LatticeSet2LatticeBeams.cpp
   trunk/pkg/lattice/Engine/StandAloneEngine/BeamRecorder.cpp
   trunk/pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp
   trunk/pkg/lattice/Engine/StandAloneEngine/MeasurePoisson.cpp
   trunk/pkg/lattice/Engine/StandAloneEngine/MovingSupport.cpp
   trunk/pkg/lattice/Engine/StandAloneEngine/NodeRecorder.cpp
   trunk/pkg/lattice/Engine/StandAloneEngine/NonLocalInitializer.cpp
   trunk/pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp
   trunk/pkg/lattice/PreProcessor/LatticeExample.cpp
   trunk/pkg/lattice/PreProcessor/LatticeExampleCTData.cpp
   trunk/pkg/lattice/PreProcessor/LatticeExampleSimple.cpp
   trunk/pkg/lattice/RenderingEngine/GLDrawLatticeBeamState/GLDrawLatticeBeamState.cpp
   trunk/pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry/GLDrawLatticeInteractingGeometry.cpp
   trunk/pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry/GLDrawLatticeSetGeometry.cpp
   trunk/pkg/lattice/RenderingEngine/GLDrawLineSegment/GLDrawLineSegment.cpp
   trunk/pkg/mass-spring/DataClass/InteractionGeometry/SpringGeometry.cpp
   trunk/pkg/mass-spring/DataClass/InteractionPhysics/SpringPhysics.cpp
   trunk/pkg/mass-spring/DataClass/PhysicalParameters/ParticleSetParameters.cpp
   trunk/pkg/mass-spring/Engine/EngineUnit/ParticleSet2Mesh2D.cpp
   trunk/pkg/mass-spring/Engine/StandAloneEngine/MassSpringLaw.cpp
   trunk/pkg/mass-spring/PreProcessor/HangingCloth.cpp
   trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingBox2InteractingBox4ClosestFeatures.cpp
   trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingBox2InteractingSphere4ClosestFeatures.cpp
   trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingSphere2InteractingSphere4ClosestFeatures.cpp
   trunk/pkg/realtime-rigidbody/Engine/StandAloneEngine/FrictionLessElasticContactLaw.cpp
   trunk/pkg/realtime-rigidbody/PreProcessor/BoxStack.cpp
   trunk/pkg/realtime-rigidbody/PreProcessor/RotatingBox.cpp
   trunk/pkg/snow/DataClass/BshSnowGrain.cpp
   trunk/pkg/snow/DataClass/BshSnowGrain.hpp
   trunk/pkg/snow/DataClass/BssSnowGrain.cpp
   trunk/pkg/snow/Engine/Ef2_BssSnowGrain_AABB_makeAABB.cpp
   trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp
   trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeSpheresContactGeometry.cpp
   trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp
   trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeSpheresContactGeometry.cpp
   trunk/pkg/snow/Engine/ElawSnowLayersDeformation.cpp
   trunk/pkg/snow/PreProcessor/SnowCreepTest.cpp
   trunk/pkg/snow/PreProcessor/SnowVoxelsLoader.cpp
   trunk/pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp
   trunk/pkg/snow/RenderingEngine/Ef1_BssSnowGrain_glDraw.cpp
   trunk/pkg/snow/RenderingEngine/Ef1_IstSnowLayersContact_glDraw.cpp
   trunk/py/yadeWrapper/yadeWrapper.cpp
   trunk/scripts/fix-plugin-names.py
Log:
1. Change syntax of YADE_PLUGIN("Plugin1","Plugin2") to YADE_PLUGIN((Plugin1)(Plugin2)) (replaced everywhere)
2. Add some perliminary and not-enabled by default support for boost::serialization (see ClassFactory.hpp)
3. Add boost::serialization code for Se3r, Vector2r, Vector2<int>, Quaternionr
4. Do not reset BexContainer's moves and rotations uselessly (i.e. if not used)
5. Use Omega's mutex in SimulationController to prevent loading-related crashes




Modified: trunk/SConstruct
===================================================================
--- trunk/SConstruct	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/SConstruct	2009-08-03 11:02:11 UTC (rev 1911)
@@ -381,7 +381,10 @@
 		LINKCOMSTR='L ${TARGET.file}',
 		INSTALLSTR='⇒ $TARGET',
 		QT_UICCOMSTR='U ${SOURCES}',
-		QT_MOCCOMSTR='M ${SOURCES}')
+		QT_MOCCOMSTR='M ${SOURCES}',
+		QT_MOCFROMHCOMSTR='M ${SOURCES}',
+		QT_MOCFROMCXXCOMSTR='M ${SOURCES}',
+		)
 else:
 	env.Replace(INSTALLSTR='cp -f ${SOURCE} ${TARGET}')
 

Modified: trunk/core/BexContainer.hpp
===================================================================
--- trunk/core/BexContainer.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/BexContainer.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -128,15 +128,19 @@
 		// perhaps should be private and friend MetaBody or whatever the only caller should be
 		void reset(){
 			for(int thread=0; thread<nThreads; thread++){
-				memset(_forceData [thread][0], 0,sizeof(Vector3r)*size);
+				memset(_forceData [thread][0],0,sizeof(Vector3r)*size);
 				memset(_torqueData[thread][0],0,sizeof(Vector3r)*size);
-				memset(_moveData  [thread][0],0,sizeof(Vector3r)*size);
-				memset(_rotData   [thread][0],0,sizeof(Vector3r)*size);
+				if(moveRotUsed){
+					memset(_moveData  [thread][0],0,sizeof(Vector3r)*size);
+					memset(_rotData   [thread][0],0,sizeof(Vector3r)*size);
+				}
 			}
 			memset(_force [0], 0,sizeof(Vector3r)*size);
 			memset(_torque[0], 0,sizeof(Vector3r)*size);
-			memset(_move  [0], 0,sizeof(Vector3r)*size);
-			memset(_rot   [0], 0,sizeof(Vector3r)*size);
+			if(moveRotUsed){
+				memset(_move  [0], 0,sizeof(Vector3r)*size);
+				memset(_rot   [0], 0,sizeof(Vector3r)*size);
+			}
 			synced=true; moveRotUsed=false;
 		}
 		//! say for how many threads we have allocated space
@@ -172,8 +176,11 @@
 		void reset(){
 			memset(_force [0],0,sizeof(Vector3r)*size);
 			memset(_torque[0],0,sizeof(Vector3r)*size);
-			memset(_move  [0],0,sizeof(Vector3r)*size);
-			memset(_rot   [0],0,sizeof(Vector3r)*size);
+			if(moveRotUsed){
+				memset(_move  [0],0,sizeof(Vector3r)*size);
+				memset(_rot   [0],0,sizeof(Vector3r)*size);
+				moveRotUsed=False;
+			}
 		}
 		//! No-op for API compatibility with the threaded version
 		void sync(){return;}

Modified: trunk/core/Body.cpp
===================================================================
--- trunk/core/Body.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/Body.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -20,6 +20,9 @@
 const shared_ptr<Body>& Body::byId(body_id_t _id, MetaBody* rb){return (*((rb?rb:Omega::instance().getRootBody().get())->bodies))[_id];}
 const shared_ptr<Body>& Body::byId(body_id_t _id, shared_ptr<MetaBody> rb){return (*(rb->bodies))[_id];}
 
+#ifdef YADE_BOOST_SERIALIZATION
+	BOOST_CLASS_EXPORT(Body);
+#endif
 
 // we must initialize id = 0, otherwise BodyContainer will crash.
 Body::Body () : 

Modified: trunk/core/Body.hpp
===================================================================
--- trunk/core/Body.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/Body.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -88,7 +88,7 @@
 
 		// Serialization
 	protected:
-		REGISTER_ATTRIBUTES(/*no base*/,
+		REGISTER_ATTRIBUTES(Serializable,
 			(id)
 			(groupMask)
 			(isDynamic)

Modified: trunk/core/BodyContainer.cpp
===================================================================
--- trunk/core/BodyContainer.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/BodyContainer.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -11,7 +11,11 @@
 #include "BodyContainer.hpp"
 #include "Body.hpp"
 
+#ifdef YADE_BOOST_SERIALIZATION
+	BOOST_CLASS_EXPORT(BodyContainer);
+#endif
 
+
 BodyContainer::BodyContainer()
 { 
 	body.clear();

Modified: trunk/core/BodyContainer.hpp
===================================================================
--- trunk/core/BodyContainer.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/BodyContainer.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -105,7 +105,7 @@
 	private :
 		vector<shared_ptr<Body> > body; 
 	public :
-		REGISTER_ATTRIBUTES(/*no base*/,(body));
+		REGISTER_ATTRIBUTES(Serializable,(body));
 	protected :
 		virtual void preProcessAttributes(bool deserializing);
 		virtual void postProcessAttributes(bool deserializing);

Modified: trunk/core/BoundingVolume.hpp
===================================================================
--- trunk/core/BoundingVolume.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/BoundingVolume.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -26,7 +26,7 @@
 				,max;			/// Maximum of the bounding volume
 		BoundingVolume(): diffuseColor(Vector3r(1,1,1)), min(Vector3r(0,0,0)), max(Vector3r(0,0,0)) {}
 
-	REGISTER_ATTRIBUTES(/*no base*/,(diffuseColor));
+	REGISTER_ATTRIBUTES(Serializable,(diffuseColor));
 	REGISTER_CLASS_AND_BASE(BoundingVolume,Serializable Indexable);
 	REGISTER_INDEX_COUNTER(BoundingVolume);
 };

Modified: trunk/core/DisplayParameters.hpp
===================================================================
--- trunk/core/DisplayParameters.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/DisplayParameters.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -21,7 +21,7 @@
 		void setValue(std::string displayType, std::string value){assert(values.size()==displayTypes.size()); vector<string>::iterator I=std::find(displayTypes.begin(),displayTypes.end(),displayType); if(I==displayTypes.end()){displayTypes.push_back(displayType); values.push_back(value);} else {values[std::distance(displayTypes.begin(),I)]=value;};}
 	DisplayParameters(){}
 	virtual ~DisplayParameters(){}
-	REGISTER_ATTRIBUTES(/*no base*/,(displayTypes)(values));
+	REGISTER_ATTRIBUTES(Serializable,(displayTypes)(values));
 	REGISTER_CLASS_AND_BASE(DisplayParameters,Serializable);
 };
 REGISTER_SERIALIZABLE(DisplayParameters);

Modified: trunk/core/Engine.hpp
===================================================================
--- trunk/core/Engine.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/Engine.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -31,7 +31,7 @@
 		virtual void action(MetaBody*) { throw; };
 		/* returns all BodyExternalVariable's (Bex; formerly PhysicalActions) that this engine needs */
 		virtual list<string> getNeededBex(){return list<string>();}
-	REGISTER_ATTRIBUTES(/*no base*/,(label));
+	REGISTER_ATTRIBUTES(Serializable,(label));
 	REGISTER_CLASS_AND_BASE(Engine,Serializable);
 };
 REGISTER_SERIALIZABLE(Engine);

Modified: trunk/core/EngineUnit.hpp
===================================================================
--- trunk/core/EngineUnit.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/EngineUnit.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -22,7 +22,7 @@
 	// label to be able to retrieve an engine unit by its label
 	string label; 
 	REGISTER_CLASS_AND_BASE(EngineUnit,Serializable);
-	REGISTER_ATTRIBUTES(/* no base class attributes */,(label));
+	REGISTER_ATTRIBUTES(Serializable,(label));
 };
 
 REGISTER_SERIALIZABLE(EngineUnit);

Modified: trunk/core/FileGenerator.hpp
===================================================================
--- trunk/core/FileGenerator.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/FileGenerator.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -41,9 +41,8 @@
 	protected :
 	//! Returns whether the generation was successful; message for user is in FileGenerator::message
 	virtual bool generate();
-	virtual void postProcessAttributes(){};
 
-	REGISTER_ATTRIBUTES(/*no base*/,(outputFileName)(serializationDynlib));
+	REGISTER_ATTRIBUTES(Serializable,(outputFileName)(serializationDynlib));
 	DECLARE_LOGGER;
 	REGISTER_CLASS_AND_BASE(FileGenerator,Serializable);
 };

Modified: trunk/core/GeometricalModel.hpp
===================================================================
--- trunk/core/GeometricalModel.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/GeometricalModel.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -23,7 +23,7 @@
 		Vector3r	diffuseColor;
 		GeometricalModel(): highlight(false),wire(false),shadowCaster(false),diffuseColor(Vector3r(1,1,1)){}
 
-	REGISTER_ATTRIBUTES(/*no base*/,(highlight)(wire)(shadowCaster)(diffuseColor));
+	REGISTER_ATTRIBUTES(Serializable,(highlight)(wire)(shadowCaster)(diffuseColor));
 	REGISTER_CLASS_AND_BASE(GeometricalModel,Serializable Indexable);
 	REGISTER_INDEX_COUNTER(GeometricalModel);
 };

Modified: trunk/core/GroupRelationData.hpp
===================================================================
--- trunk/core/GroupRelationData.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/GroupRelationData.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -101,7 +101,7 @@
   void read(istream & is);  
   void write(ostream & os);
 
-  REGISTER_ATTRIBUTES(/*no base*/,(commands_));
+  REGISTER_ATTRIBUTES(Serializable,(commands_));
   REGISTER_CLASS_AND_BASE(GroupRelationData,Serializable);
  
   protected : virtual void preProcessAttributes  (bool deserializing);

Modified: trunk/core/InteractingGeometry.cpp
===================================================================
--- trunk/core/InteractingGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/InteractingGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -9,3 +9,4 @@
 *************************************************************************/
 
 #include "InteractingGeometry.hpp"
+

Modified: trunk/core/InteractingGeometry.hpp
===================================================================
--- trunk/core/InteractingGeometry.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/InteractingGeometry.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -34,11 +34,10 @@
 		#endif
 
 /// Serialization
-	REGISTER_ATTRIBUTES(/*no base*/,(diffuseColor));
+	REGISTER_ATTRIBUTES(Serializable,(diffuseColor));
 	REGISTER_CLASS_AND_BASE(InteractingGeometry,Serializable Indexable);
 /// Indexable
 	REGISTER_INDEX_COUNTER(InteractingGeometry);
 };
 REGISTER_SERIALIZABLE(InteractingGeometry);
 
-

Modified: trunk/core/Interaction.hpp
===================================================================
--- trunk/core/Interaction.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/Interaction.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -68,7 +68,7 @@
 		//! common initialization called from both constructor and reset()
 		void init();
 			
-	REGISTER_ATTRIBUTES(/*no base*/,
+	REGISTER_ATTRIBUTES(Serializable,
 		(id1)
 		(id2)
 		(iterMadeReal)

Modified: trunk/core/InteractionContainer.hpp
===================================================================
--- trunk/core/InteractionContainer.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/InteractionContainer.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -165,7 +165,7 @@
 	protected :
 		virtual void preProcessAttributes(bool deserializing);
 		virtual void postProcessAttributes(bool deserializing);
-	REGISTER_ATTRIBUTES(/*no base*/,(interaction)(pendingErase)(serializeSorted));
+	REGISTER_ATTRIBUTES(Serializable,(interaction)(pendingErase)(serializeSorted));
 	REGISTER_CLASS_AND_BASE(InteractionContainer,Serializable);
 };
 

Modified: trunk/core/InteractionGeometry.hpp
===================================================================
--- trunk/core/InteractionGeometry.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/InteractionGeometry.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -17,7 +17,7 @@
 	REGISTER_CLASS_NAME(InteractionGeometry);
 	REGISTER_BASE_CLASS_NAME(Serializable Indexable);
 	REGISTER_INDEX_COUNTER(InteractionGeometry);
-	REGISTER_ATTRIBUTES(/* no base class*/,/*no attributes either*/); // keep this line here
+	REGISTER_ATTRIBUTES(Serializable,/*no attributes either*/); // keep this line here
 };
 
 REGISTER_SERIALIZABLE(InteractionGeometry);

Modified: trunk/core/InteractionPhysics.hpp
===================================================================
--- trunk/core/InteractionPhysics.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/InteractionPhysics.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -17,7 +17,7 @@
 	REGISTER_CLASS_NAME(InteractionPhysics);
 	REGISTER_BASE_CLASS_NAME(Serializable Indexable);
 	REGISTER_INDEX_COUNTER(InteractionPhysics);
-	REGISTER_ATTRIBUTES(/* no base for attributes */,/* no attributes either */);
+	REGISTER_ATTRIBUTES(Serializable,/* no attributes either */);
 };
 REGISTER_SERIALIZABLE(InteractionPhysics);
 

Modified: trunk/core/MetaBody.cpp
===================================================================
--- trunk/core/MetaBody.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/MetaBody.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -34,7 +34,7 @@
 bool TimingInfo::enabled=false;
 
 MetaBody::MetaBody() :
-	Body(),bodies(new BodyRedirectionVector), interactions(new InteractionVecMap), transientInteractions(interactions)
+	Body(), bodies(new BodyRedirectionVector), interactions(new InteractionVecMap), transientInteractions(interactions)
 {	
 	engines.clear();
 	initializers.clear();
@@ -47,6 +47,8 @@
 	isDynamic=false;
 	dt=1e-8;
 	selectedBody=-1;
+	// FIXME: move MetaInteractingGeometry to core and create it here right away
+	// interactingGeometry=shared_ptr<InteractingGeometry>(new MetaInteractingGeometry);
 
 	// fill default tags
 	struct passwd* pw;

Modified: trunk/core/Omega.cpp
===================================================================
--- trunk/core/Omega.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/Omega.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -217,6 +217,7 @@
 void Omega::loadSimulationFromStream(std::istream& stream){
 	LOG_DEBUG("Loading simulation from stream.");
 	resetRootBody();
+	RenderMutexLock lock;
 	IOFormatManager::loadFromStream("XMLFormatManager",stream,"rootBody",rootBody);
 }
 
@@ -231,7 +232,6 @@
 	if(!filesystem::exists(simulationFileName) && !algorithm::starts_with(simulationFileName,":memory")) throw runtime_error("Simulation file to load doesn't exist: "+simulationFileName);
 	
 	LOG_INFO("Loading file " + simulationFileName);
-
 	{
 		if(algorithm::ends_with(simulationFileName,".xml") || algorithm::ends_with(simulationFileName,".xml.gz") || algorithm::ends_with(simulationFileName,".xml.bz2")){
 			joinSimulationLoop(); // stop current simulation if running

Modified: trunk/core/Omega.hpp
===================================================================
--- trunk/core/Omega.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/Omega.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -92,6 +92,9 @@
 		long tmpFileCounter;
 		std::string tmpFileDir;
 
+		// to avoid accessing simulation when it is being loaded (should avoid crashes with the UI)
+		boost::mutex loadingSimulationMutex;
+
 	public :
 		shared_ptr<Preferences> preferences;
 		string 				 yadeConfigPath;	// FIXME - must be private and more clean

Modified: trunk/core/PhysicalParameters.hpp
===================================================================
--- trunk/core/PhysicalParameters.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/PhysicalParameters.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -40,7 +40,7 @@
 		std::vector<std::string> blockedDOFs_vec_get() const;
 		void blockedDOFs_vec_set(const std::vector<std::string>& dofs);
 
-	REGISTER_ATTRIBUTES(/*no base*/,(se3)(refSe3)(blockedDOFs));
+	REGISTER_ATTRIBUTES(Serializable,(se3)(refSe3)(blockedDOFs));
 	REGISTER_CLASS_AND_BASE(PhysicalParameters,Serializable Indexable);
 	REGISTER_INDEX_COUNTER(PhysicalParameters);
 };

Modified: trunk/core/Preferences.hpp
===================================================================
--- trunk/core/Preferences.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/Preferences.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -19,7 +19,7 @@
 	public :
 		string		 defaultGUILibName;
 		Preferences ();
-	REGISTER_ATTRIBUTES(/* no base class*/,(defaultGUILibName));
+	REGISTER_ATTRIBUTES(Serializable,(defaultGUILibName));
 	REGISTER_CLASS_AND_BASE(Preferences,Serializable);
 };
 REGISTER_SERIALIZABLE(Preferences);

Modified: trunk/core/containers/BodyAssocVector.cpp
===================================================================
--- trunk/core/containers/BodyAssocVector.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/containers/BodyAssocVector.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -216,4 +216,4 @@
 }
 
 
-YADE_PLUGIN("BodyAssocVector");
\ No newline at end of file
+YADE_PLUGIN((BodyAssocVector));
\ No newline at end of file

Modified: trunk/core/containers/BodyRedirectionVector.cpp
===================================================================
--- trunk/core/containers/BodyRedirectionVector.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/containers/BodyRedirectionVector.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -261,4 +261,4 @@
 }
 
 
-// YADE_PLUGIN("BodyRedirectionVector");
\ No newline at end of file
+// YADE_PLUGIN((BodyRedirectionVector));
\ No newline at end of file

Modified: trunk/core/containers/InteractionHashMap.cpp
===================================================================
--- trunk/core/containers/InteractionHashMap.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/containers/InteractionHashMap.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -167,4 +167,4 @@
 {
 	return interactions.size();
 }
-YADE_PLUGIN("InteractionHashMap");
\ No newline at end of file
+YADE_PLUGIN((InteractionHashMap));
\ No newline at end of file

Modified: trunk/core/containers/InteractionVecMap.cpp
===================================================================
--- trunk/core/containers/InteractionVecMap.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/core/containers/InteractionVecMap.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -196,4 +196,4 @@
 	return currentSize;
 }
 
-// YADE_PLUGIN("InteractionVecMap");
\ No newline at end of file
+// YADE_PLUGIN((InteractionVecMap));
\ No newline at end of file

Modified: trunk/gui/qt3/QtGUIPreferences.hpp
===================================================================
--- trunk/gui/qt3/QtGUIPreferences.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/gui/qt3/QtGUIPreferences.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -23,7 +23,7 @@
 		QtGUIPreferences ();
 
 /// Serialization										///
-	REGISTER_ATTRIBUTES(/* nothing */,(version)(mainWindowPositionX)(mainWindowPositionY)(mainWindowSizeX)(mainWindowSizeY));
+	REGISTER_ATTRIBUTES(Serializable,(version)(mainWindowPositionX)(mainWindowPositionY)(mainWindowSizeX)(mainWindowSizeY));
 	REGISTER_CLASS_AND_BASE(QtGUIPreferences,Serializable);
 };
 REGISTER_SERIALIZABLE(QtGUIPreferences);

Modified: trunk/gui/qt3/SimulationController.cpp
===================================================================
--- trunk/gui/qt3/SimulationController.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/gui/qt3/SimulationController.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -151,7 +151,6 @@
 #endif
 };
 
-
 void SimulationController::pbLoadClicked()
 {
 	pbStopClicked();
@@ -173,10 +172,11 @@
 {
 	assert(filesystem::exists(fileName) || fileName.find(":memory:")==(size_t)0);
 
+		deactivateControlsWhenLoading();
+
 		Omega::instance().finishSimulationLoop();
 		Omega::instance().joinSimulationLoop();
 
-
 		bool keepTimeStepperSettings=Omega::instance().getSimulationFileName()==fileName;
 		Real prevDt=Omega::instance().getTimeStep();
 		bool timeStepperUsed=Omega::instance().timeStepperActive();
@@ -207,34 +207,8 @@
 			else {
 				LOG_DEBUG("New simulation loaded, timestepper is "<<(Omega::instance().timeStepperActive()?"":"NOT ")<<"being used (as per XML).");
 			}
-
-			//rbTimeStepper->setEnabled(Omega::instance().containTimeStepper());
-			//LOG_DEBUG("(Un)checking rbTimeStepper and rbFixed.");
-			//rbTimeStepper->setChecked(Omega::instance().timeStepperActive());
-			//rbFixed->setChecked(!Omega::instance().timeStepperActive());
-
-			#if 0
-			Real dt=Omega::instance().getTimeStep();
-			int exp10=(int)floor(log10(dt));
-			sbSecond->setValue((int)(dt/(pow(10.,exp10)))); // we may lose quite some precision here :-(
-			sb10PowerSecond->setValue(exp10);
-
-			changeSkipTimeStepper = true;
-			if (Omega::instance().containTimeStepper())
-			{
-				rbTimeStepper->setEnabled(true);
-				rbTimeStepper->setChecked(useTimeStepperIfPresent);
-				wasUsingTimeStepper = useTimeStepperIfPresent;
-			}
-			else
-			{
-				rbTimeStepper->setEnabled(false);
-				rbFixed->setChecked(true);
-				wasUsingTimeStepper = false;
-			}
-			skipTimeStepper=!wasUsingTimeStepper;
-			#endif
-		} 
+		}
+		 
 		catch(SerializableError& e) // catching it...
 		{
 			Omega::instance().resetRootBody();
@@ -415,8 +389,37 @@
 	restartTimer();
 }
 
+void SimulationController::deactivateControlsWhenLoading(){
+	labelSimulTime->setText(string(""));
+	labelRealTime->setText(string(""));
+	labelIter->setText(string(""));
+	labelStep->setText(string(""));
+	labelEstimationTime->setText(string(""));
+	labelStopAtIter->setText(string(""));
+	tlCurrentSimulation->setText("[loading]");
+	pbStartSimulation->setEnabled(false);
+	pbStopSimulation->setEnabled(false);
+	pbResetSimulation->setEnabled(false);
+	pbOneSimulationStep->setEnabled(false);
+	rbFixed->setEnabled(false);
+	rbTimeStepper->setEnabled(false);
+	sbSecond->setEnabled(false);
+	sb10PowerSecond->setEnabled(false);
+}
 
+
 void SimulationController::doUpdate(){
+	#if BOOST_VERSION<103500
+		boost::try_mutex::scoped_try_lock lock(Omega::instance().renderMutex);
+		if(!lock.locked()){
+	#else
+		boost::try_mutex::scoped_try_lock lock(Omega::instance().renderMutex,boost::defer_lock);
+		if(!lock.owns_lock()){
+	#endif
+		deactivateControlsWhenLoading();
+		return;
+	}
+	// if we got the lock, update controls as normally
 
 	Real simulationTime = Omega::instance().getSimulationTime();
 
@@ -454,41 +457,31 @@
 		labelRealTime->setText(string(strReal));
         
 	}
-    // update iterations per second - only one in a while (iterPerSec_TTL_ms)
-    // does someone need to display that with more precision than integer?
-    long iterPerSec_LastAgo_ms=(microsec_clock::local_time()-iterPerSec_LastLocalTime).total_milliseconds();
-    if(iterPerSec_LastAgo_ms>iterPerSec_TTL_ms){
-        iterPerSec=(1000.*(Omega::instance().getCurrentIteration()-iterPerSec_LastIter))/iterPerSec_LastAgo_ms;
-        iterPerSec_LastIter=Omega::instance().getCurrentIteration();
-        iterPerSec_LastLocalTime=microsec_clock::local_time();
-    }
-    char strIter[64];
-    /* print 0 instead of bogus values (at startup) */
-    snprintf(strIter,64,"iter #%ld, %.1f/s",Omega::instance().getCurrentIteration(),(iterPerSec<1e9 && iterPerSec>0)?iterPerSec:0.);
-    labelIter->setText(strIter);
+	// update iterations per second - only one in a while (iterPerSec_TTL_ms)
+	// does someone need to display that with more precision than integer?
+	long iterPerSec_LastAgo_ms=(microsec_clock::local_time()-iterPerSec_LastLocalTime).total_milliseconds();
+	if(iterPerSec_LastAgo_ms>iterPerSec_TTL_ms){
+		iterPerSec=(1000.*(Omega::instance().getCurrentIteration()-iterPerSec_LastIter))/iterPerSec_LastAgo_ms;
+		iterPerSec_LastIter=Omega::instance().getCurrentIteration();
+		iterPerSec_LastLocalTime=microsec_clock::local_time();
+	}
+	char strIter[64];
+	/* print 0 instead of bogus values (at startup) */
+	snprintf(strIter,64,"iter #%ld, %.1f/s",Omega::instance().getCurrentIteration(),(iterPerSec<1e9 && iterPerSec>0)?iterPerSec:0.);
+	labelIter->setText(strIter);
 
-    // update estimation time
-    char strEstimation[64];
-    if (Omega::instance().getRootBody()->stopAtIteration>0 && iterPerSec>0 ) 
-        estimation=duration+time_duration(seconds((Omega::instance().getRootBody()->stopAtIteration-Omega::instance().getCurrentIteration())/iterPerSec));
-    snprintf(strEstimation,64,"estimation %02d:%02d:%02d",estimation.hours(),estimation.minutes(),estimation.seconds());
-    labelEstimationTime->setText(strEstimation);
+   // update estimation time
+	char strEstimation[64];
+	if (Omega::instance().getRootBody()->stopAtIteration>0 && iterPerSec>0 ) estimation=duration+time_duration(seconds((Omega::instance().getRootBody()->stopAtIteration-Omega::instance().getCurrentIteration())/iterPerSec));
+	snprintf(strEstimation,64,"estimation %02d:%02d:%02d",estimation.hours(),estimation.minutes(),estimation.seconds());
+ 	labelEstimationTime->setText(strEstimation);
 
-    char strStopAtIter[64];
-    snprintf(strStopAtIter,64,"stopAtIter #%ld",Omega::instance().getRootBody()->stopAtIteration);
-    labelStopAtIter->setText(strStopAtIter);
+	char strStopAtIter[64];
+	snprintf(strStopAtIter,64,"stopAtIter #%ld",Omega::instance().getRootBody()->stopAtIteration);
+	labelStopAtIter->setText(strStopAtIter);
 
-	//boost::mutex::scoped_lock lock(timeMutex);
-
-	//if (changeSkipTimeStepper) Omega::instance().skipTimeStepper(skipTimeStepper);
-	//if (changeTimeStep) {
-	//	// wrap the mantissa around
-	//} else {
-	//}
-
 	if(sbRefreshTime->value()!=refreshTime) sbRefreshTime->setValue(refreshTime);
 
-
 	char strStep[64];
 	snprintf(strStep,64,"step %g",(double)Omega::instance().getTimeStep());
 	labelStep->setText(string(strStep));
@@ -509,6 +502,7 @@
 	pbStopSimulation->setEnabled(hasSimulation && isRunning);
 	pbResetSimulation->setEnabled(hasSimulation && hasFileName);
 	pbOneSimulationStep->setEnabled(hasSimulation && !isRunning);
+	rbFixed->setEnabled(true);
 	rbTimeStepper->setEnabled(hasTimeStepper);
 	sbSecond->setEnabled(!usesTimeStepper);
 	sb10PowerSecond->setEnabled(!usesTimeStepper);

Modified: trunk/gui/qt3/SimulationController.hpp
===================================================================
--- trunk/gui/qt3/SimulationController.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/gui/qt3/SimulationController.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -57,6 +57,7 @@
 	
 	public : 
 		void loadSimulationFromFileName(const std::string& fileName,bool center=true);
+		void deactivateControlsWhenLoading();
 		bool changeSkipTimeStepper,skipTimeStepper,changeTimeStep,wasUsingTimeStepper;
 		SimulationController (QWidget * parent=NULL);
 		virtual ~SimulationController () {}; 

Modified: trunk/gui/qt3/SnapshotEngine.cpp
===================================================================
--- trunk/gui/qt3/SnapshotEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/gui/qt3/SnapshotEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -2,7 +2,7 @@
 #include<sstream>
 #include<iomanip>
 CREATE_LOGGER(SnapshotEngine);
-YADE_PLUGIN("SnapshotEngine");
+YADE_PLUGIN((SnapshotEngine));
 void SnapshotEngine::action(MetaBody* rb){
 	shared_ptr<GLViewer> glv;
 	if(!YadeQtMainWindow::self || ((size_t)viewNo>=YadeQtMainWindow::self->glViews.size()) || !(glv=YadeQtMainWindow::self->glViews[viewNo])){

Modified: trunk/lib/base/yadeWm3Extra.hpp
===================================================================
--- trunk/lib/base/yadeWm3Extra.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/lib/base/yadeWm3Extra.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -122,24 +122,43 @@
 void quaternionToEulerAngles (const Quaternionr& q, Vector3r& eulerAngles,Real threshold=1e-6f);
 void quaterniontoGLMatrix(const Quaternionr& q, Real m[16]);
 
+#include<boost/serialization/nvp.hpp>
 
-#include <boost/archive/text_oarchive.hpp>
-#include <boost/archive/text_iarchive.hpp>
-#include <boost/archive/binary_oarchive.hpp>
-#include <boost/archive/binary_iarchive.hpp>
-
-
 namespace boost {
 namespace serialization {
 
 template<class Archive>
+void serialize(Archive & ar, Vector2r & g, const unsigned int version){
+	Real &x=g[0], &y=g[1];
+	ar & BOOST_SERIALIZATION_NVP(x) & BOOST_SERIALIZATION_NVP(y);
+}
+
+template<class Archive>
+void serialize(Archive & ar, Vector2<int> & g, const unsigned int version){
+	int &x=g[0], &y=g[1];
+	ar & BOOST_SERIALIZATION_NVP(x) & BOOST_SERIALIZATION_NVP(y);
+}
+
+template<class Archive>
 void serialize(Archive & ar, Vector3r & g, const unsigned int version)
 {
-    ar & g[0];
-    ar & g[1];
-    ar & g[2];
+	Real &x=g[0], &y=g[1], &z=g[2];
+	ar & BOOST_SERIALIZATION_NVP(x) & BOOST_SERIALIZATION_NVP(y) & BOOST_SERIALIZATION_NVP(z);
 }
 
+template<class Archive>
+void serialize(Archive & ar, Quaternionr & g, const unsigned int version)
+{
+	Real &x=g[0], &y=g[1], &z=g[2], &w=g[2];
+	ar & BOOST_SERIALIZATION_NVP(x) & BOOST_SERIALIZATION_NVP(y) & BOOST_SERIALIZATION_NVP(z) & BOOST_SERIALIZATION_NVP(w);
+}
+
+template<class Archive>
+void serialize(Archive & ar, Se3r & g, const unsigned int version){
+	Vector3r& position=g.position; Quaternionr& orientation=g.orientation;
+	ar & BOOST_SERIALIZATION_NVP(position) & BOOST_SERIALIZATION_NVP(orientation);
+}
+
 } // namespace serialization
 } // namespace boost
 

Modified: trunk/lib/factory/ClassFactory.hpp
===================================================================
--- trunk/lib/factory/ClassFactory.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/lib/factory/ClassFactory.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -26,13 +26,35 @@
 
 
 #include<yade/lib-loki/Singleton.hpp>
-#include<boost/preprocessor/cat.hpp>
+#include<boost/preprocessor.hpp>
 
 
 #include "FactoryExceptions.hpp"
 #include "DynLibManager.hpp"
 
+/*! define the following macro to enable experimenta boost::serialization support
+	Slows the compilation down about 10×, and doesn't work.
+	Python wrapper defines O.saveXML('file.xml') to try it out.
+*/
+// #define YADE_BOOST_SERIALIZATION
 
+#ifdef YADE_BOOST_SERIALIZATION
+	//#include<boost/archive/binary_oarchive.hpp>
+	//#include<boost/archive/binary_iarchive.hpp>
+	#include<boost/archive/xml_oarchive.hpp>
+	#include<boost/archive/xml_iarchive.hpp>
+
+	#include<boost/serialization/export.hpp> // must come after all supported archive types
+
+	#include<boost/serialization/base_object.hpp>
+	#include<boost/serialization/shared_ptr.hpp>
+	#include<boost/serialization/list.hpp>
+	#include<boost/serialization/vector.hpp>
+	#include<boost/serialization/map.hpp>
+	#include<boost/serialization/nvp.hpp>
+#endif
+
+
 #define REGISTER_FACTORABLE(name) 						\
 	inline shared_ptr< Factorable > CreateShared##name()			\
 	{										\
@@ -154,13 +176,20 @@
 };
 
 
-/*! Macro defining what classes can be found in this plugin -- must always be used in the respective .cpp file. If left empty, filename will be used to deduce that.
+/*! Macro defining what classes can be found in this plugin -- must always be used in the respective .cpp file.
  *
- * Note:
- * 	1. Visibility must be set to "internal" (or "protected") so that other plugins' init will not shadow this one and all of them get properly executed.
- * 	2. The function must be enclosed in its own anonymous namespace, otherwise there will be clashes (liker errors) if more files with YADE_PLUGIN are linked together.
+ * Note: __COUNTER__ generates unique function name for each plugin. This avoids name clashes, even if multiple .cpp files
+ * are compiled into one plugin.
  */
-#define YADE_PLUGIN(...) namespace{ __attribute__((constructor)) __attribute__((visibility("internal"))) void BOOST_PP_CAT(registerThisPluginClasses,__COUNTER__) (void){ const char* info[]={__FILE__ , ##__VA_ARGS__ , NULL}; ClassFactory::instance().registerPluginClasses(info);} }
+
+#ifdef YADE_BOOST_SERIALIZATION
+	#define _YADE_PLUGIN_BOOST_REGISTER(x,y,z) BOOST_CLASS_EXPORT(z);
+#else
+	#define _YADE_PLUGIN_BOOST_REGISTER(x,y,z)
+#endif
+
+#define _YADE_PLUGIN_REPEAT(x,y,z) BOOST_PP_STRINGIZE(z),
+#define YADE_PLUGIN(plugins) namespace{ __attribute__((constructor)) void BOOST_PP_CAT(registerThisPluginClasses,__COUNTER__) (void){ const char* info[]={__FILE__ , BOOST_PP_SEQ_FOR_EACH(_YADE_PLUGIN_REPEAT,~,plugins) NULL}; ClassFactory::instance().registerPluginClasses(info);} } BOOST_PP_SEQ_FOR_EACH(_YADE_PLUGIN_BOOST_REGISTER,~,plugins)
 //! Macro informing build file generator what features that particular file depends on. Has no effect at compile-time. Can be specified multiple times within a single (.cpp) file
 #define YADE_REQUIRE_FEATURE(feature)
 

Modified: trunk/lib/multimethods/DynLibDispatcher.hpp
===================================================================
--- trunk/lib/multimethods/DynLibDispatcher.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/lib/multimethods/DynLibDispatcher.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -460,8 +460,10 @@
 		  {
 			index1 = base1->getClassIndex();
 			index2 = base2->getClassIndex();
-			assert( index1 >= 0 && (unsigned int)( index1 ) < callBacks.size() &&
-				index2 >= 0 && (unsigned int)( index2 ) < callBacks[index1].size() );
+			assert( index1 >= 0 ); 
+			assert( index2 >= 0 ); 
+			assert((unsigned int)( index1 ) < callBacks.size());
+			assert((unsigned int)( index2 ) < callBacks.size());
 				
 			if(callBacks[index1][index2])
 				return true;

Modified: trunk/lib/serialization/IOFormatManager.cpp
===================================================================
--- trunk/lib/serialization/IOFormatManager.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/lib/serialization/IOFormatManager.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -159,7 +159,7 @@
 
 	shared_ptr<Archive> tmpAc = Archive::create(ac.getName(),*s);
 	tmpAc->deserialize(stream, *tmpAc, str);
-	s->deserialize(ac.getAddress());
+	s->yadeDeserialize(ac.getAddress());
 
 	ac.markProcessed();
 }
@@ -167,7 +167,7 @@
 void IOFormatManager::serializeCustomClass(ostream& stream, Archive& ac,int depth)
 {
 	shared_ptr<Serializable> s = YADE_PTR_CAST<Serializable>(ClassFactory::instance().createShared(ac.getSerializableClassName()));
-	s->serialize(ac.getAddress());
+	s->yadeSerialize(ac.getAddress());
 	shared_ptr<Archive> tmpAc = Archive::create(ac.getName(),*s);
 	tmpAc->serialize(stream,*tmpAc,depth);
 	ac.markProcessed();
@@ -220,7 +220,7 @@
 	for(;si!=siEnd;++si,++arci)
 		(*arci)->deserialize(stream,*(*arci),(*si));
 
-	s->deserialize(ac.getAddress());
+	s->yadeDeserialize(ac.getAddress());
 	s->unregisterSerializableAttributes(true); // FIXME - make sure that it was a mistake that this line WAS MISSING.
 	ac.markProcessed();
 }
@@ -229,7 +229,7 @@
 void IOFormatManager::serializeCustomFundamental(ostream& stream, Archive& ac,int depth)
 {
 	shared_ptr<Serializable> ss = YADE_PTR_CAST<Serializable>(ClassFactory::instance().createShared(ac.getSerializableClassName()));
-	ss->serialize(ac.getAddress());
+	ss->yadeSerialize(ac.getAddress());
 	ss->registerSerializableAttributes(false);
 	Serializable::Archives archives = ss->getArchives();
 	Serializable::Archives::iterator archi = archives.begin();

Modified: trunk/lib/serialization/Serializable.hpp
===================================================================
--- trunk/lib/serialization/Serializable.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/lib/serialization/Serializable.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -34,6 +34,9 @@
 #include"SerializationExceptions.hpp"
 #include"Archive.hpp"
 
+
+
+
 using namespace boost;
 using namespace std;
 using namespace ArchiveTypes;
@@ -50,13 +53,22 @@
 	void registerAttributes(){}
 };
 
-#define _REGISTER_ATTRIBUTES_BODY(x,y,z) registerAttribute(BOOST_PP_STRINGIZE(z),z);
-#define REGISTER_ATTRIBUTES_MANY(attrs) BOOST_PP_SEQ_FOR_EACH(_REGISTER_ATTRIBUTES_BODY,~,attrs)
+#ifdef YADE_BOOST_SERIALIZATION
+	#define _REGISTER_BOOST_ATTRIBUTES_REPEAT(x,y,z) ar & BOOST_SERIALIZATION_NVP(z);
+	#define _REGISTER_BOOST_ATTRIBUTES(baseClass,attrs) \
+		friend class boost::serialization::access; private: template<class ArchiveT> void serialize(ArchiveT & ar, unsigned int version){ preProcessAttributes(ArchiveT::is_loading::value); ar & BOOST_SERIALIZATION_BASE_OBJECT_NVP(baseClass); BOOST_PP_SEQ_FOR_EACH(_REGISTER_BOOST_ATTRIBUTES_REPEAT,~,attrs) postProcessAttributes(ArchiveT::is_loading::value); }
+#else
+	#define _REGISTER_BOOST_ATTRIBUTES(baseClass,attrs)
+#endif
+
+
+
+#define _REGISTER_ATTRIBUTES_REPEAT(x,y,z) registerAttribute(BOOST_PP_STRINGIZE(z),z);
 //! create member function that register attributes; must be parenthesized, without commas: (attr1) (attr2) (attr3) ...
 //#define REGISTER_ATTRIBUTES(attrs) protected: void registerAttributes(){ REGISTER_ATTRIBUTES_MANY(attrs) }
 //! Same as REGISTER_ATTRIBUTES, but with first argument of base class, of which registerAttributes will be called first
 #ifndef YADE_PYTHON
-	#define REGISTER_ATTRIBUTES(baseClass,attrs) protected: void registerAttributes(){ baseClass::registerAttributes(); REGISTER_ATTRIBUTES_MANY(attrs); }
+	#define REGISTER_ATTRIBUTES(baseClass,attrs) protected: void registerAttributes(){ baseClass::registerAttributes(); BOOST_PP_SEQ_FOR_EACH(_REGISTER_ATTRIBUTES_REPEAT,~,attrs) } _REGISTER_BOOST_ATTRIBUTES(baseClass,attrs)
 #else
 	#include<boost/python.hpp>
 
@@ -73,18 +85,13 @@
 	#define _PYKEYS_ATTR(x,y,z) ret.append(BOOST_PP_STRINGIZE(z));
 	#define _PYHASKEY_ATTR(x,y,z) if(key==BOOST_PP_STRINGIZE(z)) return true;
 	#define _PYDICT_ATTR(x,y,z) ret[BOOST_PP_STRINGIZE(z)]=boost::python::object(z);
-	#define PYGET_MANY(attrs) BOOST_PP_SEQ_FOR_EACH(_PYGET_ATTR,~,attrs)
-	#define PYSET_MANY(attrs) BOOST_PP_SEQ_FOR_EACH(_PYSET_ATTR,~,attrs)
-	#define PYKEYS_MANY(attrs) BOOST_PP_SEQ_FOR_EACH(_PYKEYS_ATTR,~,attrs)
-	#define PYHASKEY_MANY(attrs) BOOST_PP_SEQ_FOR_EACH(_PYHASKEY_ATTR,~,attrs)
-	#define PYDICT_MANY(attrs) BOOST_PP_SEQ_FOR_EACH(_PYDICT_ATTR,~,attrs)
 
-	#define REGISTER_ATTRIBUTES(baseClass,attrs) protected: void registerAttributes(){ baseClass::registerAttributes(); REGISTER_ATTRIBUTES_MANY(attrs); } \
-		public: boost::python::object pyGetAttr(const std::string& key) const{ PYGET_MANY(attrs); return baseClass::pyGetAttr(key); } \
-		void pySetAttr(const std::string& key, const boost::python::object& value){ PYSET_MANY(attrs); baseClass::pySetAttr(key,value); } \
-		boost::python::list pyKeys() const { boost::python::list ret; PYKEYS_MANY(attrs); ret.extend(baseClass::pyKeys()); return ret; } \
-		bool pyHasKey(const std::string& key) const { PYHASKEY_MANY(attrs); return baseClass::pyHasKey(key); } \
-		boost::python::dict pyDict() const { boost::python::dict ret; PYDICT_MANY(attrs); ret.update(baseClass::pyDict()); return ret; }
+	#define REGISTER_ATTRIBUTES(baseClass,attrs) protected: void registerAttributes(){ baseClass::registerAttributes(); BOOST_PP_SEQ_FOR_EACH(_REGISTER_ATTRIBUTES_REPEAT,~,attrs) } _REGISTER_BOOST_ATTRIBUTES(baseClass,attrs) \
+		public: boost::python::object pyGetAttr(const std::string& key) const{ BOOST_PP_SEQ_FOR_EACH(_PYGET_ATTR,~,attrs); return baseClass::pyGetAttr(key); } \
+		void pySetAttr(const std::string& key, const boost::python::object& value){  BOOST_PP_SEQ_FOR_EACH(_PYSET_ATTR,~,attrs); baseClass::pySetAttr(key,value); } \
+		boost::python::list pyKeys() const { boost::python::list ret; BOOST_PP_SEQ_FOR_EACH(_PYKEYS_ATTR,~,attrs); ret.extend(baseClass::pyKeys()); return ret; } \
+		bool pyHasKey(const std::string& key) const { BOOST_PP_SEQ_FOR_EACH(_PYHASKEY_ATTR,~,attrs); return baseClass::pyHasKey(key); } \
+		boost::python::dict pyDict() const { boost::python::dict ret; BOOST_PP_SEQ_FOR_EACH(_PYDICT_ATTR,~,attrs); ret.update(baseClass::pyDict()); return ret; }
 #endif
 
 
@@ -92,6 +99,7 @@
 #define REGISTER_SERIALIZABLE_GENERIC(name,isFundamental) 						\
 	REGISTER_FACTORABLE(name);								\
 	REGISTER_SERIALIZABLE_DESCRIPTOR(name,name,SerializableTypes::SERIALIZABLE,isFundamental);
+
 // implied non-fundamental
 #define REGISTER_SERIALIZABLE(name) REGISTER_SERIALIZABLE_GENERIC(name,false)
 // explicit fundamental
@@ -115,19 +123,20 @@
 		bool containsOnlyFundamentals();
 		Archives& getArchives() 	{ return archives; };
 		
-		virtual void serialize(any& )	{ throw SerializableError(SerializationExceptions::SetFunctionNotDeclared); };
-		virtual void deserialize(any& ) { throw SerializableError(SerializationExceptions::GetFunctionNotDeclared); };
+		virtual void yadeSerialize(any& )	{ throw SerializableError(SerializationExceptions::SetFunctionNotDeclared); };
+		virtual void yadeDeserialize(any& ) { throw SerializableError(SerializationExceptions::GetFunctionNotDeclared); };
 
 		virtual void postProcessAttributes(bool /*deserializing*/) {};
 
+		// harmless even if boost::serialization is not used
+		template <class ArchiveT> void serialize(ArchiveT & ar, unsigned int version){ };
+
 	#ifdef YADE_PYTHON
 		virtual boost::python::object pyGetAttr(const std::string& key) const { return ::pyGetAttr(key); }
 		virtual void pySetAttr(const std::string& key, const boost::python::object& value){ ::pySetAttr(key,value); };
 		virtual boost::python::list pyKeys() const {return ::pyKeys(); };
 		virtual bool pyHasKey(const std::string& key) const {return ::pyHasKey(key);}
 		virtual boost::python::dict pyDict() const { return ::pyDict(); }
-		// override for root classes only (those which have distinct python wrappers
-		virtual std::string pyRootClassName() const { return std::string("Serializable"); }
 	#endif
 
 	private :

Modified: trunk/pkg/common/DataClass/BoundingVolume/AABB.cpp
===================================================================
--- trunk/pkg/common/DataClass/BoundingVolume/AABB.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/BoundingVolume/AABB.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -16,4 +16,5 @@
 {
 }
 
-YADE_PLUGIN("AABB");
\ No newline at end of file
+YADE_PLUGIN((AABB));
+

Modified: trunk/pkg/common/DataClass/BoundingVolume/AABB.hpp
===================================================================
--- trunk/pkg/common/DataClass/BoundingVolume/AABB.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/BoundingVolume/AABB.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -20,15 +20,11 @@
 		virtual ~AABB();
 	
 /// Serialization
-	
-	REGISTER_CLASS_NAME(AABB);	
-	REGISTER_BASE_CLASS_NAME(BoundingVolume);
-
+	REGISTER_CLASS_AND_BASE(AABB,BoundingVolume);	
+	REGISTER_ATTRIBUTES(BoundingVolume,/* no attributes */);
 /// Indexable
-	
 	REGISTER_CLASS_INDEX(AABB,BoundingVolume);
 };
-
 REGISTER_SERIALIZABLE(AABB);
 
 

Modified: trunk/pkg/common/DataClass/BoundingVolume/BoundingSphere.cpp
===================================================================
--- trunk/pkg/common/DataClass/BoundingVolume/BoundingSphere.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/BoundingVolume/BoundingSphere.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -24,4 +24,5 @@
 // 	min = center-v;
 // 	max = center+v;	
 // }
-YADE_PLUGIN("BoundingSphere");
\ No newline at end of file
+YADE_PLUGIN((BoundingSphere));
+

Modified: trunk/pkg/common/DataClass/GeometricalModel/Box.cpp
===================================================================
--- trunk/pkg/common/DataClass/GeometricalModel/Box.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/GeometricalModel/Box.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -8,4 +8,5 @@
 #include "Box.hpp"
 Box::Box () : GeometricalModel() { createIndex(); }
 Box::~Box (){}
-YADE_PLUGIN("Box");
\ No newline at end of file
+YADE_PLUGIN((Box));
+

Modified: trunk/pkg/common/DataClass/GeometricalModel/BshTube.cpp
===================================================================
--- trunk/pkg/common/DataClass/GeometricalModel/BshTube.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/GeometricalModel/BshTube.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -19,4 +19,5 @@
 {		
 }
 
-YADE_PLUGIN("BshTube");
+YADE_PLUGIN((BshTube));
+

Modified: trunk/pkg/common/DataClass/GeometricalModel/Facet.cpp
===================================================================
--- trunk/pkg/common/DataClass/GeometricalModel/Facet.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/GeometricalModel/Facet.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,4 +18,5 @@
 {
 }
 
-YADE_PLUGIN("Facet");
\ No newline at end of file
+YADE_PLUGIN((Facet));
+

Modified: trunk/pkg/common/DataClass/GeometricalModel/Mesh2D.cpp
===================================================================
--- trunk/pkg/common/DataClass/GeometricalModel/Mesh2D.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/GeometricalModel/Mesh2D.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -47,4 +47,5 @@
 
 
 
-YADE_PLUGIN("Mesh2D");
\ No newline at end of file
+YADE_PLUGIN((Mesh2D));
+

Modified: trunk/pkg/common/DataClass/GeometricalModel/Quadrilateral.cpp
===================================================================
--- trunk/pkg/common/DataClass/GeometricalModel/Quadrilateral.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/GeometricalModel/Quadrilateral.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -31,4 +31,5 @@
 
 Quadrilateral::~Quadrilateral(){}
 
-YADE_PLUGIN("Quadrilateral");
\ No newline at end of file
+YADE_PLUGIN((Quadrilateral));
+

Modified: trunk/pkg/common/DataClass/GeometricalModel/Sphere.cpp
===================================================================
--- trunk/pkg/common/DataClass/GeometricalModel/Sphere.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/GeometricalModel/Sphere.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -19,4 +19,5 @@
 }
 
 
-YADE_PLUGIN("Sphere");
\ No newline at end of file
+YADE_PLUGIN((Sphere));
+

Modified: trunk/pkg/common/DataClass/GeometricalModel/Tetrahedron.cpp
===================================================================
--- trunk/pkg/common/DataClass/GeometricalModel/Tetrahedron.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/GeometricalModel/Tetrahedron.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -30,4 +30,5 @@
 {
 }
 
-YADE_PLUGIN("Tetrahedron");
\ No newline at end of file
+YADE_PLUGIN((Tetrahedron));
+

Modified: trunk/pkg/common/DataClass/InteractingGeometry/BssSweptSphereLineSegment.cpp
===================================================================
--- trunk/pkg/common/DataClass/InteractingGeometry/BssSweptSphereLineSegment.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractingGeometry/BssSweptSphereLineSegment.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -20,4 +20,4 @@
 {		
 }
 
-YADE_PLUGIN("BssSweptSphereLineSegment");
+YADE_PLUGIN((BssSweptSphereLineSegment));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/InteractingGeometry/InteractingBox.cpp
===================================================================
--- trunk/pkg/common/DataClass/InteractingGeometry/InteractingBox.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractingGeometry/InteractingBox.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,4 +18,4 @@
 {		
 }
 
-YADE_PLUGIN("InteractingBox");
\ No newline at end of file
+YADE_PLUGIN((InteractingBox));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/InteractingGeometry/InteractingFacet.cpp
===================================================================
--- trunk/pkg/common/DataClass/InteractingGeometry/InteractingFacet.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractingGeometry/InteractingFacet.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -42,4 +42,4 @@
 		icr = e[0].Length()*ne[0].Dot(e[2])/p;
 	}
 }
-YADE_PLUGIN("InteractingFacet");
\ No newline at end of file
+YADE_PLUGIN((InteractingFacet));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/InteractingGeometry/InteractingNode.cpp
===================================================================
--- trunk/pkg/common/DataClass/InteractingGeometry/InteractingNode.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractingGeometry/InteractingNode.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,4 +18,4 @@
 }
 
 
-YADE_PLUGIN("InteractingNode");
+YADE_PLUGIN((InteractingNode));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/InteractingGeometry/InteractingSphere.cpp
===================================================================
--- trunk/pkg/common/DataClass/InteractingGeometry/InteractingSphere.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractingGeometry/InteractingSphere.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,4 +18,4 @@
 }
 
 
-YADE_PLUGIN("InteractingSphere");
\ No newline at end of file
+YADE_PLUGIN((InteractingSphere));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.cpp
===================================================================
--- trunk/pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -17,4 +17,4 @@
 {
 }
 
-YADE_PLUGIN("MetaInteractingGeometry");
\ No newline at end of file
+YADE_PLUGIN((MetaInteractingGeometry));

Modified: trunk/pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.hpp
===================================================================
--- trunk/pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -17,13 +17,12 @@
 		virtual ~MetaInteractingGeometry ();
 
 /// Serialization
-	REGISTER_CLASS_NAME(MetaInteractingGeometry);
-	REGISTER_BASE_CLASS_NAME(InteractingGeometry);
-	
+	REGISTER_CLASS_AND_BASE(MetaInteractingGeometry,InteractingGeometry);
+	// FIXME: if this class is registered, MetaBody then has "abstract" InteractingGeometry, which fails in the functor (??)
+	REGISTER_ATTRIBUTES(InteractingGeometry,/* no attributes */);
 /// Indexable
 	REGISTER_CLASS_INDEX(MetaInteractingGeometry,InteractingGeometry);
 };
 
 REGISTER_SERIALIZABLE(MetaInteractingGeometry);
 
-

Modified: trunk/pkg/common/DataClass/InteractionGeometry/ClosestFeatures.cpp
===================================================================
--- trunk/pkg/common/DataClass/InteractionGeometry/ClosestFeatures.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractionGeometry/ClosestFeatures.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -28,4 +28,4 @@
 // }
 // 
 
-YADE_PLUGIN("ClosestFeatures");
\ No newline at end of file
+YADE_PLUGIN((ClosestFeatures));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/InteractionPhysics/NormalShearInteractions.cpp
===================================================================
--- trunk/pkg/common/DataClass/InteractionPhysics/NormalShearInteractions.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractionPhysics/NormalShearInteractions.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -1,5 +1,5 @@
 #include"NormalShearInteractions.hpp"
-YADE_PLUGIN("NormalInteraction","NormalShearInteraction");
+YADE_PLUGIN((NormalInteraction)(NormalShearInteraction));
 /* At least one virtual function must be in the shared object; let's put empty desctructors here
  * Otherwise downcasting via dynamic_cast will not work (no vtable in the shared lib?)
  */

Modified: trunk/pkg/common/DataClass/InteractionPhysics/NormalShearInteractions.hpp
===================================================================
--- trunk/pkg/common/DataClass/InteractionPhysics/NormalShearInteractions.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/InteractionPhysics/NormalShearInteractions.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -13,7 +13,7 @@
 		Vector3r normalForce;
 		NormalInteraction(): normalForce(Vector3r::ZERO) {createIndex(); }
 		virtual ~NormalInteraction();
-	REGISTER_ATTRIBUTES(/*no base class attributes*/,(kn)(normalForce));
+	REGISTER_ATTRIBUTES(Serializable,(kn)(normalForce));
 	REGISTER_CLASS_AND_BASE(NormalInteraction,InteractionPhysics);
 	REGISTER_CLASS_INDEX(NormalInteraction,InteractionPhysics);
 };

Modified: trunk/pkg/common/DataClass/PhysicalParameters/BcpConnection.cpp
===================================================================
--- trunk/pkg/common/DataClass/PhysicalParameters/BcpConnection.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/PhysicalParameters/BcpConnection.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -20,4 +20,4 @@
 {
 }
 
-YADE_PLUGIN("BcpConnection");
+YADE_PLUGIN((BcpConnection));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/PhysicalParameters/ElasticBodyParameters.cpp
===================================================================
--- trunk/pkg/common/DataClass/PhysicalParameters/ElasticBodyParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/PhysicalParameters/ElasticBodyParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -17,4 +17,4 @@
 {
 }
 
-YADE_PLUGIN("ElasticBodyParameters");
\ No newline at end of file
+YADE_PLUGIN((ElasticBodyParameters));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/PhysicalParameters/ParticleParameters.cpp
===================================================================
--- trunk/pkg/common/DataClass/PhysicalParameters/ParticleParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/PhysicalParameters/ParticleParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -23,4 +23,4 @@
 {
 }
 
-YADE_PLUGIN("ParticleParameters");
\ No newline at end of file
+YADE_PLUGIN((ParticleParameters));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/PhysicalParameters/RigidBodyParameters.cpp
===================================================================
--- trunk/pkg/common/DataClass/PhysicalParameters/RigidBodyParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/PhysicalParameters/RigidBodyParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -22,4 +22,4 @@
 {
 }
 
-YADE_PLUGIN("RigidBodyParameters");
\ No newline at end of file
+YADE_PLUGIN((RigidBodyParameters));
\ No newline at end of file

Modified: trunk/pkg/common/DataClass/Widgets/ColorScale.cpp
===================================================================
--- trunk/pkg/common/DataClass/Widgets/ColorScale.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/DataClass/Widgets/ColorScale.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -24,4 +24,4 @@
 }
 
 
-YADE_PLUGIN("ColorScale");
\ No newline at end of file
+YADE_PLUGIN((ColorScale));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/DeusExMachina/DisplacementEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/DisplacementEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/DisplacementEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -76,4 +76,4 @@
 
 }
 
-YADE_PLUGIN("DisplacementEngine");
\ No newline at end of file
+YADE_PLUGIN((DisplacementEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/DeusExMachina/DisplacementToForceEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/DisplacementToForceEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/DisplacementToForceEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -70,4 +70,4 @@
 		
 }
 
-YADE_PLUGIN("DisplacementToForceEngine");
\ No newline at end of file
+YADE_PLUGIN((DisplacementToForceEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/DeusExMachina/FixedOrientationEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/FixedOrientationEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/FixedOrientationEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -47,4 +47,4 @@
 //	}
 }
 
-YADE_PLUGIN("FixedOrientationEngine");
\ No newline at end of file
+YADE_PLUGIN((FixedOrientationEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/DeusExMachina/FixedPositionEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/FixedPositionEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/FixedPositionEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -28,4 +28,4 @@
 	}
 }
 
-YADE_PLUGIN("FixedPositionEngine");
\ No newline at end of file
+YADE_PLUGIN((FixedPositionEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/DeusExMachina/ForceEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/ForceEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/ForceEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -8,8 +8,7 @@
 #include<yade/pkg-common/LinearInterpolate.hpp>
 #include<yade/pkg-dem/Shop.hpp>
 
-YADE_PLUGIN("ForceEngine","InterpolatingDirectedForceEngine");
-
+YADE_PLUGIN((ForceEngine)(InterpolatingDirectedForceEngine));
 void ForceEngine::applyCondition(MetaBody* ncb){
 	FOREACH(body_id_t id, subscribedBodies){
 		assert(ncb->bodies->exists(id));

Modified: trunk/pkg/common/Engine/DeusExMachina/GravityEngines.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/GravityEngines.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/GravityEngines.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -10,9 +10,8 @@
 #include<yade/pkg-common/ParticleParameters.hpp>
 #include<yade/core/MetaBody.hpp>
 
-YADE_PLUGIN("GravityEngine","CentralGravityEngine","AxialGravityEngine");
+YADE_PLUGIN((GravityEngine)(CentralGravityEngine)(AxialGravityEngine));
 
-
 void GravityEngine::applyCondition(MetaBody* ncb){
 	/* skip bodies that are within a clump;
 	 * even if they are marked isDynamic==false, forces applied to them are passed to the clump, which is dynamic;

Modified: trunk/pkg/common/Engine/DeusExMachina/JumpChangeSe3.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/JumpChangeSe3.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/JumpChangeSe3.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -1,5 +1,4 @@
 // 2008 © Václav Šmilauer <eudoxos@xxxxxxxx> 
 #include"JumpChangeSe3.hpp"
 CREATE_LOGGER(JumpChangeSe3);
-YADE_PLUGIN("JumpChangeSe3");
-
+YADE_PLUGIN((JumpChangeSe3));

Modified: trunk/pkg/common/Engine/DeusExMachina/MomentEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/MomentEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/MomentEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -40,4 +40,4 @@
         }
 }
 
-YADE_PLUGIN("MomentEngine");
\ No newline at end of file
+YADE_PLUGIN((MomentEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/PressTestEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -66,4 +66,4 @@
 }
 
 CREATE_LOGGER(PressTestEngine);
-YADE_PLUGIN("PressTestEngine");
+YADE_PLUGIN((PressTestEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/DeusExMachina/RotationEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/RotationEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/RotationEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -10,9 +10,8 @@
 
 #include<yade/pkg-common/LinearInterpolate.hpp>
 
-YADE_PLUGIN("RotationEngine","SpiralEngine","InterpolatingSpiralEngine");
+YADE_PLUGIN((RotationEngine)(SpiralEngine)(InterpolatingSpiralEngine));
 
-
 void InterpolatingSpiralEngine::applyCondition(MetaBody* rb){
 	Real virtTime=wrap ? Shop::periodicWrap(rb->simulationTime,*times.begin(),*times.rbegin()) : rb->simulationTime;
 	angularVelocity=linearInterpolate<Real>(virtTime,times,angularVelocities,_pos);

Modified: trunk/pkg/common/Engine/DeusExMachina/Se3Interpolator.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/Se3Interpolator.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/Se3Interpolator.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -2,8 +2,7 @@
 #include"Se3Interpolator.hpp"
 #include<yade/pkg-common/PeriodicEngines.hpp>
 
-YADE_PLUGIN("Se3Interpolator")
-CREATE_LOGGER(Se3Interpolator);
+YADE_PLUGIN((Se3Interpolator))CREATE_LOGGER(Se3Interpolator);
 
 void Se3Interpolator::applyCondition(MetaBody* mb){
 	assert(subscribedBodies.size()==1);

Modified: trunk/pkg/common/Engine/DeusExMachina/StaticAttractionEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/StaticAttractionEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/StaticAttractionEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -75,4 +75,4 @@
 			(*bi)->physicalParameters->se3.position+=moves[i++];
 }
 
-YADE_PLUGIN("StaticAttractionEngine");
+YADE_PLUGIN((StaticAttractionEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/DeusExMachina/TranslationEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/DeusExMachina/TranslationEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/DeusExMachina/TranslationEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -26,4 +26,4 @@
 	}
 }
 
-YADE_PLUGIN("TranslationEngine");
\ No newline at end of file
+YADE_PLUGIN((TranslationEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/CundallNonViscousDamping.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/CundallNonViscousDamping.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/CundallNonViscousDamping.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -4,8 +4,7 @@
 #include<yade/pkg-common/RigidBodyParameters.hpp>
 #include"CundallNonViscousDamping.hpp"
 
-YADE_PLUGIN("CundallNonViscousForceDamping","CundallNonViscousMomentumDamping");
-
+YADE_PLUGIN((CundallNonViscousForceDamping)(CundallNonViscousMomentumDamping));
 //! damping of force, for bodies that have only ParticleParameters
 void CundallNonViscousForceDamping::go(const shared_ptr<PhysicalParameters>& pp, const Body* body, MetaBody* rb){
 	if(body->isClump()) return;

Modified: trunk/pkg/common/Engine/EngineUnit/ElasticBodySimpleRelationship.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/ElasticBodySimpleRelationship.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/ElasticBodySimpleRelationship.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -30,4 +30,4 @@
 };
 
 
-YADE_PLUGIN("ElasticBodySimpleRelationship");
\ No newline at end of file
+YADE_PLUGIN((ElasticBodySimpleRelationship));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/InteractingBox2AABB.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/InteractingBox2AABB.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/InteractingBox2AABB.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -32,4 +32,4 @@
 	aabb->max = aabb->center+aabb->halfSize;
 }
 	
-YADE_PLUGIN("InteractingBox2AABB");
\ No newline at end of file
+YADE_PLUGIN((InteractingBox2AABB));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/InteractingFacet2AABB.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/InteractingFacet2AABB.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/InteractingFacet2AABB.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -31,4 +31,4 @@
 	aabb->center = aabb->min + aabb->halfSize;
 }
 	
-YADE_PLUGIN("InteractingFacet2AABB");
\ No newline at end of file
+YADE_PLUGIN((InteractingFacet2AABB));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/InteractingSphere2AABB.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/InteractingSphere2AABB.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/InteractingSphere2AABB.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -20,4 +20,4 @@
 	aabb->max = aabb->center+aabb->halfSize;	
 }
 	
-YADE_PLUGIN("InteractingSphere2AABB");
\ No newline at end of file
+YADE_PLUGIN((InteractingSphere2AABB));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/LeapFrogOrientationIntegrator.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/LeapFrogOrientationIntegrator.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/LeapFrogOrientationIntegrator.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -50,4 +50,4 @@
 // 	firsts[id] = false;
 }
 
-YADE_PLUGIN("LeapFrogOrientationIntegrator");
\ No newline at end of file
+YADE_PLUGIN((LeapFrogOrientationIntegrator));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/LeapFrogPositionIntegrator.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/LeapFrogPositionIntegrator.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/LeapFrogPositionIntegrator.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -45,4 +45,4 @@
 }
 
 
-YADE_PLUGIN("LeapFrogPositionIntegrator");
\ No newline at end of file
+YADE_PLUGIN((LeapFrogPositionIntegrator));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/MetaInteractingGeometry2AABB.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/MetaInteractingGeometry2AABB.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/MetaInteractingGeometry2AABB.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -51,4 +51,4 @@
 	aabb->max = max;
 }
 	
-YADE_PLUGIN("MetaInteractingGeometry2AABB");
\ No newline at end of file
+YADE_PLUGIN((MetaInteractingGeometry2AABB));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/NewtonsForceLaw.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/NewtonsForceLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/NewtonsForceLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -33,4 +33,4 @@
 }
 
 
-YADE_PLUGIN("NewtonsForceLaw");
\ No newline at end of file
+YADE_PLUGIN((NewtonsForceLaw));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/NewtonsMomentumLaw.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/NewtonsMomentumLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/NewtonsMomentumLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -31,4 +31,4 @@
 	}
 }
 
-YADE_PLUGIN("NewtonsMomentumLaw");
\ No newline at end of file
+YADE_PLUGIN((NewtonsMomentumLaw));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -34,4 +34,4 @@
   
 }
 	
-YADE_PLUGIN("ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment");
+YADE_PLUGIN((ef2_BshTube_BssSweptSphereLineSegment_makeBssSweptSphereLineSegment));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/EngineUnit/ef2_BssSweptSphereLineSegment_AABB_makeAABB.cpp
===================================================================
--- trunk/pkg/common/Engine/EngineUnit/ef2_BssSweptSphereLineSegment_AABB_makeAABB.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/EngineUnit/ef2_BssSweptSphereLineSegment_AABB_makeAABB.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -25,4 +25,4 @@
         aabb->max = aabb->center + aabb->halfSize; 
 }
 	
-YADE_PLUGIN("ef2_BssSweptSphereLineSegment_AABB_makeAABB");
+YADE_PLUGIN((ef2_BssSweptSphereLineSegment_AABB_makeAABB));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/FilterEngine/ColorizedLayerFilter.cpp
===================================================================
--- trunk/pkg/common/Engine/FilterEngine/ColorizedLayerFilter.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/FilterEngine/ColorizedLayerFilter.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -53,4 +53,4 @@
 	}
 }
 
-YADE_PLUGIN("ColorizedLayerFilter");
\ No newline at end of file
+YADE_PLUGIN((ColorizedLayerFilter));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/FilterEngine/ColorizedTimeFilter.cpp
===================================================================
--- trunk/pkg/common/Engine/FilterEngine/ColorizedTimeFilter.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/FilterEngine/ColorizedTimeFilter.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -158,4 +158,4 @@
 }
 
 
-YADE_PLUGIN("ColorizedTimeFilter");
\ No newline at end of file
+YADE_PLUGIN((ColorizedTimeFilter));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/FilterEngine/ColorizedVelocityFilter.cpp
===================================================================
--- trunk/pkg/common/Engine/FilterEngine/ColorizedVelocityFilter.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/FilterEngine/ColorizedVelocityFilter.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -155,4 +155,4 @@
 }
 
 
-YADE_PLUGIN("ColorizedVelocityFilter");
\ No newline at end of file
+YADE_PLUGIN((ColorizedVelocityFilter));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/FilterEngine/FilterEngine.hpp
===================================================================
--- trunk/pkg/common/Engine/FilterEngine/FilterEngine.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/FilterEngine/FilterEngine.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -20,10 +20,8 @@
 		bool isActivated(MetaBody*);
 
 		FilterEngine();
-	
-	REGISTER_ATTRIBUTES(FilterEngine,(isFilterActivated));
-	REGISTER_CLASS_NAME(FilterEngine);
-	REGISTER_BASE_CLASS_NAME(DeusExMachina);
+	REGISTER_ATTRIBUTES(DeusExMachina,(isFilterActivated));
+	REGISTER_CLASS_AND_BASE(FilterEngine,DeusExMachina);
 };
 REGISTER_SERIALIZABLE(FilterEngine);
 

Modified: trunk/pkg/common/Engine/FilterEngine/PythonRunnerFilter.cpp
===================================================================
--- trunk/pkg/common/Engine/FilterEngine/PythonRunnerFilter.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/FilterEngine/PythonRunnerFilter.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -1,3 +1,3 @@
 #include"PythonRunnerFilter.hpp"
-YADE_PLUGIN("PythonRunnerFilter");
+YADE_PLUGIN((PythonRunnerFilter));
 YADE_REQUIRE_FEATURE(PYTHON)

Modified: trunk/pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/BoundingVolumeMetaEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -56,4 +56,4 @@
 
 
 
-YADE_PLUGIN("BoundingVolumeMetaEngine");
\ No newline at end of file
+YADE_PLUGIN((BoundingVolumeMetaEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/MetaEngine/ConstitutiveLawDispatcher.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/ConstitutiveLawDispatcher.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/ConstitutiveLawDispatcher.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -1,7 +1,6 @@
 // 2009 © Václav Šmilauer <eudoxos@xxxxxxxx>
 #include "ConstitutiveLawDispatcher.hpp"
-YADE_PLUGIN("ConstitutiveLawDispatcher");
-
+YADE_PLUGIN((ConstitutiveLawDispatcher));
 void ConstitutiveLawDispatcher::action(MetaBody* rootBody){
 	#ifdef YADE_OPENMP
 		const long size=rootBody->transientInteractions->size();

Modified: trunk/pkg/common/Engine/MetaEngine/GeometricalModelMetaEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/GeometricalModelMetaEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/GeometricalModelMetaEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -26,4 +26,4 @@
 	 	operator()(ncb->physicalParameters,ncb->geometricalModel,ncb);
 }
 
-YADE_PLUGIN("GeometricalModelMetaEngine");
\ No newline at end of file
+YADE_PLUGIN((GeometricalModelMetaEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/MetaEngine/InteractingGeometryMetaEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/InteractingGeometryMetaEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/InteractingGeometryMetaEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -25,4 +25,4 @@
 		operator()(ncb->geometricalModel,ncb->interactingGeometry,ncb->physicalParameters->se3,ncb);
 }
 
-YADE_PLUGIN("InteractingGeometryMetaEngine");
\ No newline at end of file
+YADE_PLUGIN((InteractingGeometryMetaEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/MetaEngine/InteractionDispatchers.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/InteractionDispatchers.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/InteractionDispatchers.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -1,6 +1,6 @@
 #include"InteractionDispatchers.hpp"
 
-YADE_PLUGIN("InteractionDispatchers");
+YADE_PLUGIN((InteractionDispatchers));
 CREATE_LOGGER(InteractionDispatchers);
 
 // #define IDISP_TIMING

Modified: trunk/pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/InteractionGeometryMetaEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -69,4 +69,4 @@
 	}
 }
 
-YADE_PLUGIN("InteractionGeometryMetaEngine");
\ No newline at end of file
+YADE_PLUGIN((InteractionGeometryMetaEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/InteractionPhysicsMetaEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -43,4 +43,4 @@
 		}
 }
 
-YADE_PLUGIN("InteractionPhysicsMetaEngine");
\ No newline at end of file
+YADE_PLUGIN((InteractionPhysicsMetaEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/MetaEngine/PhysicalActionApplier.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/PhysicalActionApplier.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/PhysicalActionApplier.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -15,4 +15,4 @@
 		operator()(b->physicalParameters,b.get(),ncb);
 	}
 }
-YADE_PLUGIN("PhysicalActionApplier");
\ No newline at end of file
+YADE_PLUGIN((PhysicalActionApplier));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/MetaEngine/PhysicalActionDamper.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/PhysicalActionDamper.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/PhysicalActionDamper.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -17,4 +17,4 @@
 		operator()(b->physicalParameters,b.get(),ncb);
 	}
 }
-YADE_PLUGIN("PhysicalActionDamper");
\ No newline at end of file
+YADE_PLUGIN((PhysicalActionDamper));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/MetaEngine/PhysicalParametersMetaEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -28,4 +28,4 @@
  	operator()(ncb->physicalParameters,ncb,ncb->bex);
 }
 
-YADE_PLUGIN("PhysicalParametersMetaEngine");
\ No newline at end of file
+YADE_PLUGIN((PhysicalParametersMetaEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/ParallelEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/ParallelEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/ParallelEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -1,6 +1,6 @@
 #include"ParallelEngine.hpp"
 //#include<omp.h> // needed for omp_get_thread_num() (debugging)
-YADE_PLUGIN("ParallelEngine");
+YADE_PLUGIN((ParallelEngine));
 list<string> ParallelEngine::getNeededBex(){
 	list<string> ret;
 	FOREACH(const vector<shared_ptr<Engine> >& ve, slaves){

Modified: trunk/pkg/common/Engine/StandAloneEngine/DistantPersistentSAPCollider.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/DistantPersistentSAPCollider.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/StandAloneEngine/DistantPersistentSAPCollider.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -252,4 +252,4 @@
 	}
 }
 
-YADE_PLUGIN("DistantPersistentSAPCollider");
\ No newline at end of file
+YADE_PLUGIN((DistantPersistentSAPCollider));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/StandAloneEngine/InsertionSortCollider.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/InsertionSortCollider.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/StandAloneEngine/InsertionSortCollider.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -14,8 +14,7 @@
 
 using namespace std;
 
-YADE_PLUGIN("InsertionSortCollider")
-
+YADE_PLUGIN((InsertionSortCollider))
 CREATE_LOGGER(InsertionSortCollider);
 
 // return true if bodies bb overlap in all 3 dimensions

Modified: trunk/pkg/common/Engine/StandAloneEngine/PeriodicPythonRunner.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/PeriodicPythonRunner.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/StandAloneEngine/PeriodicPythonRunner.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -1,3 +1,3 @@
 #include<yade/pkg-common/PeriodicPythonRunner.hpp>
-YADE_PLUGIN("PeriodicPythonRunner");
+YADE_PLUGIN((PeriodicPythonRunner));
 YADE_REQUIRE_FEATURE(PYTHON)

Modified: trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/StandAloneEngine/PersistentSAPCollider.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -314,4 +314,4 @@
 	}
 }
 
-YADE_PLUGIN("PersistentSAPCollider");
\ No newline at end of file
+YADE_PLUGIN((PersistentSAPCollider));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/StandAloneEngine/PersistentTriangulationCollider.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/PersistentTriangulationCollider.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/StandAloneEngine/PersistentTriangulationCollider.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -151,4 +151,4 @@
 
 }
 
-YADE_PLUGIN("PersistentTriangulationCollider");
+YADE_PLUGIN((PersistentTriangulationCollider));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/StandAloneEngine/PhysicalActionContainerReseter.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/PhysicalActionContainerReseter.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/StandAloneEngine/PhysicalActionContainerReseter.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -9,8 +9,7 @@
 #include"PhysicalActionContainerReseter.hpp"
 #include<yade/core/MetaBody.hpp>
 
-YADE_PLUGIN("PhysicalActionContainerReseter","BexResetter");
-
+YADE_PLUGIN((PhysicalActionContainerReseter)(BexResetter));
 PhysicalActionContainerReseter::PhysicalActionContainerReseter(){}
 PhysicalActionContainerReseter::~PhysicalActionContainerReseter(){} 
 void PhysicalActionContainerReseter::action(MetaBody* ncb){ ncb->bex.reset(); }

Modified: trunk/pkg/common/Engine/StandAloneEngine/ResetPositionEngine.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/ResetPositionEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/StandAloneEngine/ResetPositionEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -87,4 +87,4 @@
 	for(int i=0,e=subscribedBodies.size(); i<e; ++i)
 		os << ini_pos[i][0]<< '\t' << ini_pos[i][1]<< '\t' << ini_pos[i][2]<< std::endl;
 }
-YADE_PLUGIN("ResetPositionEngine");
\ No newline at end of file
+YADE_PLUGIN((ResetPositionEngine));
\ No newline at end of file

Modified: trunk/pkg/common/Engine/StandAloneEngine/SpatialQuickSortCollider.cpp
===================================================================
--- trunk/pkg/common/Engine/StandAloneEngine/SpatialQuickSortCollider.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/Engine/StandAloneEngine/SpatialQuickSortCollider.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -11,8 +11,8 @@
 #include <math.h>
 #include <algorithm>
 
-YADE_PLUGIN("SpatialQuickSortCollider");
- 
+YADE_PLUGIN((SpatialQuickSortCollider));
+
 SpatialQuickSortCollider::SpatialQuickSortCollider() : Collider()
 {
 	haveDistantTransient=false;

Modified: trunk/pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawAABB.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawAABB.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawAABB.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -20,5 +20,5 @@
 	glutWireCube(1);
 }
 
-YADE_PLUGIN("GLDrawAABB");
+YADE_PLUGIN((GLDrawAABB));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawBoundingVolume/GLDrawBoundingSphere.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,5 +18,5 @@
 	glutWireSphere(s->radius,10,10);
 }
 
-YADE_PLUGIN("GLDrawBoundingSphere");
+YADE_PLUGIN((GLDrawBoundingSphere));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawBox.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawBox.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawBox.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -36,5 +36,5 @@
 }
 
 
-YADE_PLUGIN("GLDrawBox");
+YADE_PLUGIN((GLDrawBox));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawFacet.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawFacet.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawFacet.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -41,5 +41,5 @@
 		glEnd();
     }
 }
-YADE_PLUGIN("GLDrawFacet");
+YADE_PLUGIN((GLDrawFacet));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawMesh2D.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawMesh2D.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawMesh2D.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -82,5 +82,5 @@
 	}
 }
 
-YADE_PLUGIN("GLDrawMesh2D");
+YADE_PLUGIN((GLDrawMesh2D));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawQuadrilateral.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawQuadrilateral.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawQuadrilateral.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -214,5 +214,5 @@
 	y = X[1];
 };
 
-YADE_PLUGIN("GLDrawQuadrilateral");
+YADE_PLUGIN((GLDrawQuadrilateral));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -243,5 +243,5 @@
 	glLoadMatrixf(modelview);
 }
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-YADE_PLUGIN("GLDrawSphere");
+YADE_PLUGIN((GLDrawSphere));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawSphere.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -32,7 +32,7 @@
 /// Serialization
 	protected :
 		virtual void postProcessAttributes(bool deserializing){if(deserializing){first=true;};};
-	REGISTER_ATTRIBUTES(/*nothing*/,(glutUse)(glutNormalize)(glutSlices)(glutStacks));
+	REGISTER_ATTRIBUTES(Serializable,(glutUse)(glutNormalize)(glutSlices)(glutStacks));
 	RENDERS(Sphere);
 	REGISTER_CLASS_NAME(GLDrawSphere);
 	REGISTER_BASE_CLASS_NAME(GLDrawGeometricalModelFunctor);

Modified: trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTetrahedron.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTetrahedron.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTetrahedron.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -143,5 +143,5 @@
 	}
 }
 
-YADE_PLUGIN("GLDrawTetrahedron");
+YADE_PLUGIN((GLDrawTetrahedron));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTube.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTube.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawGeometricalModel/GLDrawTube.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -80,5 +80,5 @@
 	}
 }
 
-YADE_PLUGIN("GLDrawTube");
+YADE_PLUGIN((GLDrawTube));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawBssSweptSphereLineSegment.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawBssSweptSphereLineSegment.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawBssSweptSphereLineSegment.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -69,5 +69,5 @@
 
 
 
-YADE_PLUGIN("GLDrawBssSweptSphereLineSegment");
+YADE_PLUGIN((GLDrawBssSweptSphereLineSegment));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingBox.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingBox.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingBox.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -32,5 +32,5 @@
 //	}
 }
 
-YADE_PLUGIN("GLDrawInteractingBox");
+YADE_PLUGIN((GLDrawInteractingBox));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingFacet.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingFacet.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingFacet.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -50,5 +50,5 @@
     glEnd();
 }
 
-YADE_PLUGIN("GLDrawInteractingFacet");
+YADE_PLUGIN((GLDrawInteractingFacet));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawInteractingSphere.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -155,5 +155,5 @@
 		subdivideTriangle(vertices[(unsigned int)faces[i][0]],vertices[(unsigned int)faces[i][1]],vertices[(unsigned int)faces[i][2]],depth);
 }
 
-YADE_PLUGIN("GLDrawInteractingSphere");
+YADE_PLUGIN((GLDrawInteractingSphere));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawMetaInteractingGeometry.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawMetaInteractingGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawInteractingGeometry/GLDrawMetaInteractingGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -16,5 +16,5 @@
 }
 
 
-YADE_PLUGIN("GLDrawMetaInteractingGeometry");
+YADE_PLUGIN((GLDrawMetaInteractingGeometry));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawInteractionGeometry/GLDrawClosestFeatures.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawInteractionGeometry/GLDrawClosestFeatures.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawInteractionGeometry/GLDrawClosestFeatures.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -43,5 +43,5 @@
 	glEnd();
 }
 
-YADE_PLUGIN("GLDrawClosestFeatures");
+YADE_PLUGIN((GLDrawClosestFeatures));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawInteractionPhysics/GLDrawNormalInteraction.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawInteractionPhysics/GLDrawNormalInteraction.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawInteractionPhysics/GLDrawNormalInteraction.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -39,5 +39,5 @@
 	glPopMatrix();
 }
 
-YADE_PLUGIN("GLDrawNormalInteraction");
+YADE_PLUGIN((GLDrawNormalInteraction));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawBoxShadowVolume.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawBoxShadowVolume.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawBoxShadowVolume.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -288,5 +288,5 @@
 
 
 
-YADE_PLUGIN("GLDrawBoxShadowVolume");
+YADE_PLUGIN((GLDrawBoxShadowVolume));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawSphereShadowVolume.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawSphereShadowVolume.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawShadowVolume/GLDrawSphereShadowVolume.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -56,5 +56,5 @@
 }
 
 
-YADE_PLUGIN("GLDrawSphereShadowVolume");
+YADE_PLUGIN((GLDrawSphereShadowVolume));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawState/GLDrawParticleState.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawState/GLDrawParticleState.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawState/GLDrawParticleState.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -39,5 +39,5 @@
 	glEnd();
 }
 
-YADE_PLUGIN("GLDrawParticleState");
+YADE_PLUGIN((GLDrawParticleState));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawState/GLDrawRigidBodyState.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawState/GLDrawRigidBodyState.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawState/GLDrawRigidBodyState.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -48,5 +48,5 @@
 	glEnd();
 }
 
-YADE_PLUGIN("GLDrawRigidBodyState");
+YADE_PLUGIN((GLDrawRigidBodyState));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/GLDrawWidgets/GLDrawColorScale.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/GLDrawWidgets/GLDrawColorScale.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/GLDrawWidgets/GLDrawColorScale.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -64,5 +64,5 @@
 	glMatrixMode(GL_MODELVIEW);	
 
 }
-YADE_PLUGIN("GLDrawColorScale");
+YADE_PLUGIN((GLDrawColorScale));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp
===================================================================
--- trunk/pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -9,7 +9,7 @@
 #include<GL/gl.h>
 #include<GL/glut.h>
 
-YADE_PLUGIN("OpenGLRenderingEngine");
+YADE_PLUGIN((OpenGLRenderingEngine));
 YADE_REQUIRE_FEATURE(OPENGL)
 CREATE_LOGGER(OpenGLRenderingEngine);
 

Modified: trunk/pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.hpp
===================================================================
--- trunk/pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/common/RenderingEngine/OpenGLRenderingEngine/OpenGLRenderingEngine.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -92,7 +92,7 @@
 	
 	protected :
 		void postProcessAttributes(bool deserializing);
-	REGISTER_ATTRIBUTES(/* no base*/,(scaleDisplacements)(displacementScale)(scaleRotations)(rotationScale)(Light_position)(Background_color)(Body_wire)(Show_DOF)(Show_ID)(Body_state)(Body_bounding_volume)(Body_interacting_geom)(Body_geometrical_model)(Interaction_wire)(Interaction_geometry)(Interaction_physics)(Draw_mask)(Draw_inside)(Cast_shadows)(Shadow_volumes)(Fast_shadow_volume)(clipPlaneSe3)(clipPlaneActive)(selectBodyLimit));
+	REGISTER_ATTRIBUTES(Serializable,(scaleDisplacements)(displacementScale)(scaleRotations)(rotationScale)(Light_position)(Background_color)(Body_wire)(Show_DOF)(Show_ID)(Body_state)(Body_bounding_volume)(Body_interacting_geom)(Body_geometrical_model)(Interaction_wire)(Interaction_geometry)(Interaction_physics)(Draw_mask)(Draw_inside)(Cast_shadows)(Shadow_volumes)(Fast_shadow_volume)(clipPlaneSe3)(clipPlaneActive)(selectBodyLimit));
 	REGISTER_CLASS_AND_BASE(OpenGLRenderingEngine,RenderingEngine);
 };
 REGISTER_SERIALIZABLE(OpenGLRenderingEngine);

Modified: trunk/pkg/dem/DataClass/Clump.cpp
===================================================================
--- trunk/pkg/dem/DataClass/Clump.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/Clump.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -3,8 +3,7 @@
 #include"Clump.hpp"
 #include<algorithm>
 
-YADE_PLUGIN("Clump","ClumpMemberMover","ClumpTestGen");
-
+YADE_PLUGIN((Clump)(ClumpMemberMover)(ClumpTestGen));
 CREATE_LOGGER(Clump);
 CREATE_LOGGER(ClumpMemberMover);
 CREATE_LOGGER(ClumpTestGen);

Modified: trunk/pkg/dem/DataClass/InteractingGeometry/InteractingMyTetrahedron.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractingGeometry/InteractingMyTetrahedron.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractingGeometry/InteractingMyTetrahedron.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -19,4 +19,4 @@
 }
 
 
-YADE_PLUGIN("InteractingMyTetrahedron");
\ No newline at end of file
+YADE_PLUGIN((InteractingMyTetrahedron));
\ No newline at end of file

Modified: trunk/pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_FacetSphere.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_FacetSphere.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_FacetSphere.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -1,11 +1,11 @@
 #include "Dem3DofGeom_FacetSphere.hpp"
 #include<yade/pkg-common/InteractingSphere.hpp>
 #include<yade/pkg-common/InteractingFacet.hpp>
-YADE_PLUGIN("Dem3DofGeom_FacetSphere",
+YADE_PLUGIN((Dem3DofGeom_FacetSphere)
 	#ifdef YADE_OPENGL
-		"GLDraw_Dem3DofGeom_FacetSphere",
+		(GLDraw_Dem3DofGeom_FacetSphere)
 	#endif	
-		"ef2_Facet_Sphere_Dem3DofGeom");
+		(ef2_Facet_Sphere_Dem3DofGeom));
 
 CREATE_LOGGER(Dem3DofGeom_FacetSphere);
 Dem3DofGeom_FacetSphere::~Dem3DofGeom_FacetSphere(){}

Modified: trunk/pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_SphereSphere.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_SphereSphere.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_SphereSphere.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -2,11 +2,11 @@
 
 #include<yade/pkg-common/InteractingSphere.hpp>
 #include<yade/core/Omega.hpp>
-YADE_PLUGIN("Dem3DofGeom_SphereSphere",
+YADE_PLUGIN((Dem3DofGeom_SphereSphere)
 	#ifdef YADE_OPENGL
-		"GLDraw_Dem3DofGeom_SphereSphere",
+		(GLDraw_Dem3DofGeom_SphereSphere)
 	#endif
-	"ef2_Sphere_Sphere_Dem3DofGeom");
+	(ef2_Sphere_Sphere_Dem3DofGeom));
 
 
 Dem3DofGeom_SphereSphere::~Dem3DofGeom_SphereSphere(){}

Modified: trunk/pkg/dem/DataClass/InteractionGeometry/DemXDofGeom.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionGeometry/DemXDofGeom.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionGeometry/DemXDofGeom.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -1,4 +1,4 @@
 #include"DemXDofGeom.hpp"
-YADE_PLUGIN("Dem3DofGeom");
+YADE_PLUGIN((Dem3DofGeom));
 Real Dem3DofGeom::displacementN(){throw;}
 

Modified: trunk/pkg/dem/DataClass/InteractionGeometry/InteractionOfMyTetrahedron.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionGeometry/InteractionOfMyTetrahedron.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionGeometry/InteractionOfMyTetrahedron.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,4 +18,4 @@
 {
 }
 
-YADE_PLUGIN("InteractionOfMyTetrahedron");
\ No newline at end of file
+YADE_PLUGIN((InteractionOfMyTetrahedron));
\ No newline at end of file

Modified: trunk/pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -4,8 +4,7 @@
 
 #include "SpheresContactGeometry.hpp"
 #include<yade/core/Omega.hpp>
-YADE_PLUGIN("SpheresContactGeometry");
-
+YADE_PLUGIN((SpheresContactGeometry));
 // At least one virtual method must be in the .cpp file (!!!)
 SpheresContactGeometry::~SpheresContactGeometry(){};
 

Modified: trunk/pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.hpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionGeometry/SpheresContactGeometry.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -49,7 +49,7 @@
 
 		void updateShearForce(Vector3r& shearForce, Real ks, const Vector3r& prevNormal, const RigidBodyParameters* rbp1, const RigidBodyParameters* rbp2, Real dt, bool avoidGranularRatcheting=true);
 
-	REGISTER_ATTRIBUTES(/* no attributes from base class */,
+	REGISTER_ATTRIBUTES(Serializable,
 			(normal)
 			(contactPoint)
 			(radius1)

Modified: trunk/pkg/dem/DataClass/InteractionPhysics/CohesiveFrictionalContactInteraction.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/CohesiveFrictionalContactInteraction.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/CohesiveFrictionalContactInteraction.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -52,4 +52,4 @@
 // }
 
 
-YADE_PLUGIN("CohesiveFrictionalContactInteraction");
\ No newline at end of file
+YADE_PLUGIN((CohesiveFrictionalContactInteraction));
\ No newline at end of file

Modified: trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ContactLaw1Interaction.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -46,4 +46,4 @@
 // }
 
 
-YADE_PLUGIN("ContactLaw1Interaction");
\ No newline at end of file
+YADE_PLUGIN((ContactLaw1Interaction));
\ No newline at end of file

Modified: trunk/pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ElasticContactInteraction.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -10,5 +10,4 @@
 {
 }
 
-YADE_PLUGIN("ElasticContactInteraction");
-//YADE_PLUGIN("ElasticContactInteraction");
+YADE_PLUGIN((ElasticContactInteraction));

Modified: trunk/pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/SDECLinkPhysics.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -30,4 +30,4 @@
 }
 
 
-YADE_PLUGIN("SDECLinkPhysics");
\ No newline at end of file
+YADE_PLUGIN((SDECLinkPhysics));
\ No newline at end of file

Modified: trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp
===================================================================
--- trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/InteractionPhysics/ViscoelasticInteraction.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,4 +18,4 @@
 {
 }
 
-YADE_PLUGIN("ViscoelasticInteraction");
\ No newline at end of file
+YADE_PLUGIN((ViscoelasticInteraction));
\ No newline at end of file

Modified: trunk/pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.cpp
===================================================================
--- trunk/pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/PhysicalParameters/BodyMacroParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -19,4 +19,4 @@
 {
 }
 
-YADE_PLUGIN("BodyMacroParameters");
\ No newline at end of file
+YADE_PLUGIN((BodyMacroParameters));
\ No newline at end of file

Modified: trunk/pkg/dem/DataClass/PhysicalParameters/CohesiveFrictionalBodyParameters.cpp
===================================================================
--- trunk/pkg/dem/DataClass/PhysicalParameters/CohesiveFrictionalBodyParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/PhysicalParameters/CohesiveFrictionalBodyParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -19,4 +19,4 @@
 {
 }
 
-YADE_PLUGIN("CohesiveFrictionalBodyParameters");
\ No newline at end of file
+YADE_PLUGIN((CohesiveFrictionalBodyParameters));
\ No newline at end of file

Modified: trunk/pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp
===================================================================
--- trunk/pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/DataClass/PhysicalParameters/SimpleViscoelasticBodyParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -17,4 +17,4 @@
 {
 }
 
-YADE_PLUGIN("SimpleViscoelasticBodyParameters");
+YADE_PLUGIN((SimpleViscoelasticBodyParameters));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/CapillaryPressureEngine.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/CapillaryPressureEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/CapillaryPressureEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -48,4 +48,4 @@
 	
 }
 
-YADE_PLUGIN("CapillaryPressureEngine");
\ No newline at end of file
+YADE_PLUGIN((CapillaryPressureEngine));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/CapillaryRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/CapillaryRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/CapillaryRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -106,4 +106,4 @@
 	
 }
 
-YADE_PLUGIN("CapillaryRecorder");
\ No newline at end of file
+YADE_PLUGIN((CapillaryRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/CapillaryStressRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -236,4 +236,4 @@
 	
 }
 
-YADE_PLUGIN("CapillaryStressRecorder");
\ No newline at end of file
+YADE_PLUGIN((CapillaryStressRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/ContactStressRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/ContactStressRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/ContactStressRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -330,4 +330,4 @@
 
 }
 
-YADE_PLUGIN("ContactStressRecorder");
\ No newline at end of file
+YADE_PLUGIN((ContactStressRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/FlowEngine.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/FlowEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/FlowEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -72,4 +72,4 @@
 	}
 }
 
-YADE_PLUGIN("FlowEngine");
+YADE_PLUGIN((FlowEngine));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/HydraulicForceEngine.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/HydraulicForceEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/HydraulicForceEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -176,4 +176,4 @@
     }
 }
 
-YADE_PLUGIN("HydraulicForceEngine");
+YADE_PLUGIN((HydraulicForceEngine));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/StaticSpheresAttractionEngine.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/StaticSpheresAttractionEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/StaticSpheresAttractionEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -52,4 +52,4 @@
 };
 
 
-YADE_PLUGIN("StaticSpheresAttractionEngine");
\ No newline at end of file
+YADE_PLUGIN((StaticSpheresAttractionEngine));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/ThreeDTriaxialEngine.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/ThreeDTriaxialEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/ThreeDTriaxialEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -217,4 +217,4 @@
 
  
 
-YADE_PLUGIN("ThreeDTriaxialEngine");
+YADE_PLUGIN((ThreeDTriaxialEngine));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/TriaxialCompressionEngine.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -327,4 +327,4 @@
 
  
 
-YADE_PLUGIN("TriaxialCompressionEngine");
+YADE_PLUGIN((TriaxialCompressionEngine));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/TriaxialStateRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/TriaxialStateRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/TriaxialStateRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -297,4 +297,4 @@
 
 
 
-YADE_PLUGIN("TriaxialStateRecorder");
\ No newline at end of file
+YADE_PLUGIN((TriaxialStateRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -411,4 +411,4 @@
 	}
 }
 
-YADE_PLUGIN("TriaxialStressController");
\ No newline at end of file
+YADE_PLUGIN((TriaxialStressController));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/DeusExMachina/WallStressRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/DeusExMachina/WallStressRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/DeusExMachina/WallStressRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -90,4 +90,4 @@
 	
 }
 
-YADE_PLUGIN("WallStressRecorder");
\ No newline at end of file
+YADE_PLUGIN((WallStressRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/BasicViscoelasticRelationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/BasicViscoelasticRelationships.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/BasicViscoelasticRelationships.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -99,4 +99,4 @@
     contactPhysics->prevNormal = Vector3r(0,0,0);
 }
 
-YADE_PLUGIN("BasicViscoelasticRelationships");
\ No newline at end of file
+YADE_PLUGIN((BasicViscoelasticRelationships));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/CL1Relationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/CL1Relationships.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/CL1Relationships.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -188,4 +188,4 @@
 	}
 #endif
 };
-YADE_PLUGIN("CL1Relationships");
+YADE_PLUGIN((CL1Relationships));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/CohesiveFrictionalRelationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/CohesiveFrictionalRelationships.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/CohesiveFrictionalRelationships.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -194,4 +194,4 @@
 	}
 #endif
 };
-YADE_PLUGIN("CohesiveFrictionalRelationships");
+YADE_PLUGIN((CohesiveFrictionalRelationships));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/InteractingBox2InteractingSphere4SpheresContactGeometry.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/InteractingBox2InteractingSphere4SpheresContactGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/InteractingBox2InteractingSphere4SpheresContactGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -165,4 +165,4 @@
 	return go(cm2,cm1,se32,se31,c);
 }
 
-YADE_PLUGIN("InteractingBox2InteractingSphere4SpheresContactGeometry");
\ No newline at end of file
+YADE_PLUGIN((InteractingBox2InteractingSphere4SpheresContactGeometry));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/InteractingFacet2InteractingSphere4SpheresContactGeometry.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/InteractingFacet2InteractingSphere4SpheresContactGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/InteractingFacet2InteractingSphere4SpheresContactGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -128,4 +128,4 @@
 	return go(cm2,cm1,se32,se31,c);
 }
 
-YADE_PLUGIN("InteractingFacet2InteractingSphere4SpheresContactGeometry");
\ No newline at end of file
+YADE_PLUGIN((InteractingFacet2InteractingSphere4SpheresContactGeometry));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2AABB.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2AABB.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2AABB.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -43,4 +43,4 @@
 	aabb->max = max;	
 }
 	
-YADE_PLUGIN("InteractingMyTetrahedron2AABB");
\ No newline at end of file
+YADE_PLUGIN((InteractingMyTetrahedron2AABB));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2InteractingBox4InteractionOfMyTetrahedron.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2InteractingBox4InteractionOfMyTetrahedron.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2InteractingBox4InteractionOfMyTetrahedron.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -130,4 +130,4 @@
 	return isInteracting;
 }
 
-YADE_PLUGIN("InteractingMyTetrahedron2InteractingBox4InteractionOfMyTetrahedron");
\ No newline at end of file
+YADE_PLUGIN((InteractingMyTetrahedron2InteractingBox4InteractionOfMyTetrahedron));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2InteractingMyTetrahedron4InteractionOfMyTetrahedron.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2InteractingMyTetrahedron4InteractionOfMyTetrahedron.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/InteractingMyTetrahedron2InteractingMyTetrahedron4InteractionOfMyTetrahedron.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -90,4 +90,4 @@
 	return isInteracting;
 }
 
-YADE_PLUGIN("InteractingMyTetrahedron2InteractingMyTetrahedron4InteractionOfMyTetrahedron");
\ No newline at end of file
+YADE_PLUGIN((InteractingMyTetrahedron2InteractingMyTetrahedron4InteractionOfMyTetrahedron));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -79,4 +79,4 @@
 	return isInteracting;
 }
 
-YADE_PLUGIN("InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry");
+YADE_PLUGIN((InteractingSphere2BssSweptSphereLineSegment4SpheresContactGeometry));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/InteractingSphere2InteractingSphere4SpheresContactGeometry.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/InteractingSphere2InteractingSphere4SpheresContactGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/InteractingSphere2InteractingSphere4SpheresContactGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -60,4 +60,4 @@
 	return go(cm1,cm2,se31,se32,c);
 }
 
-YADE_PLUGIN("InteractingSphere2InteractingSphere4SpheresContactGeometry");
\ No newline at end of file
+YADE_PLUGIN((InteractingSphere2InteractingSphere4SpheresContactGeometry));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/MacroMicroElasticRelationships.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -129,4 +129,4 @@
 		}
 	}
 };
-YADE_PLUGIN("MacroMicroElasticRelationships");
+YADE_PLUGIN((MacroMicroElasticRelationships));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/SimpleElasticRelationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/SimpleElasticRelationships.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/SimpleElasticRelationships.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -82,4 +82,4 @@
 	}
 	throw runtime_error("SimpleElasticRelationships currently fails for non-SpheresContactGeometry geometry!");
 };
-YADE_PLUGIN("SimpleElasticRelationships");
\ No newline at end of file
+YADE_PLUGIN((SimpleElasticRelationships));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/SimpleElasticRelationshipsWater.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/SimpleElasticRelationshipsWater.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/SimpleElasticRelationshipsWater.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -110,4 +110,4 @@
 // 		}
 // 	}
 };
-YADE_PLUGIN("SimpleElasticRelationshipsWater");
\ No newline at end of file
+YADE_PLUGIN((SimpleElasticRelationshipsWater));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/SimpleViscoelasticRelationships.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/SimpleViscoelasticRelationships.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/SimpleViscoelasticRelationships.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -47,4 +47,4 @@
 
 }
 
-YADE_PLUGIN("SimpleViscoelasticRelationships");
\ No newline at end of file
+YADE_PLUGIN((SimpleViscoelasticRelationships));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/Tetrahedron2InteractingMyTetrahedron.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/Tetrahedron2InteractingMyTetrahedron.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/Tetrahedron2InteractingMyTetrahedron.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -32,4 +32,4 @@
 	it->r4 = it->c4.Length();
 }
 	
-YADE_PLUGIN("Tetrahedron2InteractingMyTetrahedron");
\ No newline at end of file
+YADE_PLUGIN((Tetrahedron2InteractingMyTetrahedron));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/EngineUnit/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -2,8 +2,7 @@
 #include"ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw.hpp"
 #include<yade/pkg-dem/DemXDofGeom.hpp>
 #include<yade/pkg-common/NormalShearInteractions.hpp>
-YADE_PLUGIN("ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw");
-
+YADE_PLUGIN((ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw));
 void ef2_Dem3Dof_NormalShear_ElasticFrictionalLaw::go(shared_ptr<InteractionGeometry>& _geom, shared_ptr<InteractionPhysics>& _phys, Interaction* I, MetaBody* rootBody){
 	Dem3DofGeom* geom=static_cast<Dem3DofGeom*>(_geom.get());
 	NormalShearInteraction* phys=static_cast<NormalShearInteraction*>(_phys.get());

Modified: trunk/pkg/dem/Engine/EngineUnit/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/EngineUnit/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/EngineUnit/ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -10,8 +10,7 @@
 #include<yade/pkg-dem/SpheresContactGeometry.hpp>
 #include<yade/pkg-dem/ViscoelasticInteraction.hpp>
 #include<yade/pkg-common/RigidBodyParameters.hpp>
-YADE_PLUGIN("ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw");
-
+YADE_PLUGIN((ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw));
 void ef2_Spheres_Viscoelastic_SimpleViscoelasticContactLaw::go(shared_ptr<InteractionGeometry>& _geom, shared_ptr<InteractionPhysics>& _phys, Interaction* I, MetaBody* rootBody){
 
 	SpheresContactGeometry* geom=static_cast<SpheresContactGeometry*>(_geom.get());

Modified: trunk/pkg/dem/Engine/StandAloneEngine/AveragePositionRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/AveragePositionRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/AveragePositionRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -73,4 +73,4 @@
 }
 
 
-YADE_PLUGIN("AveragePositionRecorder");
\ No newline at end of file
+YADE_PLUGIN((AveragePositionRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/CohesiveFrictionalContactLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/CohesiveFrictionalContactLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/CohesiveFrictionalContactLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -377,4 +377,4 @@
 
 }
 
-YADE_PLUGIN("CohesiveFrictionalContactLaw");
+YADE_PLUGIN((CohesiveFrictionalContactLaw));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/ContactLaw1.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/ContactLaw1.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/ContactLaw1.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -310,4 +310,4 @@
 
 }
 
-YADE_PLUGIN("ContactLaw1");
\ No newline at end of file
+YADE_PLUGIN((ContactLaw1));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/ElasticCohesiveLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -230,4 +230,4 @@
 }
 
 
-YADE_PLUGIN("ElasticCohesiveLaw");
+YADE_PLUGIN((ElasticCohesiveLaw));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/ElasticContactLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -15,9 +15,8 @@
 #include<yade/core/Omega.hpp>
 #include<yade/core/MetaBody.hpp>
 
-YADE_PLUGIN("ef2_Spheres_Elastic_ElasticLaw","Law2_Dem3Dof_Elastic_Elastic","ElasticContactLaw");
+YADE_PLUGIN((ef2_Spheres_Elastic_ElasticLaw)(Law2_Dem3Dof_Elastic_Elastic)(ElasticContactLaw));
 
-
 ElasticContactLaw::ElasticContactLaw() : InteractionSolver()
 {
 	sdecGroupMask=1;

Modified: trunk/pkg/dem/Engine/StandAloneEngine/ElasticCriterionTimeStepper.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/ElasticCriterionTimeStepper.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/ElasticCriterionTimeStepper.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -134,4 +134,4 @@
 	}
 }
 
-YADE_PLUGIN("ElasticCriterionTimeStepper");
\ No newline at end of file
+YADE_PLUGIN((ElasticCriterionTimeStepper));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/FacetTopologyAnalyzer.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/FacetTopologyAnalyzer.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/FacetTopologyAnalyzer.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -4,8 +4,7 @@
 #include<yade/core/Body.hpp>
 
 CREATE_LOGGER(FacetTopologyAnalyzer);
-YADE_PLUGIN("FacetTopologyAnalyzer");
-
+YADE_PLUGIN((FacetTopologyAnalyzer));
 #ifndef FACET_TOPO
 void FacetTopologyAnalyzer::action(MetaBody* rb){
 	throw runtime_error("FACET_TOPO was not enabled in InteractingFacet.hpp at compile-time. Do not use FacetTopologyAnalyzer or recompile.");

Modified: trunk/pkg/dem/Engine/StandAloneEngine/ForceRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/ForceRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/ForceRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -84,4 +84,4 @@
 		
 }
 
-YADE_PLUGIN("ForceRecorder");
\ No newline at end of file
+YADE_PLUGIN((ForceRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/GeometricalModelForceColorizer.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/GeometricalModelForceColorizer.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/GeometricalModelForceColorizer.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -82,4 +82,4 @@
 		
 }
 
-YADE_PLUGIN("GeometricalModelForceColorizer");
\ No newline at end of file
+YADE_PLUGIN((GeometricalModelForceColorizer));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/GlobalStiffnessTimeStepper.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -16,8 +16,7 @@
 #include<yade/pkg-common/Sphere.hpp>
 
 CREATE_LOGGER(GlobalStiffnessTimeStepper);
-YADE_PLUGIN("GlobalStiffnessTimeStepper");
-
+YADE_PLUGIN((GlobalStiffnessTimeStepper));
 GlobalStiffnessTimeStepper::GlobalStiffnessTimeStepper() : TimeStepper()
 {
 //cerr << "GlobalStiffnessTimeStepper()"  << endl;

Modified: trunk/pkg/dem/Engine/StandAloneEngine/MGPRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/MGPRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/MGPRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -87,4 +87,4 @@
 
 }
 
-YADE_PLUGIN("MGPRecorder");
\ No newline at end of file
+YADE_PLUGIN((MGPRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/MicroMacroAnalyser.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -225,4 +225,4 @@
 
 
 
-YADE_PLUGIN("MicroMacroAnalyser");
+YADE_PLUGIN((MicroMacroAnalyser));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/MyTetrahedronLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/MyTetrahedronLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/MyTetrahedronLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -76,4 +76,4 @@
 }
 
 
-YADE_PLUGIN("MyTetrahedronLaw");
\ No newline at end of file
+YADE_PLUGIN((MyTetrahedronLaw));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/NewtonsDampedLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/NewtonsDampedLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/NewtonsDampedLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -13,8 +13,7 @@
 #include<yade/lib-base/yadeWm3Extra.hpp>
 #include<yade/pkg-dem/Clump.hpp>
 
-YADE_PLUGIN("NewtonsDampedLaw");
-
+YADE_PLUGIN((NewtonsDampedLaw));
 void NewtonsDampedLaw::cundallDamp(const Real& dt, const Vector3r& f, const Vector3r& velocity, Vector3r& acceleration, const Vector3r& m, const Vector3r& angularVelocity, Vector3r& angularAcceleration){
 	for(int i=0; i<3; i++){
 		angularAcceleration[i]*= 1 - damping*Mathr::Sign ( m[i]*(angularVelocity[i] + (Real) 0.5 *dt*angularAcceleration[i]) );

Modified: trunk/pkg/dem/Engine/StandAloneEngine/PositionOrientationRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/PositionOrientationRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/PositionOrientationRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -54,4 +54,4 @@
 }
 
 
-YADE_PLUGIN("PositionOrientationRecorder");
\ No newline at end of file
+YADE_PLUGIN((PositionOrientationRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/RigidBodyRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/RigidBodyRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/RigidBodyRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -97,4 +97,4 @@
     }
 }
 
-YADE_PLUGIN("RigidBodyRecorder");
\ No newline at end of file
+YADE_PLUGIN((RigidBodyRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/SQLiteRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/SQLiteRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/SQLiteRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -6,7 +6,7 @@
 #include<boost/algorithm/string/join.hpp>
 #include<yade/core/MetaBody.hpp>
 
-YADE_PLUGIN("SQLiteRecorder");
+YADE_PLUGIN((SQLiteRecorder));
 using namespace boost;
 CREATE_LOGGER(SQLiteRecorder);
 

Modified: trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/SimpleViscoelasticSpheresInteractionRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -93,4 +93,4 @@
     }
 }
 
-YADE_PLUGIN("SimpleViscoelasticSpheresInteractionRecorder");
+YADE_PLUGIN((SimpleViscoelasticSpheresInteractionRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/UniaxialStrainer.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/UniaxialStrainer.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/UniaxialStrainer.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -6,8 +6,7 @@
 #include<yade/pkg-common/ParticleParameters.hpp>
 #include<yade/pkg-common/AABB.hpp>
 
-YADE_PLUGIN("UniaxialStrainer");
-
+YADE_PLUGIN((UniaxialStrainer));
 /************************ UniaxialStrainer **********************/
 CREATE_LOGGER(UniaxialStrainer);
 

Modified: trunk/pkg/dem/Engine/StandAloneEngine/VelocityRecorder.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/VelocityRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/VelocityRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -73,4 +73,4 @@
 }
 
 
-YADE_PLUGIN("VelocityRecorder");
\ No newline at end of file
+YADE_PLUGIN((VelocityRecorder));
\ No newline at end of file

Modified: trunk/pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp
===================================================================
--- trunk/pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/Engine/StandAloneEngine/VolumicContactLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -634,4 +634,4 @@
 }
 
  
-YADE_PLUGIN("VolumicContactLaw");
+YADE_PLUGIN((VolumicContactLaw));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -697,4 +697,4 @@
 
 
 
-YADE_PLUGIN("CohesiveTriaxialTest");
+YADE_PLUGIN((CohesiveTriaxialTest));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/Funnel.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/Funnel.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/Funnel.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -316,4 +316,4 @@
 }
 
 
-YADE_PLUGIN("Funnel");
\ No newline at end of file
+YADE_PLUGIN((Funnel));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/HydraulicTest.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/HydraulicTest.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/HydraulicTest.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -315,4 +315,4 @@
 	return true;
 };
 
-YADE_PLUGIN("HydraulicTest");
+YADE_PLUGIN((HydraulicTest));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/MembraneTest.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/MembraneTest.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/MembraneTest.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -352,4 +352,4 @@
 
 
 
-YADE_PLUGIN("MembraneTest");
+YADE_PLUGIN((MembraneTest));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -691,4 +691,4 @@
 
 
 
-YADE_PLUGIN("ModifiedTriaxialTest");
+YADE_PLUGIN((ModifiedTriaxialTest));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/SDECImpactTest.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/SDECImpactTest.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/SDECImpactTest.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -494,4 +494,4 @@
 	
 }
 
-YADE_PLUGIN("SDECImpactTest");
\ No newline at end of file
+YADE_PLUGIN((SDECImpactTest));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/SDECLinkedSpheres.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/SDECLinkedSpheres.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/SDECLinkedSpheres.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -367,4 +367,4 @@
 	
 }
 
-YADE_PLUGIN("SDECLinkedSpheres");
\ No newline at end of file
+YADE_PLUGIN((SDECLinkedSpheres));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/SDECMovingWall.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/SDECMovingWall.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/SDECMovingWall.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -395,4 +395,4 @@
 }
 
 
-YADE_PLUGIN("SDECMovingWall");
\ No newline at end of file
+YADE_PLUGIN((SDECMovingWall));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/SDECSpheresPlane.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/SDECSpheresPlane.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/SDECSpheresPlane.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -372,4 +372,4 @@
 }
 
 
-YADE_PLUGIN("SDECSpheresPlane");
\ No newline at end of file
+YADE_PLUGIN((SDECSpheresPlane));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/STLImporterTest.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/STLImporterTest.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/STLImporterTest.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -291,4 +291,4 @@
 }
 
 
-YADE_PLUGIN("STLImporterTest");
+YADE_PLUGIN((STLImporterTest));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/SimpleScene.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/SimpleScene.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/SimpleScene.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -33,8 +33,7 @@
 
 
 
-YADE_PLUGIN("SimpleScene");
-
+YADE_PLUGIN((SimpleScene));
 bool SimpleScene::generate(){
 	message="";
 	//@

Modified: trunk/pkg/dem/PreProcessor/TetraTestGen.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/TetraTestGen.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/TetraTestGen.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -6,8 +6,7 @@
 
 #include<yade/pkg-dem/Tetra.hpp>
 
-YADE_PLUGIN("TetraTestGen");
-
+YADE_PLUGIN((TetraTestGen));
 bool TetraTestGen::generate()
 {
 	Shop::setDefault<int>("param_timeStepUpdateInterval",-1);

Modified: trunk/pkg/dem/PreProcessor/TetrahedronsTest.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/TetrahedronsTest.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/TetrahedronsTest.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -394,4 +394,4 @@
 	tet->v[3]=size*(Mathr::UnitRandom()*0.7+1.0)*Vector3r(0.16,0.93,-0.33);
 }
 
-YADE_PLUGIN("TetrahedronsTest");
\ No newline at end of file
+YADE_PLUGIN((TetrahedronsTest));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/ThreePointBending.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/ThreePointBending.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/ThreePointBending.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -354,4 +354,4 @@
 	
 }
 
-YADE_PLUGIN("ThreePointBending");
+YADE_PLUGIN((ThreePointBending));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/TriaxialTest.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/TriaxialTest.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/TriaxialTest.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -694,4 +694,4 @@
 
 
 
-YADE_PLUGIN("TriaxialTest");
+YADE_PLUGIN((TriaxialTest));
\ No newline at end of file

Modified: trunk/pkg/dem/PreProcessor/TriaxialTestWater.cpp
===================================================================
--- trunk/pkg/dem/PreProcessor/TriaxialTestWater.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/PreProcessor/TriaxialTestWater.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -682,4 +682,4 @@
 
 
 
-YADE_PLUGIN("TriaxialTestWater");
+YADE_PLUGIN((TriaxialTestWater));
\ No newline at end of file

Modified: trunk/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction/GLDrawCohesiveFrictionalContactInteraction.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -245,5 +245,5 @@
 
 }
 
-YADE_PLUGIN("GLDrawCohesiveFrictionalContactInteraction");
+YADE_PLUGIN((GLDrawCohesiveFrictionalContactInteraction));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/dem/RenderingEngine/GLDrawElasticContactInteraction/GLDrawElasticContactInteraction.cpp
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawElasticContactInteraction/GLDrawElasticContactInteraction.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/RenderingEngine/GLDrawElasticContactInteraction/GLDrawElasticContactInteraction.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -90,5 +90,5 @@
 
 }
 
-YADE_PLUGIN("GLDrawElasticContactInteraction");
+YADE_PLUGIN((GLDrawElasticContactInteraction));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/dem/RenderingEngine/GLDrawInteractingMyTetrahedron/GLDrawInteractingMyTetrahedron.cpp
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawInteractingMyTetrahedron/GLDrawInteractingMyTetrahedron.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/RenderingEngine/GLDrawInteractingMyTetrahedron/GLDrawInteractingMyTetrahedron.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -36,5 +36,5 @@
 	}
 }
 
-YADE_PLUGIN("GLDrawInteractingMyTetrahedron");
+YADE_PLUGIN((GLDrawInteractingMyTetrahedron));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry/GLDrawSpheresContactGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -14,7 +14,7 @@
 #include<yade/lib-opengl/OpenGLWrapper.hpp>
 #include<yade/lib-opengl/GLUtils.hpp>
 
-YADE_PLUGIN("GLDrawSpheresContactGeometry");
+YADE_PLUGIN((GLDrawSpheresContactGeometry));
 YADE_REQUIRE_FEATURE(OPENGL)
 CREATE_LOGGER(GLDrawSpheresContactGeometry);
 

Modified: trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp
===================================================================
--- trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction/GLDrawViscoelasticInteraction.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -35,5 +35,5 @@
 	glPopMatrix();
 }
 
-YADE_PLUGIN("GLDrawViscoelasticInteraction");
+YADE_PLUGIN((GLDrawViscoelasticInteraction));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/dem/meta/ConcretePM.cpp
===================================================================
--- trunk/pkg/dem/meta/ConcretePM.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/meta/ConcretePM.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -6,11 +6,11 @@
 #include<yade/pkg-dem/DemXDofGeom.hpp>
 #include<yade/pkg-dem/Shop.hpp>
 
-YADE_PLUGIN("CpmMat","Ip2_CpmMat_CpmMat_CpmPhys","CpmPhys","Law2_Dem3DofGeom_CpmPhys_Cpm","CpmGlobalCharacteristics",
+YADE_PLUGIN((CpmMat)(Ip2_CpmMat_CpmMat_CpmPhys)(CpmPhys)(Law2_Dem3DofGeom_CpmPhys_Cpm)(CpmGlobalCharacteristics)
 	#ifdef YADE_OPENGL
-		"GLDrawCpmPhys",
+		(GLDrawCpmPhys)
 	#endif	
-		"CpmPhysDamageColorizer");
+		(CpmPhysDamageColorizer));
 
 
 /********************** Ip2_CpmMat_CpmMat_CpmPhys ****************************/

Modified: trunk/pkg/dem/meta/ConcretePM.hpp
===================================================================
--- trunk/pkg/dem/meta/ConcretePM.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/meta/ConcretePM.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -296,7 +296,7 @@
 	class GLDrawCpmPhys: public GLDrawInteractionPhysicsFunctor {
 		public: virtual void go(const shared_ptr<InteractionPhysics>&,const shared_ptr<Interaction>&,const shared_ptr<Body>&,const shared_ptr<Body>&,bool wireFrame);
 		virtual ~GLDrawCpmPhys() {};
-		REGISTER_ATTRIBUTES(/*no base*/,(contactLine)(dmgLabel)(dmgPlane)(epsT)(epsTAxes)(normal)(colorStrain)(epsNLabel));
+		REGISTER_ATTRIBUTES(Serializable,(contactLine)(dmgLabel)(dmgPlane)(epsT)(epsTAxes)(normal)(colorStrain)(epsNLabel));
 		RENDERS(CpmPhys);
 		REGISTER_CLASS_AND_BASE(GLDrawCpmPhys,GLDrawInteractionPhysicsFunctor);
 		DECLARE_LOGGER;

Modified: trunk/pkg/dem/meta/RockPM.cpp
===================================================================
--- trunk/pkg/dem/meta/RockPM.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/meta/RockPM.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -23,10 +23,9 @@
 #include<yade/pkg-dem/Shop.hpp>
 
 
-YADE_PLUGIN("Law2_Dem3DofGeom_RockPMPhys_Rpm", "RpmMat","Ip2_RpmMat_RpmMat_RpmPhys","RpmPhys");
+YADE_PLUGIN((Law2_Dem3DofGeom_RockPMPhys_Rpm)(RpmMat)(Ip2_RpmMat_RpmMat_RpmPhys)(RpmPhys));
 
 
-
 /********************** Law2_Dem3DofGeom_RockPMPhys_Rpm ****************************/
 CREATE_LOGGER(Law2_Dem3DofGeom_RockPMPhys_Rpm);
 

Modified: trunk/pkg/dem/meta/Tetra.cpp
===================================================================
--- trunk/pkg/dem/meta/Tetra.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/dem/meta/Tetra.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -2,10 +2,10 @@
 
 #include"Tetra.hpp"
 
-YADE_PLUGIN(/* self-contained in hpp: */ "TetraMold", "TetraBang", "Tetrahedron2TetraMold","TetraAABB", 
-	/* some code in cpp (this file): */ "TetraLaw",	 "Tetra2TetraBang"
+YADE_PLUGIN(/* self-contained in hpp: */ (TetraMold) (TetraBang) (Tetrahedron2TetraMold) (TetraAABB) 
+	/* some code in cpp (this file): */ (TetraLaw) (Tetra2TetraBang)
 	#ifdef YADE_OPENGL
-		,"TetraDraw"
+		(TetraDraw)
 	#endif	
 	);
 

Modified: trunk/pkg/fem/DataClass/GeometricalModel/FEMSetGeometry.cpp
===================================================================
--- trunk/pkg/fem/DataClass/GeometricalModel/FEMSetGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/fem/DataClass/GeometricalModel/FEMSetGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -21,4 +21,4 @@
 }
 
 
-YADE_PLUGIN("FEMSetGeometry");
\ No newline at end of file
+YADE_PLUGIN((FEMSetGeometry));
\ No newline at end of file

Modified: trunk/pkg/fem/DataClass/PhysicalParameters/FEMNodeData.cpp
===================================================================
--- trunk/pkg/fem/DataClass/PhysicalParameters/FEMNodeData.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/fem/DataClass/PhysicalParameters/FEMNodeData.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -21,4 +21,4 @@
 }
 
 
-YADE_PLUGIN("FEMNodeData");
\ No newline at end of file
+YADE_PLUGIN((FEMNodeData));
\ No newline at end of file

Modified: trunk/pkg/fem/DataClass/PhysicalParameters/FEMSetParameters.cpp
===================================================================
--- trunk/pkg/fem/DataClass/PhysicalParameters/FEMSetParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/fem/DataClass/PhysicalParameters/FEMSetParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -24,4 +24,4 @@
 
 
 
-YADE_PLUGIN("FEMSetParameters");
\ No newline at end of file
+YADE_PLUGIN((FEMSetParameters));
\ No newline at end of file

Modified: trunk/pkg/fem/DataClass/PhysicalParameters/FEMTetrahedronData.cpp
===================================================================
--- trunk/pkg/fem/DataClass/PhysicalParameters/FEMTetrahedronData.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/fem/DataClass/PhysicalParameters/FEMTetrahedronData.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -183,4 +183,4 @@
 	damping = Damp * mass ;
 }
 
-YADE_PLUGIN("FEMTetrahedronData");
+YADE_PLUGIN((FEMTetrahedronData));
\ No newline at end of file

Modified: trunk/pkg/fem/Engine/EngineUnit/FEMSet2Tetrahedrons.cpp
===================================================================
--- trunk/pkg/fem/Engine/EngineUnit/FEMSet2Tetrahedrons.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/fem/Engine/EngineUnit/FEMSet2Tetrahedrons.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -43,4 +43,4 @@
 	}
 }
 
-YADE_PLUGIN("FEMSet2Tetrahedrons");
\ No newline at end of file
+YADE_PLUGIN((FEMSet2Tetrahedrons));
\ No newline at end of file

Modified: trunk/pkg/fem/Engine/EngineUnit/FEMSetTextLoader.cpp
===================================================================
--- trunk/pkg/fem/Engine/EngineUnit/FEMSetTextLoader.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/fem/Engine/EngineUnit/FEMSetTextLoader.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -128,4 +128,4 @@
 	body->physicalParameters	= physics;
 }
 
-YADE_PLUGIN("FEMSetTextLoader");
\ No newline at end of file
+YADE_PLUGIN((FEMSetTextLoader));
\ No newline at end of file

Modified: trunk/pkg/fem/Engine/EngineUnit/FEMTetrahedronStiffness.cpp
===================================================================
--- trunk/pkg/fem/Engine/EngineUnit/FEMTetrahedronStiffness.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/fem/Engine/EngineUnit/FEMTetrahedronStiffness.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -35,4 +35,4 @@
 	}
 	
 }
-YADE_PLUGIN("FEMTetrahedronStiffness");
\ No newline at end of file
+YADE_PLUGIN((FEMTetrahedronStiffness));
\ No newline at end of file

Modified: trunk/pkg/fem/Engine/StandAloneEngine/FEMLaw.cpp
===================================================================
--- trunk/pkg/fem/Engine/StandAloneEngine/FEMLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/fem/Engine/StandAloneEngine/FEMLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -76,4 +76,4 @@
 
 
 
-YADE_PLUGIN("FEMLaw");
\ No newline at end of file
+YADE_PLUGIN((FEMLaw));
\ No newline at end of file

Modified: trunk/pkg/fem/PreProcessor/FEMBeam.cpp
===================================================================
--- trunk/pkg/fem/PreProcessor/FEMBeam.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/fem/PreProcessor/FEMBeam.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -238,4 +238,4 @@
 }
 
  
-YADE_PLUGIN("FEMBeam");
+YADE_PLUGIN((FEMBeam));
\ No newline at end of file

Modified: trunk/pkg/lattice/DataClass/GeometricalModel/LatticeSetGeometry.cpp
===================================================================
--- trunk/pkg/lattice/DataClass/GeometricalModel/LatticeSetGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/DataClass/GeometricalModel/LatticeSetGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -21,4 +21,4 @@
 }
 
 
-YADE_PLUGIN("LatticeSetGeometry");
\ No newline at end of file
+YADE_PLUGIN((LatticeSetGeometry));
\ No newline at end of file

Modified: trunk/pkg/lattice/DataClass/GeometricalModel/LineSegment.cpp
===================================================================
--- trunk/pkg/lattice/DataClass/GeometricalModel/LineSegment.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/DataClass/GeometricalModel/LineSegment.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,4 +18,4 @@
 }
 
 
-YADE_PLUGIN("LineSegment");
\ No newline at end of file
+YADE_PLUGIN((LineSegment));
\ No newline at end of file

Modified: trunk/pkg/lattice/DataClass/InteractingGeometry/LatticeInteractingGeometry.cpp
===================================================================
--- trunk/pkg/lattice/DataClass/InteractingGeometry/LatticeInteractingGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/DataClass/InteractingGeometry/LatticeInteractingGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -19,4 +19,4 @@
 }
 
 
-YADE_PLUGIN("LatticeInteractingGeometry");
\ No newline at end of file
+YADE_PLUGIN((LatticeInteractingGeometry));
\ No newline at end of file

Modified: trunk/pkg/lattice/DataClass/InteractionPhysics/LatticeBeamAngularSpring.cpp
===================================================================
--- trunk/pkg/lattice/DataClass/InteractionPhysics/LatticeBeamAngularSpring.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/DataClass/InteractionPhysics/LatticeBeamAngularSpring.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -34,4 +34,4 @@
 }
 
 
-YADE_PLUGIN("LatticeBeamAngularSpring");
\ No newline at end of file
+YADE_PLUGIN((LatticeBeamAngularSpring));
\ No newline at end of file

Modified: trunk/pkg/lattice/DataClass/InteractionPhysics/NonLocalDependency.cpp
===================================================================
--- trunk/pkg/lattice/DataClass/InteractionPhysics/NonLocalDependency.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/DataClass/InteractionPhysics/NonLocalDependency.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -21,4 +21,4 @@
 }
 
 
-YADE_PLUGIN("NonLocalDependency");
\ No newline at end of file
+YADE_PLUGIN((NonLocalDependency));
\ No newline at end of file

Modified: trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeBeamParameters.cpp
===================================================================
--- trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeBeamParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeBeamParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -144,4 +144,4 @@
         }
 }
 
-YADE_PLUGIN("LatticeBeamParameters");
\ No newline at end of file
+YADE_PLUGIN((LatticeBeamParameters));
\ No newline at end of file

Modified: trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeNodeParameters.cpp
===================================================================
--- trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeNodeParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeNodeParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -24,4 +24,4 @@
 }
 
 
-YADE_PLUGIN("LatticeNodeParameters");
\ No newline at end of file
+YADE_PLUGIN((LatticeNodeParameters));
\ No newline at end of file

Modified: trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeSetParameters.cpp
===================================================================
--- trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeSetParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/DataClass/PhysicalParameters/LatticeSetParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -29,4 +29,4 @@
 
 
  
-YADE_PLUGIN("LatticeSetParameters");
\ No newline at end of file
+YADE_PLUGIN((LatticeSetParameters));
\ No newline at end of file

Modified: trunk/pkg/lattice/Engine/EngineUnit/LatticeSet2LatticeBeams.cpp
===================================================================
--- trunk/pkg/lattice/Engine/EngineUnit/LatticeSet2LatticeBeams.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/Engine/EngineUnit/LatticeSet2LatticeBeams.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -56,4 +56,4 @@
 	}
 }
 
-YADE_PLUGIN("LatticeSet2LatticeBeams");
\ No newline at end of file
+YADE_PLUGIN((LatticeSet2LatticeBeams));
\ No newline at end of file

Modified: trunk/pkg/lattice/Engine/StandAloneEngine/BeamRecorder.cpp
===================================================================
--- trunk/pkg/lattice/Engine/StandAloneEngine/BeamRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/Engine/StandAloneEngine/BeamRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -193,4 +193,4 @@
 	 
 }
 
-YADE_PLUGIN("BeamRecorder");
\ No newline at end of file
+YADE_PLUGIN((BeamRecorder));
\ No newline at end of file

Modified: trunk/pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp
===================================================================
--- trunk/pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/Engine/StandAloneEngine/LatticeLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -711,4 +711,4 @@
 
 */
 
-YADE_PLUGIN("LatticeLaw");
\ No newline at end of file
+YADE_PLUGIN((LatticeLaw));
\ No newline at end of file

Modified: trunk/pkg/lattice/Engine/StandAloneEngine/MeasurePoisson.cpp
===================================================================
--- trunk/pkg/lattice/Engine/StandAloneEngine/MeasurePoisson.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/Engine/StandAloneEngine/MeasurePoisson.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -100,4 +100,4 @@
 	 
 }
 
-YADE_PLUGIN("MeasurePoisson");
\ No newline at end of file
+YADE_PLUGIN((MeasurePoisson));
\ No newline at end of file

Modified: trunk/pkg/lattice/Engine/StandAloneEngine/MovingSupport.cpp
===================================================================
--- trunk/pkg/lattice/Engine/StandAloneEngine/MovingSupport.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/Engine/StandAloneEngine/MovingSupport.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -210,4 +210,4 @@
 	 
 }
 
-YADE_PLUGIN("MovingSupport");
\ No newline at end of file
+YADE_PLUGIN((MovingSupport));
\ No newline at end of file

Modified: trunk/pkg/lattice/Engine/StandAloneEngine/NodeRecorder.cpp
===================================================================
--- trunk/pkg/lattice/Engine/StandAloneEngine/NodeRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/Engine/StandAloneEngine/NodeRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -204,4 +204,4 @@
 	// GLDrawSomething can just put a getClassName()
 }
 
-YADE_PLUGIN("NodeRecorder");
+YADE_PLUGIN((NodeRecorder));
\ No newline at end of file

Modified: trunk/pkg/lattice/Engine/StandAloneEngine/NonLocalInitializer.cpp
===================================================================
--- trunk/pkg/lattice/Engine/StandAloneEngine/NonLocalInitializer.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/Engine/StandAloneEngine/NonLocalInitializer.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -179,4 +179,4 @@
 //	cerr << "number of beams: " << total << "\n";
 }
 
-YADE_PLUGIN("NonLocalInitializer");
\ No newline at end of file
+YADE_PLUGIN((NonLocalInitializer));
\ No newline at end of file

Modified: trunk/pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp
===================================================================
--- trunk/pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/Engine/StandAloneEngine/StrainRecorder.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -118,4 +118,4 @@
 	 
 }
 
-YADE_PLUGIN("StrainRecorder");
\ No newline at end of file
+YADE_PLUGIN((StrainRecorder));
\ No newline at end of file

Modified: trunk/pkg/lattice/PreProcessor/LatticeExample.cpp
===================================================================
--- trunk/pkg/lattice/PreProcessor/LatticeExample.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/PreProcessor/LatticeExample.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -2169,4 +2169,4 @@
 }
 
 
-YADE_PLUGIN("LatticeExample");
+YADE_PLUGIN((LatticeExample));
\ No newline at end of file

Modified: trunk/pkg/lattice/PreProcessor/LatticeExampleCTData.cpp
===================================================================
--- trunk/pkg/lattice/PreProcessor/LatticeExampleCTData.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/PreProcessor/LatticeExampleCTData.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -552,4 +552,4 @@
 	}
 }
 
-YADE_PLUGIN("LatticeExampleCTData");
+YADE_PLUGIN((LatticeExampleCTData));
\ No newline at end of file

Modified: trunk/pkg/lattice/PreProcessor/LatticeExampleSimple.cpp
===================================================================
--- trunk/pkg/lattice/PreProcessor/LatticeExampleSimple.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/PreProcessor/LatticeExampleSimple.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -509,4 +509,4 @@
 	}
 }
 
-YADE_PLUGIN("LatticeExampleSimple");
+YADE_PLUGIN((LatticeExampleSimple));
\ No newline at end of file

Modified: trunk/pkg/lattice/RenderingEngine/GLDrawLatticeBeamState/GLDrawLatticeBeamState.cpp
===================================================================
--- trunk/pkg/lattice/RenderingEngine/GLDrawLatticeBeamState/GLDrawLatticeBeamState.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/RenderingEngine/GLDrawLatticeBeamState/GLDrawLatticeBeamState.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -67,5 +67,5 @@
 	*/
 }
 
-YADE_PLUGIN("GLDrawLatticeBeamState");
+YADE_PLUGIN((GLDrawLatticeBeamState));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry/GLDrawLatticeInteractingGeometry.cpp
===================================================================
--- trunk/pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry/GLDrawLatticeInteractingGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry/GLDrawLatticeInteractingGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -200,5 +200,5 @@
 
 }
 
-YADE_PLUGIN("GLDrawLatticeInteractingGeometry");
+YADE_PLUGIN((GLDrawLatticeInteractingGeometry));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry/GLDrawLatticeSetGeometry.cpp
===================================================================
--- trunk/pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry/GLDrawLatticeSetGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry/GLDrawLatticeSetGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -233,5 +233,5 @@
 //	std::cerr << "GLDrawLatticeSetGeometry\n";
 }
 
-YADE_PLUGIN("GLDrawLatticeSetGeometry");
+YADE_PLUGIN((GLDrawLatticeSetGeometry));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/lattice/RenderingEngine/GLDrawLineSegment/GLDrawLineSegment.cpp
===================================================================
--- trunk/pkg/lattice/RenderingEngine/GLDrawLineSegment/GLDrawLineSegment.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/lattice/RenderingEngine/GLDrawLineSegment/GLDrawLineSegment.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -65,5 +65,5 @@
 	}
 }
 
-YADE_PLUGIN("GLDrawLineSegment");
+YADE_PLUGIN((GLDrawLineSegment));
 YADE_REQUIRE_FEATURE(OPENGL)

Modified: trunk/pkg/mass-spring/DataClass/InteractionGeometry/SpringGeometry.cpp
===================================================================
--- trunk/pkg/mass-spring/DataClass/InteractionGeometry/SpringGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/mass-spring/DataClass/InteractionGeometry/SpringGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,4 +18,4 @@
 }
 
 
-YADE_PLUGIN("SpringGeometry");
\ No newline at end of file
+YADE_PLUGIN((SpringGeometry));
\ No newline at end of file

Modified: trunk/pkg/mass-spring/DataClass/InteractionPhysics/SpringPhysics.cpp
===================================================================
--- trunk/pkg/mass-spring/DataClass/InteractionPhysics/SpringPhysics.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/mass-spring/DataClass/InteractionPhysics/SpringPhysics.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,4 +18,4 @@
 }
 
 
-YADE_PLUGIN("SpringPhysics");
\ No newline at end of file
+YADE_PLUGIN((SpringPhysics));
\ No newline at end of file

Modified: trunk/pkg/mass-spring/DataClass/PhysicalParameters/ParticleSetParameters.cpp
===================================================================
--- trunk/pkg/mass-spring/DataClass/PhysicalParameters/ParticleSetParameters.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/mass-spring/DataClass/PhysicalParameters/ParticleSetParameters.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -20,4 +20,4 @@
 }
 
 
-YADE_PLUGIN("ParticleSetParameters");
\ No newline at end of file
+YADE_PLUGIN((ParticleSetParameters));
\ No newline at end of file

Modified: trunk/pkg/mass-spring/Engine/EngineUnit/ParticleSet2Mesh2D.cpp
===================================================================
--- trunk/pkg/mass-spring/Engine/EngineUnit/ParticleSet2Mesh2D.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/mass-spring/Engine/EngineUnit/ParticleSet2Mesh2D.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -35,4 +35,4 @@
 	}
 }
 	
-YADE_PLUGIN("ParticleSet2Mesh2D");
\ No newline at end of file
+YADE_PLUGIN((ParticleSet2Mesh2D));
\ No newline at end of file

Modified: trunk/pkg/mass-spring/Engine/StandAloneEngine/MassSpringLaw.cpp
===================================================================
--- trunk/pkg/mass-spring/Engine/StandAloneEngine/MassSpringLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/mass-spring/Engine/StandAloneEngine/MassSpringLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -68,4 +68,4 @@
 	
 }
 
-YADE_PLUGIN("MassSpringLaw");
\ No newline at end of file
+YADE_PLUGIN((MassSpringLaw));
\ No newline at end of file

Modified: trunk/pkg/mass-spring/PreProcessor/HangingCloth.cpp
===================================================================
--- trunk/pkg/mass-spring/PreProcessor/HangingCloth.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/mass-spring/PreProcessor/HangingCloth.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -505,4 +505,4 @@
 	body->physicalParameters	= physics;
 }
 
-YADE_PLUGIN("HangingCloth");
+YADE_PLUGIN((HangingCloth));
\ No newline at end of file

Modified: trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingBox2InteractingBox4ClosestFeatures.cpp
===================================================================
--- trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingBox2InteractingBox4ClosestFeatures.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingBox2InteractingBox4ClosestFeatures.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -466,4 +466,4 @@
 
 }
 
-YADE_PLUGIN("InteractingBox2InteractingBox4ClosestFeatures");
\ No newline at end of file
+YADE_PLUGIN((InteractingBox2InteractingBox4ClosestFeatures));
\ No newline at end of file

Modified: trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingBox2InteractingSphere4ClosestFeatures.cpp
===================================================================
--- trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingBox2InteractingSphere4ClosestFeatures.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingBox2InteractingSphere4ClosestFeatures.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -128,4 +128,4 @@
 	return isInteracting;
 }
 
-YADE_PLUGIN("InteractingBox2InteractingSphere4ClosestFeatures");
\ No newline at end of file
+YADE_PLUGIN((InteractingBox2InteractingSphere4ClosestFeatures));
\ No newline at end of file

Modified: trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingSphere2InteractingSphere4ClosestFeatures.cpp
===================================================================
--- trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingSphere2InteractingSphere4ClosestFeatures.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/realtime-rigidbody/Engine/EngineUnit/InteractingSphere2InteractingSphere4ClosestFeatures.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -48,4 +48,4 @@
 	return go(cm1,cm2,se31,se32,c);
 }
 
-YADE_PLUGIN("InteractingSphere2InteractingSphere4ClosestFeatures");
\ No newline at end of file
+YADE_PLUGIN((InteractingSphere2InteractingSphere4ClosestFeatures));
\ No newline at end of file

Modified: trunk/pkg/realtime-rigidbody/Engine/StandAloneEngine/FrictionLessElasticContactLaw.cpp
===================================================================
--- trunk/pkg/realtime-rigidbody/Engine/StandAloneEngine/FrictionLessElasticContactLaw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/realtime-rigidbody/Engine/StandAloneEngine/FrictionLessElasticContactLaw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -81,4 +81,4 @@
 	}
 }
 
-YADE_PLUGIN("FrictionLessElasticContactLaw");
\ No newline at end of file
+YADE_PLUGIN((FrictionLessElasticContactLaw));
\ No newline at end of file

Modified: trunk/pkg/realtime-rigidbody/PreProcessor/BoxStack.cpp
===================================================================
--- trunk/pkg/realtime-rigidbody/PreProcessor/BoxStack.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/realtime-rigidbody/PreProcessor/BoxStack.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -296,4 +296,4 @@
 	rootBody->physicalParameters 		= physics;
 }
 
-YADE_PLUGIN("BoxStack");
\ No newline at end of file
+YADE_PLUGIN((BoxStack));
\ No newline at end of file

Modified: trunk/pkg/realtime-rigidbody/PreProcessor/RotatingBox.cpp
===================================================================
--- trunk/pkg/realtime-rigidbody/PreProcessor/RotatingBox.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/realtime-rigidbody/PreProcessor/RotatingBox.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -317,4 +317,4 @@
 }
 
 
-YADE_PLUGIN("RotatingBox");
+YADE_PLUGIN((RotatingBox));
\ No newline at end of file

Modified: trunk/pkg/snow/DataClass/BshSnowGrain.cpp
===================================================================
--- trunk/pkg/snow/DataClass/BshSnowGrain.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/DataClass/BshSnowGrain.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -602,5 +602,4 @@
 	return depth;
 }
 
-YADE_PLUGIN("BshSnowGrain","Grrrr");
-
+YADE_PLUGIN((BshSnowGrain)(Grrrr));

Modified: trunk/pkg/snow/DataClass/BshSnowGrain.hpp
===================================================================
--- trunk/pkg/snow/DataClass/BshSnowGrain.hpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/DataClass/BshSnowGrain.hpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -21,7 +21,7 @@
 		Grrrr(){};
 		Grrrr(std::vector<Vector3r>& g):grr(g){};
 	protected :
-		REGISTER_ATTRIBUTES(/* */, (grr));
+		REGISTER_ATTRIBUTES(Serializable, (grr));
 	REGISTER_CLASS_NAME(Grrrr);
 	REGISTER_BASE_CLASS_NAME(Serializable);
 };
@@ -76,9 +76,9 @@
 		Real calc_depth(size_t);
 		bool is_point_orthogonally_projected_on_triangle(Vector3r& a,Vector3r& b,Vector3r c,Vector3r& N,Vector3r& P,Real point_plane_distance = 0.0);
 
-		friend class boost::serialization::access;
+		// friend class boost::serialization::access;
 		template<class Archive>
-		void serialize(Archive & ar, unsigned int version)
+		void serialize_REMOVED(Archive & ar, unsigned int version)
 		{
 			//boost::mutex::scoped_lock scoped_lock(m_voxel_envelope_mutex);
 			ar & layer_distance;

Modified: trunk/pkg/snow/DataClass/BssSnowGrain.cpp
===================================================================
--- trunk/pkg/snow/DataClass/BssSnowGrain.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/DataClass/BssSnowGrain.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -58,4 +58,4 @@
 }
 
 
-YADE_PLUGIN("BssSnowGrain");
+YADE_PLUGIN((BssSnowGrain));
\ No newline at end of file

Modified: trunk/pkg/snow/Engine/Ef2_BssSnowGrain_AABB_makeAABB.cpp
===================================================================
--- trunk/pkg/snow/Engine/Ef2_BssSnowGrain_AABB_makeAABB.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/Engine/Ef2_BssSnowGrain_AABB_makeAABB.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -63,4 +63,4 @@
 */
 }
 	
-YADE_PLUGIN("Ef2_BssSnowGrain_AABB_makeAABB");
\ No newline at end of file
+YADE_PLUGIN((Ef2_BssSnowGrain_AABB_makeAABB));
\ No newline at end of file

Modified: trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp
===================================================================
--- trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -450,4 +450,4 @@
 //	return result;
 }
 
-YADE_PLUGIN("Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact");
+YADE_PLUGIN((Ef2_BssSnowGrain_BssSnowGrain_makeIstSnowLayersContact));
\ No newline at end of file

Modified: trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeSpheresContactGeometry.cpp
===================================================================
--- trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeSpheresContactGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/Engine/Ef2_BssSnowGrain_BssSnowGrain_makeSpheresContactGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -84,4 +84,4 @@
 	return result;
 }
 
-YADE_PLUGIN("Ef2_BssSnowGrain_BssSnowGrain_makeSpheresContactGeometry");
+YADE_PLUGIN((Ef2_BssSnowGrain_BssSnowGrain_makeSpheresContactGeometry));
\ No newline at end of file

Modified: trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp
===================================================================
--- trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -448,4 +448,4 @@
 
 }
 
-YADE_PLUGIN("Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact");
+YADE_PLUGIN((Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact));
\ No newline at end of file

Modified: trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeSpheresContactGeometry.cpp
===================================================================
--- trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeSpheresContactGeometry.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeSpheresContactGeometry.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -83,4 +83,4 @@
 	return result;
 }
 
-YADE_PLUGIN("Ef2_InteractingBox_BssSnowGrain_makeSpheresContactGeometry");
+YADE_PLUGIN((Ef2_InteractingBox_BssSnowGrain_makeSpheresContactGeometry));
\ No newline at end of file

Modified: trunk/pkg/snow/Engine/ElawSnowLayersDeformation.cpp
===================================================================
--- trunk/pkg/snow/Engine/ElawSnowLayersDeformation.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/Engine/ElawSnowLayersDeformation.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -172,4 +172,4 @@
 	}
 }
 
-YADE_PLUGIN("ElawSnowLayersDeformation");
+YADE_PLUGIN((ElawSnowLayersDeformation));
\ No newline at end of file

Modified: trunk/pkg/snow/PreProcessor/SnowCreepTest.cpp
===================================================================
--- trunk/pkg/snow/PreProcessor/SnowCreepTest.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/PreProcessor/SnowCreepTest.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -709,4 +709,4 @@
 
 
 
-YADE_PLUGIN("SnowCreepTest");
+YADE_PLUGIN((SnowCreepTest));
\ No newline at end of file

Modified: trunk/pkg/snow/PreProcessor/SnowVoxelsLoader.cpp
===================================================================
--- trunk/pkg/snow/PreProcessor/SnowVoxelsLoader.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/PreProcessor/SnowVoxelsLoader.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -79,7 +79,8 @@
 #include"Voxel/VoxelEnvelope.cpp"
 
 
-YADE_PLUGIN("SnowVoxelsLoader");
+YADE_PLUGIN((SnowVoxelsLoader));
+
 SnowVoxelsLoader::SnowVoxelsLoader() : FileGenerator()
 {
 	voxel_binary_data_file = "/home/janek/32-Snow-white/20-Programy/31-SNOW-read-data/RESULT.bz2";

Modified: trunk/pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp
===================================================================
--- trunk/pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -393,4 +393,4 @@
 
 }
 
-YADE_PLUGIN("Ef1_BshSnowGrain_glDraw");
+YADE_PLUGIN((Ef1_BshSnowGrain_glDraw));
\ No newline at end of file

Modified: trunk/pkg/snow/RenderingEngine/Ef1_BssSnowGrain_glDraw.cpp
===================================================================
--- trunk/pkg/snow/RenderingEngine/Ef1_BssSnowGrain_glDraw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/RenderingEngine/Ef1_BssSnowGrain_glDraw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -179,5 +179,4 @@
 }
 
 
-YADE_PLUGIN("Ef1_BssSnowGrain_glDraw");
-
+YADE_PLUGIN((Ef1_BssSnowGrain_glDraw));

Modified: trunk/pkg/snow/RenderingEngine/Ef1_IstSnowLayersContact_glDraw.cpp
===================================================================
--- trunk/pkg/snow/RenderingEngine/Ef1_IstSnowLayersContact_glDraw.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/pkg/snow/RenderingEngine/Ef1_IstSnowLayersContact_glDraw.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -18,8 +18,7 @@
 	#include <Wm3Plane3.h>
 #endif
 
-YADE_PLUGIN("Ef1_IstSnowLayersContact_glDraw");
-
+YADE_PLUGIN((Ef1_IstSnowLayersContact_glDraw));
 /*
 /// all points must share the same plane!
 std::vector<Vector3r> find_boundary(std::vector<Vector3r> points)

Modified: trunk/py/yadeWrapper/yadeWrapper.cpp
===================================================================
--- trunk/py/yadeWrapper/yadeWrapper.cpp	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/py/yadeWrapper/yadeWrapper.cpp	2009-08-03 11:02:11 UTC (rev 1911)
@@ -6,7 +6,6 @@
 #include<unistd.h>
 #include<list>
 
-
 #include<boost/python.hpp>
 #include<boost/python/raw_function.hpp>
 #include<boost/python/suite/indexing/vector_indexing_suite.hpp>
@@ -20,6 +19,8 @@
 #include<boost/foreach.hpp>
 #include<boost/algorithm/string.hpp>
 
+
+
 #include<yade/lib-base/Logging.hpp>
 #include<yade/lib-serialization-xml/XMLFormatManager.hpp>
 #include<yade/core/Omega.hpp>
@@ -470,7 +471,14 @@
 		int numThreads_get(){return 1;}
 		void numThreads_set(int n){ LOG_WARN("Yade was compiled without openMP support, changing number of threads will have no effect."); }
 	#endif
-
+	#ifdef YADE_BOOST_SERIALIZATION
+	void saveXML(string filename){
+		std::ofstream ofs(filename.c_str());
+		boost::archive::xml_oarchive oa(ofs);
+		shared_ptr<MetaBody> YadeSimulation=OMEGA.getRootBody();
+		oa << YadeSimulation;
+	}
+	#endif
 };
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(omega_run_overloads,run,0,2);
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(omega_saveTmp_overloads,saveTmp,0,1);
@@ -503,9 +511,7 @@
 }
 
 std::string Serializable_pyStr(const shared_ptr<Serializable>& self) {
-	std::string nameThis=self->getClassName(),nameRoot=self->pyRootClassName();
-	if(nameThis==nameRoot) return "<"+nameRoot+">";
-	else return "<"+nameThis+" "+nameRoot+">";
+	return "<"+self->getClassName()+" instance at "+lexical_cast<string>(self.get())+">";
 }
 
 python::list TimingDeltas_pyData(const shared_ptr<TimingDeltas> self){
@@ -626,6 +632,9 @@
 		.add_property("timingEnabled",&pyOmega::timingEnabled_get,&pyOmega::timingEnabled_set,"Globally enable/disable timing services (see documentation of yade.timing).")
 		.add_property("bexSyncCount",&pyOmega::bexSyncCount_get,&pyOmega::bexSyncCount_set,"Counter for number of syncs in BexContainer, for profiling purposes.")
 		.add_property("numThreads",&pyOmega::numThreads_get /* ,&pyOmega::numThreads_set*/ ,"Get maximum number of threads openMP can use.")
+		#ifdef YADE_BOOST_SERIALIZATION
+			.def("saveXML",&pyOmega::saveXML,"[EXPERIMENTAL] function saving to XML file using boost::serialization.")
+		#endif
 		;
 	python::class_<pyTags>("TagsWrapper",python::init<pyTags&>())
 		.def("__getitem__",&pyTags::getItem)

Modified: trunk/scripts/fix-plugin-names.py
===================================================================
--- trunk/scripts/fix-plugin-names.py	2009-07-31 14:32:36 UTC (rev 1910)
+++ trunk/scripts/fix-plugin-names.py	2009-08-03 11:02:11 UTC (rev 1911)
@@ -6,11 +6,11 @@
 		modified=False
 		new=[]
 		for l in open(root+'/'+name):
-			m=re.match('(.*)YADE_PLUGIN\(\)(.*)',l)
+			m=re.match('(.*)YADE_PLUGIN\(([^)]*)\)(.*)',l)
 			if m:
 				modified=True
-				plugin=name[:-4] # strip the .cpp
-				new.append(m.group(1)+'YADE_PLUGIN("'+plugin+'")'+m.group(2))
+				plugins=''.join(['('+pl.strip()[1:-1]+')' for pl in m.group(2).split(',')])
+				new.append(m.group(1)+'YADE_PLUGIN('+plugins+')'+m.group(3))
 			else: new.append(l)
 		if modified:
 			print root+'/'+name