Merge branch 'geode-sdk:main' into scrollable-descriptions

CMakeLists.txt

@@ -237,7 +237,7 @@ endif()
 
 set(MAT_JSON_AS_INTERFACE ON)
 CPMAddPackage("gh:geode-sdk/result@1.3.2")
-CPMAddPackage("gh:geode-sdk/json@3.1.5")
+CPMAddPackage("gh:geode-sdk/json@3.2.0")
 CPMAddPackage("gh:fmtlib/fmt#11.0.2")
 
 target_compile_definitions(${PROJECT_NAME} INTERFACE MAT_JSON_DYNAMIC=1)
@@ -332,7 +332,6 @@ elseif (EXISTS ${GEODE_PLATFORM_BIN_PATH})
 else()
 	message(FATAL_ERROR
 		"No valid loader binary to link to! Install pre-built binaries with `geode sdk install-binaries`, "
-		"or build Geode from source and add `set(GEODE_LINK_NIGHTLY ON)` to your CMakeLists.txt "
-		"in the line before calling add_subdirectory for Geode."
+		"or build Geode from source."
 	)
 endif()

loader/include/Geode/Loader.hpp

@@ -5,6 +5,7 @@
 #include "loader/Log.hpp"
 #include "loader/Mod.hpp"
 #include "loader/ModEvent.hpp"
+#include "loader/EventV2.hpp"
 #include "loader/Setting.hpp"
 #include "loader/Dirs.hpp"
 

loader/include/Geode/c++stl/gnustl/stl_algobase.h

@@ -990,7 +990,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	    typename iterator_traits<_ForwardIterator>::value_type, _Tp>)
       __glibcxx_requires_partitioned_lower(__first, __last, __val);
 
-      return std::__lower_bound(__first, __last, __val,
+      return geode::stl::__lower_bound(__first, __last, __val,
 				__gnu_cxx::__ops::__iter_less_val());
     }
 

loader/include/Geode/c++stl/gnustl/stl_tree.h

@@ -141,17 +141,66 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       { return _M_storage._M_ptr(); }
     };
 
-  _GLIBCXX_PURE _Rb_tree_node_base*
-  _Rb_tree_increment(_Rb_tree_node_base* __x) throw ();
+  inline _GLIBCXX_PURE _Rb_tree_node_base*
+  _Rb_tree_increment(_Rb_tree_node_base* __x) throw ()
+  {
+    if (__x->_M_right != 0) 
+      {
+        __x = __x->_M_right;
+        while (__x->_M_left != 0)
+          __x = __x->_M_left;
+      }
+    else 
+      {
+        _Rb_tree_node_base* __y = __x->_M_parent;
+        while (__x == __y->_M_right) 
+          {
+            __x = __y;
+            __y = __y->_M_parent;
+          }
+        if (__x->_M_right != __y)
+          __x = __y;
+      }
+    return __x;
+  }
 
-  _GLIBCXX_PURE const _Rb_tree_node_base*
-  _Rb_tree_increment(const _Rb_tree_node_base* __x) throw ();
+  inline _GLIBCXX_PURE const _Rb_tree_node_base*
+  _Rb_tree_increment(const _Rb_tree_node_base* __x) throw ()
+  {
+    return _Rb_tree_increment(const_cast<_Rb_tree_node_base*>(__x));
+  }
 
-  _GLIBCXX_PURE _Rb_tree_node_base*
-  _Rb_tree_decrement(_Rb_tree_node_base* __x) throw ();
+  inline _GLIBCXX_PURE _Rb_tree_node_base*
+  _Rb_tree_decrement(_Rb_tree_node_base* __x) throw ()
+  {
+    if (__x->_M_color == _S_red 
+        && __x->_M_parent->_M_parent == __x)
+      __x = __x->_M_right;
+    else if (__x->_M_left != 0) 
+      {
+        _Rb_tree_node_base* __y = __x->_M_left;
+        while (__y->_M_right != 0)
+          __y = __y->_M_right;
+        __x = __y;
+      }
+    else 
+      {
+        _Rb_tree_node_base* __y = __x->_M_parent;
+        while (__x == __y->_M_left) 
+          {
+            __x = __y;
+            __y = __y->_M_parent;
+          }
+        __x = __y;
+      }
+    return __x;
+  }
 
-  _GLIBCXX_PURE const _Rb_tree_node_base*
-  _Rb_tree_decrement(const _Rb_tree_node_base* __x) throw ();
+  inline _GLIBCXX_PURE const _Rb_tree_node_base*
+  _Rb_tree_decrement(const _Rb_tree_node_base* __x) throw ()
+  {
+    return _Rb_tree_decrement(const_cast<_Rb_tree_node_base*>(__x));
+  }
 
   template<typename _Tp>
     struct _Rb_tree_iterator
@@ -315,15 +364,299 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
                const _Rb_tree_const_iterator<_Val>& __y) _GLIBCXX_NOEXCEPT
     { return __x._M_node != __y._M_node; }
 
