Merge pull request #16 from Synesthesias/release/v2.1.0

Release/v2.1.0

Author: tomoki-suzuki-syn

Documentation~/Sandbox Images/asset_cannot_be_placed_to_building.png

@@ -108,6 +108,12 @@ public static void BorderLine()
             EditorGUI.DrawRect(borderRect, PlateauToolkitGUIStyles.k_LineColor);
         }
 
+        public static void BorderLine(Color color, float height = 1f)
+        {
+            Rect borderRect = EditorGUILayout.GetControlRect(false, height, PlateauToolkitGUIStyles.BorderStyle);
+            EditorGUI.DrawRect(borderRect, color);
+        }
+
         public static void Title(float windowWidth, string label)
         {
             EditorGUILayout.Space(15);
@@ -303,6 +309,30 @@ public bool TabButton(
             return button;
         }
 
+        public bool TabButton(string label)
+        {
+            float scopeWidth = m_IsPositionCenter ? 0 : m_Width;
+            using (var scope = new EditorGUILayout.HorizontalScope(GUILayout.Height(m_Height), GUILayout.Width(scopeWidth)))
+            {
+                GUILayout.FlexibleSpace();
+
+                float centerY = (scope.rect.height - m_Height) / 2;
+                float centerX = (scope.rect.width - m_Width) / 2;
+                var buttonRect = new Rect(scope.rect.x + centerX, scope.rect.y + centerY, m_Width, m_Height);
+
+                GUI.DrawTexture(buttonRect, WhiteTexture, ScaleMode.StretchToFill, true, 0, m_Color, new Vector4(), new Vector4(6f, 6f, 0f, 0f));
+
+                bool button = GUILayout.Button(
+                    label,
+                    PlateauToolkitGUIStyles.ButtonStyle,
+                    GUILayout.Height(m_Height),
+                    GUILayout.Width(m_Width));
+
+                GUILayout.FlexibleSpace();
+                return button;
+            }
+        }
+
         public bool Button(string label)
         {
             float scopeWidth = m_IsPositionCenter ? 0 : m_Width;

Documentation~/Sandbox Images/asset_placed_to_building.png

@@ -629,7 +629,7 @@ public Vector3 CalculateSunDirection(DateTime dateTime, float latitude, float lo
                 Math.Cos(elipticalLongitude));
             double declination = Math.Asin(
                 Math.Sin(rightAscension) * Math.Sin(obliquity));
-            double hourAngle = NormalizeAngle(siderealTime * Math.PI / 180.0) - rightAscension;
+            double hourAngle = rightAscension - NormalizeAngle(siderealTime * Math.PI / 180.0);
 
             if (hourAngle > Math.PI)
             {

Documentation~/Sandbox Images/building_settings_apartment.png

@@ -0,0 +1,217 @@
+using PlateauToolkit.Editor;
+using PlateauToolkit.Sandbox.Runtime.ElectricPost;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.Events;
+using EditorGUILayout = UnityEditor.EditorGUILayout;
+
+namespace PlateauToolkit.Sandbox.Editor
+{
+    /// <summary>
+    /// 電柱コンポーネントのGUI表示
+    /// </summary>
+    public class PlateauSandboxElectricPostConnectionGUI
+    {
+        public PlateauSandboxElectricPostConnectionGUI(PlateauSandboxElectricPost own, bool isFront)
+        {
+            m_Context = PlateauSandboxElectricPostContext.GetCurrent();
+            m_Own = own;
+            m_IsFront = isFront;
+        }
+        private PlateauSandboxElectricPostContext m_Context;
+        private PlateauSandboxElectricPost m_Own;
+        private bool m_IsFront;
+        private int m_SelectingIndex = -1;
+
+        public UnityEvent<PlateauSandboxElectricPost> OnDirectSelect = new ();
+        public UnityEvent<bool> OnClickSelect = new ();
+
+        public void DrawLayout(List<PlateauSandboxElectricConnectInfo> connectedPosts)
+        {
+            GUILayout.Space(5);
+            PlateauToolkitEditorGUILayout.BorderLine();
+            GUILayout.Space(5);
+
+            // タイトル
+            DrawTitle();
+
+            // 接続先の電柱
+            if (connectedPosts != null)
+            {
+                foreach (var connectedPost in connectedPosts.ToList())
+                {
+                    PlateauSandboxElectricPost selectingPost = null;
+
+                    GUILayout.Space(5);
+                    selectingPost = DrawConnectedPost(connectedPost.m_OwnIndex, connectedPost.m_Target);
+                    GUILayout.Space(5);
+
+                    using (new EditorGUILayout.HorizontalScope())
+                    {
+                        if (selectingPost != null)
+                        {
+                            DrawIsConnectedFront(connectedPost.m_OwnIndex, selectingPost);
+                        }
+                    }
+
+                    GUILayout.Space(5);
+                    using (new EditorGUILayout.HorizontalScope())
+                    {
+                        GUILayout.FlexibleSpace();
+                        DrawSelectButton(connectedPost.m_OwnIndex, selectingPost);
+                        GUILayout.Space(5);
+                        DrawDeleteButton(connectedPost.m_OwnIndex, selectingPost);
+                    }
+
+                    GUILayout.Space(5);
+                }
+            }
+
+            // 追加ボタン
+            GUILayout.Space(15);
+            using (new EditorGUILayout.HorizontalScope())
+            {
+                GUILayout.FlexibleSpace();
+                DrawAddButton();
+                GUILayout.FlexibleSpace();
+            }
+            GUILayout.Space(10);
+        }
+
+        public void DrawTitle()
+        {
+            // タイトル
+            EditorGUILayout.LabelField(m_IsFront ? "前方接続部" : "後方接続部", EditorStyles.boldLabel);
+        }
+
+        public PlateauSandboxElectricPost DrawConnectedPost(int index, PlateauSandboxElectricPost target)
+        {
+            string focusName = "";
+            if (target != null)
+            {
+                // フォーカス時の名前を設定
+                focusName = $"{target.name}_{index}";
+                GUI.SetNextControlName(focusName);
+            }
+
+            // 接続先の電柱
+            var selectedPost = EditorGUILayout.ObjectField(
+                                   "",
+                                   target,
+                                   typeof(PlateauSandboxElectricPost), true) as PlateauSandboxElectricPost;
+
+            if (selectedPost != null &&
+                selectedPost != target &&
+                selectedPost != m_Own)
+            {
+                // ドロップで直接セット
+                bool isOtherFront = selectedPost.IsTargetFacingForward(selectedPost.gameObject.transform.position);
+                int otherIndex = selectedPost.AddConnectionAndWires(isOtherFront);
+
+                string wireID = m_Own.GetWireID();
+                m_Own.SetConnectPoint(selectedPost, m_IsFront, isOtherFront, index, wireID, otherIndex);
+                selectedPost.SetConnectPoint(m_Own, isOtherFront, m_IsFront, otherIndex, wireID, index);
+            }
+
+            // Deleteイベント
+            if (Event.current.keyCode == KeyCode.Delete ||
+                Event.current.keyCode == KeyCode.Backspace)
+            {
+                if (GUI.GetNameOfFocusedControl() == focusName)
+                {
+                    // 選択をnullに設定
+                    var post = m_Own.GetConnectedPost(m_IsFront, index);
+                    selectedPost?.ResetConnection(post.m_IsTargetFront, post.m_TargetIndex);
+                    m_Own.ResetConnection(m_IsFront, index);
+                }
+            }
+
+            return selectedPost;
+        }
+
+        private void DrawIsConnectedFront(int count, PlateauSandboxElectricPost target)
+        {
+            var post = m_Own.GetConnectedPost(m_IsFront, count);
+
+            GUI.enabled = false;
+            string text = post.m_IsTargetFront ? "接続部：前方" : "接続部：後方";
+            EditorGUILayout.LabelField(text);
+            GUI.enabled = true;
+        }
+
+        private void DrawSelectButton(int index, PlateauSandboxElectricPost other)
+        {
+            bool isSelect = index == m_SelectingIndex;
+            if (new PlateauToolkitImageButtonGUI(
+                    100,
+                    20,
+                    isSelect ? PlateauToolkitGUIStyles.k_ButtonCancelColor : PlateauToolkitGUIStyles.k_ButtonNormalColor,
+                    false)
+                .Button("選択する"))
+            {
+                // 選択時
+                if (!isSelect)
+                {
+                    // ワイヤーを外す
+                    var post = m_Own.GetConnectedPost(m_IsFront, index);
+                    other?.ResetConnection(post.m_IsTargetFront, post.m_TargetIndex);
+                    m_Own.ResetConnection(m_IsFront, index);
+
+                    // ワイヤーを非表示に
+                    m_Own.HideWire(m_IsFront, index);
+                    other?.HideWire(post.m_IsTargetFront, post.m_TargetIndex);
+
+                    m_SelectingIndex = index;
+                    m_Context.SetSelectingPost(m_Own, m_IsFront, index);
+                }
+                else
+                {
+                    m_SelectingIndex = -1;
+                    m_Context.ResetSelect();
+                }
+                OnClickSelect.Invoke(m_SelectingIndex >= 0);
+            }
+        }
+
+        private void DrawDeleteButton(int index, PlateauSandboxElectricPost other)
+        {
+            if (new PlateauToolkitImageButtonGUI(
+                    100,
+                    20,
+                    PlateauToolkitGUIStyles.k_ButtonPrimaryColor,
+                    false)
+                .Button("削除する"))
+            {
+
+                var post = m_Own.GetConnectedPost(m_IsFront, index);
+                other?.RemoveConnection(post.m_IsTargetFront, post.m_TargetIndex);
+                m_Own.RemoveConnection(m_IsFront, index);
+
+                Reset();
+            }
+        }
+
+        private void DrawAddButton()
+        {
+            if (new PlateauToolkitImageButtonGUI(
+                    150,
+                    20,
+                    PlateauToolkitGUIStyles.k_ButtonPrimaryColor,
+                    false)
+                .Button("追加する"))
+            {
+                // ワイヤーを追加
+                m_Own.AddConnectionAndWires(m_IsFront);
+            }
+        }
+
+        public void Reset()
+        {
+            m_Context.ResetSelect();
+            m_SelectingIndex = -1;
+        }
+    }
+
+}

Documentation~/Sandbox Images/building_settings_complex.png

@@ -0,0 +1,107 @@
+using PlateauToolkit.Editor;
+using PlateauToolkit.Sandbox.Runtime;
+using PlateauToolkit.Sandbox.Runtime.ElectricPost;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using UnityEditor;
+using UnityEditor.EditorTools;
+using UnityEngine;
+
+namespace PlateauToolkit.Sandbox.Editor
+{
+    [CustomEditor(typeof(PlateauSandboxElectricPost))]
+    public class PlateauSandboxElectricPostInspector : UnityEditor.Editor
+    {
+        private PlateauSandboxElectricPostContext m_Context;
+        private PlateauSandboxElectricPost m_Target;
+
+        private PlateauSandboxElectricPostConnectionGUI m_FrontConnectionGUI;
+        private PlateauSandboxElectricPostConnectionGUI m_BackConnectionGUI;
+
+        private void OnEnable()
+        {
+            m_Target = target as PlateauSandboxElectricPost;
+            m_Context = PlateauSandboxElectricPostContext.GetCurrent();
+            m_Context.OnSelected.AddListener(ResetSelect);
+
+            SetGUI();
+        }
+
+        private void SetGUI()
+        {
+            if (m_FrontConnectionGUI == null)
+            {
+                m_FrontConnectionGUI = new PlateauSandboxElectricPostConnectionGUI(m_Target, true);
+                m_FrontConnectionGUI.OnClickSelect.AddListener(SelectingPost);
+            }
+            if (m_BackConnectionGUI == null)
+            {
+                m_BackConnectionGUI = new PlateauSandboxElectricPostConnectionGUI(m_Target, false);
+                m_BackConnectionGUI.OnClickSelect.AddListener(SelectingPost);
+            }
+        }
+
+        public override void OnInspectorGUI()
+        {
+            if (m_Context == null || m_Target == null)
+            {
+                return;
+            }
+
+            serializedObject.Update();
+            base.OnInspectorGUI();
+
+            m_FrontConnectionGUI.DrawLayout(m_Target.FrontConnectedPosts);
+            m_BackConnectionGUI.DrawLayout(m_Target.BackConnectedPosts);
+
+            if (GUI.changed)
+            {
+                EditorUtility.SetDirty(m_Target);
+                serializedObject.ApplyModifiedProperties();
+            }
+
+            // キーイベント
+            if (Event.current.keyCode == KeyCode.Escape)
+            {
+                ResetSelect();
+            }
+        }
+
+        private void SelectingPost(bool isSelecting)
+        {
+            if (isSelecting)
+            {
+                // 選択中状態に
+                SetActiveTool();
+            }
+            else
+            {
+                ResetSelect();
+            }
+        }
+
+        private void ResetSelect()
+        {
+            GUIUtility.hotControl = 0;
+            Event.current.Use();
+
+            ToolManager.RestorePreviousPersistentTool();
+            m_FrontConnectionGUI.Reset();
+            m_BackConnectionGUI.Reset();
+
+            m_Context.OnCancel.Invoke();
+        }
+
+        private void SetActiveTool()
+        {
+            if (ToolManager.activeToolType != typeof(PlateauSandboxElectricPostSelectTool))
+            {
+                ToolManager.SetActiveTool<PlateauSandboxElectricPostSelectTool>();
+            }
+            else
+            {
+                ToolManager.RestorePreviousPersistentTool();
+            }
+        }
+    }
+}