瀏覽代碼

测试模型

yichael 4 年之前
父節點
當前提交
a39ad88cf7

+ 38 - 26
Assets/BowArrow/Resources/Prefabs/BluetoothHolder.prefab

@@ -132,9 +132,6 @@ MonoBehaviour:
   m_OnEndEdit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnSubmit:
-    m_PersistentCalls:
-      m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -3630,6 +3627,9 @@ MonoBehaviour:
   ellipseScript: {fileID: 4155488362915228892}
   AccObj: {fileID: 8120678166936344988}
   MagObj: {fileID: 8120678168769779090}
+  AccMesh: {fileID: 5494251821269932017}
+  GryMesh: {fileID: 6691673740526471866}
+  MagMesh: {fileID: 1236425143670165313}
   AMesh: {fileID: 6477564168608866414}
   DebugTexts: {fileID: 4155488362989209738}
   DrawImage: {fileID: 4155488362355793910}
@@ -5594,9 +5594,6 @@ MonoBehaviour:
   m_OnEndEdit:
     m_PersistentCalls:
       m_Calls: []
-  m_OnSubmit:
-    m_PersistentCalls:
-      m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -6999,6 +6996,11 @@ PrefabInstance:
       objectReference: {fileID: 2100000, guid: 60f820932c627624e876497802e0423e, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 8c9e3b1466f251343934a20aeea28cd0, type: 3}
+--- !u!4 &4155488363235150467 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2873263698172359512, guid: 8c9e3b1466f251343934a20aeea28cd0, type: 3}
+  m_PrefabInstance: {fileID: 2194555641130924507}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4155488362915228893 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2873263698492052742, guid: 8c9e3b1466f251343934a20aeea28cd0, type: 3}
@@ -7015,11 +7017,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b1d6997c80c485f4291c7a975c1407da, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &4155488363235150467 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2873263698172359512, guid: 8c9e3b1466f251343934a20aeea28cd0, type: 3}
-  m_PrefabInstance: {fileID: 2194555641130924507}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &4155488363911791133 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2873263697211128774, guid: 8c9e3b1466f251343934a20aeea28cd0, type: 3}
@@ -7144,6 +7141,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 6939955684172241615, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
   m_PrefabInstance: {fileID: 3202107743928077631}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5494251821269932017 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6939955684172241614, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
+  m_PrefabInstance: {fileID: 3202107743928077631}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4155488362696958207
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7209,16 +7211,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b100e5f3d1feffb49824e72907d434a4, type: 3}
---- !u!4 &8120678168769779086 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 5267297738912478577, guid: b100e5f3d1feffb49824e72907d434a4, type: 3}
-  m_PrefabInstance: {fileID: 4155488362696958207}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &8120678168769779090 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 5267297738912478573, guid: b100e5f3d1feffb49824e72907d434a4, type: 3}
   m_PrefabInstance: {fileID: 4155488362696958207}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &8120678168769779086 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5267297738912478577, guid: b100e5f3d1feffb49824e72907d434a4, type: 3}
+  m_PrefabInstance: {fileID: 4155488362696958207}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4155488363248417440
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7328,16 +7330,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
---- !u!1 &6477564168608866414 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 6939955684172241614, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
-  m_PrefabInstance: {fileID: 4155488363248417440}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &6477564168608866415 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 6939955684172241615, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
   m_PrefabInstance: {fileID: 4155488363248417440}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &6477564168608866414 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6939955684172241614, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
+  m_PrefabInstance: {fileID: 4155488363248417440}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4155488363481820401
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7403,16 +7405,16 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b100e5f3d1feffb49824e72907d434a4, type: 3}
---- !u!1 &8120678166936344988 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 5267297738912478573, guid: b100e5f3d1feffb49824e72907d434a4, type: 3}
-  m_PrefabInstance: {fileID: 4155488363481820401}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &8120678166936344960 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 5267297738912478577, guid: b100e5f3d1feffb49824e72907d434a4, type: 3}
   m_PrefabInstance: {fileID: 4155488363481820401}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8120678166936344988 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5267297738912478573, guid: b100e5f3d1feffb49824e72907d434a4, type: 3}