-  void
+  inline void
+  _Rb_tree_rotate_left(_Rb_tree_node_base* const __x, 
+		                   _Rb_tree_node_base*& __root)
+  {
+    _Rb_tree_node_base* const __y = __x->_M_right;
+
+    __x->_M_right = __y->_M_left;
+    if (__y->_M_left !=0)
+      __y->_M_left->_M_parent = __x;
+    __y->_M_parent = __x->_M_parent;
+    
+    if (__x == __root)
+      __root = __y;
+    else if (__x == __x->_M_parent->_M_left)
+      __x->_M_parent->_M_left = __y;
+    else
+      __x->_M_parent->_M_right = __y;
+    __y->_M_left = __x;
+    __x->_M_parent = __y;
+  }
+
+  inline void
+  _Rb_tree_rotate_right(_Rb_tree_node_base* const __x, 
+			                  _Rb_tree_node_base*& __root)
+  {
+    _Rb_tree_node_base* const __y = __x->_M_left;
+
+    __x->_M_left = __y->_M_right;
+    if (__y->_M_right != 0)
+      __y->_M_right->_M_parent = __x;
+    __y->_M_parent = __x->_M_parent;
+
+    if (__x == __root)
+      __root = __y;
+    else if (__x == __x->_M_parent->_M_right)
+      __x->_M_parent->_M_right = __y;
+    else
+      __x->_M_parent->_M_left = __y;
+    __y->_M_right = __x;
+    __x->_M_parent = __y;
+  }
+
+  inline void
   _Rb_tree_insert_and_rebalance(const bool __insert_left,
                                 _Rb_tree_node_base* __x,
                                 _Rb_tree_node_base* __p,
-                                _Rb_tree_node_base& __header) throw ();
+                                _Rb_tree_node_base& __header) throw ()
+  {
+    _Rb_tree_node_base *& __root = __header._M_parent;
 
-  _Rb_tree_node_base*
+    // Initialize fields in new node to insert.
+    __x->_M_parent = __p;
+    __x->_M_left = 0;
+    __x->_M_right = 0;
+    __x->_M_color = _S_red;
+
+    // Insert.
+    // Make new node child of parent and maintain root, leftmost and
+    // rightmost nodes.
+    // N.B. First node is always inserted left.
+    if (__insert_left)
+      {
+        __p->_M_left = __x; // also makes leftmost = __x when __p == &__header
+
+        if (__p == &__header)
+        {
+            __header._M_parent = __x;
+            __header._M_right = __x;
+        }
+        else if (__p == __header._M_left)
+          __header._M_left = __x; // maintain leftmost pointing to min node
+      }
+    else
+      {
+        __p->_M_right = __x;
+
+        if (__p == __header._M_right)
+          __header._M_right = __x; // maintain rightmost pointing to max node
+      }
+    // Rebalance.
+    while (__x != __root 
+	   && __x->_M_parent->_M_color == _S_red) 
+      {
+	_Rb_tree_node_base* const __xpp = __x->_M_parent->_M_parent;
+
+	if (__x->_M_parent == __xpp->_M_left) 
+	  {
+	    _Rb_tree_node_base* const __y = __xpp->_M_right;
+	    if (__y && __y->_M_color == _S_red) 
+	      {
+		__x->_M_parent->_M_color = _S_black;
+		__y->_M_color = _S_black;
+		__xpp->_M_color = _S_red;
+		__x = __xpp;
+	      }
+	    else 
+	      {
+		if (__x == __x->_M_parent->_M_right) 
+		  {
+		    __x = __x->_M_parent;
+		    _Rb_tree_rotate_left(__x, __root);
+		  }
+		__x->_M_parent->_M_color = _S_black;
+		__xpp->_M_color = _S_red;
+		_Rb_tree_rotate_right(__xpp, __root);
+	      }
+	  }
+	else 
+	  {
+	    _Rb_tree_node_base* const __y = __xpp->_M_left;
+	    if (__y && __y->_M_color == _S_red) 
+	      {
+		__x->_M_parent->_M_color = _S_black;
+		__y->_M_color = _S_black;
+		__xpp->_M_color = _S_red;
+		__x = __xpp;
+	      }
+	    else 
+	      {
+		if (__x == __x->_M_parent->_M_left) 
+		  {
+		    __x = __x->_M_parent;
+		    _Rb_tree_rotate_right(__x, __root);
+		  }
+		__x->_M_parent->_M_color = _S_black;
+		__xpp->_M_color = _S_red;
+		_Rb_tree_rotate_left(__xpp, __root);
+	      }
+	  }
+      }
+    __root->_M_color = _S_black;
+  }
+
+  inline _Rb_tree_node_base*
   _Rb_tree_rebalance_for_erase(_Rb_tree_node_base* const __z,
-			       _Rb_tree_node_base& __header) throw ();
+			       _Rb_tree_node_base& __header) throw ()
+  {
+    _Rb_tree_node_base *& __root = __header._M_parent;
+    _Rb_tree_node_base *& __leftmost = __header._M_left;
+    _Rb_tree_node_base *& __rightmost = __header._M_right;
+    _Rb_tree_node_base* __y = __z;
+    _Rb_tree_node_base* __x = 0;
+    _Rb_tree_node_base* __x_parent = 0;
+
+    if (__y->_M_left == 0)     // __z has at most one non-null child. y == z.
+      __x = __y->_M_right;     // __x might be null.
+    else
+      if (__y->_M_right == 0)  // __z has exactly one non-null child. y == z.
+	__x = __y->_M_left;    // __x is not null.
+      else 
+	{
+	  // __z has two non-null children.  Set __y to
+	  __y = __y->_M_right;   //   __z's successor.  __x might be null.
+	  while (__y->_M_left != 0)
+	    __y = __y->_M_left;
+	  __x = __y->_M_right;
+	}
+    if (__y != __z) 
+      {
+	// relink y in place of z.  y is z's successor
+	__z->_M_left->_M_parent = __y; 
+	__y->_M_left = __z->_M_left;
+	if (__y != __z->_M_right) 
+	  {
+	    __x_parent = __y->_M_parent;
+	    if (__x) __x->_M_parent = __y->_M_parent;
+	    __y->_M_parent->_M_left = __x;   // __y must be a child of _M_left
+	    __y->_M_right = __z->_M_right;
+	    __z->_M_right->_M_parent = __y;
+	  }
+	else
+	  __x_parent = __y;  
+	if (__root == __z)
+	  __root = __y;
+	else if (__z->_M_parent->_M_left == __z)
+	  __z->_M_parent->_M_left = __y;
+	else 
+	  __z->_M_parent->_M_right = __y;
+	__y->_M_parent = __z->_M_parent;
+	std::swap(__y->_M_color, __z->_M_color);
+	__y = __z;
+	// __y now points to node to be actually deleted
+      }
+    else 
+      {                        // __y == __z
+	__x_parent = __y->_M_parent;
+	if (__x) 
+	  __x->_M_parent = __y->_M_parent;   
+	if (__root == __z)
+	  __root = __x;
+	else 
+	  if (__z->_M_parent->_M_left == __z)
+	    __z->_M_parent->_M_left = __x;
+	  else
+	    __z->_M_parent->_M_right = __x;
+	if (__leftmost == __z) 
+	  {
+	    if (__z->_M_right == 0)        // __z->_M_left must be null also
+	      __leftmost = __z->_M_parent;
+	    // makes __leftmost == _M_header if __z == __root
+	    else
+	      __leftmost = _Rb_tree_node_base::_S_minimum(__x);
+	  }
+	if (__rightmost == __z)  
+	  {
+	    if (__z->_M_left == 0)         // __z->_M_right must be null also
+	      __rightmost = __z->_M_parent;  
+	    // makes __rightmost == _M_header if __z == __root
+	    else                      // __x == __z->_M_left
+	      __rightmost = _Rb_tree_node_base::_S_maximum(__x);
+	  }
+      }
+    if (__y->_M_color != _S_red) 
+      { 
+	while (__x != __root && (__x == 0 || __x->_M_color == _S_black))
+	  if (__x == __x_parent->_M_left) 
+	    {
+	      _Rb_tree_node_base* __w = __x_parent->_M_right;
+	      if (__w->_M_color == _S_red) 
+		{
+		  __w->_M_color = _S_black;
+		  __x_parent->_M_color = _S_red;
+		  _Rb_tree_rotate_left(__x_parent, __root);
+		  __w = __x_parent->_M_right;
+		}
+	      if ((__w->_M_left == 0 || 
+		   __w->_M_left->_M_color == _S_black) &&
+		  (__w->_M_right == 0 || 
+		   __w->_M_right->_M_color == _S_black)) 
+		{
+		  __w->_M_color = _S_red;
+		  __x = __x_parent;
+		  __x_parent = __x_parent->_M_parent;
+		} 
+	      else 
+		{
+		  if (__w->_M_right == 0 
+		      || __w->_M_right->_M_color == _S_black) 
+		    {
+		      __w->_M_left->_M_color = _S_black;
+		      __w->_M_color = _S_red;
+		      _Rb_tree_rotate_right(__w, __root);
+		      __w = __x_parent->_M_right;
+		    }
+		  __w->_M_color = __x_parent->_M_color;
+		  __x_parent->_M_color = _S_black;
+		  if (__w->_M_right) 
+		    __w->_M_right->_M_color = _S_black;
+		  _Rb_tree_rotate_left(__x_parent, __root);
+		  break;
+		}
+	    } 
+	  else 
+	    {   
+	      // same as above, with _M_right <-> _M_left.
+	      _Rb_tree_node_base* __w = __x_parent->_M_left;
+	      if (__w->_M_color == _S_red) 
+		{
+		  __w->_M_color = _S_black;
+		  __x_parent->_M_color = _S_red;
+		  _Rb_tree_rotate_right(__x_parent, __root);
+		  __w = __x_parent->_M_left;
+		}
+	      if ((__w->_M_right == 0 || 
+		   __w->_M_right->_M_color == _S_black) &&
+		  (__w->_M_left == 0 || 
+		   __w->_M_left->_M_color == _S_black)) 
+		{
+		  __w->_M_color = _S_red;
+		  __x = __x_parent;
+		  __x_parent = __x_parent->_M_parent;
+		} 
+	      else 
+		{
+		  if (__w->_M_left == 0 || __w->_M_left->_M_color == _S_black) 
+		    {
+		      __w->_M_right->_M_color = _S_black;
+		      __w->_M_color = _S_red;
+		      _Rb_tree_rotate_left(__w, __root);
+		      __w = __x_parent->_M_left;
+		    }
+		  __w->_M_color = __x_parent->_M_color;
+		  __x_parent->_M_color = _S_black;
+		  if (__w->_M_left) 
+		    __w->_M_left->_M_color = _S_black;
+		  _Rb_tree_rotate_right(__x_parent, __root);
+		  break;
+		}
+	    }
+	if (__x) __x->_M_color = _S_black;
+      }
+    return __y;
+  }
 
 
   template<typename _Key, typename _Val, typename _KeyOfValue,
@@ -2017,9 +2350,24 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
       return __n;
     }
 
-  _GLIBCXX_PURE unsigned int
+  inline _GLIBCXX_PURE unsigned int
   _Rb_tree_black_count(const _Rb_tree_node_base* __node,
-                       const _Rb_tree_node_base* __root) throw ();
+                       const _Rb_tree_node_base* __root) throw ()
+  {
+    if (__node == 0)
+      return 0;
+    unsigned int __sum = 0;
+    do 
+      {
+	if (__node->_M_color == _S_black) 
+	  ++__sum;
+	if (__node == __root) 
+	  break;
+	__node = __node->_M_parent;
+      } 
+    while (1);
+    return __sum;
+  }
 
   template<typename _Key, typename _Val, typename _KeyOfValue,
            typename _Compare, typename _Alloc>

loader/include/Geode/cocos/CCCamera.h

@@ -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;

loader/include/Geode/cocos/CCConfiguration.h

@@ -142,7 +142,7 @@ private:
     static CCConfiguration *s_gSharedConfiguration;
 	static gd::string		s_sConfigfile;
     
-protected:
+public:
     GLint           m_nMaxTextureSize;
     GLint           m_nMaxModelviewStackDepth;
     bool            m_bSupportsPVRTC;

loader/include/Geode/cocos/CCScheduler.h

@@ -102,7 +102,7 @@ public:
      */
     inline int getScriptHandler() { return m_nScriptHandler; };
 
-protected:
+public:
     CCObject *m_pTarget;
     float m_fElapsed;
     bool m_bRunForever;
@@ -300,7 +300,7 @@ private:
     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;
 
     //

