Отслеживание маркера

Assets/Scenes/Editor2D.unity

@@ -260,6 +260,14 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cc33a39070010f94fb1c2dd721c1286d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Name: 
+  m_EditorClassIdentifier: 
+  id: -1
+  blueBlock: 0
 --- !u!1 &22629138
 GameObject:
   m_ObjectHideFlags: 0
@@ -337,7 +345,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 22629138}
   m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 0, y: 0, z: 4}
+  m_LocalPosition: {x: 0, y: 0, z: 5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -345,7 +353,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 5, y: 10}
+  m_AnchoredPosition: {x: 5, y: 12}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &22629142
@@ -360,25 +368,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 15f63ac17de22e740bdce6c2d3a18986, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  axes: 3
-  sensitivityX: 2
-  sensitivityY: 2
-  minimumX: -360
-  maximumX: 360
-  minimumY: -90
-  maximumY: 90
-  target: {fileID: 1578927729}
-  offset: {x: 0, y: 0, z: 5}
-  sensitivity: 3
-  limit: 90
-  zoom: 0.5
-  zoomMax: 50
-  zoomMin: 0.5
+  axes: 0
   movementSpeed: 0.1
-  rotationSpeed: 4
   smoothness: 0.85
-  targetRotation: {x: 0, y: 0, z: 0, w: 0}
-  dragSpeed: 0.00001
+  target: {fileID: 1578927729}
 --- !u!1 &153530783
 GameObject:
   m_ObjectHideFlags: 0
@@ -906,7 +899,6 @@ GameObject:
   - component: {fileID: 488654198}
   - component: {fileID: 488654197}
   - component: {fileID: 488654196}
-  - component: {fileID: 488654200}
   m_Layer: 5
   m_Name: Panel_Image
   m_TagString: Untagged
@@ -1006,18 +998,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 488654194}
   m_CullTransparentMesh: 0
---- !u!114 &488654200
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 488654194}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cc33a39070010f94fb1c2dd721c1286d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &493986112
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/Location.unity

@@ -3608,25 +3608,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 15f63ac17de22e740bdce6c2d3a18986, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  axes: 3
-  sensitivityX: 2
-  sensitivityY: 2
-  minimumX: -360
-  maximumX: 360
-  minimumY: -90
-  maximumY: 90
-  target: {fileID: 0}
-  offset: {x: 0, y: 0, z: -20}
-  sensitivity: 3
-  limit: 90
-  zoom: 0.5
-  zoomMax: 50
-  zoomMin: 0.5
+  axes: 0
   movementSpeed: 0.1
-  rotationSpeed: 4
   smoothness: 0.85
-  targetRotation: {x: 0, y: 0, z: 0, w: 0}
-  dragSpeed: 2
+  target: {fileID: 0}
 --- !u!114 &534669907
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -8227,24 +8212,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   axes: 3
-  sensitivityX: 2
-  sensitivityY: 2
-  minimumX: -360
-  maximumX: 360
-  minimumY: -90
-  maximumY: 90
-  target: {fileID: 0}
-  offset: {x: 0, y: 0, z: 5}
-  sensitivity: 3
-  limit: 90
-  zoom: 0.5
-  zoomMax: 50
-  zoomMin: 0.5
   movementSpeed: 0.1
-  rotationSpeed: 4
   smoothness: 0.85
-  targetRotation: {x: 0, y: 0, z: 0, w: 0}
-  dragSpeed: 2
+  target: {fileID: 0}
 --- !u!81 &1341786429
 AudioListener:
   m_ObjectHideFlags: 0

Assets/Scripts/Controllers/CameraController.cs

