[cgkit-commits] [SCM] cgkit branch, py3k, updated. 77547407b858f3c593fa1256470555298484f3ff
Brought to you by:
mbaas
From: Matthias B. <mb...@us...> - 2011-11-20 20:37:47
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "cgkit". The branch, py3k has been updated via 77547407b858f3c593fa1256470555298484f3ff (commit) via 46b6a61f5e5e658e0f902052c3c5373f99398a33 (commit) via fc774df51574df2f68ab33db2c3e6d71d54c76df (commit) via 0db942f44dace572974efb975ae3226aa5a39068 (commit) via 858368f1bf48dc2c63de075f082419b7a81fe244 (commit) via 99c08d2c13b1daa7cb63191d02b7fe285e3eb1ab (commit) via 954c5aef047ecc95c3151d89716d2784197806d7 (commit) via d417649608a11e47ce96282c3d9786f497d59bb2 (commit) from 86d54a13ec2611e432987b8262a3aa84a46e624a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 77547407b858f3c593fa1256470555298484f3ff Author: Matthias Baas <mb...@us...> Date: Sun Nov 20 20:36:01 2011 +0000 Py3k updates (the modules can be imported now, but the unit tests still fail). commit 46b6a61f5e5e658e0f902052c3c5373f99398a33 Merge: 99c08d2 fc774df Author: Matthias Baas <mb...@us...> Date: Sun Nov 13 21:32:28 2011 +0000 Merge branch 'master' into py3k Conflicts: cgkit/cmds.py cgkit/component.py cgkit/scene.py cgkit/sceneglobals.py commit fc774df51574df2f68ab33db2c3e6d71d54c76df Author: Matthias Baas <mb...@us...> Date: Sun Nov 13 20:55:07 2011 +0000 Refactored the imports to avoid a cyclic import. The main getScene() function is now in the globalscene module. Most other modules can now import from that module instead from the scene module. commit 99c08d2c13b1daa7cb63191d02b7fe285e3eb1ab Merge: 86d54a1 954c5ae Author: Matthias Baas <mb...@us...> Date: Sat Nov 12 21:49:52 2011 +0000 Merge branch 'master' of ssh://cgkit.git.sourceforge.net/gitroot/cgkit/cgkit into py3k ----------------------------------------------------------------------- Summary of changes: cgkit/_OpenGL/GL.py | 2 +- cgkit/_OpenGL/GLU.py | 2 +- cgkit/_OpenGL/GLUT.py | 2 +- cgkit/__init__.py | 125 ------------------------ cgkit/asfamcimport.py | 24 +++--- cgkit/autocam.py | 2 +- cgkit/beziercurve.py | 12 +- cgkit/beziercurvegeom.py | 16 ++-- cgkit/box.py | 16 ++-- cgkit/boxgeom.py | 2 +- cgkit/bvh.py | 2 +- cgkit/bvhimport.py | 12 +- cgkit/camcontrol.py | 12 +- cgkit/camerabase.py | 20 ++-- cgkit/ccylinder.py | 16 ++-- cgkit/ccylindergeom.py | 2 +- cgkit/cmds.py | 26 +++--- cgkit/component.py | 10 +- cgkit/dddsimport.py | 32 +++--- cgkit/draw.py | 10 +- cgkit/drawgeom.py | 2 +- cgkit/drawtextgeom.py | 4 +- cgkit/euleradapter.py | 22 ++-- cgkit/expression.py | 36 ++++---- cgkit/flockofbirds.py | 16 ++-- cgkit/fob.py | 20 ++-- cgkit/freecamera.py | 20 ++-- cgkit/geomobject.py | 4 +- cgkit/glfreedistantlight.py | 17 ++-- cgkit/glfreespotlight.py | 17 ++-- cgkit/glmaterial.py | 28 +++--- cgkit/{drawgeom.py => globalscene.py} | 16 ++-- cgkit/glpointlight.py | 17 ++-- cgkit/glrenderer.py | 8 +- cgkit/glslangparams.py | 6 +- cgkit/gltargetdistantlight.py | 21 ++-- cgkit/gltargetspotlight.py | 21 ++-- cgkit/gnuplotter.py | 16 ++-- cgkit/group.py | 31 +++++-- cgkit/ifsimport.py | 10 +- cgkit/joint.py | 34 ++++---- cgkit/joints.py | 4 +- cgkit/joystick.py | 2 +- cgkit/lightsource.py | 11 +- cgkit/lookat.py | 7 +- cgkit/lwobimport.py | 18 ++-- cgkit/maimport.py | 34 ++++---- cgkit/material.py | 2 +- cgkit/material3ds.py | 20 ++-- cgkit/mayaspotlight.py | 12 +- cgkit/mediafile.py | 4 +- cgkit/objexport.py | 32 +++--- cgkit/objimport.py | 28 +++--- cgkit/objmaterial.py | 20 ++-- cgkit/odedynamics.py | 97 ++++++++++---------- cgkit/offexport.py | 26 +++--- cgkit/offimport.py | 24 +++--- cgkit/pidcontroller.py | 28 +++--- cgkit/plane.py | 16 ++-- cgkit/planegeom.py | 2 +- cgkit/pluginmanager.py | 10 +- cgkit/plyexport.py | 18 ++-- cgkit/plyimport.py | 10 +- cgkit/polyhedron.py | 16 ++-- cgkit/polyhedrongeom.py | 2 +- cgkit/preferences.py | 6 +- cgkit/pyimport.py | 17 ++-- cgkit/quadrics.py | 18 ++-- cgkit/ribarchive.py | 12 +- cgkit/ribexport.py | 80 ++++++++-------- cgkit/riutil.py | 2 +- cgkit/rmshader.py | 40 ++++---- cgkit/scene.py | 8 +- cgkit/sceneglobals.py | 2 +- cgkit/slideshow.py | 34 ++++---- cgkit/sloargs.py | 16 ++-- cgkit/slparams.py | 23 +++-- cgkit/spheregeom.py | 2 +- cgkit/spotlight3ds.py | 12 +- cgkit/stitch.py | 20 ++-- cgkit/stlimport.py | 8 +- cgkit/targetcamera.py | 24 +++--- cgkit/tool.py | 30 +++--- cgkit/torus.py | 12 +- cgkit/torusgeom.py | 2 +- cgkit/trimesh.py | 18 ++-- cgkit/trimeshgeom.py | 2 +- cgkit/tunnel.py | 49 +++++----- cgkit/undo.py | 2 +- cgkit/valuetable.py | 14 ++-- cgkit/worldobject.py | 18 ++-- cgkit/x3dimport.py | 32 +++--- supportlib/SConstruct | 168 ++++++++++++++++---------------- supportlib/include/quat.h | 6 +- unittests/test_arrayslots.py | 6 +- wrappers/py_slot.h | 7 +- wrappers/py_worldobject3.cpp | 2 +- 97 files changed, 867 insertions(+), 979 deletions(-) copy cgkit/{drawgeom.py => globalscene.py} (89%) hooks/post-receive -- cgkit |