added ios tilt

HEAVYPOLY · Sep 5, 2024 · 50f5736 · 50f5736
1 parent 72c3dfb
commit 50f5736
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/platform/iphone/godot_view.mm b/platform/iphone/godot_view.mm
@@ -344,7 +344,9 @@ - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
 		CGFloat force = touch.force;
 
 		if (touch.type == UITouchTypeStylus) {
-			OSIPhone::get_singleton()->pencil_drag(tid, prev_point.x * self.contentScaleFactor, prev_point.y * self.contentScaleFactor, touchPoint.x * self.contentScaleFactor, touchPoint.y * self.contentScaleFactor, force);
+			CGVector azimuth = [touch azimuthUnitVectorInView:self];
+			// CGFloat altitudeAngle = (1.0 - ((3.14159/2.0) / [touch altitudeAngle])) / 3.14159;
+			OSIPhone::get_singleton()->pencil_drag(tid, prev_point.x * self.contentScaleFactor, prev_point.y * self.contentScaleFactor, touchPoint.x * self.contentScaleFactor, touchPoint.y * self.contentScaleFactor, force, -azimuth.dx , -azimuth.dy);
 		} else {
 			OSIPhone::get_singleton()->touch_drag(tid, prev_point.x * self.contentScaleFactor, prev_point.y * self.contentScaleFactor, touchPoint.x * self.contentScaleFactor, touchPoint.y * self.contentScaleFactor);
 		}

diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h
@@ -143,7 +143,7 @@ class OSIPhone : public OS_Unix {
 	virtual int get_screen_dpi(int p_screen = -1) const;
 	virtual float get_screen_refresh_rate(int p_screen = -1) const;
 
-	void pencil_press(int p_idx, int p_x, int p_y, bool p_pressed, bool p_doubleclick, float p_tilt_x, float p_tilt_y);
+	void pencil_press(int p_idx, int p_x, int p_y, bool p_pressed, bool p_doubleclick);
 	void touch_press(int p_idx, int p_x, int p_y, bool p_pressed, bool p_doubleclick);
 	void pencil_drag(int p_idx, int p_prev_x, int p_prev_y, int p_x, int p_y, float p_force, float p_tilt_x, float p_tilt_y);
 	void touch_drag(int p_idx, int p_prev_x, int p_prev_y, int p_x, int p_y);

diff --git a/platform/iphone/os_iphone.mm b/platform/iphone/os_iphone.mm
@@ -269,15 +269,14 @@
 	perform_event(ev);
 };
 
-void OSIPhone::pencil_press(int p_idx, int p_x, int p_y, bool p_pressed, bool p_doubleclick, float p_tilt_x, float p_tilt_y) {
+void OSIPhone::pencil_press(int p_idx, int p_x, int p_y, bool p_pressed, bool p_doubleclick) {
     Ref<InputEventMouseButton> ev;
     ev.instance();
     ev->set_button_index(1);
     ev->set_pressed(p_pressed);
     ev->set_position(Vector2(p_x, p_y));
     ev->set_global_position(Vector2(p_x, p_y));
     ev->set_doubleclick(p_doubleclick);
-    ev->set_tilt(Vector2(p_tilt_x, p_tilt_y));
     perform_event(ev);
 }
 
@@ -293,7 +292,7 @@
 }
 
 void OSIPhone::pencil_cancelled(int p_idx) {
-	pencil_press(p_idx, -1, -1, false, false, 0, 0);
+	pencil_press(p_idx, -1, -1, false, false);
 }
 
 void OSIPhone::touch_press(int p_idx, int p_x, int p_y, bool p_pressed, bool p_doubleclick) {