diff --git a/Templates/SalmonUniversalTemplate/iOS/CustomGLKView.m b/Templates/SalmonUniversalTemplate/iOS/CustomGLKView.m index 130b654..30d1a3f 100644 --- a/Templates/SalmonUniversalTemplate/iOS/CustomGLKView.m +++ b/Templates/SalmonUniversalTemplate/iOS/CustomGLKView.m @@ -49,17 +49,22 @@ CGPoint prev_loc; touchMoved = true; } - AppOnScroll(prevLocation.x - location.x, prevLocation.y - location.y); + AppOnScroll(prevLocation.x - location.x, -(prevLocation.y - location.y)); } - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event { CGPoint location = [[[touches allObjects] objectAtIndex:0] locationInView:self]; - if (!touchMoved) + if (touchMoved) + { + AppOnTapUpAfterScroll(location.x, self.bounds.size.height - location.y); + } + else { AppOnTapUp(location.x, self.bounds.size.height - location.y); } + } diff --git a/Templates/SalmonUniversalTemplate/iOS/ios_api.cpp b/Templates/SalmonUniversalTemplate/iOS/ios_api.cpp index e8c79cc..7f46ee7 100644 --- a/Templates/SalmonUniversalTemplate/iOS/ios_api.cpp +++ b/Templates/SalmonUniversalTemplate/iOS/ios_api.cpp @@ -32,16 +32,21 @@ extern "C" void AppDraw() extern "C" void AppOnTapDown(int posx, int posy) { - //App.OuterOnTapDown(vec2(posx, posy)); + App.OuterOnTapDown(vec2(posx, posy)); } extern "C" void AppOnTapUp(int posx, int posy) { - //App.OuterOnTapUp(vec2(posx, posy)); + App.OuterOnTapUp(vec2(posx, posy)); +} + +extern "C" void AppOnTapUpAfterScroll(int posx, int posy) +{ + App.OuterOnTapUpAfterShift(vec2(posx, posy)); } extern "C" void AppOnScroll(int shiftx, int shifty) { - //App.OuterOnMove(vec2(shiftx, shifty)); + App.OuterOnMove(vec2(shiftx, shifty)); } diff --git a/Templates/SalmonUniversalTemplate/iOS/ios_api.h b/Templates/SalmonUniversalTemplate/iOS/ios_api.h index 66b7e7f..aa8d8bf 100644 --- a/Templates/SalmonUniversalTemplate/iOS/ios_api.h +++ b/Templates/SalmonUniversalTemplate/iOS/ios_api.h @@ -12,4 +12,5 @@ void AppUpdate(int dt); void AppDraw(); void AppOnTapDown(int posx, int posy); void AppOnTapUp(int posx, int posy); +void AppOnTapUpAfterScroll(int posx, int posy); void AppOnScroll(int shiftx, int shifty); \ No newline at end of file