add TouchSensor on PointerCliced

toppers · Jul 19, 2020 · a74f062 · a74f062
1 parent 86a5079
commit a74f062
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/Assets/Scripts/Hakoniwa/Assets/EV3/RobotController.cs b/Assets/Scripts/Hakoniwa/Assets/EV3/RobotController.cs
@@ -227,6 +227,7 @@ private void UpdateActuator()
             this.motor_b.SetTargetVelicty(power_b * powerConst);
             if (this.motor_arm != null)
             {
+                //Debug.Log("moter_c:" + power_c);
                 this.motor_arm.SetTargetVelicty(power_c * this.armMotorConst);
             }
         }

diff --git a/Assets/Scripts/Hakoniwa/Assets/EV3/TouchSensor.cs b/Assets/Scripts/Hakoniwa/Assets/EV3/TouchSensor.cs
@@ -2,8 +2,9 @@
 using System.Collections.Generic;
 using UnityEngine;
 using Hakoniwa.Assets;
+using UnityEngine.EventSystems;
 
-public class TouchSensor : MonoBehaviour, IRobotTouchSensor
+public class TouchSensor : MonoBehaviour, IRobotTouchSensor, IPointerDownHandler, IPointerUpHandler
 {
     private GameObject touchSensor;
     private bool isTouched;
@@ -32,4 +33,18 @@ private void OnTriggerExit(Collider other)
         this.isTouched = false;
         //Debug.Log("NotPressed");
     }
+
+
+    void IPointerDownHandler.OnPointerDown(PointerEventData eventData)
+    {
+        this.isTouched = true;
+        //Debug.Log("Pressed");
+    }
+
+
+    void IPointerUpHandler.OnPointerUp(PointerEventData eventData)
+    {
+        this.isTouched = false;
+        //Debug.Log("NotPressed");
+    }
 }
diff --git a/Assets/Scripts/Hakoniwa/Assets/HackEV/HackEVParts.cs b/Assets/Scripts/Hakoniwa/Assets/HackEV/HackEVParts.cs
@@ -14,6 +14,7 @@ public class HackEVParts : MonoBehaviour, IEV3Parts
         private string ultra_sonic_sensor = "RoboModel_Axis/HackEV_L8_Sidewinder_Head/EV3_UltrasonicSensor/EV3_UltrasonicSensor_Bk10";
         private string gyro_sensor = "RoboModel_Axis/HackEV_L8_Sidewinder_Head/EV3_GyroSensor/EV3_GyroSensor_Ash01";
         private string motor_arm = "RoboModel_Axis/HackEV_L8_MiddleMotor/EV3_InteractiveServoMotor_L/EV3_InteractiveServoMotor_L_MotorRoot";
+        private string touch_sensor = "RoboModel_Axis/HackEV_L9_Sidewinder_ShoulderSensor/HackEV_L8_TouchSensor2/L8_DoubleBevelGear20_Bk 1";
 
         public string GetColorSensor()
         {
@@ -36,7 +37,7 @@ public string getUltraSonicSensor()
         }
         public string getTouchSensor()
         {
-            return null;
+            return touch_sensor;
         }
 
         public string getGyroSensor()