supplement annotations

This commit is contained in:
songchengjiang 2015-08-26 17:24:36 +08:00
parent 2239b624a8
commit f9e9871bcc
1 changed files with 58 additions and 19 deletions

View File

@ -1,4 +1,4 @@
/**************************************************************************** /****************************************************************************
Copyright (c) 2015 Chukong Technologies Inc. Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org http://www.cocos2d-x.org
@ -365,14 +365,23 @@ protected:
*/ */
struct CC_DLL Physics3DColliderDes struct CC_DLL Physics3DColliderDes
{ {
Physics3DShape* shape; // shape pointer /**shape pointer*/
Physics3DShape* shape;
/**original world Transform*/
cocos2d::Mat4 originalTransform; cocos2d::Mat4 originalTransform;
bool isTrigger; //is it a trigger? /**Is collider a trigger?*/
bool isTrigger;
/**the friction*/
float friction; float friction;
/**the rolling friction*/
float rollingFriction; float rollingFriction;
/**the restitution*/
float restitution; float restitution;
/**the hit fraction*/
float hitFraction; float hitFraction;
/**the swep sphere radius*/
float ccdSweptSphereRadius; float ccdSweptSphereRadius;
/**the motion threshold*/
float ccdMotionThreshold; float ccdMotionThreshold;
Physics3DColliderDes() Physics3DColliderDes()
@ -403,52 +412,82 @@ public:
*/ */
static Physics3DCollider* create(Physics3DColliderDes *info); static Physics3DCollider* create(Physics3DColliderDes *info);
/** Get the pointer of btGhostObject. */ /** Get the pointer of btGhostObject.
* @return The pointer of btGhostObject.
*/
btGhostObject* getGhostObject() const { return _btGhostObject; } btGhostObject* getGhostObject() const { return _btGhostObject; }
/** Set trigger. */ /** Set trigger.
* @param isTrigger Is a trigger.
*/
void setTrigger(bool isTrigger); void setTrigger(bool isTrigger);
/** Check is a trigger. */ /** Check is a trigger.
* @return Is a trigger.
*/
bool isTrigger() const; bool isTrigger() const;
/** Set restitution. */ /** Set restitution.
* @param rest The restitution.
*/
void setRestitution(float rest); void setRestitution(float rest);
/** Get restitution. */ /** Get restitution.
* @return The restitution.
*/
float getRestitution() const; float getRestitution() const;
/** Set friction. */ /** Set friction.
* @param rest The friction.
*/
void setFriction(float frict); void setFriction(float frict);
/** Get friction. */ /** Get friction.
* @return The friction.
*/
float getFriction() const; float getFriction() const;
/** Set rolling friction. */ /** Set rolling friction.
* @param frict The rolling friction.
*/
void setRollingFriction(float frict); void setRollingFriction(float frict);
/** Get rolling friction. */ /** Get rolling friction.
* @return The rolling friction.
*/
float getRollingFriction() const; float getRollingFriction() const;
/** Set hit friction. */ /** Set hit friction.
* @param hitFraction The hit friction.
*/
void setHitFraction(float hitFraction); void setHitFraction(float hitFraction);
/** Get hit friction. */ /** Get hit friction.
* @return The hit friction.
*/
float getHitFraction() const; float getHitFraction() const;
/** Set motion threshold, don't do continuous collision detection if the motion (in one step) is less then ccdMotionThreshold */ /** Set motion threshold, don't do continuous collision detection if the motion (in one step) is less then ccdMotionThreshold.
* @param ccdMotionThreshold The motion threshold.
*/
void setCcdMotionThreshold(float ccdMotionThreshold); void setCcdMotionThreshold(float ccdMotionThreshold);
/** Get motion threshold. */ /** Get motion threshold.
* @return The motion threshold.
*/
float getCcdMotionThreshold() const; float getCcdMotionThreshold() const;
/** Set swept sphere radius. */ /** Set swept sphere radius.
* @param radius The swept sphere radius.
*/
void setCcdSweptSphereRadius(float radius); void setCcdSweptSphereRadius(float radius);
/** Get swept sphere radius. */ /** Get swept sphere radius.
* @return The swept sphere radius.
*/
float getCcdSweptSphereRadius() const; float getCcdSweptSphereRadius() const;
/** Get the world matrix of Physics3DObject. */ /** override. */
virtual cocos2d::Mat4 getWorldTransform() const; virtual cocos2d::Mat4 getWorldTransform() const;
/** Set a callback when trigger enter. */ /** Set a callback when trigger enter. */