@@ -8,39 +8,18 @@ using UnityEngine.EventSystems;
 /// </summary>
 public class CameraController : MonoBehaviour
 {
-    public enum RotationAxes { MouseXAndY, MouseX, MouseY, RelativeObject, KeyBoard, Mouse, TrackMarker }
-    public RotationAxes axes = RotationAxes.MouseXAndY;
-    public float sensitivityX = 2F;
-    public float sensitivityY = 2F;
-    public float minimumX = -360F;
-    public float maximumX = 360F;
-    public float minimumY = -90F;
-    public float maximumY = 90F;
-    float rotationY = -60F;
+    public enum RotationAxes { Mouse, TrackMarker }
+    public RotationAxes axes = RotationAxes.Mouse;
+    public float movementSpeed = 0.1f;
+    public float smoothness = 0.85f;
 
-    // For camera movement
-    //float CameraPanningSpeed = 10.0f;
+    Vector3 targetPosition;
+    private Vector3 dragOrigin;
 
-    // Target Rotate
     public Transform target;
-    public Vector3 offset;
-    public float sensitivity = 3; // чувствительность мышки
-    public float limit = 90; // ограничение вращения по Y
-    public float zoom = 0.5f; // чувствительность при увеличении, колесиком мышки
-    public float zoomMax = 50; // макс. увеличение
-    public float zoomMin = 0.5f; // мин. увеличение
-    private float X, Y;
-
-
+    
     void Start()
-    {
-        limit = Mathf.Abs(limit);
-        if (limit > 90) limit = 90;
-        if (axes != RotationAxes.Mouse) offset = new Vector3(offset.x, offset.y, offset.z/*-Mathf.Abs(zoomMax) / 2*/);
-        else 
-            offset = transform.position;
-        if(target != null) transform.position = target.position + offset;
-
+    {      
         targetPosition = transform.position;
     }
 
@@ -48,49 +27,14 @@ public class CameraController : MonoBehaviour
     {
         switch (axes)
         {
-            case RotationAxes.KeyBoard:
-                KeyboardsCommands();
-                break;
             case RotationAxes.Mouse:
                 MouseCommands();
                 break;
-            default:
-                MouseInput();
+            case RotationAxes.TrackMarker:
+                TrackMarker();
                 break;
         }
-    }
-
-    void MouseInput()
-    {
-        if (EventSystem.current.IsPointerOverGameObject())
-        {
-            return;
-        }
-
-        if (Input.GetMouseButton(0))
-        {
-        }
-        else if (Input.GetMouseButton(1))
-        {
-            MouseRightClick();
-        }
-        else if (Input.GetMouseButton(2))
-        {
-            MouseMiddleButtonClicked();
-        }
-        else if (Input.GetMouseButtonUp(1))
-        {
-            ShowAndUnlockCursor();
-        }
-        else if (Input.GetMouseButtonUp(2))
-        {
-            ShowAndUnlockCursor();
-        }
-        else
-        {
-            MouseWheeling();
-        }
-    }
+    }   
 
     void ShowAndUnlockCursor()
     {
@@ -102,164 +46,22 @@ public class CameraController : MonoBehaviour
     {
         Cursor.lockState = CursorLockMode.Locked;
         Cursor.visible = false;
-    }
-
-    void MouseMiddleButtonClicked()
-    {
-        HideAndLockCursor();
-        Vector3 NewPosition = new Vector3(Input.GetAxis("Mouse X"), 0, Input.GetAxis("Mouse Y"));
-        Vector3 pos = transform.position;
-        if (NewPosition.x > 0.0f)
-        {
-            pos += transform.right;
-        }
-        else if (NewPosition.x < 0.0f)
-        {
-            pos -= transform.right;
-        }
-        if (NewPosition.z > 0.0f)
-        {
-            pos += transform.forward;
-        }
-        if (NewPosition.z < 0.0f)
-        {
-            pos -= transform.forward;
-        }
-        pos.y = transform.position.y;
-        transform.position = pos;
-    }
-
-    void MouseRightClick()
-    {
-        HideAndLockCursor();
-        switch (axes)
-        {
-            case RotationAxes.MouseXAndY:
-                float rotationX = transform.localEulerAngles.y + Input.GetAxis("Mouse X") * sensitivityX;
-
-                rotationY += Input.GetAxis("Mouse Y") * sensitivityY;
-                rotationY = Mathf.Clamp(rotationY, minimumY, maximumY);
-
-                transform.localEulerAngles = new Vector3(-rotationY, rotationX, 0);
-                break;
-
-            case RotationAxes.MouseX:
-
-                transform.Rotate(0, Input.GetAxis("Mouse X") * sensitivityX, 0);
-                break;
-            case RotationAxes.RelativeObject:
-
-                /*if (Input.GetAxis("Mouse ScrollWheel") > 0) 
-                    offset.z += zoom;
-                else if (Input.GetAxis("Mouse ScrollWheel") < 0) 
-                    offset.z -= zoom;*/
-                //offset.z = Mathf.Clamp(offset.z, -Mathf.Abs(zoomMax), -Mathf.Abs(zoomMin));
-
-                X = transform.localEulerAngles.y + Input.GetAxis("Mouse X") * sensitivity;
-                Y += Input.GetAxis("Mouse Y") * sensitivity;
-                Y = Mathf.Clamp(Y, -limit, limit);
-                transform.localEulerAngles = new Vector3(-Y, X, 0);
-                transform.position = transform.localRotation * offset + target.position;
-                break;
-         
-            default:
-                rotationY += Input.GetAxis("Mouse Y") * sensitivityY;
-                rotationY = Mathf.Clamp(rotationY, minimumY, maximumY);
-
-                transform.localEulerAngles = new Vector3(-rotationY, transform.localEulerAngles.y, 0);
-                break;
-        }
-    }
-
-    void MouseWheeling()
-    {
-        /*Vector3 pos = transform.position;
-        if (Input.GetAxis("Mouse ScrollWheel") < 0)
-        {
-            pos = pos - transform.forward;
-            transform.position = pos;
-        }
-        if (Input.GetAxis("Mouse ScrollWheel") > 0)
-        {
-            pos = pos + transform.forward;
-            transform.position = pos;
-        }*/
-
-        if (Input.GetAxis("Mouse ScrollWheel") > 0)
-        {
-            offset.z += zoom;
-        }
-        else if (Input.GetAxis("Mouse ScrollWheel") < 0)
-            offset.z -= zoom; 
-        offset.z = Mathf.Clamp(offset.z, -Mathf.Abs(zoomMax), -Mathf.Abs(zoomMin));
-
-        transform.position = transform.localRotation * offset + target.position;
-    }
-
-    private Vector3 GetBaseInput()
-    { //returns the basic values, if it's 0 than it's not active.
-        Vector3 p_Velocity = new Vector3();
-        if (Input.GetKey(KeyCode.W))
-        {
-            p_Velocity += new Vector3(0, 0, 1);
-        }
-        if (Input.GetKey(KeyCode.S))
-        {
-            p_Velocity += new Vector3(0, 0, -1);
-        }
-        if (Input.GetKey(KeyCode.A))
-        {
-            p_Velocity += new Vector3(-1, 0, 0);
-        }
-        if (Input.GetKey(KeyCode.D))
-        {
-            p_Velocity += new Vector3(1, 0, 0);
-        }
-        return p_Velocity;
-    }
-
-    private void KeyboardsCommands()
-    {
-        //Keyboard commands
-        //float f = 0.0f;
-        Vector3 p = GetBaseInput();
-      
-
-        p = p * Time.deltaTime;
-        Vector3 newPosition = transform.position;
-        if (Input.GetKey(KeyCode.Space))
-        { //If player wants to move on X and Z axis only
-            transform.Translate(p);
-            newPosition.x = transform.position.x;
-            newPosition.z = transform.position.z;
-            transform.position = newPosition;
-        }
-        else
-        {
-            transform.Translate(p);
-        }
-    }
-
-    public float movementSpeed = 0.1f;
-    public float rotationSpeed = 4f;
-    public float smoothness = 0.85f;
-
-    Vector3 targetPosition;
-
-    public Quaternion targetRotation;
-    float targetRotationY;
-    float targetRotationX;
-
-    public float dragSpeed = 0.00001f;
-    private Vector3 dragOrigin;
+    }     
+   
     private void MouseCommands()
     {
         if (Input.GetKey(KeyCode.W))
+        {
             targetPosition += transform.forward * movementSpeed;
+            Camera.main.orthographicSize += 1;
+        }
         if (Input.GetKey(KeyCode.A))
             targetPosition -= transform.right * movementSpeed;
         if (Input.GetKey(KeyCode.S))
+        {
             targetPosition -= transform.forward * movementSpeed;
+            Camera.main.orthographicSize -= 1;
+        }
         if (Input.GetKey(KeyCode.D))
             targetPosition += transform.right * movementSpeed;
         if (Input.GetKey(KeyCode.Q))
@@ -267,15 +69,11 @@ public class CameraController : MonoBehaviour
         if (Input.GetKey(KeyCode.E))
             targetPosition += transform.up * movementSpeed;
 
-        //
-
         if (Input.GetMouseButtonDown(2))
         {
             dragOrigin = Input.mousePosition;
-            //return;
         }
 
-        //if (!Input.GetMouseButton(2)) return;
 
         if (Input.GetMouseButton(1))
         {    
@@ -284,49 +82,50 @@ public class CameraController : MonoBehaviour
                 targetPosition -= transform.right * movementSpeed * 0.1f;
             if (pos.x>0)
                 targetPosition += transform.right * movementSpeed * 0.1f;
-            if (pos.y > 0)
-                targetPosition -= transform.up * movementSpeed*0.1f;
             if (pos.y < 0)
+                targetPosition -= transform.up * movementSpeed*0.1f;
+            if (pos.y > 0)
                 targetPosition += transform.up * movementSpeed * 0.1f;            
         }
 
         if (Input.GetAxis("Mouse ScrollWheel") > 0)
         {
-            //offset.z += zoom;   
             targetPosition += transform.forward * movementSpeed;
+            Camera.main.orthographicSize += 1;
         }
         else if (Input.GetAxis("Mouse ScrollWheel") < 0)
         {
-            //offset.z -= zoom;
             targetPosition -= transform.forward * movementSpeed;
+            Camera.main.orthographicSize -= 1;
         }
-        //offset.z = Mathf.Clamp(offset.z, -Mathf.Abs(zoomMax), -Mathf.Abs(zoomMin));
-
-        //if (Input.GetAxis("Mouse ScrollWheel") != 0)
-        //{
-
-        //    X = transform.localEulerAngles.y + Input.GetAxis("Mouse X") * sensitivity;
-        //    Y += Input.GetAxis("Mouse Y") * sensitivity;
-        //    Y = Mathf.Clamp(Y, -limit, limit);
-        //    //transform.localEulerAngles = new Vector3(-Y, X, 0);
-        //    transform.position = new Vector3(transform.position.x, Y, transform.position.z);
-         
-        //}
-       
 
-        //transform.position = transform.localRotation * offset;
-
-        //if (Input.GetMouseButton(1))
-        //{ 
-        //    Cursor.visible = false;
-        //    targetRotationY += Input.GetAxis("Mouse X") * rotationSpeed;
-        //    targetRotationX -= Input.GetAxis("Mouse Y") * rotationSpeed;
-        //    targetRotation = Quaternion.Euler(targetRotationX, targetRotationY, 0.0f);
-        //}
-        //else
-        //    Cursor.visible = true;
-
-     transform.position = Vector3.Lerp(transform.position, targetPosition, (1.0f - smoothness));
-        //transform.rotation = Quaternion.Lerp(transform.rotation, targetRotation, (1.0f - smoothness));
+        transform.position = Vector3.Lerp(transform.position, targetPosition, (1.0f - smoothness));
     }   
+
+    void TrackMarker()
+    {
+        if (Input.GetKey(KeyCode.W))
+        {            
+            targetPosition += transform.forward * movementSpeed;
+            Camera.main.orthographicSize += 1;
+        }
+        if (Input.GetKey(KeyCode.S))
+        {
+            targetPosition -= transform.forward * movementSpeed;
+            Camera.main.orthographicSize -= 1;
+        }
+        if (Input.GetAxis("Mouse ScrollWheel") > 0)
+        {
+            targetPosition += transform.forward * movementSpeed;
+            Camera.main.orthographicSize += 1;
+        }
+        else if (Input.GetAxis("Mouse ScrollWheel") < 0)
+        {
+            targetPosition -= transform.forward * movementSpeed;
+            Camera.main.orthographicSize -= 1;
+        }
+        var marker_offset = new Vector3(5, 0, 5);
+        transform.position = Vector3.Lerp(transform.position, targetPosition + target.position - marker_offset, (1.0f - smoothness));
+        if (Input.GetMouseButton(1)) axes = RotationAxes.Mouse;
+    }
 }

