3DTouch for iOS Target implemented

modules/brl/gametarget.monkey

@@ -57,7 +57,8 @@ Class BBGameDelegate Abstract
 	Method RenderGame:Void() Abstract
 	Method KeyEvent:Void( event:Int,data:Int ) Abstract
 	Method MouseEvent:Void( event:Int,data:Int,x:Float,y:Float ) Abstract
-	Method TouchEvent:Void( event:Int,data:Int,x:Float,y:Float ) Abstract
+	Method TouchEvent:Void( event:Int,data:Int,x:Float,y:Float,force:Float,maximumPossibleForce:Float) Abstract
+	Method TouchEvent:Void( event:Int,data:Int,x:Float,y:Float) Abstract
 	Method MotionEvent:Void( event:Int,data:Int,x:Float,y:Float,z:Float ) Abstract
 	Method DiscardGraphics:Void() Abstract
 End

modules/brl/native/gametarget.cpp

@@ -20,7 +20,7 @@ class BBGameDelegate : public Object{
 	virtual void RenderGame(){}
 	virtual void KeyEvent( int event,int data ){}
 	virtual void MouseEvent( int event,int data,Float x,Float y ){}
-	virtual void TouchEvent( int event,int data,Float x,Float y ){}
+	virtual void TouchEvent( int event,int data,Float x,Float y,Float force, Float maximumPossibleForce){}
 	virtual void MotionEvent( int event,int data,Float x,Float y,Float z ){}
 	virtual void DiscardGraphics(){}
 };
@@ -87,7 +87,7 @@ class BBGame{
 	virtual void RenderGame();
 	virtual void KeyEvent( int ev,int data );
 	virtual void MouseEvent( int ev,int data,float x,float y );
-	virtual void TouchEvent( int ev,int data,float x,float y );
+	virtual void TouchEvent( int ev,int data,float x,float y,float force,float maximumPossibleForce );
 	virtual void MotionEvent( int ev,int data,float x,float y,float z );
 	virtual void DiscardGraphics();
 
@@ -372,12 +372,12 @@ void BBGame::MouseEvent( int ev,int data,float x,float y ){
 	gc_collect();
 }
 
-void BBGame::TouchEvent( int ev,int data,float x,float y ){
+void BBGame::TouchEvent( int ev,int data,float x,float y,float force, float maximumPossibleForce ){
 
 	if( !_started ) return;
 
 	try{
-		_delegate->TouchEvent( ev,data,x,y );
+		_delegate->TouchEvent( ev,data,x,y,force,maximumPossibleForce );
 	}catch( ThrowableObject *ex ){
 		Die( ex );
 	}

modules/mojo/app.monkey

@@ -130,10 +130,14 @@ Class GameDelegate Extends BBGameDelegate
 		_input.MouseEvent event,data,x,y
 	End
 
-	Method TouchEvent:Void( event:Int,data:Int,x:Float,y:Float )
-		_input.TouchEvent event,data,x,y
+	Method TouchEvent:Void( event:Int,data:Int,x:Float,y:Float, force:Float, maximumPossibleForce:Float )
+		_input.TouchEvent event,data,x,y,force,maximumPossibleForce
 	End
 
+	Method TouchEvent:Void( event:Int,data:Int,x:Float,y:Float )
+		TouchEvent(event,data,x,y,0,0)
+	End
+
 	Method MotionEvent:Void( event:Int,data:Int,x:Float,y:Float,z:Float )
 		_input.MotionEvent event,data,x,y,z
 	End

modules/mojo/input.monkey

@@ -80,6 +80,14 @@ Function TouchY#( index=0 )
 	Return device.TouchY( index )
 End
 
+Function TouchForce#( index=0 )
+	Return device.TouchForce( index )
+End
+
+Function TouchMaximumPossibleForce#( index= 0)
+	Return device.TouchMaximumPossibleForce( index )
+End
+
 Function TouchDown( index=0 )
 	Return device.KeyDown( KEY_TOUCH0+index )
 End

modules/mojo/inputdevice.monkey

@@ -82,6 +82,16 @@ Class InputDevice
 		If index>=0 And index<32 Return _touchY[index]
 		Return 0
 	End
+
+	Method TouchForce#( index )
+		If index>=0 And index<32 Return _touchForce[index]
+		Return 0
+	End
+
+	Method TouchMaximumPossibleForce#( index )
+		If index>=0 And index<32 Return _touchMaximumPossibleForce[index]
+		Return 0
+	End
 
 	Method AccelX#()
 		Return _accelX
@@ -155,19 +165,22 @@ Class InputDevice
 		_touchY[0]=y
 	End
 
-	Method TouchEvent:Void( event:Int,data:Int,x:Float,y:Float )
+	Method TouchEvent:Void( event:Int,data:Int,x:Float,y:Float, force:Float = 0.0, maximumPossibleForce:Float = 0.0 )
 		Select event
 		Case BBGameEvent.TouchDown
 			KeyEvent BBGameEvent.KeyDown,KEY_TOUCH0+data
 		Case BBGameEvent.TouchUp
 			KeyEvent BBGameEvent.KeyUp,KEY_TOUCH0+data
+			_touchForce[data] = 0
 			Return
 		Case BBGameEvent.TouchMove
 		Default
 			Return
 		End
 		_touchX[data]=x
 		_touchY[data]=y
+		_touchForce[data] = force
+		_touchMaximumPossibleForce[data] = maximumPossibleForce
 		If data=0
 			_mouseX=x
 			_mouseY=y
@@ -228,6 +241,8 @@ Private
 	Field _mouseY:Float
 	Field _touchX:Float[32]
 	Field _touchY:Float[32]
+	Field _touchForce:Float[32]
+	Field _touchMaximumPossibleForce:Float[32]
 	Field _accelX:Float
 	Field _accelY:Float
 	Field _accelZ:Float

targets/ios/modules/native/iosgame.cpp

@@ -457,8 +457,13 @@ void BBIosGame::TouchesEvent( UIEvent *event ){
 			CGPoint p=[touch locationInView:view];
 			p.x*=scaleFactor;
 			p.y*=scaleFactor;
-
-			TouchEvent( ev,pid,p.x,p.y );
+
+			#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
+			if (SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"9.0")) {
+				TouchEvent( ev,pid,p.x,p.y, _touches[pid].force, _touches[pid].maximumPossibleForce );
+			} else {
+				TouchEvent( ev,pid,p.x,p.y, 0, 0 );
+			}
 		}
 	}
 }