← Back to team overview

yade-dev team mailing list archive

[Branch ~yade-dev/yade/trunk] Rev 1892: 1. Rename GLDraw* to Gl1_*

 

------------------------------------------------------------
revno: 1892
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-12-11 19:10:19 +0100
message:
  1. Rename GLDraw* to Gl1_*
  2. Scene no longer inherits from Body, some of its properties are "emulated" (bound, shape). Not sure if Shape is really needed, perhaps for periodicity things etc in one place? It can be in the class itself just as well.
  3. Remove MetaInteractingGeometry2AABB from all files (no longer needed); backwards-compatibility with python assured.
renamed:
  pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.cpp => pkg/common/DataClass/InteractingGeometry/SceneShape.cpp
  pkg/common/DataClass/InteractingGeometry/MetaInteractingGeometry.hpp => pkg/common/DataClass/InteractingGeometry/SceneShape.hpp
  pkg/common/Engine/Functor/MetaInteractingGeometry2AABB.cpp => pkg/common/Engine/Functor/Bo1_SceneShape_Aabb.cpp
  pkg/common/Engine/Functor/MetaInteractingGeometry2AABB.hpp => pkg/common/Engine/Functor/Bo1_SceneShape_Aabb.hpp
  pkg/common/RenderingEngine/GLDrawInteractingBox.cpp => pkg/common/RenderingEngine/Gl1_Box.cpp
  pkg/common/RenderingEngine/GLDrawInteractingBox.hpp => pkg/common/RenderingEngine/Gl1_Box.hpp
  pkg/common/RenderingEngine/GLDrawInteractingFacet.cpp => pkg/common/RenderingEngine/Gl1_Facet.cpp
  pkg/common/RenderingEngine/GLDrawInteractingFacet.hpp => pkg/common/RenderingEngine/Gl1_Facet.hpp
  pkg/common/RenderingEngine/GLDrawInteractingSphere.cpp => pkg/common/RenderingEngine/Gl1_Sphere.cpp
  pkg/common/RenderingEngine/GLDrawInteractingSphere.hpp => pkg/common/RenderingEngine/Gl1_Sphere.hpp
  pkg/common/RenderingEngine/GLDrawMetaInteractingGeometry.cpp => pkg/common/RenderingEngine/Gl1_SceneShape.cpp
  pkg/common/RenderingEngine/GLDrawMetaInteractingGeometry.hpp => pkg/common/RenderingEngine/Gl1_SceneShape.hpp
