Browse Source

interrogate fix for ode::get_id()

David Rose 15 years ago
parent
commit
bb96117de2

+ 1 - 1
dtool/src/interrogate/interfaceMakerPythonNative.cxx

@@ -3261,7 +3261,7 @@ bool InterfaceMakerPythonNative::isCppTypeLegal(CPPType *in_ctype)
     {
         return true;
     }
-    else  if(builder.in_forcetype(in_ctype->get_local_name(&parser)))
+    else  if(builder.in_forcetype(type->get_local_name(&parser)))
     {
         return true;
     }

+ 3 - 1
dtool/src/parser-inc/ode.h

@@ -87,6 +87,8 @@ typedef struct dSurfaceParameters dSurfaceParameters;
 typedef struct dMass dMass;
 typedef struct dContact dContact;
 typedef struct dContactGeom dContactGeom;
-typedef struct dTriMeshDataID dTriMeshDataID;
+
+struct dxTriMeshData;
+typedef struct dxTriMeshData* dTriMeshDataID;
 
 #endif /* _ODE_COMMON_H_ */

+ 8 - 0
panda/src/ode/config_ode.N

@@ -1 +1,9 @@
 noinclude ode/ode.h
+
+forcetype dxGeom
+forcetype dxBody
+forcetype dxWorld
+forcetype dxJointGroup
+forcetype dxJoint
+forcetype dxSpace
+forcetype dxTriMeshData

+ 2 - 0
panda/src/ode/ode_includes.h

@@ -14,6 +14,8 @@
 
 #ifndef _ODE_INCLUDES_H_
 #define _ODE_INCLUDES_H_
+
+#include "pandabase.h"
  
 #ifdef int8
   #define temp_ode_int8 int8