Author: gladky_anton
Date: 2009-07-29 10:00:56 +0200 (Wed, 29 Jul 2009)
New Revision: 1898

Modified:
   trunk/scripts/simple-scene-graph.py
   trunk/scripts/simple-scene-player.py
Log:
1. Updated simple-scene-graph.py according to a new syntax
2. Updated simple-scene-video.py according to a new syntax



Modified: trunk/scripts/simple-scene-graph.py
===================================================================
--- trunk/scripts/simple-scene-graph.py 2009-07-28 22:43:38 UTC (rev 1897)
+++ trunk/scripts/simple-scene-graph.py 2009-07-29 08:00:56 UTC (rev 1898)
@@ -2,8 +2,8 @@
 # -*- encoding=utf-8 -*-
 
 O.initializers=[
-       
MetaEngine('BoundingVolumeMetaEngine',[EngineUnit('InteractingSphere2AABB'),EngineUnit('InteractingBox2AABB'),EngineUnit('MetaInteractingGeometry2AABB')])
-       ]
+               
BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
+]
 O.engines=[
        BexResetter(),
        
BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),

Modified: trunk/scripts/simple-scene-player.py
===================================================================
--- trunk/scripts/simple-scene-player.py        2009-07-28 22:43:38 UTC (rev 
1897)
+++ trunk/scripts/simple-scene-player.py        2009-07-29 08:00:56 UTC (rev 
1898)
@@ -1,30 +1,24 @@
 #!/usr/local/bin/yade-trunk -x
 # -*- encoding=utf-8 -*-
-
-o=Omega()
+o=Omega() 
 o.initializers=[
-       
MetaEngine('BoundingVolumeMetaEngine',[EngineUnit('InteractingSphere2AABB'),EngineUnit('InteractingBox2AABB'),EngineUnit('MetaInteractingGeometry2AABB')])
-       ]
+               
BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()])
+]
 o.engines=[
-       StandAloneEngine('PhysicalActionContainerReseter'),
-       MetaEngine('BoundingVolumeMetaEngine',[
-               EngineUnit('InteractingSphere2AABB'),
-               EngineUnit('InteractingBox2AABB'),
-               EngineUnit('MetaInteractingGeometry2AABB')
-       ]),
-       StandAloneEngine('PersistentSAPCollider'),
-       MetaEngine('InteractionGeometryMetaEngine',[
-               
EngineUnit('InteractingSphere2InteractingSphere4SpheresContactGeometry'),
-               
EngineUnit('InteractingBox2InteractingSphere4SpheresContactGeometry')
-       ]),
-       
MetaEngine('InteractionPhysicsMetaEngine',[EngineUnit('SimpleElasticRelationships')]),
-       StandAloneEngine('ElasticContactLaw'),
-       DeusExMachina('GravityEngine',{'gravity':[0,0,-9.81]}),
+       BexResetter(),
+       
BoundingVolumeMetaEngine([InteractingSphere2AABB(),InteractingBox2AABB(),MetaInteractingGeometry2AABB()]),
+       InsertionSortCollider(),
+       InteractionDispatchers(
+               
[InteractingSphere2InteractingSphere4SpheresContactGeometry(),InteractingBox2InteractingSphere4SpheresContactGeometry()],
+               [SimpleElasticRelationships()],
+               [ef2_Spheres_Elastic_ElasticLaw()]
+       ),
+       GravityEngine(gravity=(0,0,-9.81)),
        NewtonsDampedLaw(damping=.2),
        ###
        ### NOTE this extra engine.
        ###
-       
StandAloneEngine('SQLiteRecorder',{'recorders':['se3','rgb'],'dbFile':'/tmp/player.sqlite','iterPeriod':50})
+       
SQLiteRecorder(recorders=['se3','rgb'],dbFile='/tmp/player.sqlite',iterPeriod=50)
 ]
 from yade import utils
 
o.bodies.append(utils.box(center=[0,0,0],extents=[.5,.5,.5],dynamic=False,color=[1,0,0],young=30e9,poisson=.3,density=2400))


_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to     : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp

Reply via email to