Browse Source

Проектирование сетки

Виктор Шейко 4 years ago
parent
commit
bdac55651c

+ 33 - 0
Assets/Scenes/Editor2D.unity

@@ -362,6 +362,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   axes: 0
   movementSpeed: 0.1
+  mouseSpeed: 4
   smoothness: 0.85
   target: {fileID: 1578927729}
 --- !u!1 &153530783
@@ -878,6 +879,36 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 376672378}
   m_CullTransparentMesh: 0
+--- !u!1 &439042231
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 439042233}
+  m_Layer: 0
+  m_Name: Grid By Kilosoft
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &439042233
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 439042231}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &488654194
 GameObject:
   m_ObjectHideFlags: 0
@@ -1828,6 +1859,8 @@ MonoBehaviour:
   SizeX: {fileID: 265782952}
   SizeY: {fileID: 2088359224}
   plane: {fileID: 2121551164}
+  Grid: {fileID: 439042231}
+  Length: 20
 --- !u!1 &1497404089
 GameObject:
   m_ObjectHideFlags: 0

+ 2 - 0
Assets/Scenes/Location.unity

@@ -3610,6 +3610,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   axes: 0
   movementSpeed: 0.1
+  mouseSpeed: 4
   smoothness: 0.85
   target: {fileID: 0}
 --- !u!114 &534669907
@@ -8213,6 +8214,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   axes: 3
   movementSpeed: 0.1
+  mouseSpeed: 4
   smoothness: 0.85
   target: {fileID: 0}
 --- !u!81 &1341786429

+ 43 - 0
Assets/Scripts/Components/Grid.cs

@@ -0,0 +1,43 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Grid : MonoBehaviour
+{
+    // Start is called before the first frame update
+    void Start()
+    {
+        
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+    //public override void OnInspectorGUI()
+    //{
+    //    //grid = (Grid)target;
+
+    //    //EditorGUILayout.LabelField("Настройка шага:", EditorStyles.boldLabel);
+    //    //grid.Width = EditorGUILayout.FloatField("По оси X", grid.Width);
+    //    //grid.Height = EditorGUILayout.FloatField("По оси Y", grid.Height);
+    //    //grid.Length = EditorGUILayout.FloatField("По оси Y", grid.Length);
+    //    //grid.Draw = EditorGUILayout.Toggle("Показывать", grid.Draw);
+
+    //    //EditorGUILayout.LabelField("Настройка сетки:", EditorStyles.boldLabel);
+    //    //grid.CountLines = EditorGUILayout.IntSlider("Кол-во линий", (int)grid.CountLines, 1, 1000);
+
+    //    //EditorGUILayout.LabelField("Выбранные объекты:", EditorStyles.boldLabel);
+    //    //foreach (var obj in objects)
+    //    //{
+    //    //    EditorGUILayout.TextField("Имя объекта:", obj.name);
+    //    //}
+
+    //    //grid.name = "Grid By Kilosoft";
+    //    //EditorUtility.SetDirty(grid);
+
+    //    //EditorGUILayout.LabelField("О программе:", EditorStyles.boldLabel);
+    //    //EditorGUILayout.LabelField("Name: Grid By Kilosoft\nAuthor: Kilosoft\nVersion: 0.1", EditorStyles.helpBox);
+    //}
+}

+ 72 - 2
Assets/Scripts/Controllers/Editor2DController.cs

@@ -12,11 +12,13 @@ public class Editor2DController : MonoBehaviour
     public InputField SizeY;
     public GameObject plane;
 
-    CultureInfo culture = CultureInfo.CreateSpecificCulture("eu-ES");
+    public GameObject Grid;
+    public float Length = 20;
+
     // Start is called before the first frame update
     void Start()
     {
-        
+        CreateGrid(10);
     }
 
     // Update is called once per frame
@@ -50,4 +52,72 @@ public class Editor2DController : MonoBehaviour
     {
         SceneManager.LoadScene("Location");
     }
+
+    public void CreateGrid(int l)
+    {
+        float s = -0.5f;
+
+        for (int i = 0; i < l; i++)
+        {
+            var posX = new Vector3(0, 0, i);
+            var positionX_start = new Vector3(0, 0, i);
+            var positionX_end = new Vector3(Length, 0, i);            
+            var LineX = NewLine(posX, positionX_start, positionX_end, "LineX_" + i);
+            LineX.transform.parent = Grid.transform;
+
+            var posY = new Vector3(i, 0, 0);
+            var positionY_start = new Vector3(i, 0, 0);
+            var positionY_end = new Vector3(i, Length, 0);
+            var LineY = NewLine(posY, positionY_start, positionY_end, "LineY_" + i);
+            LineY.transform.parent = Grid.transform;
+
+            //var positionY_start = new Vector3(i, 10, 0);
+            //var positionY_end = new Vector3(i, 10, 0);
+            //var LineY = NewLine(pos, positionY_start, positionY_end, "LineY_" + i);
+            //LineY.transform.parent = Grid.transform;
+
+            //var positionZ_start = new Vector3(i, 0, 10);
+            //var positionZ_end = new Vector3(i, 0, 10);
+            //var LineZ = NewLine(pos, positionZ_start, positionZ_end, "LineZ_" + i);
+            //LineZ.transform.parent = Grid.transform;
+
+            //if (positionX.y == 0)
+            //{
+            //    var cubeRendererX = LineX.GetComponent<Renderer>();
+            //    cubeRendererX.material.SetColor("_Color", Color.red);
+
+            //    LineX_zero = LineX;
+            //    cubeRendererX_zero = LineX_zero.GetComponent<Renderer>();
+            //}
+
+            //if (positionY.x == 0)
+            //{
+            //    var cubeRendererY = LineY.GetComponent<Renderer>();
+            //    cubeRendererY.material.SetColor("_Color", Color.green);
+
+            //    LineY_zero = LineY;
+            //    cubeRendererY_zero = LineY_zero.GetComponent<Renderer>();
+            //}
+
+            s += 0.05f;
+        }
+    }
+
+    LineRenderer NewLine(Vector3 pos, Vector3 start, Vector3 end, string name_line)
+    {
+        var line = Instantiate(Resources.Load("GameObjects/Line", typeof(LineRenderer))) as LineRenderer;
+        line.transform.position = pos;
+        line.name = name_line;
+        line.SetPosition(line.positionCount++, start);
+        line.SetPosition(line.positionCount++, end);
+        line.startColor = Color.gray;
+        line.endColor = Color.gray;
+        line.material.color = Color.gray;
+
+        //line.name = name_line;
+        //line.transform.localScale = localScale;
+        //line.transform.position = position;
+
+        return line;
+    }
 }