Assets/Scripts/Controllers/LabelObjectScript.cs

@@ -16,6 +16,7 @@ public class LabelObjectScript : MonoBehaviour
     void Start()
     {
         //text = Instantiate(Resources.Load("GameObjects/Capsule", typeof(GameObject))) as GameObject;
+        cameraController = Camera.main.GetComponent<CameraController>();
     }
 
     // Update is called once per frame
@@ -40,4 +41,11 @@ public class LabelObjectScript : MonoBehaviour
         text.transform.localPosition = canvasPos;
 
     }
+
+    CameraController cameraController;
+    void OnMouseDown()
+    {
+        cameraController.target = transform;
+        cameraController.axes = CameraController.RotationAxes.TrackMarker;
+    }
 }

Assets/WebGLSupport/WebGLInput/WebGLInput.cs

@@ -1,351 +0,0 @@
-#if UNITY_2018_2_OR_NEWER
-#define TMP_WEBGL_SUPPORT
-#endif
-
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-using System;
-using AOT;
-using System.Runtime.InteropServices; // for DllImport
-using System.Collections;
-
-namespace WebGLSupport
-{
-    class WebGLInputPlugin
-    {
-#if UNITY_WEBGL && !UNITY_EDITOR
-        [DllImport("__Internal")]
-        public static extern int WebGLInputCreate(string canvasId, int x, int y, int width, int height, int fontsize, string text, bool isMultiLine, bool isPassword);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputEnterSubmit(int id, bool flag);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputTab(int id, Action<int, int> cb);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputFocus(int id);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputOnFocus(int id, Action<int> cb);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputOnBlur(int id, Action<int> cb);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputOnValueChange(int id, Action<int, string> cb);
-        
-        [DllImport("__Internal")]
-        public static extern void WebGLInputOnEditEnd(int id, Action<int, string> cb);
-
-        [DllImport("__Internal")]
-        public static extern int WebGLInputSelectionStart(int id);
-
-        [DllImport("__Internal")]
-        public static extern int WebGLInputSelectionEnd(int id);
-
-        [DllImport("__Internal")]
-        public static extern int WebGLInputSelectionDirection(int id);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputSetSelectionRange(int id, int start, int end);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputMaxLength(int id, int maxlength);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputText(int id, string text);
-
-        [DllImport("__Internal")]
-        public static extern bool WebGLInputIsFocus(int id);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLInputDelete(int id);
-#else
-
-        public static int WebGLInputCreate(string canvasId, int x, int y, int width, int height, int fontsize, string text, bool isMultiLine, bool isPassword) { return 0; }
-        public static void WebGLInputEnterSubmit(int id, bool flag) { }
-        public static void WebGLInputTab(int id, Action<int, int> cb) { }
-        public static void WebGLInputFocus(int id) { }
-        public static void WebGLInputOnFocus(int id, Action<int> cb) { }
-        public static void WebGLInputOnBlur(int id, Action<int> cb) { }
-        public static void WebGLInputOnValueChange(int id, Action<int, string> cb) { }
-        public static void WebGLInputOnEditEnd(int id, Action<int, string> cb) { }
-        public static int WebGLInputSelectionStart(int id) { return 0; }
-        public static int WebGLInputSelectionEnd(int id) { return 0; }
-        public static int WebGLInputSelectionDirection(int id) { return 0; }
-        public static void WebGLInputSetSelectionRange(int id, int start, int end) { }
-        public static void WebGLInputMaxLength(int id, int maxlength) { }
-        public static void WebGLInputText(int id, string text) { }
-        public static bool WebGLInputIsFocus(int id) { return false; }
-        public static void WebGLInputDelete(int id) { }
-#endif
-    }
-
-    public class WebGLInput : MonoBehaviour, IComparable<WebGLInput>
-    {
-        static Dictionary<int, WebGLInput> instances = new Dictionary<int, WebGLInput>();
-        public static string CanvasId { get; set; }
-
-        static WebGLInput()
-        {
-#if UNITY_2019_1_OR_NEWER
-            WebGLInput.CanvasId = "unityContainer";
-#else
-            WebGLInput.CanvasId = "gameContainer";
-#endif
-        }
-
-        int id = -1;
-        IInputField input;
-        bool blueBlock = false;
-
-        private IInputField Setup()
-        {
-            if (GetComponent<InputField>()) return new WrappedInputField(GetComponent<InputField>());
-#if TMP_WEBGL_SUPPORT
-            if (GetComponent<TMPro.TMP_InputField>()) return new WrappedTMPInputField(GetComponent<TMPro.TMP_InputField>());
-#endif // TMP_WEBGL_SUPPORT
-            throw new Exception("Can not Setup WebGLInput!!");
-        }
-
-        private void Awake()
-        {
-            input = Setup();
-#if !(UNITY_WEBGL && !UNITY_EDITOR)
-            // WebGL 以外、更新メソッドは動作しないようにします
-            enabled = false;
-#endif
-        }
-        /// <summary>
-        /// 対象が選択されたとき
-        /// </summary>
-        /// <param name="eventData"></param>
-        public void OnSelect(/*BaseEventData eventData*/)
-        {
-            var rect = GetScreenCoordinates(input.TextComponentRectTransform());
-            bool isPassword = input.contentType == ContentType.Password;
-
-            var x = (int)(rect.x);
-            //var y = (int)(Screen.height - (rect.y + rect.height));
-            //id = WebGLInputPlugin.WebGLInputCreate(x, y, (int)rect.width, (int)rect.height, input.textComponent.fontSize, input.text);
-            var y = (int)(Screen.height - (rect.y));
-            id = WebGLInputPlugin.WebGLInputCreate(WebGLInput.CanvasId, x, y, (int)rect.width, (int)1, input.fontSize, input.text, input.lineType != LineType.SingleLine, isPassword);
-
-            instances[id] = this;
-            WebGLInputPlugin.WebGLInputEnterSubmit(id, input.lineType != LineType.MultiLineNewline);
-            WebGLInputPlugin.WebGLInputOnFocus(id, OnFocus);
-            WebGLInputPlugin.WebGLInputOnBlur(id, OnBlur);
-            WebGLInputPlugin.WebGLInputOnValueChange(id, OnValueChange);
-            WebGLInputPlugin.WebGLInputOnEditEnd(id, OnEditEnd);
-            WebGLInputPlugin.WebGLInputTab(id, OnTab);
-            // default value : https://www.w3schools.com/tags/att_input_maxlength.asp
-            WebGLInputPlugin.WebGLInputMaxLength(id, (input.characterLimit > 0) ? input.characterLimit : 524288);
-            WebGLInputPlugin.WebGLInputFocus(id);
-
-            if(input.OnFocusSelectAll)
-            {
-                WebGLInputPlugin.WebGLInputSetSelectionRange(id, 0, input.text.Length);
-            }
-
-            WebGLWindow.OnBlurEvent += OnWindowBlur;
-        }
-
-        void OnWindowBlur()
-        {
-            blueBlock = true;
-        }
-
-        /// <summary>
-        /// 画面内の描画範囲を取得する
-        /// </summary>
-        /// <param name="uiElement"></param>
-        /// <returns></returns>
-        Rect GetScreenCoordinates(RectTransform uiElement)
-        {
-            var worldCorners = new Vector3[4];
-            uiElement.GetWorldCorners(worldCorners);
-
-            // try to support RenderMode:WorldSpace
-            var canvas = uiElement.GetComponentInParent<Canvas>();
-            var hasCamera = (canvas.renderMode != RenderMode.ScreenSpaceOverlay) && (canvas.worldCamera != null);
-            if (canvas && hasCamera )
-            {
-                for (var i = 0; i < worldCorners.Length; i++)
-                {
-                    worldCorners[i] = canvas.worldCamera.WorldToScreenPoint(worldCorners[i]);
-                }
-            }
-
-            var min = new Vector3(float.MaxValue, float.MaxValue);
-            var max = new Vector3(float.MinValue, float.MinValue);
-            for (var i = 0; i < worldCorners.Length; i++)
-            {
-                min.x = Mathf.Min(min.x, worldCorners[i].x);
-                min.y = Mathf.Min(min.y, worldCorners[i].y);
-                max.x = Mathf.Max(max.x, worldCorners[i].x);
-                max.y = Mathf.Max(max.y, worldCorners[i].y);
-            }
-
-            return new Rect(min.x, min.y, max.x - min.x, max.y - min.y);
-        }
-
-        void DeactivateInputField()
-        {
-            WebGLInputPlugin.WebGLInputDelete(id);
-            input.DeactivateInputField();
-            instances.Remove(id);
-            id = -1;    // reset id to -1;
-            WebGLWindow.OnBlurEvent -= OnWindowBlur;
-        }
-
-        [MonoPInvokeCallback(typeof(Action<int>))]
-        static void OnFocus(int id)
-        {
-#if UNITY_WEBGL && !UNITY_EDITOR
-            UnityEngine.WebGLInput.captureAllKeyboardInput = false;
-#endif
-        }
-
-        [MonoPInvokeCallback(typeof(Action<int>))]
-        static void OnBlur(int id)
-        {
-#if UNITY_WEBGL && !UNITY_EDITOR
-            UnityEngine.WebGLInput.captureAllKeyboardInput = true;
-#endif
-            instances[id].StartCoroutine(Blue(id));
-        }
-        static IEnumerator Blue(int id)
-        {
-            yield return null;
-            if (!instances.ContainsKey(id)) yield break;
-
-            var block = instances[id].blueBlock;    // get blue block state
-            instances[id].blueBlock = false;        // reset instalce block state
-            if (block) yield break;                 // if block. break it!!
-
-            instances[id].DeactivateInputField();
-        }
-
-        [MonoPInvokeCallback(typeof(Action<int, string>))]
-        static void OnValueChange(int id, string value)
-        {
-            if (!instances.ContainsKey(id)) return;
-
-            var instance = instances[id];
-            var index = instance.input.caretPosition;
-            if(!instance.input.ReadOnly)
-            {
-                instance.input.text = value;
-            }
-            
-
-            // InputField.ContentType.Name が Name の場合、先頭文字が強制的大文字になるため小文字にして比べる
-            if (instance.input.contentType == ContentType.Name)
-            {
-                if (string.Compare(instance.input.text, value, true) == 0)
-                {
-                    value = instance.input.text;
-                }
-            }
-
-            // InputField の ContentType による整形したテキストを HTML の input に再設定します
-            if (value != instance.input.text)
-            {
-                WebGLInputPlugin.WebGLInputText(id, instance.input.text);
-                WebGLInputPlugin.WebGLInputSetSelectionRange(id, index, index);
-            }
-        }
-        [MonoPInvokeCallback(typeof(Action<int, string>))]
-        static void OnEditEnd(int id, string value)
-        {
-            if (!instances[id].input.ReadOnly)
-            {
-                instances[id].input.text = value;
-            }
-        }
-        [MonoPInvokeCallback(typeof(Action<int, int>))]
-        static void OnTab(int id, int value)
-        {
-            WebGLInputTabFocus.OnTab(instances[id], value);
-        }
-
-        void Update()
-        {
-            if (input == null || !input.isFocused) return;
-            // 未登録の場合、選択する
-            if (!instances.ContainsKey(id))
-            {
-                OnSelect();
-            } else if(!WebGLInputPlugin.WebGLInputIsFocus(id))
-            {
-                // focus this id
-                WebGLInputPlugin.WebGLInputFocus(id);
-            }
-
-            var start = WebGLInputPlugin.WebGLInputSelectionStart(id);
-            var end = WebGLInputPlugin.WebGLInputSelectionEnd(id);
-            // 選択方向によって設定します
-            if (WebGLInputPlugin.WebGLInputSelectionDirection(id) == -1)
-            {
-                input.selectionFocusPosition = start;
-                input.selectionAnchorPosition = end;
-            }
-            else
-            {
-                input.selectionFocusPosition = end;
-                input.selectionAnchorPosition = start;
-            }
-
-            input.Rebuild(CanvasUpdate.LatePreRender);
-            input.SetAllDirty();
-        }
-        private void OnEnable()
-        {
-            WebGLInputTabFocus.Add(this);
-        }
-        private void OnDisable()
-        {
-            WebGLInputTabFocus.Remove(this);
-        }
-        public int CompareTo(WebGLInput other)
-        {
-            var a = GetScreenCoordinates(input.TextComponentRectTransform());
-            var b = GetScreenCoordinates(other.input.TextComponentRectTransform());
-            var res = b.y.CompareTo(a.y);
-            if (res == 0) res = a.x.CompareTo(b.x);
-            return res;
-        }
-
-        /// <summary>
-        /// to manage tab focus
-        /// base on scene position
-        /// </summary>
-        static class WebGLInputTabFocus
-        {
-            static List<WebGLInput> inputs = new List<WebGLInput>();
-
-            public static void Add(WebGLInput input)
-            {
-                inputs.Add(input);
-                inputs.Sort();
-            }
-
-            public static void Remove(WebGLInput input)
-            {
-                inputs.Remove(input);
-            }
-
-            public static void OnTab(WebGLInput input, int value)
-            {
-                if (inputs.Count <= 1) return;
-                var index = inputs.IndexOf(input);
-                index += value;
-                if (index < 0) index = inputs.Count - 1;
-                else if (index >= inputs.Count) index = 0;
-                inputs[index].input.ActivateInputField();
-            }
-        }
-    }
-}

