Merge branch 'master' of https://github.com/erwincoumans/bullet3

2016-11-04 13:16:30 -07:00
parent d62ac01d14 908cb2def2
commit e35129ceaf
60 changed files with 4420 additions and 1195 deletions
--- a/examples/SharedMemory/PhysicsClientSharedMemory.cpp
+++ b/examples/SharedMemory/PhysicsClientSharedMemory.cpp
@@ -661,6 +661,24 @@ const SharedMemoryStatus* PhysicsClientSharedMemory::processServerStatus() {
 				b3Warning("Visual Shape Info Request failed");
 				break;
 			}
+            case CMD_VISUAL_SHAPE_UPDATE_COMPLETED:
+            {
+                break;
+            }
+            case CMD_VISUAL_SHAPE_UPDATE_FAILED:
+            {
+                b3Warning("Visual Shape Update failed");
+                break;
+            }
+            case CMD_LOAD_TEXTURE_COMPLETED:
+            {
+                break;
+            }
+            case CMD_LOAD_TEXTURE_FAILED:
+            {
+                b3Warning("Load texture failed");
+                break;
+            }
            default: {
                b3Error("Unknown server status %d\n", serverCmd.m_type);
                btAssert(0);