modified:
  core/Scene.cpp
  core/Scene.hpp
  examples/buldozer.py
  examples/buldozerVTK.py
  examples/concrete/periodic.py
  examples/concrete/uniax.py
  examples/cyl.py
  examples/dynamic_simulation_tests/ringCundallDamping.py
  examples/dynamic_simulation_tests/ringSimpleViscoelastic.py
  examples/mill.py
  examples/rod_penetration/model.py
  pkg/common/DataClass/InteractingGeometry/Wall.hpp
  pkg/common/Engine/Dispatcher/BoundDispatcher.cpp
  pkg/common/Engine/PartialEngine/GravityEngines.cpp
  pkg/common/Engine/PartialEngine/GravityEngines.hpp
  pkg/common/RenderingEngine/GLDrawAABB.hpp
  pkg/common/RenderingEngine/GLDrawBoxModel.hpp
  pkg/common/RenderingEngine/GLDrawBssSweptSphereLineSegment.hpp
  pkg/common/RenderingEngine/GLDrawFacetModel.hpp
  pkg/common/RenderingEngine/GLDrawFunctors.hpp
  pkg/common/RenderingEngine/GLDrawNormalInteraction.hpp
  pkg/common/RenderingEngine/GLDrawParticleState.hpp
  pkg/common/RenderingEngine/GLDrawQuadrilateral.hpp
  pkg/common/RenderingEngine/GLDrawRigidBodyState.hpp
  pkg/common/RenderingEngine/GLDrawSphereModel.hpp
  pkg/common/RenderingEngine/GLDrawTetrahedron.hpp
  pkg/common/RenderingEngine/GLDrawTube.hpp
  pkg/common/RenderingEngine/OpenGLRenderingEngine.cpp
  pkg/common/RenderingEngine/OpenGLRenderingEngine.hpp
  pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_FacetSphere.hpp
  pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_SphereSphere.hpp
  pkg/dem/DataClass/InteractionGeometry/Dem3DofGeom_WallSphere.hpp
  pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.cpp
  pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.hpp
  pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp
  pkg/dem/PreProcessor/DirectShearCis.cpp
  pkg/dem/PreProcessor/Funnel.cpp
  pkg/dem/PreProcessor/HydraulicTest.cpp
  pkg/dem/PreProcessor/MembraneTest.cpp
  pkg/dem/PreProcessor/ModifiedTriaxialTest.cpp
  pkg/dem/PreProcessor/SDECImpactTest.cpp
  pkg/dem/PreProcessor/SDECLinkedSpheres.cpp
  pkg/dem/PreProcessor/SDECMovingWall.cpp
  pkg/dem/PreProcessor/SDECSpheresPlane.cpp
  pkg/dem/PreProcessor/STLImporterTest.cpp
  pkg/dem/PreProcessor/SimpleScene.cpp
  pkg/dem/PreProcessor/SimpleShear.cpp
  pkg/dem/PreProcessor/TestSimpleViscoelastic.cpp
  pkg/dem/PreProcessor/TetraTestGen.cpp
  pkg/dem/PreProcessor/ThreePointBending.cpp
  pkg/dem/PreProcessor/TriaxialTest.cpp
  pkg/dem/PreProcessor/TriaxialTestWater.cpp
  pkg/dem/PreProcessor/UniaxialStrainerGen.cpp
  pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp
  pkg/dem/RenderingEngine/GLDrawElasticContactInteraction.hpp
  pkg/dem/RenderingEngine/GLDrawSpheresContactGeometry.hpp
  pkg/dem/RenderingEngine/GLDrawViscoelasticInteraction.hpp
  pkg/dem/meta/ConcretePM.hpp
  pkg/dem/meta/Shop.cpp
  pkg/dem/meta/Tetra.cpp
  pkg/dem/meta/Tetra.hpp
  pkg/lattice/DataClass/InteractingGeometry/LatticeInteractingGeometry.cpp
  pkg/lattice/DataClass/InteractingGeometry/LatticeInteractingGeometry.hpp
  pkg/lattice/PreProcessor/LatticeExample.cpp
  pkg/lattice/PreProcessor/LatticeExampleCTData.cpp
  pkg/lattice/PreProcessor/LatticeExampleSimple.cpp
  pkg/lattice/RenderingEngine/GLDrawLatticeBeamState.hpp
  pkg/lattice/RenderingEngine/GLDrawLatticeInteractingGeometry.hpp
  pkg/lattice/RenderingEngine/GLDrawLatticeSetGeometry.hpp
  pkg/lattice/RenderingEngine/GLDrawLineSegment.hpp
  pkg/snow/PreProcessor/SnowCreepTest.cpp
  pkg/snow/PreProcessor/SnowVoxelsLoader.cpp
  pkg/snow/RenderingEngine/Ef1_BshSnowGrain_glDraw.hpp
  pkg/snow/RenderingEngine/Ef1_BssSnowGrain_glDraw.hpp
  pkg/snow/RenderingEngine/Ef1_IstSnowLayersContact_glDraw.hpp
  py/system.py
  py/tests/wrapper.py
  py/utils.py
  py/yadeWrapper/yadeWrapper.cpp
  scripts/chain-distant-interactions.py
  scripts/constitutive-law.py
  scripts/cylindrical-layer-packing.py
  scripts/exact-rot-facet.py
  scripts/exact-rot.py
  scripts/multi.py
  scripts/simple-scene-parallel.py
  scripts/simple-scene-player.py
  scripts/simple-scene-plot.py
  scripts/simple-scene-video.py
  scripts/simple-scene.py
  scripts/test-sphere-facet-corner.py
  scripts/test-sphere-facet.py
  scripts/test/CundallStrackTest.py
  scripts/test/Dem3DofGeom.py
  scripts/test/ResetRandomPosition.py
  scripts/test/SpheresFactory/model.py
  scripts/test/clump.py
  scripts/test/collider-stride.py
  scripts/test/collider-sweep-simple.py
  scripts/test/gts-horse.py
  scripts/test/insertion-sort-collider.py
  scripts/test/periodic-compress.py
  scripts/test/periodic-grow.py
  scripts/test/periodic-simple.py
  scripts/test/regular-sphere-pack.py
  scripts/test/remove-body.py
  pkg/common/DataClass/InteractingGeometry/SceneShape.cpp
  pkg/common/DataClass/InteractingGeometry/SceneShape.hpp
  pkg/common/Engine/Functor/Bo1_SceneShape_Aabb.cpp
  pkg/common/Engine/Functor/Bo1_SceneShape_Aabb.hpp
  pkg/common/RenderingEngine/Gl1_Box.cpp
  pkg/common/RenderingEngine/Gl1_Box.hpp
  pkg/common/RenderingEngine/Gl1_Facet.cpp
  pkg/common/RenderingEngine/Gl1_Facet.hpp
  pkg/common/RenderingEngine/Gl1_Sphere.cpp
  pkg/common/RenderingEngine/Gl1_Sphere.hpp
  pkg/common/RenderingEngine/Gl1_SceneShape.cpp
  pkg/common/RenderingEngine/Gl1_SceneShape.hpp
The size of the diff (3111 lines) is larger than your specified limit of 1000 lines

--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.



Follow ups