loader/include/Geode/cocos/actions/CCAction.h

@@ -120,7 +120,7 @@ public:
 public:
     /** Create an action */
     static CCAction* create();
-protected:
+public:
     CCNode    *m_pOriginalTarget;
     /** The "target".
     The target will be set with the 'startWithTarget' method.
@@ -167,7 +167,7 @@ public:
 
     /** returns a reversed action */
     virtual CCFiniteTimeAction* reverse(void);
-protected:
+public:
     //! duration in seconds
     float m_fDuration;
 };
@@ -225,7 +225,7 @@ public:
 public:
     /** create the action */
     static CCSpeed* create(CCActionInterval* pAction, float fSpeed);
-protected:
+public:
     float m_fSpeed;
     CCActionInterval *m_pInnerAction;
 };
@@ -281,7 +281,7 @@ public:
     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;
 

loader/include/Geode/cocos/actions/CCActionCamera.h

@@ -68,7 +68,7 @@ public:
     // super methods
     virtual void startWithTarget(CCNode *pTarget);
     virtual CCActionInterval * reverse();
-protected:
+public:
     float m_fCenterXOrig;
     float m_fCenterYOrig;
     float m_fCenterZOrig;
@@ -128,7 +128,7 @@ public:
     virtual void startWithTarget(CCNode *pTarget);
     virtual void update(float time);
 
-protected:
+public:
     float m_fRadius;
     float m_fDeltaRadius;
     float m_fAngleZ;

loader/include/Geode/cocos/actions/CCActionCatmullRom.h

@@ -108,7 +108,7 @@ public:
     const gd::vector<CCPoint*>* getControlPoints();
 
     void setControlPoints(gd::vector<CCPoint*> *controlPoints);
-private:
+public:
     /** Array that contains the control points */
     gd::vector<CCPoint*> *m_pControlPoints;
 };
@@ -176,7 +176,7 @@ public:
         m_pPoints = points;
     }
     
-protected:
+public:
     /** Array of control points */
     CCPointArray *m_pPoints;
     float m_fDeltaT;
@@ -215,7 +215,7 @@ public:
      *  @lua NA
      */
     virtual void updatePosition(CCPoint &newPos);
-protected:
+public:
     CCPoint m_startPosition;
 };
 

loader/include/Geode/cocos/actions/CCActionEase.h

@@ -73,7 +73,7 @@ public:
     /** creates the action */
     static CCActionEase* create(CCActionInterval *pAction);
 
-protected:
+public:
     /** The inner action */
     CCActionInterval *m_pInner;
 };
@@ -111,7 +111,7 @@ public:
     /** Creates the action with the inner action and the rate parameter */
     static CCEaseRateAction* create(CCActionInterval* pAction, float fRate);
 
-protected:
+public:
     float m_fRate;
 };
 
@@ -338,7 +338,7 @@ public:
     /** 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;
 };
 

loader/include/Geode/cocos/actions/CCActionGrid.h

@@ -64,7 +64,7 @@ public:
 
     /** creates the action with size and duration */
     static CCGridAction* create(float duration, const CCSize& gridSize);
-protected:
+public:
     CCSize m_sGridSize;
 };
 
@@ -145,7 +145,7 @@ public:
     /** 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;
 };
@@ -178,7 +178,7 @@ public:
 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;
 };
@@ -212,7 +212,7 @@ public:
     /** 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;
 };
@@ -246,7 +246,7 @@ public:
 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;
 };
 

loader/include/Geode/cocos/actions/CCActionGrid3D.h

@@ -59,7 +59,7 @@ public:
 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;
@@ -129,7 +129,7 @@ public:
 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;
@@ -169,7 +169,7 @@ public:
 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;
@@ -195,7 +195,7 @@ public:
 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;
 };
@@ -223,7 +223,7 @@ public:
 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;
@@ -253,7 +253,7 @@ public:
 
     /** 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;
@@ -289,7 +289,7 @@ public:
 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;

loader/include/Geode/cocos/actions/CCActionInstant.h

@@ -184,7 +184,7 @@ public:
 	static CCRemoveSelf * create(bool isNeedCleanUp = true);
 	/** init the action */
 	bool init(bool isNeedCleanUp);
-protected:
+public:
 	bool m_bIsNeedCleanUp;
 };
 
@@ -222,7 +222,7 @@ public:
      */
     virtual CCObject* copyWithZone(CCZone *pZone);
 
-protected:
+public:
     bool    m_bFlipX;
 };
 
@@ -260,7 +260,7 @@ public:
      */
     virtual CCObject* copyWithZone(CCZone *pZone);
 
-protected:
+public:
     bool    m_bFlipY;
 };
 
@@ -291,7 +291,7 @@ public:
      *  @lua NA
      */
     virtual CCObject* copyWithZone(CCZone *pZone);
-protected:
+public:
     CCPoint m_tPosition;
 };
 
@@ -370,7 +370,7 @@ public:
      * @lua NA
      */
     inline int getScriptHandler() { return m_nScriptHandler; };
-protected:
+public:
     /** Target that will be called */
     CCObject*   m_pSelectorTarget;
 
@@ -468,7 +468,7 @@ public:
     virtual CCObject* copyWithZone(CCZone *pZone);
     virtual void execute();
 
-protected:
+public:
     void            *m_pData;
 };
 
@@ -527,7 +527,7 @@ public:
         }
     }
 
-protected:
+public:
     /** object to be passed as argument */
     CCObject* m_pObject;
 };

loader/include/Geode/cocos/actions/CCActionInterval.h

@@ -96,7 +96,7 @@ public:
     // 2.2 addition
     bool getM_bFirstTick(); // rob were you like high on something when you wrote this
 
-protected:
+public:
     float m_elapsed;
     bool   m_bFirstTick;
 };
@@ -165,7 +165,7 @@ public:
      */
     static CCSequence* createWithTwoActions(CCFiniteTimeAction *pActionOne, CCFiniteTimeAction *pActionTwo);
 
-protected:
+public:
     CCFiniteTimeAction *m_pActions[2];
     float m_split;
     int m_last;
@@ -216,7 +216,7 @@ public:
 
     /** creates a CCRepeat action. Times is an unsigned integer between 1 and pow(2,30) */
     static CCRepeat* create(CCFiniteTimeAction *pAction, unsigned int times);
-protected:
+public:
     unsigned int m_uTimes;
     unsigned int m_uTotal;
     float m_fNextDt;
@@ -276,7 +276,7 @@ public:
 
     /** creates the action */
     static CCRepeatForever* create(CCActionInterval *pAction);
-protected:
+public:
     /** Inner action */
     CCActionInterval *m_pInnerAction;
 };
@@ -339,7 +339,7 @@ public:
      */
     static CCSpawn* createWithTwoActions(CCFiniteTimeAction *pAction1, CCFiniteTimeAction *pAction2);
 
-protected:
+public:
     CCFiniteTimeAction *m_pOne;
     CCFiniteTimeAction *m_pTwo;
 };
@@ -368,7 +368,7 @@ public:
     virtual void startWithTarget(CCNode *pTarget);
     virtual void update(float time);
     
-protected:
+public:
     float m_fDstAngleX;
     float m_fStartAngleX;
     float m_fDiffAngleX;
@@ -400,7 +400,7 @@ public:
     virtual void update(float time);
     virtual CCActionInterval* reverse(void);
     
-protected:
+public:
     float m_fAngleX;
     float m_fStartAngleX;
     float m_fAngleY;
@@ -431,7 +431,7 @@ public:
 public:
     /** creates the action */
     static CCMoveBy* create(float duration, const CCPoint& deltaPosition);
-protected:
+public:
     CCPoint m_positionDelta;
     CCPoint m_startPosition;
     CCPoint m_previousPosition;
@@ -458,7 +458,7 @@ public:
 public:
     /** creates the action */
     static CCMoveTo* create(float duration, const CCPoint& position);
-protected:
+public:
     CCPoint m_endPosition;
 };
 
@@ -486,7 +486,7 @@ public:
 
     /** creates the action */
     static CCSkewTo* create(float t, float sx, float sy);
-protected:
+public:
     float m_fSkewX;
     float m_fSkewY;
     float m_fStartSkewX;
@@ -534,7 +534,7 @@ public:
 public:
     /** creates the action */
     static CCJumpBy* create(float duration, const CCPoint& position, float height, unsigned int jumps);
-protected:
+public:
     CCPoint         m_startPosition;
     CCPoint         m_delta;
     float           m_height;
@@ -604,7 +604,7 @@ public:
      *  @endcode
      */
     static CCBezierBy* create(float t, const ccBezierConfig& c);
-protected:
+public:
     ccBezierConfig m_sConfig;
     CCPoint m_startPosition;
     CCPoint m_previousPosition;
