← Back to branch summary

~jakob-flierl/bullet-physics-playground/master

~jakob-flierl/bullet-physics-playground/master

Viewing all changes in revision 76.

Committer: Jakob Flierl
Date: 2012-11-05 15:48:48 UTC
mfrom: (73.1.7)
Revision ID: git-v1:b8379622b1dfabfcb709c62ca79e47c18b207fa5

Merge branch 'master' of git://github.com/jaimevives/bullet-physics-playground

files added:
demo/05-mesh-chain.lua

demo/chain-link.3ds

export

export/.gitignore

includes

includes/col_ggl.inc

includes/dice.inc

includes/settings.inc

screenshots

screenshots/.gitignore

tools

tools/png2avi.sh

tools/pov2png.sh

files removed:
anim

anim/png2avi.sh

anim/pov2png.sh

demo/02-domino.png

demo/03-math.png

demo/color_ggl.gpl

povray

povray/col_ggl.inc

povray/dice.inc

povray/settings.inc

src/midi

src/midi/MidiEvent.cpp

src/midi/MidiEvent.h

src/midi/MidiIO.cpp

src/midi/MidiIO.h

src/midi/RtError.h

src/midi/RtMidi.cpp

src/midi/RtMidi.h

src/objects/cubeaxes.cpp

src/objects/cubeaxes.h

src/objects/dice.cpp

src/objects/dice.h

src/objects/robots

src/objects/robots/rm.cpp

src/objects/robots/rm.h

src/objects/robots/rm1.cpp

src/objects/robots/rm1.h

src/objects/robots/rm501_0.3ds

src/objects/robots/rm501_1.3ds

src/objects/robots/rm501_2.3ds

src/objects/robots/rm501_3.3ds

src/objects/robots/rm501_4.3ds

src/objects/robots/rm501_4_closed.3ds

src/objects/robots/rm501_ambiente.3ds

src/objects/robots/roboop

src/objects/robots/roboop/CMakeLists.txt

src/objects/robots/roboop/aclocal.m4

src/objects/robots/roboop/autoconf_inc.m4

src/objects/robots/roboop/bench.vcproj

src/objects/robots/roboop/conf

src/objects/robots/roboop/conf/pd_2dof.conf

src/objects/robots/roboop/conf/puma560_dh.conf

src/objects/robots/roboop/conf/puma560_mdh.conf

src/objects/robots/roboop/conf/q_2dof.dat

src/objects/robots/roboop/conf/rhino_dh.conf

src/objects/robots/roboop/conf/rhino_mdh.conf

src/objects/robots/roboop/conf/rr_dh.conf

src/objects/robots/roboop/conf/stewart.conf

src/objects/robots/roboop/demo.vcproj

src/objects/robots/roboop/makefile

src/objects/robots/roboop/makefile.bc5

src/objects/robots/roboop/makefile.gcc

src/objects/robots/roboop/makefile.gccOSX

src/objects/robots/roboop/makefile.gw32

src/objects/robots/roboop/makefile.vcpp

src/objects/robots/roboop/newmat

src/objects/robots/roboop/newmat.dsp

src/objects/robots/roboop/newmat.vcproj

src/objects/robots/roboop/newmat/CMakeLists.txt

src/objects/robots/roboop/newmat/Makefile.in

src/objects/robots/roboop/newmat/_newmat.dox

src/objects/robots/roboop/newmat/_rbd_com.dox

src/objects/robots/roboop/newmat/add_time.png

src/objects/robots/roboop/newmat/bandmat.cpp

src/objects/robots/roboop/newmat/cholesky.cpp

src/objects/robots/roboop/newmat/controlw.h

src/objects/robots/roboop/newmat/evalue.cpp

src/objects/robots/roboop/newmat/example.cpp

src/objects/robots/roboop/newmat/example.txt

src/objects/robots/roboop/newmat/fft.cpp

src/objects/robots/roboop/newmat/garch.cpp

src/objects/robots/roboop/newmat/garch.txt

src/objects/robots/roboop/newmat/hholder.cpp

src/objects/robots/roboop/newmat/include.h

src/objects/robots/roboop/newmat/jacobi.cpp

src/objects/robots/roboop/newmat/myexcept.cpp

src/objects/robots/roboop/newmat/myexcept.h

src/objects/robots/roboop/newmat/newfft.cpp

src/objects/robots/roboop/newmat/newmat.h

src/objects/robots/roboop/newmat/newmat.lfl

src/objects/robots/roboop/newmat/newmat1.cpp

