Merge remote-tracking branch 'origin/master'

2016-10-17 13:20:31 -07:00
parent 14fc8ae8c2 292dd5ced4
commit 3ffd95fbab
32 changed files with 922 additions and 107 deletions
--- a/examples/SharedMemory/SharedMemoryPublic.h
+++ b/examples/SharedMemory/SharedMemoryPublic.h
@@ -33,6 +33,7 @@ enum EnumSharedMemoryClientCommand
    CMD_CALCULATE_JACOBIAN,
    CMD_CREATE_JOINT,
    CMD_REQUEST_CONTACT_POINT_INFORMATION,
+	CMD_SAVE_WORLD,
    //don't go beyond this command!
    CMD_MAX_CLIENT_COMMANDS,
    
@@ -75,6 +76,10 @@ enum EnumSharedMemoryServerStatus
 		CMD_CONTACT_POINT_INFORMATION_FAILED,
 		CMD_CALCULATE_INVERSE_KINEMATICS_COMPLETED,
 		CMD_CALCULATE_INVERSE_KINEMATICS_FAILED,
+		CMD_SAVE_WORLD_COMPLETED,
+		CMD_SAVE_WORLD_FAILED,
+
+		//don't go beyond 'CMD_MAX_SERVER_COMMANDS!
        CMD_MAX_SERVER_COMMANDS
 };