@@ -641,7 +641,7 @@ public:
      */
     bool initWithDuration(float t, const ccBezierConfig &c);
     
-protected:
+public:
     ccBezierConfig m_sToConfig;
 };
 
@@ -672,7 +672,7 @@ public:
 
     /** creates the action with and X factor and a Y factor */
     static CCScaleTo* create(float duration, float sx, float sy);
-protected:
+public:
     float m_fScaleX;
     float m_fScaleY;
     float m_fStartScaleX;
@@ -730,7 +730,7 @@ public:
     virtual void startWithTarget(CCNode *pTarget);
     virtual void stop();
     
-protected:
+public:
     unsigned int m_nTimes;
     bool m_bOriginalState;
 };
@@ -796,7 +796,7 @@ public:
 public:
     /** creates an action with duration and opacity */
     static CCFadeTo* create(float duration, GLubyte opacity);
-protected:
+public:
     GLubyte m_toOpacity;
     GLubyte m_fromOpacity;
 };
@@ -822,7 +822,7 @@ public:
 public:
     /** creates an action with duration and color */
     static CCTintTo* create(float duration, GLubyte red, GLubyte green, GLubyte blue);
-protected:
+public:
     ccColor3B m_to;
     ccColor3B m_from;
 };
@@ -848,7 +848,7 @@ public:
 public:
     /** creates an action with duration and color */
     static CCTintBy* create(float duration, GLshort deltaRed, GLshort deltaGreen, GLshort deltaBlue);
-protected:
+public:
     GLshort m_deltaR;
     GLshort m_deltaG;
     GLshort m_deltaB;
@@ -914,7 +914,7 @@ public:
 public:
     /** creates the action */
     static CCReverseTime* create(CCFiniteTimeAction *pAction);
-protected:
+public:
     CCFiniteTimeAction *m_pOther;
 };
 
@@ -957,7 +957,7 @@ public:
     /** creates the action with an Animation and will restore the original frame when the animation is over */
     static CCAnimate* create(CCAnimation *pAnimation);
     CC_SYNTHESIZE_RETAIN(CCAnimation*, m_pAnimation, Animation)
-protected:
+public:
     gd::vector<float>* m_pSplitTimes;
     int                m_nNextFrame;
     CCSpriteFrame*  m_pOrigFrame;
@@ -997,7 +997,7 @@ public:
 
     /** This is the target that the action will be forced to run with */
     CC_SYNTHESIZE_RETAIN(CCNode*, m_pForcedTarget, ForcedTarget);
-private:
+public:
     CCFiniteTimeAction* m_pAction;
 };
 

loader/include/Geode/cocos/actions/CCActionManager.h

@@ -131,7 +131,7 @@ protected:
     void actionAllocWithHashElement(struct _hashElement *pElement);
     void update(float dt);
 
-protected:
+public:
     struct _hashElement    *m_pTargets;
     struct _hashElement    *m_pCurrentTarget;
     bool            m_bCurrentTargetSalvaged;

loader/include/Geode/cocos/actions/CCActionProgressTimer.h

@@ -55,7 +55,7 @@ public:
 public:
     /** Creates and initializes with a duration and a percent */
     static CCProgressTo* create(float duration, float fPercent);
-protected:
+public:
     float m_fTo;
     float m_fFrom;
 };
@@ -83,7 +83,7 @@ public:
 
     /** Creates and initializes the action with a duration, a "from" percentage and a "to" percentage */
     static CCProgressFromTo* create(float duration, float fFromPercentage, float fToPercentage);
-protected:
+public:
     float m_fTo;
     float m_fFrom;
 };

loader/include/Geode/cocos/actions/CCActionTiledGrid.h

@@ -53,7 +53,7 @@ public:
     /** creates the action with a range, whether or not to shake Z vertices, a grid size, and duration */
     static CCShakyTiles3D* create(float duration, const CCSize& gridSize, int nRange, bool bShakeZ);
 
-protected:
+public:
     int m_nRandrange;
     bool m_bShakeZ;
 };
@@ -76,7 +76,7 @@ public:
 
     /** creates the action with a range, whether of not to shatter Z vertices, a grid size and duration */
     static CCShatteredTiles3D* create(float duration, const CCSize& gridSize, int nRange, bool bShatterZ);
-protected:
+public:
     int m_nRandrange;
     bool m_bOnce;
     bool m_bShatterZ;
@@ -112,7 +112,7 @@ public:
 public:
     /** creates the action with a random seed, the grid size and the duration */
     static CCShuffleTiles* create(float duration, const CCSize& gridSize, unsigned int seed);
-protected:
+public:
     unsigned int m_nSeed;
     unsigned int m_nTilesCount;
     unsigned int* m_pTilesOrder;
@@ -216,7 +216,7 @@ public:
     /** creates the action with a random seed, the grid size and the duration */
     static CCTurnOffTiles* create(float duration, const CCSize& gridSize, unsigned int seed);
 
-protected:
+public:
     unsigned int    m_nSeed;
     unsigned int    m_nTilesCount;
     unsigned int*   m_pTilesOrder;
@@ -247,7 +247,7 @@ public:
 public:
     /** creates the action with a number of waves, the waves amplitude, the grid size and the duration */
     static CCWavesTiles3D* create(float duration, const CCSize& gridSize, unsigned int waves, float amplitude);
-protected:
+public:
     unsigned int m_nWaves;
     float m_fAmplitude;
     float m_fAmplitudeRate;
@@ -281,7 +281,7 @@ public:
 
     /** creates the action with the number of jumps, the sin amplitude, the grid size and the duration */
     static CCJumpTiles3D* create(float duration, const CCSize& gridSize, unsigned int numberOfJumps, float amplitude);
-protected:
+public:
     unsigned int m_nJumps;
     float m_fAmplitude;
     float m_fAmplitudeRate;
@@ -306,7 +306,7 @@ public:
 
     /** creates the action with the number of rows to split and the duration */
     static CCSplitRows* create(float duration, unsigned int nRows);
-protected:
+public:
     unsigned int m_nRows;
     CCSize m_winSize;
 };
@@ -329,7 +329,7 @@ public:
 public:
     /** creates the action with the number of columns to split and the duration */
     static CCSplitCols* create(float duration, unsigned int nCols);
-protected:
+public:
     unsigned int m_nCols;
     CCSize m_winSize;
 };

loader/include/Geode/cocos/base_nodes/CCAtlasNode.h

@@ -51,7 +51,7 @@ All features from CCNode are valid, plus the following features:
 class CC_DLL CCAtlasNode : public CCNodeRGBA, public CCTextureProtocol
 {
     GEODE_FRIEND_MODIFY
-protected:
+public:
 
     //! chars per row
     unsigned int m_uItemsPerRow;

loader/include/Geode/cocos/base_nodes/CCNode.h

@@ -1761,7 +1761,7 @@ private:
      */
     CCPoint convertToWindowSpace(const CCPoint& nodePoint);
 
-protected:
+public:
     float m_fRotationX;                 ///< rotation angle on x-axis
     float m_fRotationY;                 ///< rotation angle on y-axis
     
@@ -1894,7 +1894,7 @@ public:
     virtual void setOpacityModifyRGB(bool bValue) {CC_UNUSED_PARAM(bValue);};
     virtual bool isOpacityModifyRGB() { return false; };
 
-protected:
+public:
 	GLubyte		_displayedOpacity;
     GLubyte     _realOpacity;
 	ccColor3B	_displayedColor;

loader/include/Geode/cocos/cocoa/CCAutoreleasePool.h

@@ -39,8 +39,8 @@ NS_CC_BEGIN
 class CC_DLL CCAutoreleasePool : public CCObject
 {
     GEODE_FRIEND_MODIFY
-    CCArray*    m_pManagedObjectArray;    
 public:
+    CCArray*    m_pManagedObjectArray;    
     CCAutoreleasePool(void);
     ~CCAutoreleasePool(void);
 

loader/include/Geode/cocos/cocoa/CCBool.h

@@ -58,7 +58,7 @@ public:
     /* override functions */
     virtual void acceptVisitor(CCDataVisitor &visitor) { visitor.visit(this); }
 
-private:
+public:
     bool m_bValue;
 };
 

loader/include/Geode/cocos/cocoa/CCDataVisitor.h

@@ -105,6 +105,7 @@ public:
     virtual void visit(const CCSet *p);
 private:
     void setIndentLevel(int indentLevel);
+public:
     int _indentLevel;
     gd::string _indentStr;
     gd::string _result;

loader/include/Geode/cocos/cocoa/CCDictionary.h

@@ -121,7 +121,7 @@ public:
      */
     inline CCObject* getObject() const { return m_pObject; }
 
-private:
+public:
     // The max length of string key.
     #define   MAX_KEY_LEN   256
     // char array is needed for HASH_ADD_STR in UT_HASH.

loader/include/Geode/cocos/cocoa/CCDouble.h

@@ -57,7 +57,7 @@ public:
     /* override functions */
     virtual void acceptVisitor(CCDataVisitor &visitor) { visitor.visit(this); }
 
-private:
+public:
     double m_dValue;
 };
 

