Revision: 1930
          http://smartbody.svn.sourceforge.net/smartbody/?rev=1930&view=rev
Author:   arishapiro
Date:     2011-06-01 20:22:39 +0000 (Wed, 01 Jun 2011)

Log Message:
-----------
Merged from trunk r1929.
Reach tests are failing.

Modified Paths:
--------------
    branches/cmake/core/smartbody/sbm/src/RootWindow.cxx
    branches/cmake/core/smartbody/sbm/src/RootWindow.h
    branches/cmake/core/smartbody/sbm/src/fltk_viewer.cpp
    branches/cmake/core/smartbody/sbm/src/sbm_main.cpp
    branches/cmake/core/smartbody/sbm/visualc9/sbm-fltk.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/MeCtBodyReachState.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/MeCtBodyReachState.h
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/SteeringAgent.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_bodyreach.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_bodyreach.hpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_constraint.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_grab.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/bml_locomotion.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_constraint.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_constraint.hpp
    
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_hand.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_hand.hpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/me_ct_motion_example.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/sbm_character.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sbm/sbm_pawn.cpp
    branches/cmake/core/smartbody/smartbody-lib/src/sr/sr_vec.h
    branches/cmake/test_suite/src/testCreateCases.sh

Added Paths:
-----------
    branches/cmake/core/smartbody/sbm/src/CharacterCreatorWindow.cpp
    branches/cmake/core/smartbody/sbm/src/CharacterCreatorWindow.h
    branches/cmake/data/sbm-common/common-sk/motion/ChrUtah_LeanForward001.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_ArmReachBehind_High1.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_ArmReachBehind_High2.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_ArmReachBehind_Low1.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_ArmReachBehind_Low2.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_ArmReachBehind_MidHigh1.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_ArmReachBehind_MidHigh2.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_ArmReachBehind_MidLow1.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_ArmReachBehind_MidLow2.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandDefault.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandGrasp.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandGrasp2.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandGraspPinchTinySphere_Pinch.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandGraspPinchTinySphere_Reach.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandGraspPinchTinySphere_Release.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandGraspSmSphere_Grasp.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandGraspSmSphere_Reach.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandGraspSmSphere_Release.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandReach.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandReach2.skm
    
branches/cmake/data/sbm-common/common-sk/motion/ReachAnimationSet/ChrHarmony_Relax001_HandRelease2.skm
    branches/cmake/data/sbm-test/scripts/test-constraint.seq
    branches/cmake/data/sbm-test/scripts/test-reach-constraint.seq
    branches/cmake/data/sbm-test/scripts/test-reach-example.seq
    branches/cmake/data/sbm-test/scripts/test-reach-footik.seq
    branches/cmake/data/sbm-test/scripts/test-reach-noexample.seq
    branches/cmake/test_suite/input/test-constraint/
    branches/cmake/test_suite/input/test-constraint/test-constraint.seq
    branches/cmake/test_suite/input/test-constraint/test-constraint.sh
    branches/cmake/test_suite/input/test-constraint/test-constraint_std_1.ppm
    branches/cmake/test_suite/input/test-constraint/test-constraint_std_2.ppm
    branches/cmake/test_suite/input/test-constraint/test-constraint_std_3.ppm
    branches/cmake/test_suite/input/test-reach-constraint/
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint.seq
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint.sh
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_4.ppm
    branches/cmake/test_suite/input/test-reach-example/
    branches/cmake/test_suite/input/test-reach-example/test-reach-example.seq
    branches/cmake/test_suite/input/test-reach-example/test-reach-example.sh
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_4.ppm
    branches/cmake/test_suite/input/test-reach-footik/
    branches/cmake/test_suite/input/test-reach-footik/test-reach-footik.seq
    branches/cmake/test_suite/input/test-reach-footik/test-reach-footik.sh
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_4.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_5.ppm
    branches/cmake/test_suite/input/test-reach-noexample/
    
branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample.seq
    branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample.sh
    
branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample_std_2.ppm

Removed Paths:
-------------
    branches/cmake/test_suite/input/test-constraint/test-constraint.seq
    branches/cmake/test_suite/input/test-constraint/test-constraint.sh
    branches/cmake/test_suite/input/test-constraint/test-constraint_std_1.ppm
    branches/cmake/test_suite/input/test-constraint/test-constraint_std_2.ppm
    branches/cmake/test_suite/input/test-constraint/test-constraint_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint.seq
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint.sh
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-constraint/test-reach-constraint_std_4.ppm
    branches/cmake/test_suite/input/test-reach-example/test-reach-example.seq
    branches/cmake/test_suite/input/test-reach-example/test-reach-example.sh
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-example/test-reach-example_std_4.ppm
    branches/cmake/test_suite/input/test-reach-footik/test-reach-footik.seq
    branches/cmake/test_suite/input/test-reach-footik/test-reach-footik.sh
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_2.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_3.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_4.ppm
    
branches/cmake/test_suite/input/test-reach-footik/test-reach-footik_std_5.ppm
    
branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample.seq
    branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample.sh
    
branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample_std_1.ppm
    
branches/cmake/test_suite/input/test-reach-noexample/test-reach-noexample_std_2.ppm

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.

------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger. 
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today. 
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Smartbody-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/smartbody-svn

Reply via email to