Revision: 5403
          http://sourceforge.net/p/smartbody/code/5403
Author:   arishapiro
Date:     2013-12-19 01:09:38 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Merge from trunk to include binary motion formats

Modified Paths:
--------------
    branches/sdk/core/smartbody/SmartBody/CMakeLists.txt
    branches/sdk/core/smartbody/SmartBody/SmartBody.vcxproj
    branches/sdk/core/smartbody/SmartBody/SmartBody.vcxproj.filters
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_speech.cpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_speech.hpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBAssetManager.cpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBCommandManager.cpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBCommandManager.h
    branches/sdk/core/smartbody/SmartBody/src/sb/SBPython.cpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBPythonMotion.cpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBScene.cpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBVHMsgManager.cpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBVersion.hpp
    branches/sdk/core/smartbody/SmartBody/src/sbm/GPU/SbmDeformableMeshGPU.cpp
    branches/sdk/core/smartbody/SmartBody/src/sbm/remote_speech.cpp
    branches/sdk/core/smartbody/SmartBody/src/sbm/remote_speech.h
    branches/sdk/core/smartbody/SmartBody/src/sbm/sbm_deformable_mesh.cpp
    branches/sdk/core/smartbody/SmartBody/src/sbm/sbm_deformable_mesh.h
    branches/sdk/core/smartbody/SmartBody/src/sbm/sbm_speech.hpp
    branches/sdk/core/smartbody/SmartBody/src/sbm/sbm_speech_audiofile.cpp
    branches/sdk/core/smartbody/SmartBody/src/sbm/sbm_speech_audiofile.hpp
    branches/sdk/core/smartbody/SmartBody/src/sbm/sr_cmd_seq.cpp
    branches/sdk/core/smartbody/SmartBody/src/sbm/sr_cmd_seq.h
    branches/sdk/core/smartbody/SmartBody/src/sbm/text_speech.cpp
    branches/sdk/core/smartbody/SmartBody/src/sbm/text_speech.h
    branches/sdk/core/smartbody/SmartBody/src/sr/sr_gl_render_funcs.cpp
    branches/sdk/core/smartbody/SmartBody/src/sr/sr_model.h
    branches/sdk/core/smartbody/sbgui/src/SBOgreListener.cpp
    branches/sdk/core/smartbody/simplesmartbody/simplesmartbody.cpp
    branches/sdk/ios/applications/minimal/Classes/ApplicationViewer.m
    branches/sdk/ios/applications/minimal/Classes/ChasesAppDelegate.m
    branches/sdk/ios/applications/minimal/Classes/EAGLView.h
    branches/sdk/ios/applications/minimal/Classes/EAGLView.m
    branches/sdk/ios/applications/minimal/Classes/minimalwrapper.cpp
    branches/sdk/ios/applications/minimal/Classes/minimalwrapper.h
    
branches/sdk/ios/applications/minimal/smartbody-openglES.xcodeproj/project.pbxproj
    branches/sdk/ios/libs/iphoneos/libSteerLib.a
    branches/sdk/ios/libs/iphoneos/libbonebus.a
    branches/sdk/ios/libs/iphoneos/libpprAI.a
    branches/sdk/ios/libs/iphoneos/libsmartbody-lib.a
    branches/sdk/ios/libs/iphoneos/libvhcl.a
    branches/sdk/ios/libs/iphoneos/libvhmsg.a
    branches/sdk/ios/libs/iphoneos/libwsp.a
    branches/sdk/ios/smartbody-lib/smartbody-lib.xcodeproj/project.pbxproj
    branches/sdk/sdk/osx/createOSXSDK.sh

Added Paths:
-----------
    branches/sdk/core/smartbody/SmartBody/src/protocols/sbmesh.pb.cc
    branches/sdk/core/smartbody/SmartBody/src/protocols/sbmesh.pb.h
    branches/sdk/core/smartbody/SmartBody/src/protocols/sbmesh.proto
    branches/sdk/core/smartbody/SmartBody/src/protocols/sbutilities.pb.cc
    branches/sdk/core/smartbody/SmartBody/src/protocols/sbutilities.pb.h
    branches/sdk/core/smartbody/SmartBody/src/protocols/sbutilities.proto
    branches/sdk/core/smartbody/SmartBody/src/sb/SBAssetHandlerSBMeshBinary.cpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBAssetHandlerSBMeshBinary.h
    branches/sdk/core/smartbody/SmartBody/src/sb/SBAssetHandlerSkmb.cpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBAssetHandlerSkmb.h
    branches/sdk/core/smartbody/SmartBody/src/sb/SBPythonMesh.cpp
    branches/sdk/ios/protobuf/

Removed Paths:
-------------
    branches/sdk/core/smartbody/SmartBody/src/sb/SBAssetHandlerSkb.cpp
    branches/sdk/core/smartbody/SmartBody/src/sb/SBAssetHandlerSkb.h

Property Changed:
----------------
    branches/sdk/
    branches/sdk/build/
    branches/sdk/core/ogre-viewer/
    branches/sdk/core/ogre-viewer/build/vs2008/OgreViewer.sln
    branches/sdk/core/ogre-viewer/build/vs2008/OgreViewer.vcproj
    branches/sdk/core/ogre-viewer/media/Brad.mesh
    branches/sdk/core/ogre-viewer/media/Brad.skeleton
    branches/sdk/core/ogre-viewer/media/Brad_Face_2048.dds
    branches/sdk/core/ogre-viewer/media/Brad_Hand.dds
    branches/sdk/core/ogre-viewer/media/Brad_Pants.dds
    branches/sdk/core/ogre-viewer/media/Brad_Shirt.dds
    branches/sdk/core/ogre-viewer/media/Brad_Tpose.material
    branches/sdk/core/ogre-viewer/media/resources.cfg
    branches/sdk/core/ogre-viewer/src/main.cpp
    branches/sdk/core/sbmonitor/
    branches/sdk/core/smartbody/
    branches/sdk/core/smartbody/SmartBody/src/bml/behavior_span.cpp
    branches/sdk/core/smartbody/SmartBody/src/bml/behavior_span.hpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_event.cpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_event.hpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_exception.hpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_interrupt.cpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_interrupt.hpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_speech.cpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_speech.hpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_sync_point.cpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_sync_point.hpp
    branches/sdk/core/smartbody/SmartBody/src/bml/bml_xml_consts.hpp
    
branches/sdk/core/smartbody/SmartBody/src/controllers/me_default_prune_policy.cpp
    
branches/sdk/core/smartbody/SmartBody/src/controllers/me_default_prune_policy.hpp
    branches/sdk/core/smartbody/SmartBody/src/controllers/me_prune_policy.hpp
    branches/sdk/core/smartbody/SmartBody/src/external/protobuf/
    branches/sdk/core/smartbody/clapack/lib9/
    branches/sdk/core/smartbody/sbgui/
    branches/sdk/ios/vhwrapper/

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Smartbody-svn mailing list
Smartbody-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/smartbody-svn

Reply via email to