Assets/WebGLSupport/WebGLInput/WebGLInput.jslib

@@ -1,118 +0,0 @@
-var WebGLInput = {
-    $instances: [],
-
-    WebGLInputCreate: function (canvasId, x, y, width, height, fontsize, text, isMultiLine, isPassword) {
-        var container = document.getElementById(Pointer_stringify(canvasId));
-        var input = document.createElement(isMultiLine?"textarea":"input");
-        input.style.position = "absolute";
-        input.style.top = y + "px";
-        input.style.left = x + "px";
-        input.style.width = width + "px";
-        input.style.height = height + "px";
-        input.style.backgroundColor = '#00000000';
-        input.style.color = '#00000000';
-        input.style.outline = "none";
-		input.style.border = "hidden";
-		input.style.opacity = 0;
-		input.style.cursor = "default";
-		input.spellcheck = false;
-		input.value = Pointer_stringify(text);
-		input.style.fontSize = fontsize + "px";
-		//input.setSelectionRange(0, input.value.length);
-		
-		if(isPassword){
-			input.type = 'password';
-		}
-
-        container.appendChild(input);
-        return instances.push(input) - 1;
-    },
-	WebGLInputEnterSubmit: function(id, falg){
-		var input = instances[id];
-		// for enter key
-		input.addEventListener('keydown', function(e) {
-			if ((e.which && e.which === 13) || (e.keyCode && e.keyCode === 13)) {
-				if(falg)
-				{
-					e.preventDefault();
-					input.blur();
-				}
-			}
-		});
-    },
-	WebGLInputTab:function(id, cb) {
-		var input = instances[id];
-		// for tab key
-        input.addEventListener('keydown', function (e) {
-            if ((e.which && e.which === 9) || (e.keyCode && e.keyCode === 9)) {
-                e.preventDefault();
-                Runtime.dynCall("vii", cb, [id, e.shiftKey ? -1 : 1]);
-            }
-		});
-	},
-	WebGLInputFocus: function(id){
-		var input = instances[id];
-		input.focus();
-    },
-    WebGLInputOnFocus: function (id, cb) {
-        var input = instances[id];
-        input.onfocus = function () {
-            Runtime.dynCall("vi", cb, [id]);
-        };
-    },
-    WebGLInputOnBlur: function (id, cb) {
-        var input = instances[id];
-        input.onblur = function () {
-            Runtime.dynCall("vi", cb, [id]);
-        };
-    },
-	WebGLInputIsFocus: function (id) {
-		return instances[id] === document.activeElement;
-	},
-	WebGLInputOnValueChange:function(id, cb){
-        var input = instances[id];
-        input.oninput = function () {
-			var value = allocate(intArrayFromString(input.value), 'i8', ALLOC_NORMAL);
-            Runtime.dynCall("vii", cb, [id,value]);
-        };
-    },
-	WebGLInputOnEditEnd:function(id, cb){
-        var input = instances[id];
-        input.onchange = function () {
-			var value = allocate(intArrayFromString(input.value), 'i8', ALLOC_NORMAL);
-            Runtime.dynCall("vii", cb, [id,value]);
-        };
-    },
-	WebGLInputSelectionStart:function(id){
-        var input = instances[id];
-		return input.selectionStart;
-	},
-	WebGLInputSelectionEnd:function(id){
-        var input = instances[id];
-		return input.selectionEnd;
-	},
-	WebGLInputSelectionDirection:function(id){
-        var input = instances[id];
-		return (input.selectionDirection == "backward")?-1:1;
-	},
-	WebGLInputSetSelectionRange:function(id, start, end){
-		var input = instances[id];
-		input.setSelectionRange(start, end);
-	},
-	WebGLInputMaxLength:function(id, maxlength){
-        var input = instances[id];
-		input.maxLength = maxlength;
-	},
-	WebGLInputText:function(id, text){
-        var input = instances[id];
-		input.value = Pointer_stringify(text);
-	},
-	WebGLInputDelete:function(id){
-        var input = instances[id];
-        input.parentNode.removeChild(input);
-        instances[id] = null;
-    },
-}
-
-autoAddDeps(WebGLInput, '$instances');
-mergeInto(LibraryManager.library, WebGLInput);