src/objects/robots/roboop/newmat/newmat2.cpp

src/objects/robots/roboop/newmat/newmat3.cpp

src/objects/robots/roboop/newmat/newmat4.cpp

src/objects/robots/roboop/newmat/newmat5.cpp

src/objects/robots/roboop/newmat/newmat6.cpp

src/objects/robots/roboop/newmat/newmat7.cpp

src/objects/robots/roboop/newmat/newmat8.cpp

src/objects/robots/roboop/newmat/newmat9.cpp

src/objects/robots/roboop/newmat/newmatap.h

src/objects/robots/roboop/newmat/newmatex.cpp

src/objects/robots/roboop/newmat/newmatio.h

src/objects/robots/roboop/newmat/newmatnl.cpp

src/objects/robots/roboop/newmat/newmatnl.h

src/objects/robots/roboop/newmat/newmatrc.h

src/objects/robots/roboop/newmat/newmatrm.cpp

src/objects/robots/roboop/newmat/newmatrm.h

src/objects/robots/roboop/newmat/nl_ex.cpp

src/objects/robots/roboop/newmat/nl_ex.txt

src/objects/robots/roboop/newmat/nm11.htm

src/objects/robots/roboop/newmat/nm_b55.mak

src/objects/robots/roboop/newmat/nm_b56.mak

src/objects/robots/roboop/newmat/nm_cc.mak

src/objects/robots/roboop/newmat/nm_ex1.cpp

src/objects/robots/roboop/newmat/nm_ex1.txt

src/objects/robots/roboop/newmat/nm_ex2.cpp

src/objects/robots/roboop/newmat/nm_ex2.txt

src/objects/robots/roboop/newmat/nm_gnu.mak

src/objects/robots/roboop/newmat/nm_i5.mak

src/objects/robots/roboop/newmat/nm_i8.mak

src/objects/robots/roboop/newmat/nm_il5.mak

src/objects/robots/roboop/newmat/nm_il8.mak

src/objects/robots/roboop/newmat/nm_m6.mak

src/objects/robots/roboop/newmat/nm_m8.mak

src/objects/robots/roboop/newmat/nm_misc.cpp

src/objects/robots/roboop/newmat/nm_ow.mak

src/objects/robots/roboop/newmat/nm_targ.txt

src/objects/robots/roboop/newmat/precisio.h

src/objects/robots/roboop/newmat/rbd.css

src/objects/robots/roboop/newmat/readme.txt

src/objects/robots/roboop/newmat/sl_ex.cpp

src/objects/robots/roboop/newmat/sl_ex.txt

src/objects/robots/roboop/newmat/solution.cpp

src/objects/robots/roboop/newmat/solution.h

src/objects/robots/roboop/newmat/sort.cpp

src/objects/robots/roboop/newmat/submat.cpp

src/objects/robots/roboop/newmat/svd.cpp

src/objects/robots/roboop/newmat/test_exc.cpp

src/objects/robots/roboop/newmat/test_exc.txt

src/objects/robots/roboop/newmat/tmt.h

src/objects/robots/roboop/newmat/tmt.txt

src/objects/robots/roboop/newmat/tmt1.cpp

src/objects/robots/roboop/newmat/tmt2.cpp

src/objects/robots/roboop/newmat/tmt3.cpp

src/objects/robots/roboop/newmat/tmt4.cpp

src/objects/robots/roboop/newmat/tmt5.cpp

src/objects/robots/roboop/newmat/tmt6.cpp

src/objects/robots/roboop/newmat/tmt7.cpp

src/objects/robots/roboop/newmat/tmt8.cpp

src/objects/robots/roboop/newmat/tmt9.cpp

src/objects/robots/roboop/newmat/tmta.cpp

src/objects/robots/roboop/newmat/tmtb.cpp

src/objects/robots/roboop/newmat/tmtc.cpp

src/objects/robots/roboop/newmat/tmte.cpp

src/objects/robots/roboop/newmat/tmtf.cpp

src/objects/robots/roboop/newmat/tmtg.cpp

src/objects/robots/roboop/newmat/tmth.cpp

src/objects/robots/roboop/newmat/tmti.cpp

src/objects/robots/roboop/newmat/tmtj.cpp

src/objects/robots/roboop/newmat/tmtk.cpp

src/objects/robots/roboop/newmat/tmtl.cpp

src/objects/robots/roboop/newmat/tmtm.cpp

src/objects/robots/roboop/readme.txt

src/objects/robots/roboop/roboop.sln

