浏览代码

调整视角

slambb 4 年之前
父节点
当前提交
92abfb08b4
共有 2 个文件被更改,包括 190 次插入7 次删除
  1. 171 7
      Assets/BowArrow/Scenes/Game.unity
  2. 19 0
      Assets/BowArrow/Scripts/Bluetooth/BluetoothAim.cs

+ 171 - 7
Assets/BowArrow/Scenes/Game.unity

@@ -2492,15 +2492,17 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 428037815}
+  - {fileID: 1172189791}
   - {fileID: 850841593}
+  - {fileID: 668134156}
   - {fileID: 1488271442}
   m_Father: {fileID: 1979114040}
   m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 232, y: 257}
-  m_SizeDelta: {x: 600, y: 200}
+  m_AnchoredPosition: {x: 178, y: 257}
+  m_SizeDelta: {x: 650, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &276886070
 MonoBehaviour:
@@ -3676,7 +3678,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 203.1, y: 3}
+  m_AnchoredPosition: {x: 218, y: 3}
   m_SizeDelta: {x: 200, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &428037816
@@ -5137,6 +5139,81 @@ Transform:
   m_Father: {fileID: 1732392391}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 17.728542, y: -9.316131, z: 79.170685}
+--- !u!1 &668134155
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 668134156}
+  - component: {fileID: 668134158}
+  - component: {fileID: 668134157}
+  m_Layer: 5
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &668134156
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 668134155}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.0375, y: 1.9618201, z: 1}
+  m_Children: []
+  m_Father: {fileID: 276886069}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 109.7, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &668134157
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 668134155}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &668134158
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 668134155}
+  m_CullTransparentMesh: 1
 --- !u!1 &675796228
 GameObject:
   m_ObjectHideFlags: 0
@@ -6729,11 +6806,11 @@ RectTransform:
   m_Children:
   - {fileID: 1210765378}
   m_Father: {fileID: 276886069}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 3.9999504, y: 3}
+  m_AnchoredPosition: {x: 3.1, y: 3}
   m_SizeDelta: {x: 200, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &850841594
@@ -9331,6 +9408,81 @@ Transform:
   m_Father: {fileID: 1772032173}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 4.4948025, y: 5.752727, z: -22.717903}
+--- !u!1 &1172189790
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1172189791}
+  - component: {fileID: 1172189793}
+  - component: {fileID: 1172189792}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1172189791
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1172189790}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.0375, y: 1.9618201, z: 1}
+  m_Children: []
+  m_Father: {fileID: 276886069}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -104, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1172189792
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1172189790}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1172189793
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1172189790}
+  m_CullTransparentMesh: 1
 --- !u!1 &1173182073
 GameObject:
   m_ObjectHideFlags: 0
@@ -12137,11 +12289,11 @@ RectTransform:
   m_Children:
   - {fileID: 1629781605}
   m_Father: {fileID: 276886069}
-  m_RootOrder: 2
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -195.30005, y: 3}
+  m_AnchoredPosition: {x: -215, y: 3}
   m_SizeDelta: {x: 200, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1488271443
@@ -24279,6 +24431,18 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 2873263697211128775, guid: 8c9e3b1466f251343934a20aeea28cd0, type: 3}
+      propertyPath: orthographic size
+      value: 2.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2873263698172359513, guid: 8c9e3b1466f251343934a20aeea28cd0, type: 3}
+      propertyPath: orthographic size
+      value: 2.6
+      objectReference: {fileID: 0}
+    - target: {fileID: 2873263698444529689, guid: 8c9e3b1466f251343934a20aeea28cd0, type: 3}
+      propertyPath: orthographic size
+      value: 2.6
+      objectReference: {fileID: 0}
     - target: {fileID: 2873263698492052741, guid: 8c9e3b1466f251343934a20aeea28cd0, type: 3}
       propertyPath: m_Name
       value: test-ellipse

+ 19 - 0
Assets/BowArrow/Scripts/Bluetooth/BluetoothAim.cs

@@ -188,6 +188,9 @@ class AimHandler
     public Ellipse ellipseScript;
     public Toggle ellipseToggle;
 
+    Vector3 cMaxVector = new Vector3(0,0,0);
+    Vector3 cMinVector = new Vector3(0, 0, 0);
+
     //转换读取的数据,无符号->有符号
     float TwoByteToFloat(byte b1, byte b2) 
     {
@@ -339,6 +342,9 @@ class AimHandler
                 {
                     MagCalibrater.Calibration = true;
                     MagCalibrationButton.GetComponentInChildren<Text>().text = "停止地磁计校准";
+
+                    this.cMaxVector = new Vector3(0, 0, 0);
+                    this.cMinVector = new Vector3(0, 0, 0);
                 }
             });
         }
@@ -432,6 +438,19 @@ class AimHandler
             if (MagCalibrater.Calibration)
             {
                 this.ellipseScript.AddAndUpdatePointArray(Mag);
+
+                if (Mag.magnitude > this.cMaxVector.magnitude)
+                {
+                    this.cMaxVector = Mag;
+                }
+                else if (Mag.magnitude < this.cMinVector.magnitude) {
+                    this.cMinVector = Mag;
+                }
+
+                Vector3 _center = this.cMaxVector - this.cMinVector;
+                Debug.LogWarning(_center + " == "+ _center.magnitude);
+                //设置绘制图像相机的对应位置
+                this.ellipseScript.setCameraPos(_center/2);
             }
             Mag = MagCalibrater.Update(Mag);