소스 검색

WIP bullet tweaks.

Mark Sibly 8 년 전
부모
커밋
2d94c2b93e
2개의 변경된 파일13개의 추가작업 그리고 7개의 파일을 삭제
  1. 13 6
      modules/bullet/bullet.monkey2
  2. 0 1
      modules/bullet/bullet_glue.h

+ 13 - 6
modules/bullet/bullet.monkey2

@@ -300,7 +300,7 @@ Class btTriangleIndexVertexArray Extends btStridingMeshInterface
 End
 
 Class btMotionState Extends btObject
-	
+
 	Method setWorldTransform( worldTrans:btTransform )
 		
 	Method getWorldTransform:btTransform() Extension="bbBullet::getWorldTransform"
@@ -310,19 +310,21 @@ End
 Class btDefaultMotionState Extends btMotionState
 
 	Field m_graphicsWorldTrans:btTransform
- 
 	Field m_centerOfMassOffset:btTransform
- 
 	Field m_startWorldTrans:btTransform
-	
 	Field m_userPointer:Void Ptr
 	
-'	Method New()
-	
+	Method New()
  	Method New( startTrans:btTransform=btTransform.getIdentity(),centerOfMassOffset:btTransform=btTransform.getIdentity() )
 
 End
 
+Const ACTIVE_TAG:Int
+Const ISLAND_SLEEPING:Int
+Const WANTS_DEACTIVATION:Int
+Const DISABLE_DEACTIVATION:Int
+Const DISABLE_SIMULATION:Int
+
 Class btCollisionObject Extends btObject
 	
 	Const CF_STATIC_OBJECT:Int="btCollisionObject::CF_STATIC_OBJECT"
@@ -360,6 +362,11 @@ Class btCollisionObject Extends btObject
 	Method setCollisionFlags( flags:Int )
 	
 	Method getCollisionFlags:Int()
+		
+	Method setActivationState( newState:Int )
+	
+	Method getActivationState:Int()
+		
 End
 
 Struct btRigidBodyConstructionInfo

+ 0 - 1
modules/bullet/bullet_glue.h

@@ -2,7 +2,6 @@
 #ifndef BB_BULLET_H
 #define BB_BULLET_H
 
-//#include "bullet3-2.85.1/src/btBulletDynamicsCommon.h"
 #include "btBulletDynamicsCommon.h"
 
 namespace bbBullet{