omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update osx, ios and android projects with the new eraser flag on mouse events

Browse Source
This commit is contained in:
omigamedev
2018-10-09 12:39:24 +02:00
parent a6d0914bf8
commit b4c986d273
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
PanoPainter/GameViewController.m
View File

@@ -223,7 +223,7 @@ std::set<UITouch*> ignored_touch;
std::lock_guard<std::mutex> lock(task_mutex);
tasklist.emplace_back([touchLocation, scale, f=touch.force, source] {
App::I.mouse_down(0, touchLocation.x * scale, touchLocation.y * scale, f, source);
App::I.mouse_down(0, touchLocation.x * scale, touchLocation.y * scale, f, source, 0);
});
t_count = 1;
t_pos = {touchLocation.x * scale, touchLocation.y * scale};
@@ -270,9 +270,9 @@ std::set<UITouch*> ignored_touch;
std::lock_guard<std::mutex> lock(task_mutex);
tasklist.emplace_back([tt0=t0.type,tt1=t1.type,p0,p1,f0=t0.force,f1=t1.force] {
if (tt0 == UITouchType::UITouchTypeStylus)
App::I.mouse_move(p0.x, p0.y, f0, kEventSource::Stylus);
App::I.mouse_move(p0.x, p0.y, f0, kEventSource::Stylus, 0);
if (tt1 == UITouchType::UITouchTypeStylus)
App::I.mouse_move(p1.x, p1.y, f1, kEventSource::Stylus);
App::I.mouse_move(p1.x, p1.y, f1, kEventSource::Stylus, 0);
});
}
else if (n == 2)
@@ -306,7 +306,7 @@ std::set<UITouch*> ignored_touch;
kEventSource source = touch.type == UITouchType::UITouchTypeStylus ? kEventSource::Stylus : kEventSource::Touch;
std::lock_guard<std::mutex> lock(task_mutex);
tasklist.emplace_back([touchLocation, scale, source, force] {
App::I.mouse_move(touchLocation.x * scale, touchLocation.y * scale, force, source);
App::I.mouse_move(touchLocation.x * scale, touchLocation.y * scale, force, source, 0);
});
}
}
@@ -332,7 +332,7 @@ std::set<UITouch*> ignored_touch;
if (tc == 2)
App::I.gesture_end();
else
App::I.mouse_up(0, touchLocation.x * scale, touchLocation.y * scale, source);
App::I.mouse_up(0, touchLocation.x * scale, touchLocation.y * scale, source, 0);
});
t_count = 0;