fixed sliding actor and multitouch

oxygine/src/SlidingActor.cpp

@@ -19,7 +19,8 @@ namespace oxygine
         _rad(_defaultTouchThreshold),
         _maxSpeed(250),
         _downTime(0),
-        _lastTime(0), _current(0), _lastIterTime(0)
+        _lastTime(0), _current(0), _lastIterTime(0),
+        _finger(0)
     {
         _clip = new ClipRectActor;
         _clip->addEventListener(TouchEvent::TOUCH_DOWN, CLOSURE(this, &SlidingActor::_newEvent));
@@ -93,6 +94,7 @@ namespace oxygine
         _holded = 0; //event->target;
         //_downPos = te->localPosition;
         //_downTime = tm;
+        _finger = 0;
 
 
         _speed = Vector2(0, 0);
@@ -211,11 +213,13 @@ namespace oxygine
             return;
 
         TouchEvent* te = safeCast<TouchEvent*>(event);
+        //if (te->)
         timeMS tm = getTimeMS();
         switch (te->type)
         {
             case TouchEvent::TOUCH_DOWN:
             {
+                _finger = te->index;
                 _current = 0;
                 _lastIterTime = tm;
 
@@ -233,8 +237,9 @@ namespace oxygine
 
             case TouchEvent::TOUCH_UP:
             {
-                if (_drag.getDragEnabled())
+                if (_drag.getDragEnabled() && te->index == _finger)
                 {
+                    _finger = 0;
                     _downTime = 0;
                     Vector2 pos = _content->getPosition();
 
@@ -305,18 +310,21 @@ namespace oxygine
 
             case TouchEvent::MOVE:
             {
-                Vector2 offset = _downPos - te->localPosition;
-                float d = offset.dot(offset);
-                if (_holded && (d >= _rad * _rad))
+                if (te->index == _finger)
                 {
-                    spActor act = safeSpCast<Actor>(_holded);
-                    while (act && act.get() != _content.get())
+                    Vector2 offset = _downPos - te->localPosition;
+                    float d = offset.dot(offset);
+                    if (_holded && (d >= _rad * _rad))
                     {
-                        act->setNotPressed();
-                        act = act->getParent();
-                    }
+                        spActor act = safeSpCast<Actor>(_holded);
+                        while (act && act.get() != _content.get())
+                        {
+                            act->setNotPressed();
+                            act = act->getParent();
+                        }
 
-                    _holded = 0;
+                        _holded = 0;
+                    }
                 }
             }
             break;

oxygine/src/SlidingActor.h

@@ -89,6 +89,7 @@ namespace oxygine
         int _current;
 
         timeMS _lastIterTime;
+		pointer_index _finger;
     };
 }