Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mark all cocos members public #1214

Merged
merged 1 commit into from
Jan 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion loader/include/Geode/cocos/CCCamera.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ using the camera.
class CC_DLL CCCamera : public CCObject
{
GEODE_FRIEND_MODIFY
protected:
public:
float m_fEyeX;
float m_fEyeY;
float m_fEyeZ;
Expand Down
2 changes: 1 addition & 1 deletion loader/include/Geode/cocos/CCConfiguration.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class CC_DLL CCConfiguration : public CCObject
static CCConfiguration *s_gSharedConfiguration;
static gd::string s_sConfigfile;

protected:
public:
GLint m_nMaxTextureSize;
GLint m_nMaxModelviewStackDepth;
bool m_bSupportsPVRTC;
Expand Down
4 changes: 2 additions & 2 deletions loader/include/Geode/cocos/CCScheduler.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class CC_DLL CCTimer : public CCObject
*/
inline int getScriptHandler() { return m_nScriptHandler; };

protected:
public:
CCObject *m_pTarget;
float m_fElapsed;
bool m_bRunForever;
Expand Down Expand Up @@ -300,7 +300,7 @@ class CC_DLL CCScheduler : public CCObject
void priorityIn(struct _listEntry **ppList, CCObject *pTarget, int nPriority, bool bPaused);
void appendIn(struct _listEntry **ppList, CCObject *pTarget, bool bPaused);

protected:
public:
float m_fTimeScale;

//
Expand Down
8 changes: 4 additions & 4 deletions loader/include/Geode/cocos/actions/CCAction.h
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class CC_DLL CCAction : public CCObject
public:
/** Create an action */
static CCAction* create();
protected:
public:
CCNode *m_pOriginalTarget;
/** The "target".
The target will be set with the 'startWithTarget' method.
Expand Down Expand Up @@ -167,7 +167,7 @@ class CC_DLL CCFiniteTimeAction : public CCAction

/** returns a reversed action */
virtual CCFiniteTimeAction* reverse(void);
protected:
public:
//! duration in seconds
float m_fDuration;
};
Expand Down Expand Up @@ -225,7 +225,7 @@ class CC_DLL CCSpeed : public CCAction
public:
/** create the action */
static CCSpeed* create(CCActionInterval* pAction, float fSpeed);
protected:
public:
float m_fSpeed;
CCActionInterval *m_pInnerAction;
};
Expand Down Expand Up @@ -281,7 +281,7 @@ class CC_DLL CCFollow : public CCAction
It will work with no boundary if @param rect is equal to CCRectZero.
*/
static CCFollow* create(CCNode *pFollowedNode, const CCRect& rect = CCRectZero);
protected:
public:
// node to follow
CCNode *m_pobFollowedNode;

Expand Down
4 changes: 2 additions & 2 deletions loader/include/Geode/cocos/actions/CCActionCamera.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class CC_DLL CCActionCamera : public CCActionInterval //<NSCopying>
// super methods
virtual void startWithTarget(CCNode *pTarget);
virtual CCActionInterval * reverse();
protected:
public:
float m_fCenterXOrig;
float m_fCenterYOrig;
float m_fCenterZOrig;
Expand Down Expand Up @@ -128,7 +128,7 @@ class CC_DLL CCOrbitCamera : public CCActionCamera //<NSCopying>
virtual void startWithTarget(CCNode *pTarget);
virtual void update(float time);

protected:
public:
float m_fRadius;
float m_fDeltaRadius;
float m_fAngleZ;
Expand Down
6 changes: 3 additions & 3 deletions loader/include/Geode/cocos/actions/CCActionCatmullRom.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class CC_DLL CCPointArray : public CCObject
const gd::vector<CCPoint*>* getControlPoints();

void setControlPoints(gd::vector<CCPoint*> *controlPoints);
private:
public:
/** Array that contains the control points */
gd::vector<CCPoint*> *m_pControlPoints;
};
Expand Down Expand Up @@ -176,7 +176,7 @@ class CC_DLL CCCardinalSplineTo : public CCActionInterval
m_pPoints = points;
}