Assets/WebGLSupport/WebGLInput/Wrapper/IInputField.cs

@@ -1,45 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace WebGLSupport
-{
-    public enum ContentType
-    {
-        Standard = 0,
-        Autocorrected = 1,
-        IntegerNumber = 2,
-        DecimalNumber = 3,
-        Alphanumeric = 4,
-        Name = 5,
-        EmailAddress = 6,
-        Password = 7,
-        Pin = 8,
-        Custom = 9
-    }
-    public enum LineType
-    {
-        SingleLine = 0,
-        MultiLineSubmit = 1,
-        MultiLineNewline = 2
-    }
-    public interface IInputField
-    {
-        ContentType contentType { get; }
-        LineType lineType { get; }
-        int fontSize { get; }
-        string text { get; set; }
-        int characterLimit { get; }
-        int caretPosition { get; }
-        bool isFocused { get; }
-        int selectionFocusPosition { set; }
-        int selectionAnchorPosition { set; }
-        bool ReadOnly { get; }
-        bool OnFocusSelectAll { get; }
-
-        RectTransform TextComponentRectTransform();
-        void ActivateInputField();
-        void DeactivateInputField();
-        void Rebuild(CanvasUpdate update);
-        void SetAllDirty();
-    }
-}

Assets/WebGLSupport/WebGLInput/Wrapper/WrappedInputField.cs