loader/include/Geode/cocos/cocoa/CCFloat.h

@@ -57,7 +57,7 @@ public:
     /* override functions */
     virtual void acceptVisitor(CCDataVisitor &visitor) { visitor.visit(this); }
 
-private:
+public:
     float m_fValue;
 };
 

loader/include/Geode/cocos/cocoa/CCInteger.h

@@ -32,7 +32,7 @@ public:
      */
     virtual void acceptVisitor(CCDataVisitor &visitor) { visitor.visit(this); }
 
-private:
+public:
     int m_nValue;
 };
 

loader/include/Geode/cocos/cocoa/CCObject.h

@@ -97,7 +97,7 @@ public:
     unsigned int        m_uID;
     // Lua reference id
     int                 m_nLuaID;
-protected:
+public:
     // the object's tag
     int m_nTag;
     // count of references

loader/include/Geode/cocos/cocoa/CCSet.h

@@ -35,7 +35,7 @@ NS_CC_BEGIN
  * @{
  */
 
-typedef std::set<CCObject *>::iterator CCSetIterator;
+typedef gd::set<CCObject *>::iterator CCSetIterator;
 
 class CC_DLL CCSet : public CCObject
 {
@@ -114,8 +114,8 @@ public:
      */
     virtual void acceptVisitor(CCDataVisitor &visitor);
 
-private:
-    std::set<CCObject *> *m_pSet;
+public:
+    gd::set<CCObject *> *m_pSet;
 };
 
 // end of data_structure group

loader/include/Geode/cocos/draw_nodes/CCDrawNode.h

@@ -45,7 +45,7 @@ NS_CC_BEGIN
 class CC_DLL CCDrawNode : public CCNodeRGBA
 {
     GEODE_FRIEND_MODIFY
-protected:
+public:
 
     GLuint      m_uVao;
     GLuint      m_uVbo;

loader/include/Geode/cocos/effects/CCGrabber.h

@@ -52,7 +52,7 @@ public:
     void beforeRender(CCTexture2D *pTexture);
     void afterRender(CCTexture2D *pTexture);
 
-protected:
+public:
     GLuint m_FBO;
     GLint m_oldFBO;
     GLfloat    m_oldClearColor[4];

loader/include/Geode/cocos/effects/CCGrid.h

@@ -147,7 +147,7 @@ public:
      */
     void set2DProjection(void);
 
-protected:
+public:
     bool m_bActive;
     int  m_nReuseGrid;
     CCSize m_sGridSize;

loader/include/Geode/cocos/extensions/AssetsManager/AssetsManager.h

@@ -172,12 +172,12 @@ private:
         
     private:
         void handleUpdateSucceed(Message *msg);
-        
+    public:
         std::list<Message*> *_messageQueue;
         pthread_mutex_t _messageQueueMutex;
     };
     
-private:
+public:
     //! The path to store downloaded resources.
     gd::string _storagePath;
     

loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCControl.h

@@ -87,7 +87,7 @@ typedef unsigned int CCControlState;
  */
 class CC_DLL CCControl : public CCLayerRGBA
 {
-
+public:
     //CCRGBAProtocol
     bool m_bIsOpacityModifyRGB;
 
@@ -97,7 +97,7 @@ class CC_DLL CCControl : public CCLayerRGBA
     CC_SYNTHESIZE_READONLY_NV(CCControlState, m_eState, State);
 
     /** True if all of the controls parents are visible */
-protected:
+public:
     bool m_hasVisibleParents;
 
 public:

loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCControlButton.h

@@ -97,7 +97,7 @@ protected:
 	virtual void setColor(const ccColor3B&);
     
     /** Flag to know if the button is currently pushed.  */
-protected:
+public:
     bool m_isPushed;
     bool m_bParentInited;
 public:

loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCControlColourPicker.h

@@ -62,7 +62,7 @@ public:
     CCControlColourPicker();
     virtual ~CCControlColourPicker();
 
-protected:
+public:
     // @note RobTop Addition
     ccColor3B m_rgb;
     HSV m_hsv;

loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCControlPotentiometer.h

@@ -73,7 +73,7 @@ public:
     virtual void ccTouchMoved(CCTouch *pTouch, CCEvent *pEvent);
     virtual void ccTouchEnded(CCTouch *pTouch, CCEvent *pEvent);
 
-protected:
+public:
     CC_SYNTHESIZE_RETAIN(CCSprite*, m_pThumbSprite, ThumbSprite)
     CC_SYNTHESIZE_RETAIN(CCProgressTimer*, m_pProgressTimer, ProgressTimer)
     CC_SYNTHESIZE(CCPoint, m_tPreviousLocation, PreviousLocation)
@@ -85,6 +85,8 @@ protected:
     /** Contains the maximum value of the receiver. 
     * The default value of this property is 1.0. */
     float           m_fMaximumValue;
+
+protected:
     /** Factorize the event dispath into these methods. */
     void potentiometerBegan(CCPoint location);
     void potentiometerMoved(CCPoint location);

loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCControlSaturationBrightnessPicker.h

@@ -59,7 +59,7 @@ class CC_DLL CCControlSaturationBrightnessPicker : public CCControl
     CC_SYNTHESIZE_READONLY(CCSprite*, m_slider, Slider);
     CC_SYNTHESIZE_READONLY(CCPoint, m_startPos, StartPos);
 
-protected:
+public:
     int         boxPos;
     int         boxSize;
     

loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCControlStepper.h

@@ -86,6 +86,7 @@ protected:
     /** Stop the autorepeat. */
     void stopAutorepeat();
 
+public:
     /** The numeric value of the stepper. */
     double                  m_dValue;
     /** The continuous vs. noncontinuous state of the stepper. */

loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCControlSwitch.h

@@ -86,7 +86,7 @@ public:
     virtual void ccTouchEnded(CCTouch *pTouch, CCEvent *pEvent);
     virtual void ccTouchCancelled(CCTouch *pTouch, CCEvent *pEvent);
 
-protected:
+public:
     /** Sprite which represents the view. */
     CCControlSwitchSprite* m_pSwitchSprite;
     float m_fInitialTouchXPosition;

loader/include/Geode/cocos/extensions/GUI/CCControlExtension/CCScale9Sprite.h

@@ -79,7 +79,7 @@ public:
     /** Sets the bottom side inset */
     CC_PROPERTY(float, m_insetBottom, InsetBottom);
 
-protected:
+public:
     bool m_bSpritesGenerated;
     CCRect m_spriteRect;
     bool   m_bSpriteFrameRotated;
@@ -100,7 +100,8 @@ protected:
     bool _opacityModifyRGB;
     GLubyte _opacity;
     ccColor3B _color;
-    
+
+protected:
     void updateCapInset();
     void updatePositions();
 

loader/include/Geode/cocos/extensions/GUI/CCEditBox/CCEditBox.h

@@ -398,7 +398,7 @@ public:
      */
     void touchDownAction(CCObject *sender, CCControlEvent controlEvent);
     
-protected:
+public:
     CCEditBoxImpl*      m_pEditBoxImpl;
     CCEditBoxDelegate*  m_pDelegate;
     

loader/include/Geode/cocos/extensions/GUI/CCEditBox/CCEditBoxImpl.h

@@ -76,7 +76,7 @@ public:
     void setDelegate(CCEditBoxDelegate* pDelegate) { m_pDelegate = pDelegate; };
     CCEditBoxDelegate* getDelegate() { return m_pDelegate; };
     CCEditBox* getCCEditBox() { return m_pEditBox; };
-protected:
+public:
     CCEditBoxDelegate* m_pDelegate;
     CCEditBox* m_pEditBox;
 };

loader/include/Geode/cocos/extensions/GUI/CCEditBox/CCEditBoxImplAndroid.h

@@ -71,7 +71,7 @@ public:
     virtual void openKeyboard();
     virtual void closeKeyboard();
     
-private:
+public:
     CCLabelTTF* m_pLabel;
     CCLabelTTF* m_pLabelPlaceHolder;
     EditBoxInputMode    m_eEditBoxInputMode;

loader/include/Geode/cocos/extensions/GUI/CCEditBox/CCEditBoxImplIOS.h

@@ -109,7 +109,8 @@ private:
 	void			setInactiveText(const char* pText);
 	void			adjustTextFieldPosition();
     void            placeInactiveLabels();
-	
+
+public:
     CCLabelTTF*     m_pLabel;
     CCLabelTTF*     m_pLabelPlaceHolder;
     CCSize          m_tContentSize;

loader/include/Geode/cocos/extensions/GUI/CCEditBox/CCEditBoxImplMac.h

@@ -103,6 +103,7 @@ public:
 private:
     NSPoint    convertDesignCoordToScreenCoord(const CCPoint& designCoord, bool bInRetinaMode);
     void       adjustTextFieldPosition();
+public:
     CCSize     m_tContentSize;
     CCPoint    m_obPosition;
     CCPoint    m_obAnchorPoint;

loader/include/Geode/cocos/extensions/GUI/CCEditBox/CCEditBoxImplTizen.h

@@ -72,7 +72,7 @@ public:
     virtual void openKeyboard();
     virtual void closeKeyboard();
 
-private:
+public:
     CCLabelTTF* m_pLabel;
     CCLabelTTF* m_pLabelPlaceHolder;
     EditBoxInputMode    m_eEditBoxInputMode;

loader/include/Geode/cocos/extensions/GUI/CCEditBox/CCEditBoxImplWin.h

@@ -70,7 +70,7 @@ public:
     virtual void openKeyboard();
     virtual void closeKeyboard();
     virtual void onEnter(void);
-private:
+public:
 
     CCLabelTTF* m_pLabel;
     CCLabelTTF* m_pLabelPlaceHolder;

loader/include/Geode/cocos/extensions/GUI/CCEditBox/CCEditBoxImplWp8.h

@@ -64,7 +64,7 @@ public:
 private:
 	Platform::String^ stringToPlatformString(gd::string strSrc);
 	gd::string PlatformStringTostring(Platform::String^ strSrc);
-private:
+public:
 
 	CCLabelTTF* m_pLabel;
 	CCLabelTTF* m_pLabelPlaceHolder;

loader/include/Geode/cocos/extensions/GUI/CCScrollView/CCScrollView.h

@@ -253,7 +253,7 @@ private:
 
 protected:
     CCRect getViewRect();
-    
+public:
     /**
      * current zoom scale
      */
@@ -345,7 +345,7 @@ public:
     void registerScriptHandler(int nFunID,int nScriptEventType);
     void unregisterScriptHandler(int nScriptEventType);
     int  getScriptHandler(int nScriptEventType);
-private:
+public:
     gd::map<int,int> m_mapScriptHandler;
 };
 