+ 9 - 21
Assets/Scripts/Controllers/WorkerController.cs

@@ -45,18 +45,6 @@ public class WorkerController : MonoBehaviour
 
     static Client client = new Client();
 
-    Dropdown Year;
-    Dropdown Month;
-    Dropdown Day;
-    //DateTime Date
-    //{
-    //    get
-    //    {
-    //        var date = new DateTime(int.Parse(Year.options[Year.value].text), int.Parse(Month.options[Month.value].text), int.Parse(Day.options[Day.value].text));
-    //        return date;
-    //    }
-    //}
-
     DateTimePicker Date;
 
     public List<GameObject> maps;
@@ -66,8 +54,8 @@ public class WorkerController : MonoBehaviour
     //bool real_time = false;
     //bool history_start = false;
     float interpolationPeriod = 0.1f;
-    float next_time = 0;
-    float time = 0;
+    float time_realtime = 0;
+    float time_draw = 0;
 
     //List<bool> StartStop = new List<bool>();
 
@@ -162,19 +150,20 @@ public class WorkerController : MonoBehaviour
                 // moving.Add(true);
 
                 //if (markers.Count - 1 == m.i)
-                time += Time.deltaTime;
-                if (time >= interpolationPeriod)
+                time_draw += Time.deltaTime;
+                if (time_draw >= interpolationPeriod)
                 {
-                    time -= interpolationPeriod;
+                    time_draw -= interpolationPeriod;
 
                     StartingAccPositiong(m);
                 }
             }
         }
 
-
-        if (active_mode == Mode.RealTime && !inputField_location.text.Equals("") && Time.time >= next_time)
+        time_realtime += Time.deltaTime;
+        if (active_mode == Mode.RealTime && !inputField_location.text.Equals("") && time_realtime >= interpolationPeriod)
         {
+            time_realtime -= interpolationPeriod;
             //var dateNow = DateTime.UtcNow.AddHours(3);
             //Time.GetComponent<Text>().text = dateNow.ToString();
             starting.Add(true);
@@ -189,7 +178,6 @@ public class WorkerController : MonoBehaviour
                     end_send[m.acc_id] = false;
                 }
             }
-            next_time++;
         }
 
 
@@ -445,7 +433,7 @@ public class WorkerController : MonoBehaviour
         {
             newPositions[i] = lineRenderer.GetPosition(i + 1);
         }
-
+        
         lineRenderer.SetPositions(newPositions);
         return lineRenderer;
     }