@@ -1,97 +0,0 @@
-using UnityEngine;
-using UnityEngine.UI;
-
-namespace WebGLSupport
-{
-    /// <summary>
-    /// Wrapper for UnityEngine.UI.InputField
-    /// </summary>
-    class WrappedInputField : IInputField
-    {
-        InputField input;
-
-        public bool ReadOnly { get { return input.readOnly; } }
-
-        public string text
-        {
-            get { return input.text; }
-            set { input.text = value; }
-        }
-
-        public int fontSize
-        {
-            get { return input.textComponent.fontSize; }
-        }
-
-        public ContentType contentType
-        {
-            get { return (ContentType)input.contentType; }
-        }
-
-        public LineType lineType
-        {
-            get { return (LineType)input.lineType; }
-        }
-
-        public int characterLimit
-        {
-            get { return input.characterLimit; }
-        }
-
-        public int caretPosition
-        {
-            get { return input.caretPosition; }
-        }
-
-        public bool isFocused
-        {
-            get { return input.isFocused; }
-        }
-
-        public int selectionFocusPosition
-        {
-            set { input.selectionFocusPosition = value; }
-        }
-
-        public int selectionAnchorPosition
-        {
-            set { input.selectionAnchorPosition = value; }
-        }
-
-        public bool OnFocusSelectAll
-        {
-            get { return true; }
-        }
-
-        public WrappedInputField(InputField input)
-        {
-            this.input = input;
-        }
-
-        public RectTransform TextComponentRectTransform()
-        {
-            return input.textComponent.GetComponent<RectTransform>();
-        }
-
-        public void ActivateInputField()
-        {
-            input.ActivateInputField();
-        }
-
-        public void DeactivateInputField()
-        {
-            input.DeactivateInputField();
-        }
-
-        public void Rebuild(CanvasUpdate update)
-        {
-            input.Rebuild(update);
-        }
-
-        public void SetAllDirty()
-        {
-            input.textComponent.SetAllDirty();
-        }
-    }
-
-}

