------------------------------------------------------------ revno: 2450 committer: Chiara Modenese <c...@engs-018373> branch nick: yade timestamp: Wed 2010-09-29 11:08:58 +0100 message: 1. Add #pragma once to MatchMaker (thanks, Remi) 2. Remove a few useless scripts. removed: scripts/simple-scene-player.py scripts/simple-scene-video.py modified: pkg/common/DataClass/MatchMaker.hpp
-- lp:yade https://code.launchpad.net/~yade-dev/yade/trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'pkg/common/DataClass/MatchMaker.hpp' --- pkg/common/DataClass/MatchMaker.hpp 2010-09-27 17:47:59 +0000 +++ pkg/common/DataClass/MatchMaker.hpp 2010-09-29 10:08:58 +0000 @@ -1,5 +1,5 @@ // 2010 © Václav Šmilauer <[email protected]> - +#pragma once #include<yade/lib-serialization/Serializable.hpp> #include<string> === removed file 'scripts/simple-scene-player.py' --- scripts/simple-scene-player.py 2010-09-27 17:47:59 +0000 +++ scripts/simple-scene-player.py 1970-01-01 00:00:00 +0000 @@ -1,35 +0,0 @@ -#!/usr/local/bin/yade-trunk -x -# -*- encoding=utf-8 -*- -o=Omega() -o.engines=[ - ForceResetter(), - InsertionSortCollider([Bo1_Sphere_Aabb(),Bo1_Box_Aabb()]), - InteractionLoop( - [Ig2_Sphere_Sphere_ScGeom(),Ig2_Box_Sphere_ScGeom()], - [Ip2_FrictMat_FrictMat_FrictPhys()], - [Law2_ScGeom_FrictPhys_Basic()] - ), - GravityEngine(gravity=(0,0,-9.81)), - NewtonIntegrator(damping=.2), - ### - ### NOTE this extra engine. - ### - 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)) -o.bodies.append(utils.sphere([0,0,2],1,color=[0,1,0],young=30e9,poisson=.3,density=2400)) -o.dt=.4*utils.PWaveTimeStep() - -o.run(15000) -o.wait() - -def setWire(): - o=Omega() - for b in o.bodies: b.shape['wire']=False -# you could have saved the viewer state by using Alt-S in the view... -from yade import qt -qt.Video() -qt.makePlayerVideo('/tmp/player.sqlite','/tmp/player.ogg','/tmp/qglviewerState.xml',stride=10,fps=12,postLoadHook='setWire()') - -quit() === removed file 'scripts/simple-scene-video.py' --- scripts/simple-scene-video.py 2010-09-27 17:47:59 +0000 +++ scripts/simple-scene-video.py 1970-01-01 00:00:00 +0000 @@ -1,27 +0,0 @@ -#!/usr/local/bin/yade-trunk -x -# -*- encoding=utf-8 -*- - -O.engines=[ - ForceResetter(), - InsertionSortCollider([Bo1_Sphere_Aabb(),Bo1_Box_Aabb(),]), - InteractionLoop( - [Ig2_Sphere_Sphere_ScGeom(),Ig2_Box_Sphere_ScGeom()], - [Ip2_FrictMat_FrictMat_FrictPhys()], - [Law2_ScGeom_FrictPhys_Basic()] - ), - GravityEngine(gravity=(0,0,-9.81)), - NewtonIntegrator(damping=.2) -] - -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)) -O.bodies.append(utils.sphere([0,0,2],1,color=[0,1,0],young=30e9,poisson=.3,density=2400)) -O.dt=.4*utils.PWaveTimeStep() - -from yade import qt -O.stopAtIter=15000 -qt.makeSimulationVideo('/tmp/aa.ogg',iterPeriod=100,fps=12) - - - - -
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