loader/include/Geode/cocos/extensions/GUI/CCScrollView/CCTableView.h

@@ -234,8 +234,7 @@ public:
     virtual void ccTouchEnded(CCTouch *pTouch, CCEvent *pEvent);
     virtual void ccTouchCancelled(CCTouch *pTouch, CCEvent *pEvent);
 
-protected:
-
+public:
     CCTableViewCell *m_pTouchedCell;
     /**
      * vertical direction of cell filling
@@ -245,7 +244,7 @@ protected:
     /**
      * index set to query the indexes of the cells used.
      */
-    std::set<unsigned int>* m_pIndices;
+    gd::set<unsigned int>* m_pIndices;
 
     /**
      * vector with all cell positions
@@ -271,6 +270,7 @@ protected:
 
 	CCScrollViewDirection m_eOldDirection;
 
+protected:
     int __indexFromOffset(CCPoint offset);
     unsigned int _indexFromOffset(CCPoint offset);
     CCPoint __offsetFromIndex(unsigned int index);

loader/include/Geode/cocos/extensions/GUI/CCScrollView/CCTableViewCell.h

@@ -51,7 +51,7 @@ public:
 
     void setObjectID(unsigned int uIdx);
     unsigned int getObjectID();
-private:
+public:
     unsigned int m_uIdx;
 };
 

loader/include/Geode/cocos/extensions/network/HttpClient.h

@@ -107,7 +107,7 @@ private:
     /** Poll function called from main thread to dispatch callbacks when http requests finished **/
     void dispatchResponseCallbacks(float delta);
     
-private:
+public:
     int _timeoutForConnect;
     int _timeoutForRead;
     

loader/include/Geode/cocos/extensions/network/HttpRequest.h

@@ -263,7 +263,7 @@ public:
         _connectTimeout = connectTimeout;
     }
 
-protected:
+public:
     // properties
     HttpRequestType             _requestType;    /// kHttpRequestGet, kHttpRequestPost or other enums
     gd::string                 _url;            /// target url that this request is sent to

loader/include/Geode/cocos/extensions/network/HttpResponse.h

@@ -166,7 +166,7 @@ public:
     
 protected:
     bool initWithRequest(CCHttpRequest* request);
-    
+public:
     // properties
     CCHttpRequest*        _pHttpRequest;  /// the corresponding HttpRequest pointer who leads to this response 
     bool                _succeed;       /// to indecate if the http reqeust is successful simply

loader/include/Geode/cocos/extensions/network/WebSocket.h

@@ -144,8 +144,8 @@ private:
                          struct libwebsocket *wsi,
                          enum libwebsocket_callback_reasons reason,
                          void *user, void *in, size_t len);
-    
-private:
+
+public:
 	State        _readyState;
     gd::string  _host;
     unsigned int _port;

loader/include/Geode/cocos/extensions/physics_nodes/CCPhysicsDebugNode.h

@@ -46,7 +46,7 @@ NS_CC_EXT_BEGIN
 
 class CC_DLL CCPhysicsDebugNode : public CCDrawNode
 {
-protected:
+public:
     cpSpace *m_pSpacePtr;
     
 public:

loader/include/Geode/cocos/extensions/physics_nodes/CCPhysicsSprite.h

@@ -50,7 +50,7 @@ NS_CC_EXT_BEGIN
  */
 class CC_DLL CCPhysicsSprite : public CCSprite
 {
-protected:
+public:
     bool    m_bIgnoreBodyRotation;
 #if CC_ENABLE_CHIPMUNK_INTEGRATION
     cpBody  *m_pCPBody;

loader/include/Geode/cocos/extensions/spine/CCSkeleton.h

@@ -89,9 +89,10 @@ protected:
 	void setSkeletonData (SkeletonData* skeletonData, bool ownsSkeletonData);
 	cocos2d::CCTextureAtlas* getTextureAtlas (RegionAttachment* regionAttachment) const;
 
-private:
+public:
 	bool ownsSkeletonData;
 	Atlas* atlas;
+private:
 	void initialize ();
 };
 

loader/include/Geode/cocos/extensions/spine/CCSkeletonAnimation.h

@@ -61,10 +61,11 @@ public:
 protected:
 	CCSkeletonAnimation ();
 
-private:
+public:
 	typedef CCSkeleton super;
 	gd::vector<AnimationStateData*> stateDatas;
 
+private:
 	void initialize ();
 };
 

loader/include/Geode/cocos/include/CCProtocols.h

@@ -47,6 +47,27 @@ public:
      */
     virtual void setColor(const ccColor3B& color) = 0;
 
+    /**
+     * Changes the color with R,G,B,A bytes
+     *
+     * @param color Example: ccc4(255,100,0,255) means R=255, G=100, B=0, A=255
+     * @note Geode addition
+    */
+    inline void setColor(const ccColor4B& color) {
+        this->setColor(ccColor3B{color.r, color.g, color.b});
+        this->setOpacity(color.a);
+    }
+
+    /**
+     * Changes the color with R,G,B,A floats
+     *
+     * @param color Example: ccc4f(1.0, 0.5, 0.25, 1.0) means R=255, G=127, B=63, A=255
+     * @note Geode addition
+    */
+    inline void setColor(const ccColor4F& color) {
+        this->setColor(ccc4BFromccc4F(color));
+    }
+
     /**
      * Returns color that is currently used.
      *

loader/include/Geode/cocos/include/ccTypes.h

@@ -28,7 +28,11 @@ THE SOFTWARE.
 #define __CCTYPES_H__
 
 #include <string>
+
+#ifdef __cplusplus
 #include <Geode/c++stl/gdstdlib.hpp>
+#endif
+
 #include "../cocoa/CCGeometry.h"
 #include "../platform/CCGL.h"
 

loader/include/Geode/cocos/include/cocos2d.h

@@ -326,6 +326,9 @@ THE SOFTWARE.
 
 #include "../robtop/special_nodes/CCLightning.h"
 
+#include "../robtop/sprite_nodes/CCFontSprite.h"
+#include "../robtop/sprite_nodes/CCSpriteExtra.h"
+
 #include "../robtop/xml/DS_Dictionary.h"
 #include "../robtop/xml/ObjectDecoder.h"
 

loader/include/Geode/cocos/keypad_dispatcher/CCKeypadDelegate.h

@@ -74,7 +74,7 @@ public:
     /** allocates a CCKeypadHandler with a delegate */
     static CCKeypadHandler* handlerWithDelegate(CCKeypadDelegate *pDelegate);
 
-protected:
+public:
     CCKeypadDelegate* m_pDelegate;
 };
 

