Revision: 1951
http://smartbody.svn.sourceforge.net/smartbody/?rev=1951&view=rev
Author: arishapiro
Date: 2011-06-08 00:11:19 +0000 (Wed, 08 Jun 2011)
Log Message:
-----------
Merged from trunk to r1947
Modified Paths:
--------------
branches/cmake/core/FestivalRelay/src/FestivalRelay.cpp
branches/cmake/core/smartbody/sbm/src/ObjectManipulationHandle.cpp
branches/cmake/core/smartbody/sbm/src/ObjectManipulationHandle.h
branches/cmake/core/smartbody/sbm/src/PawnPosControl.cpp
branches/cmake/core/smartbody/sbm/src/fltk_viewer.cpp
branches/cmake/core/smartbody/sbm/src/fltk_viewer.h
branches/cmake/core/smartbody/sbm/src/sbm_main.cpp
branches/cmake/core/smartbody/sbm/visualc9/sbm-fltk.vcproj
branches/cmake/core/smartbody/smartbody-dll/smartbody-dll.cpp
branches/cmake/core/smartbody/smartbody-dll/smartbody-dll.vcproj
branches/cmake/core/smartbody/smartbody-lib/src/sbm/BMLDefs.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/BMLDefs.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/BoneMap.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/BoneMap.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/GPU/SbmDeformableMeshGPU.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/MeCtBodyReachState.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/MeCtBodyReachState.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/ParserBVH.cxx
branches/cmake/core/smartbody/smartbody-lib/src/sbm/SteeringAgent.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_bodyreach.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_grab.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_processor.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/mcontrol_callbacks.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/mcontrol_callbacks.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/mcontrol_util.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/mcontrol_util.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_example_body_reach.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_example_body_reach.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_gaze.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_hand.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_hand.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_jacobian_IK.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_jacobian_IK.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_motion_example.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_utilities.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/sbm_character.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/sbm_character.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/sbm_pawn.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/sbm_pawn.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sr/planner/sk_blend_cfg.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sr/planner/sk_blend_cfg.h
branches/cmake/core/smartbody/smartbody-lib/src/sr/planner/sk_blend_cfg_manager.h
branches/cmake/core/smartbody/smartbody-lib/src/sr/planner/sk_pos_cfg.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sr/planner/sk_pos_cfg.h
branches/cmake/core/smartbody/smartbody-lib/visualc9/smartbody-lib.vcproj
branches/cmake/data/sbm-common/scripts/default-init.seq
branches/cmake/data/sbm-common/scripts/init-example-reach.seq
branches/cmake/data/sbm-test/scripts/test-reach-example.seq
Added Paths:
-----------
branches/cmake/core/smartbody/ode/
branches/cmake/core/smartbody/ode/include/
branches/cmake/core/smartbody/ode/include/ode/
branches/cmake/core/smartbody/ode/include/ode/Makefile.am
branches/cmake/core/smartbody/ode/include/ode/Makefile.in
branches/cmake/core/smartbody/ode/include/ode/README
branches/cmake/core/smartbody/ode/include/ode/collision.h
branches/cmake/core/smartbody/ode/include/ode/collision_space.h
branches/cmake/core/smartbody/ode/include/ode/collision_trimesh.h
branches/cmake/core/smartbody/ode/include/ode/common.h
branches/cmake/core/smartbody/ode/include/ode/compatibility.h
branches/cmake/core/smartbody/ode/include/ode/contact.h
branches/cmake/core/smartbody/ode/include/ode/error.h
branches/cmake/core/smartbody/ode/include/ode/export-dif.h
branches/cmake/core/smartbody/ode/include/ode/mass.h
branches/cmake/core/smartbody/ode/include/ode/matrix.h
branches/cmake/core/smartbody/ode/include/ode/memory.h
branches/cmake/core/smartbody/ode/include/ode/misc.h
branches/cmake/core/smartbody/ode/include/ode/objects.h
branches/cmake/core/smartbody/ode/include/ode/ode.h
branches/cmake/core/smartbody/ode/include/ode/odeconfig.h
branches/cmake/core/smartbody/ode/include/ode/odecpp.h
branches/cmake/core/smartbody/ode/include/ode/odecpp_collision.h
branches/cmake/core/smartbody/ode/include/ode/odeinit.h
branches/cmake/core/smartbody/ode/include/ode/odemath.h
branches/cmake/core/smartbody/ode/include/ode/rotation.h
branches/cmake/core/smartbody/ode/include/ode/timer.h
branches/cmake/core/smartbody/ode/lib/
branches/cmake/core/smartbody/ode/lib/ode_single.lib
branches/cmake/core/smartbody/ode/lib/ode_singled.lib
branches/cmake/core/smartbody/smartbody-lib/src/sbm/MeCtReachEngine.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/MeCtReachEngine.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmColObject.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmColObject.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmPhysicsSim.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmPhysicsSim.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmPhysicsSimODE.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmPhysicsSimODE.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_saccade.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_saccade.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_saccade.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_saccade.h
branches/cmake/data/sbm-common/scripts/mixamo-map.seq
branches/cmake/data/sbm-test/scripts/test-reach-grab.seq
branches/cmake/data/sbm-test/scripts/test-reach-physics.seq
Removed Paths:
-------------
branches/cmake/core/smartbody/ode/include/
branches/cmake/core/smartbody/ode/include/ode/
branches/cmake/core/smartbody/ode/include/ode/Makefile.am
branches/cmake/core/smartbody/ode/include/ode/Makefile.in
branches/cmake/core/smartbody/ode/include/ode/README
branches/cmake/core/smartbody/ode/include/ode/collision.h
branches/cmake/core/smartbody/ode/include/ode/collision_space.h
branches/cmake/core/smartbody/ode/include/ode/collision_trimesh.h
branches/cmake/core/smartbody/ode/include/ode/common.h
branches/cmake/core/smartbody/ode/include/ode/compatibility.h
branches/cmake/core/smartbody/ode/include/ode/contact.h
branches/cmake/core/smartbody/ode/include/ode/error.h
branches/cmake/core/smartbody/ode/include/ode/export-dif.h
branches/cmake/core/smartbody/ode/include/ode/mass.h
branches/cmake/core/smartbody/ode/include/ode/matrix.h
branches/cmake/core/smartbody/ode/include/ode/memory.h
branches/cmake/core/smartbody/ode/include/ode/misc.h
branches/cmake/core/smartbody/ode/include/ode/objects.h
branches/cmake/core/smartbody/ode/include/ode/ode.h
branches/cmake/core/smartbody/ode/include/ode/odeconfig.h
branches/cmake/core/smartbody/ode/include/ode/odecpp.h
branches/cmake/core/smartbody/ode/include/ode/odecpp_collision.h
branches/cmake/core/smartbody/ode/include/ode/odeinit.h
branches/cmake/core/smartbody/ode/include/ode/odemath.h
branches/cmake/core/smartbody/ode/include/ode/rotation.h
branches/cmake/core/smartbody/ode/include/ode/timer.h
branches/cmake/core/smartbody/ode/lib/
branches/cmake/core/smartbody/ode/lib/ode_single.lib
branches/cmake/core/smartbody/ode/lib/ode_singled.lib
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Collision/
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmColObject.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmColObject.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmPhysicsSim.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmPhysicsSim.h
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmPhysicsSimODE.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/Physics/SbmPhysicsSimODE.h
Property Changed:
----------------
branches/cmake/
branches/cmake/core/ogre-viewer/
branches/cmake/core/ogre-viewer/build/vs2008/OgreViewer.sln
branches/cmake/core/ogre-viewer/build/vs2008/OgreViewer.vcproj
branches/cmake/core/ogre-viewer/media/Brad.mesh
branches/cmake/core/ogre-viewer/media/Brad.skeleton
branches/cmake/core/ogre-viewer/media/Brad_Face_2048.dds
branches/cmake/core/ogre-viewer/media/Brad_Hand.dds
branches/cmake/core/ogre-viewer/media/Brad_Pants.dds
branches/cmake/core/ogre-viewer/media/Brad_Shirt.dds
branches/cmake/core/ogre-viewer/media/Brad_Tpose.material
branches/cmake/core/ogre-viewer/src/main.cpp
branches/cmake/core/smartbody/
branches/cmake/core/smartbody/exporters/maya/
branches/cmake/core/smartbody/sbm/
branches/cmake/core/smartbody/smartbody-lib/src/me/me_default_prune_policy.cpp
branches/cmake/core/smartbody/smartbody-lib/src/me/me_default_prune_policy.hpp
branches/cmake/core/smartbody/smartbody-lib/src/me/me_prune_policy.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/behavior_span.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/behavior_span.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_event.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_event.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_exception.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_interrupt.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_interrupt.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_speech.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_speech.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_sync_point.cpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_sync_point.hpp
branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_xml_consts.hpp
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
Smartbody-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/smartbody-svn