src/objects/robots/roboop/rtest.dsp

src/objects/robots/roboop/rtest.tgt

src/objects/robots/roboop/rtest.vcproj

src/objects/robots/roboop/source

src/objects/robots/roboop/source/CMakeLists.txt

src/objects/robots/roboop/source/bench.cpp

src/objects/robots/roboop/source/clik.cpp

src/objects/robots/roboop/source/clik.h

src/objects/robots/roboop/source/comp_dq.cpp

src/objects/robots/roboop/source/comp_dqp.cpp

src/objects/robots/roboop/source/config.cpp

src/objects/robots/roboop/source/config.h

src/objects/robots/roboop/source/control_select.cpp

src/objects/robots/roboop/source/control_select.h

src/objects/robots/roboop/source/controller.cpp

src/objects/robots/roboop/source/controller.h

src/objects/robots/roboop/source/delta_t.cpp

src/objects/robots/roboop/source/demo.cpp

src/objects/robots/roboop/source/demo_2dof_pd.cpp

src/objects/robots/roboop/source/dynamics.cpp

src/objects/robots/roboop/source/dynamics_sim.cpp

src/objects/robots/roboop/source/dynamics_sim.h

src/objects/robots/roboop/source/gnugraph.cpp

src/objects/robots/roboop/source/gnugraph.h

src/objects/robots/roboop/source/homogen.cpp

src/objects/robots/roboop/source/invkine.cpp

src/objects/robots/roboop/source/kinemat.cpp

src/objects/robots/roboop/source/quaternion.cpp

src/objects/robots/roboop/source/quaternion.h

src/objects/robots/roboop/source/robot.cpp

src/objects/robots/roboop/source/robot.h

src/objects/robots/roboop/source/rtest.cpp

src/objects/robots/roboop/source/sensitiv.cpp

src/objects/robots/roboop/source/stewart.cpp

src/objects/robots/roboop/source/stewart.h

src/objects/robots/roboop/source/test.txt

src/objects/robots/roboop/source/trajectory.cpp

src/objects/robots/roboop/source/trajectory.h

src/objects/robots/roboop/source/utils.cpp

src/objects/robots/roboop/source/utils.h

files modified:
README.md

demo/00-objects.lua

physics.pro

src/coll.cpp

src/coll.h

src/gui.cpp

src/gui.h

src/objects/cube.cpp

src/objects/cylinder.cpp

src/objects/mesh3ds.cpp

src/objects/object.cpp

src/objects/object.h

src/objects/plane.cpp

src/objects/sphere.cpp

src/viewer.cpp

src/viewer.h

Show diffs side-by-side

added added

removed removed

anim/png2avi.sh

anim/pov2png.sh

demo/00-objects.lua

demo/02-domino.png

demo/03-math.png

demo/05-mesh-chain.lua

demo/chain-link.3ds

demo/color_ggl.gpl

export/.gitignore

includes/col_ggl.inc

includes/dice.inc

includes/settings.inc

povray/col_ggl.inc

povray/dice.inc

povray/settings.inc

screenshots/.gitignore

src/midi/MidiEvent.cpp

src/midi/MidiEvent.h

src/midi/MidiIO.cpp

src/midi/MidiIO.h

src/midi/RtError.h

src/midi/RtMidi.cpp

src/midi/RtMidi.h

src/objects/cube.cpp

src/objects/cubeaxes.cpp

src/objects/cubeaxes.h

src/objects/cylinder.cpp

src/objects/dice.cpp

src/objects/dice.h

src/objects/mesh3ds.cpp

src/objects/object.cpp

src/objects/object.h

src/objects/plane.cpp

src/objects/robots/

src/objects/robots/rm.cpp

src/objects/robots/rm.h

src/objects/robots/rm1.cpp

src/objects/robots/rm1.h

src/objects/robots/rm501_0.3ds

src/objects/robots/rm501_1.3ds

src/objects/robots/rm501_2.3ds

src/objects/robots/rm501_3.3ds

src/objects/robots/rm501_4.3ds

src/objects/robots/rm501_4_closed.3ds

src/objects/robots/rm501_ambiente.3ds

src/objects/robots/roboop/

src/objects/robots/roboop/CMakeLists.txt

src/objects/robots/roboop/aclocal.m4

src/objects/robots/roboop/autoconf_inc.m4

src/objects/robots/roboop/bench.vcproj

src/objects/robots/roboop/conf/

src/objects/robots/roboop/conf/pd_2dof.conf

src/objects/robots/roboop/conf/puma560_dh.conf