loader/include/Geode/cocos/keypad_dispatcher/CCKeypadDispatcher.h

@@ -80,7 +80,7 @@ public:
     */
     bool dispatchKeypadMSG(ccKeypadMSGType nMsgType);
 
-protected:
+public:
 
     CCArray* m_pDelegates;
     bool m_bLocked;

loader/include/Geode/cocos/label_nodes/CCLabelAtlas.h

@@ -97,7 +97,7 @@ public:
     virtual void draw();
 #endif
 
-protected:
+public:
     // string to render
     gd::string m_sString;
     // the first char in the charmap

loader/include/Geode/cocos/label_nodes/CCLabelBMFont.h

@@ -296,6 +296,7 @@ private:
 
 protected:
     virtual void setString(unsigned short *newString, bool needUpdateLabel);
+public:
     // string to render
     unsigned short* m_sString;
 

loader/include/Geode/cocos/label_nodes/CCLabelTTF.h

@@ -224,7 +224,7 @@ protected:
     /** set the text definition for this label */
     void                _updateWithTextDefinition(ccFontDefinition & textDefinition, bool mustUpdateTexture = true);
     ccFontDefinition    _prepareTextDefinition(bool adjustForResolution = false);
-    
+public:
     /** Dimensions of the label in Points */
     CCSize m_tDimensions;
     /** The alignment of the label */

loader/include/Geode/cocos/layers_scenes_transitions_nodes/CCLayer.h

@@ -193,7 +193,7 @@ public:
     inline CCTouchScriptHandlerEntry* getScriptTouchHandlerEntry() { return m_pScriptTouchHandlerEntry; };
     inline CCScriptHandlerEntry* getScriptKeypadHandlerEntry() { return m_pScriptKeypadHandlerEntry; };
     inline CCScriptHandlerEntry* getScriptAccelerateHandlerEntry() { return m_pScriptAccelerateHandlerEntry; };
-protected:   
+public:   
     bool m_bTouchEnabled;
     bool m_bAccelerometerEnabled;
     bool m_bKeypadEnabled;
@@ -202,7 +202,7 @@ protected:
     // @note RobTop Addition
     bool m_bMouseEnabled;
     
-private:
+public:
     // Script touch events handler
     CCTouchScriptHandlerEntry* m_pScriptTouchHandlerEntry;
     CCScriptHandlerEntry* m_pScriptKeypadHandlerEntry;
@@ -214,6 +214,7 @@ private:
     // 2.2 additions
     int m_uPreviousPriority; // no idea
     
+private:
     int  excuteScriptTouchHandler(int nEventType, CCTouch *pTouch);
     int  excuteScriptTouchHandler(int nEventType, CCSet *pTouches);
 };

loader/include/Geode/cocos/layers_scenes_transitions_nodes/CCTransition.h

