Merge pull request #7951 from samuele3hu/v3_check_newnon

getAllTouches() in GLViewProtocol

cocos/platform/CCGLView.cpp

@@ -56,6 +56,21 @@ namespace {
         return -1;
     }
     
+    static std::vector<Touch*> getAllTouchesVector()
+    {
+        std::vector<Touch*> ret;
+        int i;
+        int temp = g_indexBitsUsed;
+        
+        for (i = 0; i < EventTouch::MAX_TOUCHES; i++) {
+            if ( temp & 0x00000001) {
+                ret.push_back(g_touches[i]);
+            }
+            temp >>= 1;
+        }
+        return ret;
+    }
+    
     static void removeUsedIndexBit(int index)
     {
         if (index < 0 || index >= EventTouch::MAX_TOUCHES)
@@ -423,6 +438,11 @@ const Rect& GLView::getViewPortRect() const
     return _viewPortRect;
 }
 
+std::vector<Touch*> GLView::getAllTouches() const
+{
+    return getAllTouchesVector();
+}
+
 float GLView::getScaleX() const
 {
     return _scaleX;

cocos/platform/CCGLView.h

@@ -220,6 +220,11 @@ public:
      * Get the opengl view port rectangle.
      */
     const Rect& getViewPortRect() const;
+    
+    /**
+     * Get list of all active touches
+     */
+    std::vector<Touch*> getAllTouches() const;
 
     /**
      * Get scale factor of the horizontal direction.

cocos/scripting/lua-bindings/manual/cocos2d/lua_cocos2dx_manual.cpp

@@ -6505,6 +6505,80 @@ static void extendTextureCache(lua_State* tolua_S)
     lua_pop(tolua_S, 1);
 }
 
+int lua_cocos2dx_GLView_getAllTouches(lua_State* tolua_S)
+{
+    int argc = 0;
+    cocos2d::GLView* cobj = nullptr;
+    bool ok  = true;
+    
+#if COCOS2D_DEBUG >= 1
+    tolua_Error tolua_err;
+#endif
+    
+    
+#if COCOS2D_DEBUG >= 1
+    if (!tolua_isusertype(tolua_S,1,"cc.GLView",0,&tolua_err)) goto tolua_lerror;
+#endif
+    
+    cobj = (cocos2d::GLView*)tolua_tousertype(tolua_S,1,0);
+    
+#if COCOS2D_DEBUG >= 1
+    if (!cobj)
+    {
+        tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLView_getAllTouches'", nullptr);
+        return 0;
+    }
+#endif
+    
+    argc = lua_gettop(tolua_S)-1;
+    if (argc == 0)
+    {
+        if(!ok)
+            return 0;
+        
+        std::vector<cocos2d::Touch*> ret = cobj->getAllTouches();
+        lua_newtable(tolua_S);
+        if (ret.empty())
+            return 1;
+        
+        int index = 1;
+        for (const auto& obj : ret)
+        {
+            if (nullptr == obj)
+                continue;
+            
+            lua_pushnumber(tolua_S, (lua_Number)index);
+            int ID = (obj) ? (int)obj->_ID : -1;
+            int* luaID = (obj) ? &obj->_luaID : nullptr;
+            toluafix_pushusertype_ccobject(tolua_S, ID, luaID, (void*)obj, "cc.Touch");
+            lua_rawset(tolua_S, -3);
+            ++index;
+        }
+
+        return 1;
+    }
+    CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.GLView:getAllTouches",argc, 0);
+    return 0;
+    
+#if COCOS2D_DEBUG >= 1
+tolua_lerror:
+    tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLView_getAllTouches'.",&tolua_err);
+#endif
+    
+    return 0;
+}
+
+static void extendGLView(lua_State* tolua_S)
+{
+    lua_pushstring(tolua_S, "cc.GLView");
+    lua_rawget(tolua_S, LUA_REGISTRYINDEX);
+    if (lua_istable(tolua_S,-1))
+    {
+        tolua_function(tolua_S, "getAllTouches", lua_cocos2dx_GLView_getAllTouches);
+    }
+    lua_pop(tolua_S, 1);
+}
+
 int register_all_cocos2dx_manual(lua_State* tolua_S)
 {
     if (NULL == tolua_S)
@@ -6559,6 +6633,7 @@ int register_all_cocos2dx_manual(lua_State* tolua_S)
     extendEventListenerFocus(tolua_S);
     extendApplication(tolua_S);
     extendTextureCache(tolua_S);
+    extendGLView(tolua_S);
     
     return 0;
 }

tools/tolua/cocos2dx.ini

@@ -108,7 +108,7 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS
         ccFontDefinition::[*],
         Ref::[autorelease isEqual acceptVisitor update],
         UserDefault::[getInstance (s|g)etDataForKey],
-        GLView::[setTouchDelegate],
+        GLView::[setTouchDelegate getAllTouches],
         GLViewImpl::[end swapBuffers],
         NewTextureAtlas::[*],
         DisplayLinkDirector::[mainLoop setAnimationInterval startAnimation stopAnimation],