+  m_PrefabInstance: {fileID: 4155488363481820401}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4364609523926290548
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7522,6 +7524,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
+--- !u!1 &6691673740526471866 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6939955684172241614, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
+  m_PrefabInstance: {fileID: 4364609523926290548}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &6691673740526471867 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 6939955684172241615, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
@@ -7636,6 +7643,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
+--- !u!1 &1236425143670165313 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6939955684172241614, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}
+  m_PrefabInstance: {fileID: 8171507689228621199}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1236425143670165312 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 6939955684172241615, guid: 615af2d9be23fc54b9d22ed181782bc7, type: 3}

+ 9 - 0
Assets/BowArrow/Scripts/Bluetooth/AimHandler.cs

@@ -25,6 +25,10 @@ public class AimHandler : MonoBehaviour
     [SerializeField] Ellipse ellipseScript;
     [SerializeField] GameObject AccObj;
     [SerializeField] GameObject MagObj;
+
+    [SerializeField] GameObject AccMesh;
+    [SerializeField] GameObject GryMesh;
+    [SerializeField] GameObject MagMesh;
     [SerializeField] GameObject AMesh;
     [SerializeField] Transform DebugTexts;
     [SerializeField] Transform DrawImage;
@@ -56,6 +60,11 @@ public class AimHandler : MonoBehaviour
 
         //初始化
         _9Axis.LoadIdentity();
+
+        _9Axis.AccMesh = AccMesh;
+        _9Axis.GryMesh = GryMesh;
+        _9Axis.MagMesh = MagMesh;
+
         for (var i = 0; i < 9; ++i)
         {
             _9Axis.Tester.Add(DrawImage.Find(i.ToString()).gameObject.AddComponent<o0UIRawImageTester>());

+ 14 - 7
Assets/BowArrow/Scripts/Bluetooth/o09Axis.cs

@@ -660,6 +660,10 @@ public class o09Axis
     public List<o0UIRawImageTester> Tester = new List<o0UIRawImageTester>();
     public List<Text> TextTester = new List<Text>();
 
+    public GameObject AccMesh;
+    public GameObject GryMesh;
+    public GameObject MagMesh;
+
     static public Vector3 AccIdentity = new Vector3(0, -1, 0);
     static public Vector3 MagIdentity = new Vector3(-1, 2, 0).normalized;
     public class State
@@ -748,9 +752,9 @@ public class o09Axis
         //Debug.Log(HardwareVarianceMag.Value);
 
 
-        // var Accwit = GameObject.Find("Accwit");
-        // var Gyrwit = GameObject.Find("Gyrwit");
-        // var Magwit = GameObject.Find("Magwit");
+        //var Accwit = GameObject.Find("Accwit");
+        //var Gyrwit = GameObject.Find("Gyrwit");
+        //var Magwit = GameObject.Find("Magwit");
         var LastQuaternion = Last.Qua;
         //var LastQuaternion = Gyrwit.transform.localRotation;
 
@@ -758,10 +762,9 @@ public class o09Axis
         newQua.eulerAngles = Gyr * TimeGap;
         var quaGyr = LastQuaternion * newQua;
 
-        
-
-        // Accwit.transform.localRotation = o0Project.o0.FormQuaternion(Accwit.transform.localRotation, AccIdentity, Acc, 1);
-        // Magwit.transform.localRotation = o0Project.o0.FormQuaternion(Magwit.transform.localRotation, MagIdentity, Mag, 1);
+        AccMesh.transform.localRotation = o0Project.o0.FormQuaternion(AccMesh.transform.localRotation, AccIdentity, Acc, 1);
+        MagMesh.transform.localRotation = o0Project.o0.FormQuaternion(MagMesh.transform.localRotation, MagIdentity, Mag, 1);
+        GryMesh.transform.localRotation = GryMesh.transform.localRotation * newQua;
 
         //Tester?[3].DrawLine(Vector3.Angle(Acc, Last.Acc) / 1, new Color(1, 0, 0));
         //Tester?[4].DrawLine(Quaternion.Angle(LastQuaternion, quaGyr) / 45, new Color(1, 0, 0));
@@ -939,6 +942,10 @@ public class o09Axis
         
         States.Last().Variance = 0.0000001;
 
+        AccMesh.transform.localRotation = default;
+        MagMesh.transform.localRotation = default;
+        GryMesh.transform.localRotation = default;
+
         SaveIdentity();
     }
     public void SetIdentityAccordingToRecords()