src/objects/robots/roboop/conf/puma560_mdh.conf

src/objects/robots/roboop/conf/q_2dof.dat

src/objects/robots/roboop/conf/rhino_dh.conf

src/objects/robots/roboop/conf/rhino_mdh.conf

src/objects/robots/roboop/conf/rr_dh.conf

src/objects/robots/roboop/conf/stewart.conf

src/objects/robots/roboop/demo.vcproj

src/objects/robots/roboop/makefile

src/objects/robots/roboop/makefile.bc5

src/objects/robots/roboop/makefile.gcc

src/objects/robots/roboop/makefile.gccOSX

src/objects/robots/roboop/makefile.gw32

src/objects/robots/roboop/makefile.vcpp

src/objects/robots/roboop/newmat.dsp

src/objects/robots/roboop/newmat.vcproj

src/objects/robots/roboop/newmat/

src/objects/robots/roboop/newmat/CMakeLists.txt

src/objects/robots/roboop/newmat/Makefile.in

src/objects/robots/roboop/newmat/_newmat.dox

src/objects/robots/roboop/newmat/_rbd_com.dox

src/objects/robots/roboop/newmat/add_time.png

src/objects/robots/roboop/newmat/bandmat.cpp

src/objects/robots/roboop/newmat/cholesky.cpp

src/objects/robots/roboop/newmat/controlw.h

src/objects/robots/roboop/newmat/evalue.cpp

src/objects/robots/roboop/newmat/example.cpp

src/objects/robots/roboop/newmat/example.txt

src/objects/robots/roboop/newmat/fft.cpp

src/objects/robots/roboop/newmat/garch.cpp

src/objects/robots/roboop/newmat/garch.txt

src/objects/robots/roboop/newmat/hholder.cpp

src/objects/robots/roboop/newmat/include.h

src/objects/robots/roboop/newmat/jacobi.cpp

src/objects/robots/roboop/newmat/myexcept.cpp

src/objects/robots/roboop/newmat/myexcept.h

src/objects/robots/roboop/newmat/newfft.cpp

src/objects/robots/roboop/newmat/newmat.h

src/objects/robots/roboop/newmat/newmat.lfl

src/objects/robots/roboop/newmat/newmat1.cpp

src/objects/robots/roboop/newmat/newmat2.cpp

src/objects/robots/roboop/newmat/newmat3.cpp

src/objects/robots/roboop/newmat/newmat4.cpp

src/objects/robots/roboop/newmat/newmat5.cpp

src/objects/robots/roboop/newmat/newmat6.cpp

src/objects/robots/roboop/newmat/newmat7.cpp

src/objects/robots/roboop/newmat/newmat8.cpp

src/objects/robots/roboop/newmat/newmat9.cpp

src/objects/robots/roboop/newmat/newmatap.h

src/objects/robots/roboop/newmat/newmatex.cpp

src/objects/robots/roboop/newmat/newmatio.h

src/objects/robots/roboop/newmat/newmatnl.cpp

src/objects/robots/roboop/newmat/newmatnl.h

src/objects/robots/roboop/newmat/newmatrc.h

src/objects/robots/roboop/newmat/newmatrm.cpp

src/objects/robots/roboop/newmat/newmatrm.h

src/objects/robots/roboop/newmat/nl_ex.cpp

src/objects/robots/roboop/newmat/nl_ex.txt

src/objects/robots/roboop/newmat/nm11.htm

src/objects/robots/roboop/newmat/nm_b55.mak

src/objects/robots/roboop/newmat/nm_b56.mak

src/objects/robots/roboop/newmat/nm_cc.mak

src/objects/robots/roboop/newmat/nm_ex1.cpp

src/objects/robots/roboop/newmat/nm_ex1.txt

src/objects/robots/roboop/newmat/nm_ex2.cpp

src/objects/robots/roboop/newmat/nm_ex2.txt

src/objects/robots/roboop/newmat/nm_gnu.mak

src/objects/robots/roboop/newmat/nm_i5.mak

src/objects/robots/roboop/newmat/nm_i8.mak

src/objects/robots/roboop/newmat/nm_il5.mak

src/objects/robots/roboop/newmat/nm_il8.mak

src/objects/robots/roboop/newmat/nm_m6.mak

src/objects/robots/roboop/newmat/nm_m8.mak

src/objects/robots/roboop/newmat/nm_misc.cpp

src/objects/robots/roboop/newmat/nm_ow.mak

src/objects/robots/roboop/newmat/nm_targ.txt

