Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add annotations

This commit is contained in:
songchengjiang 2015-08-26 16:19:30 +08:00
parent 2a41367a02
commit 2239b624a8
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cocos/physics3d/CCPhysics3DObject.h
View File

@ -365,7 +365,7 @@ protected:
*/
struct CC_DLL Physics3DColliderDes
{
Physics3DShape* shape;
Physics3DShape* shape; // shape pointer
cocos2d::Mat4 originalTransform;
bool isTrigger; //is it a trigger?
float friction;
@ -390,14 +390,20 @@ struct CC_DLL Physics3DColliderDes
};
/**
* @brief Inherit from Physics3DObject, the main class for Colliders
* @brief Inherit from Physics3DObject, the main class for Colliders.
*/
class CC_DLL Physics3DCollider : public Physics3DObject
{
public:
/**
* Creates a Physics3DCollider with Physics3DColliderDes.
*
* @return An autoreleased Physics3DCollider object.
*/
static Physics3DCollider* create(Physics3DColliderDes *info);
/** Get the pointer of btGhostObject. */
btGhostObject* getGhostObject() const { return _btGhostObject; }
/** Set trigger. */
@ -445,7 +451,10 @@ public:
/** Get the world matrix of Physics3DObject. */
virtual cocos2d::Mat4 getWorldTransform() const;
/** Set a callback when trigger enter. */
std::function<void(Physics3DObject *otherObject)> onTriggerEnter;
/** Set a callback when trigger exit. */
std::function<void(Physics3DObject *otherObject)> onTriggerExit;
CC_CONSTRUCTOR_ACCESS :

2
cocos/physics3d/CCPhysicsSprite3D.h
View File

@ -50,7 +50,7 @@ public:
/** creates a PhysicsSprite3D*/
static PhysicsSprite3D* create(const std::string &modelPath, Physics3DRigidBodyDes* rigidDes, const cocos2d::Vec3& translateInPhysics = cocos2d::Vec3::ZERO, const cocos2d::Quaternion& rotInPhsyics = cocos2d::Quaternion::ZERO);
/** creates a PhysicsSprite3D*/
/** creates a PhysicsSprite3D as a collider*/
static PhysicsSprite3D* createWithCollider(const std::string &modelPath, Physics3DColliderDes* colliderDes, const cocos2d::Vec3& translateInPhysics = cocos2d::Vec3::ZERO, const cocos2d::Quaternion& rotInPhsyics = cocos2d::Quaternion::ZERO);
/** Get the Physics3DObject. */