protected:
public:
/** Array of control points */
CCPointArray *m_pPoints;
float m_fDeltaT;
Expand Down Expand Up @@ -215,7 +215,7 @@ class CC_DLL CCCardinalSplineBy : public CCCardinalSplineTo
* @lua NA
*/
virtual void updatePosition(CCPoint &newPos);
protected:
public:
CCPoint m_startPosition;
};

Expand Down
6 changes: 3 additions & 3 deletions loader/include/Geode/cocos/actions/CCActionEase.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class CC_DLL CCActionEase : public CCActionInterval
/** creates the action */
static CCActionEase* create(CCActionInterval *pAction);

protected:
public:
/** The inner action */
CCActionInterval *m_pInner;
};
Expand Down Expand Up @@ -111,7 +111,7 @@ class CC_DLL CCEaseRateAction : public CCActionEase
/** Creates the action with the inner action and the rate parameter */
static CCEaseRateAction* create(CCActionInterval* pAction, float fRate);

protected:
public:
float m_fRate;
};

Expand Down Expand Up @@ -338,7 +338,7 @@ class CC_DLL CCEaseElastic : public CCActionEase
/** Creates the action with the inner action and the period in radians (default is 0.3) */
static CCEaseElastic* create(CCActionInterval *pAction, float fPeriod);
static CCEaseElastic* create(CCActionInterval *pAction);
protected:
public:
float m_fPeriod;
};

Expand Down
10 changes: 5 additions & 5 deletions loader/include/Geode/cocos/actions/CCActionGrid.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class CC_DLL CCGridAction : public CCActionInterval

/** creates the action with size and duration */
static CCGridAction* create(float duration, const CCSize& gridSize);
protected:
public:
CCSize m_sGridSize;
};

Expand Down Expand Up @@ -145,7 +145,7 @@ class CC_DLL CCAccelDeccelAmplitude : public CCActionInterval
/** creates the action with an inner action that has the amplitude property, and a duration time */
static CCAccelDeccelAmplitude* create(CCAction *pAction, float duration);

protected:
public:
float m_fRate;
CCActionInterval *m_pOther;
};
Expand Down Expand Up @@ -178,7 +178,7 @@ class CC_DLL CCAccelAmplitude : public CCActionInterval
public:
/** creates the action with an inner action that has the amplitude property, and a duration time */
static CCAccelAmplitude* create(CCAction *pAction, float duration);
protected:
public:
float m_fRate;
CCActionInterval *m_pOther;
};
Expand Down Expand Up @@ -212,7 +212,7 @@ class CC_DLL CCDeccelAmplitude : public CCActionInterval
/** creates the action with an inner action that has the amplitude property, and a duration time */
static CCDeccelAmplitude* create(CCAction *pAction, float duration);

protected:
public:
float m_fRate;
CCActionInterval *m_pOther;
};
Expand Down Expand Up @@ -246,7 +246,7 @@ class CC_DLL CCReuseGrid : public CCActionInstant
public:
/** creates an action with the number of times that the current grid will be reused */
static CCReuseGrid* create(int times);
protected:
public:
int m_nTimes;
};