@@ -82,7 +82,7 @@ class CC_DLL CCTransitionScene : public CCScene
 {
     GEODE_FRIEND_MODIFY
 
-protected:
+public:
     CCScene    * m_pInScene;
     CCScene    * m_pOutScene;
     float    m_fDuration;
@@ -138,7 +138,7 @@ private:
 class CC_DLL CCTransitionSceneOriented : public CCTransitionScene
 {
     GEODE_FRIEND_MODIFY
-protected:
+public:
 
 
     tOrientation m_eOrientation;
@@ -616,7 +616,7 @@ Fade out the outgoing scene and then fade in the incoming scene.'''
 class CC_DLL CCTransitionFade : public CCTransitionScene
 {
     GEODE_FRIEND_MODIFY
-protected:
+public:
 
 
     ccColor4B    m_tColor;

loader/include/Geode/cocos/layers_scenes_transitions_nodes/CCTransitionPageTurn.h

@@ -49,7 +49,7 @@ is turned on in CCDirector using:
 class CC_DLL CCTransitionPageTurn : public CCTransitionScene
 {
     GEODE_FRIEND_MODIFY
-protected:
+public:
 
 
     bool    m_bBack;

loader/include/Geode/cocos/layers_scenes_transitions_nodes/CCTransitionProgress.h

@@ -62,6 +62,7 @@ protected:
     virtual CCProgressTimer* progressTimerNodeWithRenderTexture(CCRenderTexture* texture);
     virtual void setupTransition();
     virtual void sceneOrder();
+public:
     float m_fTo;
     float m_fFrom;
     CCScene* m_pSceneToBeModified;

loader/include/Geode/cocos/menu_nodes/CCMenu.h

@@ -56,6 +56,7 @@ enum {
 class CC_DLL CCMenu : public CCLayerRGBA
 {
     GEODE_FRIEND_MODIFY
+public:
     /** whether or not the menu will receive events */
     bool m_bEnabled;
     
@@ -190,6 +191,7 @@ public:
 protected:
     CCMenuItem* itemForTouch(CCTouch * touch);
     CCMenuItem* itemForTouch(CCTouch * touch, bool);
+public:
     tCCMenuState m_eState;
     CCMenuItem *m_pSelectedItem;
 };

loader/include/Geode/cocos/menu_nodes/CCMenuItem.h

@@ -171,7 +171,7 @@ public:
      */
     virtual void setEnabled(bool enabled);
     
-protected:
+public:
     ccColor3B    m_tColorBackup;
     float        m_fOriginalScale;
 };
@@ -265,7 +265,7 @@ public:
     
 protected:
     void recreateLabel();
-    
+public:
     unsigned int m_uFontSize;
     gd::string m_strFontName;
 };

loader/include/Geode/cocos/misc_nodes/CCClippingNode.h

@@ -41,7 +41,7 @@ NS_CC_BEGIN
 class CC_DLL CCClippingNode : public CCNode
 {
     GEODE_FRIEND_MODIFY
-protected:
+public:
 
 
     CCNode* m_pStencil;

loader/include/Geode/cocos/misc_nodes/CCMotionStreak.h

@@ -154,7 +154,7 @@ public:
         m_bStartingPositionInitialized = bStartingPositionInitialized;
     }
 
-protected:
+public:
     bool m_bFastMode;
     bool m_bStartingPositionInitialized;
     bool m_bStroke;

loader/include/Geode/cocos/misc_nodes/CCProgressTimer.h

@@ -113,7 +113,7 @@ protected:
     void updateColor(void);
     CCPoint boundaryTexCoord(char index);
 
-protected:
+public:
     CCProgressTimerType m_eType;
     float m_fPercentage;
     CCSprite *m_pSprite;

loader/include/Geode/cocos/misc_nodes/CCRenderTexture.h

@@ -172,7 +172,7 @@ public:
 private:
     void beginWithClear(float r, float g, float b, float a, float depthValue, int stencilValue, GLbitfield flags);
 
-protected:
+public:
     GLuint       m_uFBO;
     GLuint       m_uDepthRenderBufffer;
     GLint        m_nOldFBO;

loader/include/Geode/cocos/particle_nodes/CCParticleBatchNode.h

@@ -127,7 +127,7 @@ private:
     void updateBlendFunc(void);
     /** the texture atlas used for drawing the quads */
     CC_SYNTHESIZE(CCTextureAtlas*, m_pTextureAtlas, TextureAtlas);
-private:
+public:
     /** the blend function used for drawing the quads */
     ccBlendFunc m_tBlendFunc;
 };

loader/include/Geode/cocos/particle_nodes/CCParticleSystem.h

@@ -175,7 +175,7 @@ emitter.startSpin = 0;
 class CC_DLL CCParticleSystem : public CCNode, public CCTextureProtocol
 {
     GEODE_FRIEND_MODIFY
-protected:
+public:
     gd::string m_sPlistFile;
     //! time elapsed since the start of the system (in seconds)
     float m_fElapsed;
@@ -408,7 +408,7 @@ public:
     By default it is false.
     @since v0.8
     */
-protected:
+public:
     bool m_bIsAutoRemoveOnFinish;
 public:
     virtual bool isAutoRemoveOnFinish();
@@ -486,7 +486,7 @@ public:
 
 protected:
     virtual void updateBlendFunc();
-
+public:
         // saved/loaded in loadDefaults, loadScaledDefaults and saveDefaults
 
         // @note RobTop Addition

loader/include/Geode/cocos/particle_nodes/CCParticleSystemQuad.h

@@ -228,7 +228,7 @@ Special features and Limitations:
 class CC_DLL CCParticleSystemQuad : public CCParticleSystem
 {
     GEODE_FRIEND_MODIFY
-protected:
+public:
 
     ccV3F_C4B_T2F_Quad    *m_pQuads;        // quads to be rendered
     GLushort            *m_pIndices;    // indices

loader/include/Geode/cocos/platform/CCFileUtils.h

@@ -448,7 +448,8 @@ protected:
      *  @note This method is used internally.
      */
     virtual CCArray* createCCArrayWithContentsOfFile(const gd::string& filename);
-    
+
+public:
     /** Dictionary used to lookup filenames based on a key.
      *  It is used internally by the following methods:
      *
@@ -484,7 +485,8 @@ protected:
      *  This variable is used for improving the performance of file search.
      */
     gd::map<gd::string, gd::string> m_fullPathCache;
-    
+
+protected:
     /**
      *  The singleton pointer of CCFileUtils.
      */

loader/include/Geode/cocos/platform/CCImage.h

@@ -189,7 +189,7 @@ protected:
 
     bool _saveImageToPNG(const char *pszFilePath, bool bIsToRGB = true);
     bool _saveImageToJPG(const char *pszFilePath);
-
+public:
     unsigned char *m_pData;
     bool m_bHasAlpha;
     bool m_bPreMulti;

loader/include/Geode/cocos/platform/android/CCAccelerometer.h

@@ -41,7 +41,7 @@ public:
     void setAccelerometerInterval(float interval);
     void update(float x, float y, float z, long sensorTimeStamp);
 
-private:
+public:
     CCAccelerometerDelegate* m_pAccelDelegate;
     CCAcceleration m_obAccelerationValue;
 };

loader/include/Geode/cocos/robtop/keyboard_dispatcher/CCKeyboardDelegate.h

@@ -230,7 +230,7 @@ public:
 
     void setDelegate(CCKeyboardDelegate* pDelegate);
 
-protected:
+public:
     CCKeyboardDelegate* m_pDelegate;
 };
 

loader/include/Geode/cocos/robtop/keyboard_dispatcher/CCKeyboardDispatcher.h

@@ -51,7 +51,7 @@ public:
 		this->m_bBlockRepeat = blockRepeat;
 	}
 
-protected:
+public:
 	CCArray* m_pDelegates;	// 0x34
 	bool m_bUnknown38;			// 0x38
 	bool m_bUnknown39;      // 0x39

loader/include/Geode/cocos/robtop/mouse_dispatcher/CCMouseDelegate.h

@@ -38,7 +38,7 @@ public:
 
 	void setDelegate(CCMouseDelegate* pDelegate);
 
-protected:
+public:
 	CCMouseDelegate* m_pDelegate;
 };
 

loader/include/Geode/cocos/robtop/mouse_dispatcher/CCMouseDispatcher.h

@@ -24,7 +24,7 @@ public:
 
 	bool dispatchScrollMSG(float x, float y);
 
-protected:
+public:
 	CCArray* m_pMouseHandlers;
 	bool m_bLocked;
 	bool m_bToAdd;

loader/include/Geode/cocos/robtop/special_nodes/CCLightning.h

@@ -43,7 +43,7 @@ public:
     bool isCascadeOpacityEnabled();
     void setCascadeColorEnabled(bool);
 
-protected:
+public:
     CCPoint m_strikePoint;
     CCPoint m_strikePoint2;
     bool m_split;

loader/include/Geode/cocos/robtop/sprite_nodes/CCFontSprite.h

@@ -0,0 +1,29 @@
+#ifndef __CCFONTSPRITE_H__
+#define __CCFONTSPRITE_H__
+
+#include "../../include/ccMacros.h"
+#include "CCSpriteExtra.h"
+
+NS_CC_BEGIN
+
+// @note RobTop Addition
+class CC_DLL CCFontSprite : public CCSpriteExtra {
+public:
+    CCFontSprite() {}
+    virtual ~CCFontSprite() {}
+    GEODE_CUSTOM_CONSTRUCTOR_COCOS(CCFontSprite, CCSpriteExtra);
+
+public:
+    bool m_bUseInstant;
+    float m_fInstantTime;
+    float m_fDelay;
+    float m_fShakesPerSecond;
+    float m_fShakeIntensity;
+    float m_fShakeElapsed;
+    int m_nShakeIndex;
+    CCPoint m_obShakePosition;
+};
+
+NS_CC_END
+
+#endif // __CCFONTSPRITE_H__

loader/include/Geode/cocos/robtop/sprite_nodes/CCSpriteExtra.h

@@ -0,0 +1,28 @@
+#ifndef __CCSPRITEEXTRA_H__
+#define __CCSPRITEEXTRA_H__
+
+#include "../../include/ccMacros.h"
+#include "../../sprite_nodes/CCSprite.h"
+
+NS_CC_BEGIN
+
+// @note RobTop Addition
+class CC_DLL CCSpriteExtra : public CCSprite {
+public:
+    CCSpriteExtra() {}
+    GEODE_CUSTOM_CONSTRUCTOR_COCOS(CCSpriteExtra, CCSprite);
+
+    inline float getXOffset() const { return m_fXOffset; }
+    inline float getYOffset() const { return m_fYOffset; }
+
+    inline void setXOffset(float offset) { m_fXOffset = offset; }
+    inline void setYOffset(float offset) { m_fYOffset = offset; }
+
+protected:
+    float m_fXOffset;
+    float m_fYOffset;
+};
+
+NS_CC_END
+
+#endif // __CCSPRITEEXTRA_H__

loader/include/Geode/cocos/script_support/CCScriptSupport.h

@@ -75,7 +75,7 @@ protected:
         newEntryId++;
         m_nEntryId = newEntryId;
     }
-    
+public:
     int m_nHandler;
     int m_nEntryId;
 };
@@ -119,7 +119,7 @@ private:
     {
     }
     bool init(float fInterval, bool bPaused);
-    
+public:
     cocos2d::CCTimer*   m_pTimer;
     bool                m_bPaused;
     bool                m_bMarkedForDeletion;
@@ -157,7 +157,7 @@ private:
     {
     }
     bool init(bool bIsMultiTouches, int nPriority, bool bSwallowsTouches);
-    
+public:
     bool    m_bIsMultiTouches;
     int     m_nPriority;
     bool    m_bSwallowsTouches;
@@ -287,7 +287,7 @@ private:
     : m_pScriptEngine(NULL)
     {
     }
-    
+public:
     CCScriptEngineProtocol *m_pScriptEngine;
 };
 

loader/include/Geode/cocos/shaders/CCGLProgram.h

@@ -280,7 +280,7 @@ private:
     bool compileShader(GLuint * shader, GLenum type, const GLchar* source);
     const char* logForOpenGLObject(GLuint object, GLInfoFunction infoFunc, GLLogFunction logFunc);
 
-protected:
+public:
     GLuint            m_uProgram;
     GLuint            m_uVertShader;
     GLuint            m_uFragShader;

loader/include/Geode/cocos/shaders/CCShaderCache.h

@@ -82,7 +82,7 @@ public:
 private:
     bool init();
     void loadDefaultShader(CCGLProgram *program, int type);
-
+public:
     CCDictionary* m_pPrograms;
 
 };

loader/include/Geode/cocos/sprite_nodes/CCAnimationCache.h

@@ -104,8 +104,9 @@ public:
 private:
     void parseVersion1(CCDictionary* animations);
     void parseVersion2(CCDictionary* animations);
-private:
+public:
     CCDictionary* m_pAnimations;
+private:
     static CCAnimationCache* s_pSharedAnimationCache;
 };
 

loader/include/Geode/cocos/sprite_nodes/CCSprite.h

@@ -524,6 +524,7 @@ protected:
     virtual void setReorderChildDirtyRecursively(void);
     virtual void setDirtyRecursively(bool bValue);
 
+public:
     //
     // Data used when the sprite is rendered using a CCSpriteSheet
     //

loader/include/Geode/cocos/sprite_nodes/CCSpriteBatchNode.h

@@ -192,7 +192,7 @@ private:
     void swap(int oldIndex, int newIndex);
     void updateBlendFunc();
 
-protected:
+public:
     CCTextureAtlas *m_pobTextureAtlas;
     ccBlendFunc m_blendFunc;
 

loader/include/Geode/cocos/sprite_nodes/CCSpriteFrame.h

@@ -150,7 +150,7 @@ public:
 	gd::string getFrameName() const;
 	void setFrameName(gd::string);
 
-protected:
+public:
     CCPoint m_obOffset;
     CCSize m_obOriginalSize;
     CCRect m_obRectInPixels;

loader/include/Geode/cocos/sprite_nodes/CCSpriteFrameCache.h

@@ -163,7 +163,7 @@ private:
 public:
     CCDictionary* m_pSpriteFrames;
     CCDictionary* m_pSpriteFramesAliases;
-    std::set<gd::string>*  m_pLoadedFileNames;
+    gd::set<gd::string>*  m_pLoadedFileNames;
 };
 
 // end of sprite_nodes group

loader/include/Geode/cocos/support/CCNotificationCenter.h

@@ -107,7 +107,8 @@ private:
 
     // Check whether the observer exists by the specified target and name.
     bool observerExisted(CCObject *target,const char *name);
-    
+
+public:
     // variables
     //
     CCArray *m_observers;