ios stuff

iOS/CustomGLKView.m

@@ -49,14 +49,18 @@ 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);
     }

iOS/ViewController.m

@@ -9,6 +9,9 @@
 #import "ViewController.h"
 #import "ios_api.h"
 
+
+extern GLKView* defaultView;
+
 @interface ViewController () {
 }
 
@@ -39,6 +42,7 @@
     view.context = self.context;
     view.drawableDepthFormat = GLKViewDrawableDepthFormat24;
     
+    defaultView = view;
     
     [self setupGL];
 }

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));
 }
 

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

iOS/salmontemplate.xcodeproj/project.pbxproj

@@ -389,7 +389,6 @@
 				GCC_PREFIX_HEADER = "template-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					TARGET_IOS,
-					TARGET_SALMON,
 					DEBUG,
 					"$(inherited)",
 					BOOST_NO_CXX11_NUMERIC_LIMITS,
@@ -438,7 +437,6 @@
 				GCC_PREFIX_HEADER = "template-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					TARGET_IOS,
-					TARGET_SALMON,
 					BOOST_NO_CXX11_NUMERIC_LIMITS,
 				);
 				GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";