Expand Down
14 changes: 7 additions & 7 deletions loader/include/Geode/cocos/actions/CCActionGrid3D.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class CC_DLL CCWaves3D : public CCGrid3DAction
public:
/** creates an action with duration, grid size, waves and amplitude */
static CCWaves3D* create(float duration, const CCSize& gridSize, unsigned int waves, float amplitude);
protected:
public:
unsigned int m_nWaves;
float m_fAmplitude;
float m_fAmplitudeRate;
Expand Down Expand Up @@ -129,7 +129,7 @@ class CC_DLL CCLens3D : public CCGrid3DAction
public:
/** creates the action with center position, radius, a grid size and duration */
static CCLens3D* create(float duration, const CCSize& gridSize, const CCPoint& position, float radius);
protected:
public:
/* lens center position */
CCPoint m_position;
float m_fRadius;
Expand Down Expand Up @@ -169,7 +169,7 @@ class CC_DLL CCRipple3D : public CCGrid3DAction
public:
/** creates the action with radius, number of waves, amplitude, a grid size and duration */
static CCRipple3D* create(float duration, const CCSize& gridSize, const CCPoint& position, float radius, unsigned int waves, float amplitude);
protected:
public:
/* center position */
CCPoint m_position;
float m_fRadius;
Expand All @@ -195,7 +195,7 @@ class CC_DLL CCShaky3D : public CCGrid3DAction
public:
/** creates the action with a range, shake Z vertices, a grid and duration */
static CCShaky3D* create(float duration, const CCSize& gridSize, int range, bool shakeZ);
protected:
public:
int m_nRandrange;
bool m_bShakeZ;
};
Expand Down Expand Up @@ -223,7 +223,7 @@ class CC_DLL CCLiquid : public CCGrid3DAction
public:
/** creates the action with amplitude, a grid and duration */
static CCLiquid* create(float duration, const CCSize& gridSize, unsigned int waves, float amplitude);
protected:
public:
unsigned int m_nWaves;
float m_fAmplitude;
float m_fAmplitudeRate;
Expand Down Expand Up @@ -253,7 +253,7 @@ class CC_DLL CCWaves : public CCGrid3DAction

/** initializes the action with amplitude, horizontal sin, vertical sin, a grid and duration */
static CCWaves* create(float duration, const CCSize& gridSize, unsigned int waves, float amplitude, bool horizontal, bool vertical);
protected:
public:
unsigned int m_nWaves;
float m_fAmplitude;
float m_fAmplitudeRate;
Expand Down Expand Up @@ -289,7 +289,7 @@ class CC_DLL CCTwirl : public CCGrid3DAction
public:
/** creates the action with center position, number of twirls, amplitude, a grid size and duration */
static CCTwirl* create(float duration, const CCSize& gridSize, CCPoint position, unsigned int twirls, float amplitude);
protected:
public:
/* twirl center */
CCPoint m_position;
unsigned int m_nTwirls;
Expand Down
14 changes: 7 additions & 7 deletions loader/include/Geode/cocos/actions/CCActionInstant.h
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ class CC_DLL CCRemoveSelf : public CCActionInstant
static CCRemoveSelf * create(bool isNeedCleanUp = true);
/** init the action */
bool init(bool isNeedCleanUp);
protected:
public:
bool m_bIsNeedCleanUp;
};

Expand Down Expand Up @@ -222,7 +222,7 @@ class CC_DLL CCFlipX : public CCActionInstant
*/
virtual CCObject* copyWithZone(CCZone *pZone);

protected:
public:
bool m_bFlipX;
};

Expand Down Expand Up @@ -260,7 +260,7 @@ class CC_DLL CCFlipY : public CCActionInstant
*/
virtual CCObject* copyWithZone(CCZone *pZone);

protected:
public:
bool m_bFlipY;
};

Expand Down Expand Up @@ -291,7 +291,7 @@ class CC_DLL CCPlace : public CCActionInstant //<NSCopying>
* @lua NA
*/
virtual CCObject* copyWithZone(CCZone *pZone);
protected:
public:
CCPoint m_tPosition;
};

Expand Down Expand Up @@ -370,7 +370,7 @@ class CC_DLL CCCallFunc : public CCActionInstant //<NSCopying>
* @lua NA
*/
inline int getScriptHandler() { return m_nScriptHandler; };
protected:
public:
/** Target that will be called */
CCObject* m_pSelectorTarget;

Expand Down Expand Up @@ -468,7 +468,7 @@ class CC_DLL CCCallFuncND : public CCCallFuncN
virtual CCObject* copyWithZone(CCZone *pZone);
virtual void execute();

protected:
public:
void *m_pData;
};

Expand Down Expand Up @@ -527,7 +527,7 @@ class CC_DLL CCCallFuncO : public CCCallFunc, public TypeInfo
}
}

protected:
public:
/** object to be passed as argument */
CCObject* m_pObject;
};
Expand Down
Loading
Loading