Assets/WebGLSupport/WebGLInput/Wrapper/WrappedTMPInputField.cs

@@ -1,105 +0,0 @@
-#if UNITY_2018_2_OR_NEWER
-#define TMP_WEBGL_SUPPORT
-#endif
-
-#if TMP_WEBGL_SUPPORT
-using UnityEngine;
-using UnityEngine.UI;
-using TMPro;
-
-namespace WebGLSupport
-{
-    /// <summary>
-    /// Wrapper for TMPro.TMP_InputField
-    /// </summary>
-    class WrappedTMPInputField : IInputField
-    {
-        TMP_InputField input;
-
-        public bool ReadOnly { get { return input.readOnly; } }
-
-        public string text
-        {
-            get { return input.text; }
-            set { input.text = value; }
-        }
-
-        public int fontSize
-        {
-            get { return (int)input.textComponent.fontSize; }
-        }
-
-        public ContentType contentType
-        {
-            get { return (ContentType)input.contentType; }
-        }
-
-        public LineType lineType
-        {
-            get { return (LineType)input.lineType; }
-        }
-
-        public int characterLimit
-        {
-            get { return input.characterLimit; }
-        }
-
-        public int caretPosition
-        {
-            get { return input.caretPosition; }
-        }
-
-        public bool isFocused
-        {
-            get { return input.isFocused; }
-        }
-
-        public int selectionFocusPosition
-        {
-            set { input.selectionFocusPosition = value; }
-        }
-
-        public int selectionAnchorPosition
-        {
-            set { input.selectionAnchorPosition = value; }
-        }
-
-        public bool OnFocusSelectAll
-        {
-            get { return input.onFocusSelectAll; }
-        }
-
-        public WrappedTMPInputField(TMP_InputField input)
-        {
-            this.input = input;
-        }
-
-        public RectTransform TextComponentRectTransform()
-        {
-            return input.textComponent.GetComponent<RectTransform>();
-        }
-
-        public void ActivateInputField()
-        {
-            input.ActivateInputField();
-        }
-
-        public void DeactivateInputField()
-        {
-            input.DeactivateInputField();
-        }
-
-        public void Rebuild(CanvasUpdate update)
-        {
-            input.Rebuild(update);
-        }
-
-        public void SetAllDirty()
-        {
-            input.textComponent.SetAllDirty();
-        }
-    }
-
-}
-
-#endif // TMP_WEBGL_SUPPORT