src/objects/robots/roboop/newmat/precisio.h

src/objects/robots/roboop/newmat/rbd.css

src/objects/robots/roboop/newmat/readme.txt

src/objects/robots/roboop/newmat/sl_ex.cpp

src/objects/robots/roboop/newmat/sl_ex.txt

src/objects/robots/roboop/newmat/solution.cpp

src/objects/robots/roboop/newmat/solution.h

src/objects/robots/roboop/newmat/sort.cpp

src/objects/robots/roboop/newmat/submat.cpp

src/objects/robots/roboop/newmat/svd.cpp

src/objects/robots/roboop/newmat/test_exc.cpp

src/objects/robots/roboop/newmat/test_exc.txt

src/objects/robots/roboop/newmat/tmt.h

src/objects/robots/roboop/newmat/tmt.txt

src/objects/robots/roboop/newmat/tmt1.cpp

src/objects/robots/roboop/newmat/tmt2.cpp

src/objects/robots/roboop/newmat/tmt3.cpp

src/objects/robots/roboop/newmat/tmt4.cpp

src/objects/robots/roboop/newmat/tmt5.cpp

src/objects/robots/roboop/newmat/tmt6.cpp

src/objects/robots/roboop/newmat/tmt7.cpp

src/objects/robots/roboop/newmat/tmt8.cpp

src/objects/robots/roboop/newmat/tmt9.cpp

src/objects/robots/roboop/newmat/tmta.cpp

src/objects/robots/roboop/newmat/tmtb.cpp

src/objects/robots/roboop/newmat/tmtc.cpp

src/objects/robots/roboop/newmat/tmte.cpp

src/objects/robots/roboop/newmat/tmtf.cpp

src/objects/robots/roboop/newmat/tmtg.cpp

src/objects/robots/roboop/newmat/tmth.cpp

src/objects/robots/roboop/newmat/tmti.cpp

src/objects/robots/roboop/newmat/tmtj.cpp

src/objects/robots/roboop/newmat/tmtk.cpp

src/objects/robots/roboop/newmat/tmtl.cpp

src/objects/robots/roboop/newmat/tmtm.cpp

src/objects/robots/roboop/readme.txt

src/objects/robots/roboop/roboop.sln

src/objects/robots/roboop/rtest.dsp

src/objects/robots/roboop/rtest.tgt

src/objects/robots/roboop/rtest.vcproj

src/objects/robots/roboop/source/

src/objects/robots/roboop/source/CMakeLists.txt

src/objects/robots/roboop/source/bench.cpp

src/objects/robots/roboop/source/clik.cpp

src/objects/robots/roboop/source/clik.h

src/objects/robots/roboop/source/comp_dq.cpp

src/objects/robots/roboop/source/comp_dqp.cpp

src/objects/robots/roboop/source/config.cpp

src/objects/robots/roboop/source/config.h

src/objects/robots/roboop/source/control_select.cpp

src/objects/robots/roboop/source/control_select.h

src/objects/robots/roboop/source/controller.cpp

src/objects/robots/roboop/source/controller.h

src/objects/robots/roboop/source/delta_t.cpp

src/objects/robots/roboop/source/demo.cpp

src/objects/robots/roboop/source/demo_2dof_pd.cpp

src/objects/robots/roboop/source/dynamics.cpp

src/objects/robots/roboop/source/dynamics_sim.cpp

src/objects/robots/roboop/source/dynamics_sim.h

src/objects/robots/roboop/source/gnugraph.cpp

src/objects/robots/roboop/source/gnugraph.h

src/objects/robots/roboop/source/homogen.cpp

src/objects/robots/roboop/source/invkine.cpp

src/objects/robots/roboop/source/kinemat.cpp

src/objects/robots/roboop/source/quaternion.cpp

src/objects/robots/roboop/source/quaternion.h

src/objects/robots/roboop/source/robot.cpp

src/objects/robots/roboop/source/robot.h

src/objects/robots/roboop/source/rtest.cpp

src/objects/robots/roboop/source/sensitiv.cpp

src/objects/robots/roboop/source/stewart.cpp

src/objects/robots/roboop/source/stewart.h

src/objects/robots/roboop/source/test.txt

src/objects/robots/roboop/source/trajectory.cpp

src/objects/robots/roboop/source/trajectory.h

src/objects/robots/roboop/source/utils.cpp

src/objects/robots/roboop/source/utils.h

src/objects/sphere.cpp

tools/png2avi.sh

tools/pov2png.sh

Older »