Merge branch 'release/1.9.x'

makepanda/makepanda.py

@@ -1374,6 +1374,8 @@ def CompileIgate(woutd,wsrc,opts):
             cmd += ' -D_LP64'
         else:
             cmd += ' -D__i386__'
+        if GetTarget() == 'darwin':
+            cmd += ' -D__APPLE__'
 
     optlevel = GetOptimizeOption(opts)
     if (optlevel==1): cmd += ' -D_DEBUG'

panda/src/physx/physxActorDesc.cxx

@@ -117,12 +117,12 @@ set_body(PhysxBodyDesc &desc) {
 ////////////////////////////////////////////////////////////////////
 PhysxBodyDesc PhysxActorDesc::
 get_body() const {
-
-  throw "Not Implemented";
+  assert(false /* Not implemented */);
 
   //PhysxBodyDesc value;
   //value._desc = *(_desc.body);
   //return value;
+  return PhysxBodyDesc();
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/physx/physxController.cxx

@@ -55,6 +55,8 @@ factory(NxControllerType controllerType) {
   case NX_CONTROLLER_CAPSULE:
     return new PhysxCapsuleController();
 
+  default:
+    break;
   }
 
   physx_cat.error() << "Unknown controller type.\n";

panda/src/physx/physxForceField.cxx

@@ -135,7 +135,7 @@ get_include_shape_group() const {
 unsigned int PhysxForceField::
 get_num_shape_groups() const {
 
-  nassertr(_error_type == ET_ok, NULL);
+  nassertr(_error_type == ET_ok, 0);
   return _ptr->getNbShapeGroups();
 }
 

panda/src/physx/physxKitchen.cxx

@@ -170,7 +170,7 @@ cook_texcoords(const PhysxClothMeshDesc &meshDesc, const Filename &filename) {
 PhysxConvexMesh *PhysxKitchen::
 cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) {
 
-  nassertr_always(meshDesc.is_valid(), false);
+  nassertr_always(meshDesc.is_valid(), NULL);
 
   PhysxMemoryWriteBuffer buffer;
   bool status = _cooking->NxCookConvexMesh(meshDesc.get_desc(), buffer);
@@ -198,7 +198,7 @@ cook_convex_mesh(const PhysxConvexMeshDesc &meshDesc) {
 PhysxTriangleMesh *PhysxKitchen::
 cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc) {
 
-  nassertr_always(meshDesc.is_valid(), false);
+  nassertr_always(meshDesc.is_valid(), NULL);
 
   PhysxMemoryWriteBuffer buffer;
   bool status = _cooking->NxCookTriangleMesh(meshDesc.get_desc(), buffer);
@@ -226,7 +226,7 @@ cook_triangle_mesh(const PhysxTriangleMeshDesc &meshDesc) {
 PhysxClothMesh *PhysxKitchen::
 cook_cloth_mesh(const PhysxClothMeshDesc &meshDesc) {
 
-  nassertr_always(meshDesc.is_valid(), false);
+  nassertr_always(meshDesc.is_valid(), NULL);
 
   PhysxMemoryWriteBuffer wbuffer;
   bool status = _cooking->NxCookClothMesh(meshDesc.get_desc(), wbuffer);
@@ -255,7 +255,7 @@ cook_cloth_mesh(const PhysxClothMeshDesc &meshDesc) {
 PhysxSoftBodyMesh *PhysxKitchen::
 cook_soft_body_mesh(const PhysxSoftBodyMeshDesc &meshDesc) {
 
-  nassertr_always(meshDesc.is_valid(), false);
+  nassertr_always(meshDesc.is_valid(), NULL);
 
   PhysxMemoryWriteBuffer wbuffer;
   bool status = _cooking->NxCookSoftBodyMesh(meshDesc.get_desc(), wbuffer);

panda/src/physx/physxScene.cxx

@@ -309,7 +309,7 @@ void PhysxScene::
 set_timing_variable() {
 
   nassertv(_error_type == ET_ok);
-  _ptr->setTiming(NULL, NULL, NX_TIMESTEP_VARIABLE);
+  _ptr->setTiming(0, 0, NX_TIMESTEP_VARIABLE);
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/physx/physxSceneDesc.cxx

@@ -93,16 +93,16 @@ set_max_bounds(PhysxBounds3 &bounds) {
 ////////////////////////////////////////////////////////////////////
 //     Function: PhysxSceneDesc::get_max_bounds
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 PhysxBounds3 PhysxSceneDesc::
 get_max_bounds() const {
-
-  throw "Not Implemented";
+  assert(false /* Not implemented */);
 
   //PhysxBounds3 value;
   //value._bounds = *(_desc.maxBounds);
   //return value;
+  return PhysxBounds3();
 }
 
 ////////////////////////////////////////////////////////////////////