Assets/WebGLSupport/WebGLWindow/WebGLWindow.cs

@@ -1,57 +0,0 @@
-using System;
-using AOT;
-using System.Runtime.InteropServices; // for DllImport
-using UnityEngine;
-
-namespace WebGLSupport
-{
-    static class WebGLWindowPlugin
-    {
-#if UNITY_WEBGL && !UNITY_EDITOR
-        [DllImport("__Internal")]
-        public static extern void WebGLWindowOnFocus(Action cb);
-
-        [DllImport("__Internal")]
-        public static extern void WebGLWindowOnBlur(Action cb);
-
-#else
-        public static void WebGLWindowOnFocus(Action cb) { }
-        public static void WebGLWindowOnBlur(Action cb) { }
-#endif
-
-    }
-
-    public static class WebGLWindow
-    {
-        public static bool Focus { get; private set; }
-        public static event Action OnFocusEvent = () => { };
-        public static event Action OnBlurEvent = () => { };
-
-        static void Init()
-        {
-            Focus = true;
-            WebGLWindowPlugin.WebGLWindowOnFocus(OnWindowFocus);
-            WebGLWindowPlugin.WebGLWindowOnBlur(OnWindowBlur);
-        }
-
-        [MonoPInvokeCallback(typeof(Action))]
-        static void OnWindowFocus()
-        {
-            Focus = true;
-            OnFocusEvent();
-        }
-
-        [MonoPInvokeCallback(typeof(Action))]
-        static void OnWindowBlur()
-        {
-            Focus = false;
-            OnBlurEvent();
-        }
-
-        [RuntimeInitializeOnLoadMethod]
-        static void RuntimeInitializeOnLoadMethod()
-        {
-            Init();
-        }
-    }
-}

Assets/WebGLSupport/WebGLWindow/WebGLWindow.jslib

@@ -1,14 +0,0 @@
-var WebGLWindow = {
-    WebGLWindowOnFocus: function (cb) {
-        window.addEventListener('focus', function () {
-            Runtime.dynCall("v", cb, []);
-        });
-    },
-    WebGLWindowOnBlur: function (cb) {
-        window.addEventListener('blur', function () {
-            Runtime.dynCall("v", cb, []);
-        });
-    },
-}
-
-mergeInto(LibraryManager.library, WebGLWindow);

ProjectSettings/EditorBuildSettings.asset

@@ -8,10 +8,10 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/Location.unity
     guid: c0b38db15ebfc8b4fbd5046c1b62bfd8
-  - enabled: 1
-    path: Assets/Scenes/Editor3D.unity
-    guid: ef6a7447f6450d2439c4e8ac7471e6bc
   - enabled: 1
     path: Assets/Scenes/Editor2D.unity
     guid: 30de5117aa1ad344398e2b3c802389e3
+  - enabled: 1
+    path: Assets/Scenes/Editor3D.unity
+    guid: ef6a7447f6450d2439c4e8ac7471e6bc
   m_configObjects: {}