+ Complex32 x = new Complex32(1f,2f);
+ Complex32 y = Complex32.FromPolarCoordinates(1f, Math.Pi);
+ Complex32 z = (x + y) / (x - y);
+
+
+ // a, b of type Complex32
+ a.Conjugate = b;
+
+ is equivalent to
+
+ // a, b of type Complex32
+ a = b.Conjugate
+
+
+ long x,y,d;
+ d = Fn.GreatestCommonDivisor(45,18,out x, out y);
+ -> d == 9 && x == 1 && y == -2
+
+ The
+ long x,y,d;
+ d = Fn.GreatestCommonDivisor(45,18,out x, out y);
+ -> d == 9 && x == 1 && y == -2
+
+ The + 1, 2, 3 + 4, 5, 6 will be returned as 1, 4, 7, 2, 5, 8, 3, 6, 9 + 7, 8, 9 +
+ 1, 2, 3 + 4, 5, 6 will be returned as 1, 2, 3, 4, 5, 6, 7, 8, 9 + 7, 8, 9 +
+ 1, 2, 3 + 4, 5, 6 will be returned as 1, 4, 7, 2, 5, 8, 3, 6, 9 + 7, 8, 9 +
+ 1, 2, 3 + 4, 5, 6 will be returned as 1, 2, 3, 4, 5, 6, 7, 8, 9 + 7, 8, 9 +
Xn = a * Xn−3 + c mod 2^32
+ http://www.jstatsoft.org/v08/i14/paper
+ x -> exp(x)-1
+ exp(power)-1.x -> exp(x)-1
+ exp(power)-1.(a,b) -> sqrt(a^2 + b^2)
+ sqrt(a2 + b2) without underflow/overflow.(a,b) -> sqrt(a^2 + b^2)
+ sqrt(a2 + b2) without underflow/overflow.(a,b) -> sqrt(a^2 + b^2)
+ sqrt(a2 + b2) without underflow/overflow.(a,b) -> sqrt(a^2 + b^2)
+ sqrt(a2 + b2) without underflow/overflow.+ N-1 + - ' + y = > coef[i] T (x/2) + - i + i=0 ++ Coefficients are stored in reverse order, i.e. the zero + order term is last in the array. Note N is the number of + coefficients, not the order. + + If coefficients are for the interval a to b, x must + have been transformed to x -> 2(2x - b - a)/(b-a) before + entering the routine. This maps x from (a, b) to (-1, 1), + over which the Chebyshev polynomials are defined. + + If the coefficients are for the inverted interval, in + which (a, b) is mapped to (1/b, 1/a), the transformation + required is x -> 2(2ab/x - b - a)/(b-a). If b is infinity, + this becomes x -> 4a/x - 1. + + SPEED: + + Taking advantage of the recurrence properties of the + Chebyshev polynomials, the routine requires one more + addition per loop than evaluating a nested polynomial of + the same degree. +
@@ -157,9 +155,9 @@ namespace LRC
///
///
@@ -333,16 +331,20 @@ namespace LRC
public bool ForceBlockUpdate
{
get => forceBlockUpdate;
- set => forceBlockUpdate = value;
+ set => forceBlockUpdate = value;
}
-
+
///
/// ÏîÄ¿±êÌâ
///
public string TitleName
{
get => titleLabel.text;
- set => titleLabel.text = value;
+ set
+ {
+ if (titleLabel != null)
+ titleLabel.text = value;
+ }
}
///
@@ -375,7 +377,7 @@ namespace LRC
get => unitLabel.text;
set => unitLabel.text = value;
}
-
+
[SerializeField]
// [Obsolete("ÇëʹÓ÷ÃÎÊÆ÷")]
private object _value;
@@ -385,7 +387,7 @@ namespace LRC
///
public object Value
{
- get => _value;
+ get => _value;
protected set
{
if (IsValueInitNull && value != null)
@@ -395,11 +397,11 @@ namespace LRC
}
// ==== ÔÝ´æ ==== //
-
+
public FieldInfo FieldInfo;
public Type FieldType;
-
+
#endregion
#region ÉúÃüÖÜÆÚ
@@ -431,7 +433,7 @@ namespace LRC
ConfigItemList.Add(this);
ForceUpdateAllConfigEvent += ForceUpdate;
ForceSetAllSourceValueEvent += SetSourceValueRequest;
-
+
if (dirtyAutoReset)
IsDirty = false;
}
@@ -535,9 +537,9 @@ namespace LRC
_ => Vector3.zero
};
}
-
+
#endregion
-
+
#region ³õʼ»¯·½·¨
///
@@ -600,7 +602,7 @@ namespace LRC
#endregion
#region ¸üз½·¨
-
+
///
/// ¸üк¯Êý
///
@@ -614,7 +616,7 @@ namespace LRC
IsDirty = false;
var value = GetSourceValue?.Invoke(this);
if (value == null)
- return ;
+ return;
RefreshValueWithoutEvent(value, forceSet);
RefreshAutoUpdateValue();
}
@@ -665,15 +667,15 @@ namespace LRC
{
var isSourceValueAutoUpdate = GetSourceValueAutoUpdate?.Invoke(this);
if (isSourceValueAutoUpdate != null)
- AutoUpdateValue = isSourceValueAutoUpdate.Value;
+ AutoUpdateValue = isSourceValueAutoUpdate.Value;
}
-
+
///
/// ˢиñʽ»¯Îı¾£¬ÔÚ´¥·¢Ë¢ÐÂʱ½«²úÉú¸üÐÂ
///
protected virtual void RefreshFormatValue(object newValue)
{
-
+
}
protected void WhenStartEdit()
@@ -681,7 +683,7 @@ namespace LRC
// Debug.Log("¿ªÊ¼±à¼");
ForceBlockUpdate = true;
}
-
+
///
/// ÊýÖµÊäÈëÍê±Ï£¬»ò½¹µãÒƳýʱµ÷Óá£
///
@@ -691,7 +693,7 @@ namespace LRC
ForceBlockUpdate = false;
OnEndEdit?.Invoke(this, Value);
}
-
+
#endregion
#region Íâ¹ÛÉ趨
@@ -705,7 +707,7 @@ namespace LRC
Destroy(autoUpdateValueToggle.gameObject);
this.autoUpdateValue = autoUpdateValueReversalState ^ autoUpdateValue;
}
-
+
#endregion
}
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigSelectableItem.cs.meta b/Samples~/ConfigUIElement/Scripts/Element/ConfigSelectableItem.cs.meta
similarity index 100%
rename from Samples~/ConfigUIElement/Scripts/ConfigSelectableItem.cs.meta
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigSelectableItem.cs.meta
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigTextInputField.cs b/Samples~/ConfigUIElement/Scripts/Element/ConfigTextInputField.cs
similarity index 81%
rename from Samples~/ConfigUIElement/Scripts/ConfigTextInputField.cs
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigTextInputField.cs
index 0db11a9..314b69d 100644
--- a/Samples~/ConfigUIElement/Scripts/ConfigTextInputField.cs
+++ b/Samples~/ConfigUIElement/Scripts/Element/ConfigTextInputField.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
using TMPro;
-using UnityEngine;
using UnityEngine.EventSystems;
-using UnityEngine.UI;
namespace LRC
{
@@ -14,14 +9,19 @@ namespace LRC
public class ConfigTextInputField : ConfigSelectableItem
{
#region ÊôÐÔ×Ö¶Î
-
+
#if UNITY_EDITOR
public string editorInput;
#endif
-
+
public TMP_InputField targetInput;
-
+
+ // ¶¨ÒåÒ»¸öίÍУ¬½ÓÊÜ×Ö·û´®²ÎÊý²¢·µ»Ø²¼¶ûÖµ
+ public delegate bool StringEventHandler(string input);
+ // ÉùÃ÷ʼþ
+ public static event StringEventHandler ÅжÏÊÇ·ñÖØÃû;
+
public override bool AllowInput
{
get => base.AllowInput;
@@ -53,19 +53,25 @@ namespace LRC
{
WhenStartEdit();
});
- targetInput.onValueChanged.AddListener(o =>
+ targetInput.onEndEdit.AddListener(o =>
{
- if(double.TryParse(o, out var value))
- SetValue(value);
+ if (ÅжÏÊÇ·ñÖØÃû != null)
+ {
+ if (ÅжÏÊÇ·ñÖØÃû.Invoke(o))
+ {
+ SetValue(o);
+ }
+ }
});
targetInput.onEndEdit.AddListener(delegate
{
WhenEndEdit();
});
+
}
#endregion
-
+
#region ʵÏÖ
protected override void SetValue(object newValue)
@@ -77,11 +83,11 @@ namespace LRC
{
base.RefreshValueWithoutEvent(newValue, forceSet);
}
-
+
protected override void Initialization_ChildConstruction(UIBehaviour component)
{
base.Initialization_ChildConstruction(component);
-
+
if (component is TMP_InputField inputField)
{
if (targetInput != null)
@@ -94,7 +100,7 @@ namespace LRC
base.RefreshFormatValue(newValue);
targetInput.text = newValue.ToString();
}
-
+
#endregion
}
}
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigTextInputField.cs.meta b/Samples~/ConfigUIElement/Scripts/Element/ConfigTextInputField.cs.meta
similarity index 100%
rename from Samples~/ConfigUIElement/Scripts/ConfigTextInputField.cs.meta
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigTextInputField.cs.meta
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigToggleGroup.cs b/Samples~/ConfigUIElement/Scripts/Element/ConfigToggleGroup.cs
similarity index 98%
rename from Samples~/ConfigUIElement/Scripts/ConfigToggleGroup.cs
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigToggleGroup.cs
index d795027..db2575f 100644
--- a/Samples~/ConfigUIElement/Scripts/ConfigToggleGroup.cs
+++ b/Samples~/ConfigUIElement/Scripts/Element/ConfigToggleGroup.cs
@@ -78,6 +78,8 @@ namespace LRC
// toggle.isOn = true;
// Debug.Log(TitleName +":ÉèÖò¼¶ûÏîÄ¿");
// }
+
+ //toggles[newIndex].isOn = true;
toggles[newIndex].SetIsOnWithoutNotify(true);
}
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigToggleGroup.cs.meta b/Samples~/ConfigUIElement/Scripts/Element/ConfigToggleGroup.cs.meta
similarity index 100%
rename from Samples~/ConfigUIElement/Scripts/ConfigToggleGroup.cs.meta
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigToggleGroup.cs.meta
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigTypeOverrideAttribute.cs b/Samples~/ConfigUIElement/Scripts/Element/ConfigTypeOverrideAttribute.cs
similarity index 100%
rename from Samples~/ConfigUIElement/Scripts/ConfigTypeOverrideAttribute.cs
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigTypeOverrideAttribute.cs
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigTypeOverrideAttribute.cs.meta b/Samples~/ConfigUIElement/Scripts/Element/ConfigTypeOverrideAttribute.cs.meta
similarity index 100%
rename from Samples~/ConfigUIElement/Scripts/ConfigTypeOverrideAttribute.cs.meta
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigTypeOverrideAttribute.cs.meta
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigVec2InputField.cs b/Samples~/ConfigUIElement/Scripts/Element/ConfigVec2InputField.cs
similarity index 100%
rename from Samples~/ConfigUIElement/Scripts/ConfigVec2InputField.cs
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigVec2InputField.cs
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigVec2InputField.cs.meta b/Samples~/ConfigUIElement/Scripts/Element/ConfigVec2InputField.cs.meta
similarity index 100%
rename from Samples~/ConfigUIElement/Scripts/ConfigVec2InputField.cs.meta
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigVec2InputField.cs.meta
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigVec3InputField.cs b/Samples~/ConfigUIElement/Scripts/Element/ConfigVec3InputField.cs
similarity index 100%
rename from Samples~/ConfigUIElement/Scripts/ConfigVec3InputField.cs
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigVec3InputField.cs
diff --git a/Samples~/ConfigUIElement/Scripts/ConfigVec3InputField.cs.meta b/Samples~/ConfigUIElement/Scripts/Element/ConfigVec3InputField.cs.meta
similarity index 100%
rename from Samples~/ConfigUIElement/Scripts/ConfigVec3InputField.cs.meta
rename to Samples~/ConfigUIElement/Scripts/Element/ConfigVec3InputField.cs.meta
diff --git a/Samples~/HorizonLineOrbit/DrawTerminalLine2T3_OpSlot.cs b/Samples~/HorizonLineOrbit/DrawTerminalLine2T3_OpSlot.cs
index 13731fc..98fd0ab 100644
--- a/Samples~/HorizonLineOrbit/DrawTerminalLine2T3_OpSlot.cs
+++ b/Samples~/HorizonLineOrbit/DrawTerminalLine2T3_OpSlot.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Deconstruction.Element;
-using Deconstruction.Interface;
using Deconstruction.Manager;
-using Deconstruction.Tool;
-using Deconstruction.Trajectory;
using Deconstruction.Type.DMToolSlot;
using Deconstruction.Type.Linkable;
using UnityEngine;
@@ -14,8 +6,6 @@ using XericLibrary.Runtime.MacroLibrary;
namespace SesothoLine
{
- using LineSegment2 = Deconstruction.Element.PromptLine2.LineSegment2;
-
///
/// »æÖƹ켣ÏߵIJÙ×÷
///
@@ -83,6 +73,7 @@ namespace SesothoLine
// public SesothoArrangementWiresTool myWiresTool;
// myWiresTool = targetTool as SesothoArrangementWiresTool;
+ public static bool ÅжÏÊÇ·ñÔÚ»æÖÆÇøÓòÄÚ;
#endregion
#region ÒýÓ÷â×°
@@ -179,7 +170,13 @@ namespace SesothoLine
ReplaceThis(new DrawTerminalLine2T3_OpSlot());
}
// È¡Ïû
- else if (IsReleaseCanelKey())
+ else if (IsReleaseCanelKey() || (!ÅжÏÊÇ·ñÔÚ»æÖÆÇøÓòÄÚ))
+ {
+ RemoveThis();
+ EndPrecondition();
+ }
+ // Åжϰ´ÏÂESCÈ¡ÏûÏ߶λæÖÆ 2024.8.8
+ else if (Input.GetKeyDown(KeyCode.Escape))
{
RemoveThis();
EndPrecondition();
@@ -192,6 +189,8 @@ namespace SesothoLine
*/
}
+
+
protected override void AsyncBeforeUpdate()
{
base.AsyncBeforeUpdate();
@@ -245,8 +244,8 @@ namespace SesothoLine
{
_isStartPointSubstitute = false;
selfWiresTool.GetElement(out _startPoint);
- _lastPointPosition = SesothoArrangementWiresTool.OpKey_IgnoreNeighborAdsorption.Getkey() ?
- wfui_Slot.MouseHelperPosition :
+ _lastPointPosition = SesothoArrangementWiresTool.OpKey_IgnoreNeighborAdsorption.Getkey() ?
+ wfui_Slot.MouseHelperPosition :
CameraMouseInputHelper.Inst.GetGridAdsorb(wfui_Slot.MouseHelperPosition);
_lastPointNormal = default;
}
@@ -272,15 +271,17 @@ namespace SesothoLine
selfWiresTool.DeleteElement(_endPoint);
}
-
///
/// Ïß·»æÖƹý³Ì
///
private void DrawingProcess()
{
+ var forceStr = SesothoArrangementWiresTool.OpKey_ForceStr.Getkey();
+ var forceStraightLine = SesothoArrangementWiresTool.OpKey_ForceStraightLine.Getkey();
+ var force90Arc = SesothoArrangementWiresTool.OpKey_90Arc.Getkey();
+
// »ñÈ¡µ±Ç°µÄ×ø±ê
_helperPosition = PlaceElementManager.Inst.InputHelper.CurrentGridPosition;
-
_startPoint.transform.position = _lastPointPosition;
_isFreeEndPoint = true;
@@ -292,7 +293,7 @@ namespace SesothoLine
_isFreeEndPoint = false;
if (_endPoint.gameObject.activeSelf)
_endPoint.gameObject.SetActive(false);
-
+
_helperPosition = SesothoPeManager.NearestPoint;
_endPoint.transform.position = SesothoPeManager.NearestPoint;
if (SesothoArrangementWiresTool.GetNearestObjectAsLine(_otherPoint, out var terminalLine,
@@ -304,7 +305,7 @@ namespace SesothoLine
// {
// NearestLineTangentPoint
// }
-
+
// ·ñÔò×ÔÓɵã
if (_isFreeEndPoint)
{
@@ -315,6 +316,36 @@ namespace SesothoLine
_endPoint.transform.position = _helperPosition;
}
+ if (forceStr)
+ {
+ Vector3 startPos = _startPoint.GetPosition3();
+ Vector3 endPoint = _endPoint.GetPosition3();
+ if ((int)startPos.x != (int)endPoint.x && (int)startPos.z != (int)endPoint.z)
+ {
+ Vector3 vector3 = endPoint - startPos;
+ if (Mathf.Abs(vector3.x) > Mathf.Abs(vector3.z))
+ {
+ Vector3 vector = new Vector3(endPoint.x, endPoint.y, startPos.z);
+ _endPoint.SetPosition3(vector);
+ }
+ else if (Mathf.Abs(vector3.x) < Mathf.Abs(vector3.z))
+ {
+ Vector3 vector = new Vector3(startPos.x, endPoint.y, endPoint.z);
+ _endPoint.SetPosition3(vector);
+ }
+ _helperPosition = _endPoint.GetPosition3();
+ _line.SetLineSegment(
+ _lastPointPosition, _helperPosition,
+ _lastPointNormal, _helperNormal
+ );
+ }
+ }
+ else if (force90Arc)
+ {
+ _helperPosition = _line.GetEndPointWorldPosition();
+ }
+
+
_line.SetLineSegment(
_lastPointPosition, _helperPosition,
_lastPointNormal, _helperNormal
@@ -326,22 +357,24 @@ namespace SesothoLine
// Debug.Log($"½Ç¶È{arc.Angle} {arc.AngleExact}");
// }
- var forceStr = SesothoArrangementWiresTool.OpKey_ForceStr.Getkey();
- if (forceStr)
+ if (forceStr || forceStraightLine)
+ {
_line.DrawStraightLine();
+ }
else
{
- var force90Arc = SesothoArrangementWiresTool.OpKey_90Arc.Getkey();
var force180Arc = SesothoArrangementWiresTool.OpKey_180Arc.Getkey();
var forceRevCisoid = SesothoArrangementWiresTool.OpKey_RevCisoid.Getkey();
-
var angle = -1;
if (force90Arc || force180Arc)
{
angle = 0;
if (force90Arc)
+ {
angle += 90;
+
+ }
if (force180Arc)
angle += 180;
}
diff --git a/Samples~/HorizonLineOrbit/SesothoArrangementWiresTool.cs b/Samples~/HorizonLineOrbit/SesothoArrangementWiresTool.cs
index 9032b58..97c220c 100644
--- a/Samples~/HorizonLineOrbit/SesothoArrangementWiresTool.cs
+++ b/Samples~/HorizonLineOrbit/SesothoArrangementWiresTool.cs
@@ -1,8 +1,5 @@
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
using Deconstruction.Element;
using Deconstruction.Interface;
using Deconstruction.Manager;
@@ -13,7 +10,6 @@ using Deconstruction.Type.Linkable;
using SerializerHelper.Type;
using UnityEngine;
using UnityEngine.Pool;
-using XericLibrary.Runtime.MacroLibrary;
using XericLibrary.Runtime.Nav;
namespace SesothoLine
@@ -39,19 +35,19 @@ namespace SesothoLine
/// ¹¤¾ßÖгÉÔ±ÒƳýʼþ
///
public event ToolMemberChange OnDecreasing;
-
+
///
/// µ±ÈÎÒâÔªËØËÕÐÑ
///
public event ToolMemberChange OnAnyVivification;
-
+
///
/// µ±ÈÎÒâÔªËØÐÝÃß
///
public event ToolMemberChange OnAnyDormancy;
-
+
#endregion
-
+
#region ¿ì½Ý¼ü
/*
@@ -61,11 +57,19 @@ namespace SesothoLine
* shift+b ºöÂÔ¶ÔÏóÎü¸½
* shift+n ºöÂÔÍø¸ñÎü¸½
*/
-
+
+ ///
+ /// Ç¿ÖÆXÖá»òYÖá
+ ///
+ public static KeyPack OpKey_PlotTheXAndYAxes = new KeyPack();
+ ///
+ /// Ç¿ÖÆXÖá»òYÖáÖ±Ïß
+ ///
+ public static KeyPack OpKey_ForceStr = new KeyPack(KeyCode.LeftControl);
///
/// Ç¿ÖÆÖ±Ïß
///
- public static KeyPack OpKey_ForceStr = new KeyPack(KeyCode.Alpha1);
+ public static KeyPack OpKey_ForceStraightLine = new KeyPack(KeyCode.LeftShift, KeyCode.Q);
///
/// Ç¿ÖÆ90¶ÈÔ²»¡
///
@@ -82,18 +86,20 @@ namespace SesothoLine
///
/// ºöÂÔÎü¸½¹¦ÄÜ
///
- public static KeyPack OpKey_IgnoreNeighborAdsorption = new KeyPack(KeyCode.LeftShift, KeyCode.B);
+ public static KeyPack OpKey_IgnoreNeighborAdsorption = new KeyPack(KeyCode.Alpha1);
///
/// ºöÂÔÍø¸ñÎü¸½
///
public static KeyPack OpKey_IgnoreGridAdsorption = new KeyPack(KeyCode.LeftShift, KeyCode.N);
-
+
#endregion
#region ×Ö¶ÎÊôÐÔ
private ObjectPool _linePool;
private ObjectPool _pointPool;
+ public ObjectPool LinePool => _linePool;
+ public ObjectPool PointPool => _pointPool;
#endregion
@@ -115,7 +121,7 @@ namespace SesothoLine
point = null;
return false;
}
-
+
///
/// »ñÈ¡¹â±êÏÂ×î½üµÄ¶ÔÏóΪÏß
///
@@ -146,27 +152,27 @@ namespace SesothoLine
if (point is null)
goto End;
// ¼ì²é×î½üÏßÇÐÏßÊÇ·ñÓÐЧ£¬ÊÇ·ñÏàÁ¬
- if (SesothoPeManager.NearestLineTangentObject is TerminalLine2T3 otherLine &&
+ if (SesothoPeManager.NearestLineTangentObject is TerminalLine2T3 otherLine &&
point.TryGetLinkLineNormal(otherLine, out normal))
{
line = otherLine;
return true;
}
-
- End:
+
+ End:
line = null;
normal = default;
return false;
}
#endregion
-
+
#region ÉúÃüÖÜÆÚ
protected override void Awake()
{
base.Awake();
-
+
_linePool = new ObjectPool(
createFunc: CreatElement,
actionOnGet: ElementActive,
@@ -176,7 +182,7 @@ namespace SesothoLine
collectionCheck: true,
defaultCapacity: 10,
maxSize: 10000);
-
+
_pointPool = new ObjectPool(
createFunc: CreatElement,
actionOnGet: ElementActive,
@@ -186,7 +192,7 @@ namespace SesothoLine
collectionCheck: true,
defaultCapacity: 10,
maxSize: 10000);
-
+
}
protected override void OnEnableTool()
@@ -194,13 +200,13 @@ namespace SesothoLine
// ÆôÓÃʱ´´½¨Ò»¸öÊäÈëµÈ´ýÐÐΪ£¬Ëæºó½øÈë»æÖÆÐÐΪ
var target = GenerateOperateSlot();
target.InitializeNextTodo(() => new DrawTerminalLine2T3_OpSlot());
-
+
Debug.Log("¼¤»îÏß·»æÖƹ¤¾ß");
}
protected override void OnDisableTool()
{
-
+
}
protected override void OnFinalEnd()
@@ -232,11 +238,11 @@ namespace SesothoLine
{
if (!base.ToolDiserializDispost(context))
return false;
-
+
var deserializeList = new List<(PlacementBase, SerializeUnion)>();
var safeCount = ushort.MaxValue;
Debug.Log("·´ÐòÁл¯¹ý³Ì¿ªÊ¼´´½¨¶ÔÏó");
- while (0 <-- safeCount && SerializeTemp.IndexMoveToNext(out var block))
+ while (0 < --safeCount && SerializeTemp.IndexMoveToNext(out var block))
{
var union = SerializeTemp.GetDeserializeObject();
var type = TypeConsignMap.GetMapType(union.Index);
@@ -258,18 +264,18 @@ namespace SesothoLine
}
else
Debug.LogError($"ÎÞ·¨´´½¨ÐòÁл¯ÔªËØ£¬ÔÒòÊÇÀàÐͲ»Ö§³Ö{type}");
-
+
if (block) break;
}
Debug.Log("·´ÐòÁл¯¹ý³Ì¿ªÊ¼»Ö¸´Á´½Ó¹Øϵ");
foreach (var item in deserializeList)
item.Item1.DeserializeHysteresisOccurs(item.Item2);
-
+
return true;
}
#endregion
-
+
#region ·½·¨
///
@@ -319,7 +325,7 @@ namespace SesothoLine
obj.gameObject.SetActive(false);
OnAnyDormancy?.Invoke(obj);
}
-
+
///
/// »ñÈ¡ÔªËØ
///
@@ -343,7 +349,7 @@ namespace SesothoLine
obj = null;
return false;
}
-
+
///
/// »ñÈ¡ÔªËØ
///
@@ -368,7 +374,7 @@ namespace SesothoLine
obj = null;
return false;
}
-
+
///
/// ɾ³ýÔªËØ
@@ -376,7 +382,7 @@ namespace SesothoLine
///
/// (T obj)
- where T : PlacementBase,
+ where T : PlacementBase,
ILinkconfidentPe
{
var name = typeof(T).Name;
@@ -394,8 +400,8 @@ namespace SesothoLine
}
}
-
-
+
+
///
/// ±£´æÔªËØÁ´£¬ÔÚ´´½¨²¢³£Ì¬»¯ÔªËغó¶¼ÐèÒªÖ´ÐеIJÙ×÷ (×¢Òâ²»ÊÇÔÚ´´½¨ºóÁ¢¿Ì±£´æ)
///
@@ -404,7 +410,7 @@ namespace SesothoLine
///
///
public void PersistentElement(T obj)
- where T : PlacementBase,
+ where T : PlacementBase,
ILinkconfidentPe
{
// ±£´æÁ´±í½á¹¹£¬·´¹ýÀ´Ò²³ÖÓÐÕâ¸ö½Úµã£¬±ãÓÚºóÐø²éÕÒ
@@ -418,14 +424,14 @@ namespace SesothoLine
///
/// (T obj)
- where T : PlacementBase,
+ where T : PlacementBase,
ILinkconfidentPe
{
if (obj.GetLinkedNode(out var node))
SesothoPeManager.Inst.RemoveLinkedTarget(node);
}
-
-
+
+
///
/// Ìí¼ÓСÐÍÔªËص½Íø¸ñÖÐ
///
@@ -442,7 +448,7 @@ namespace SesothoLine
}
SesothoPeManager.Inst.InsertNeighbor(obj, out var index);
obj.NeighborGridIndex = index;
-
+
// »Øµ÷ʼþ
OnAdditional?.Invoke(obj);
}
@@ -451,8 +457,8 @@ namespace SesothoLine
/// Ìí¼Ó´óÐÍÔªËص½Íø¸ñÖÐ
///
public void AddBulkPeToNeighborGrid(T obj)
- where T : PlacementBase,
- ILinkconfidentPe,
+ where T : PlacementBase,
+ ILinkconfidentPe,
IPossessorTrajectory2
{
if (obj.NeighborGridIndex != null)
@@ -462,7 +468,7 @@ namespace SesothoLine
}
SesothoPeManager.Inst.InsertGiantNeighbor(obj, out var index);
obj.NeighborGridIndex = index;
-
+
// »Øµ÷ʼþ
OnAdditional?.Invoke(obj);
}
@@ -476,7 +482,7 @@ namespace SesothoLine
where T : PlacementBase,
ILinkconfidentPe
{
- if (obj.NeighborGridIndex != null &&
+ if (obj.NeighborGridIndex != null &&
obj.NeighborGridIndex.GetAsIndex(out var index))
SesothoPeManager.Inst.RemoveNeighbor(index);
else
@@ -485,16 +491,16 @@ namespace SesothoLine
// »Øµ÷ʼþ
OnDecreasing?.Invoke(obj);
}
-
+
///
/// ÒƳýÕâ¸ö´óÐÍÔªËØ
///
public void RemoveBulkPeFormNeighborGrid(T obj)
- where T : PlacementBase,
- ILinkconfidentPe,
+ where T : PlacementBase,
+ ILinkconfidentPe,
IPossessorTrajectory2
{
- if (obj.NeighborGridIndex != null &&
+ if (obj.NeighborGridIndex != null &&
obj.NeighborGridIndex.GetAsMappingIndex(out var index))
SesothoPeManager.Inst.RemoveGiantNeighbor(index);
else
@@ -513,7 +519,7 @@ namespace SesothoLine
*
* Ö÷ÒªÌṩ»æÖÆÏß·ʱµÄ¶à¶ÎÏßÄâºÏ£¬ÕÏ°Îï±ÜÈÃ
*/
-
+
///
/// »ñÈ¡Ò»¸ö¿ÉÒÔͨ¹ýµÄ·¾¶
///
diff --git a/Samples~/HorizonLineOrbit/SesothoPeManager.cs b/Samples~/HorizonLineOrbit/SesothoPeManager.cs
index a0e43f0..ae6142d 100644
--- a/Samples~/HorizonLineOrbit/SesothoPeManager.cs
+++ b/Samples~/HorizonLineOrbit/SesothoPeManager.cs
@@ -12,10 +12,12 @@ using Deconstruction.Manager;
using Deconstruction.Tool;
using Deconstruction.Type.Area;
using Deconstruction.Type.Serialize;
+using Newtonsoft.Json;
using SerializerHelper.Type;
using UnityEngine.UI;
using XericLibrary.Runtime.Debuger;
using XericLibrary.Runtime.MacroLibrary;
+using Deconstruction.Type.DMToolSlot;
namespace SesothoLine
{
@@ -29,9 +31,6 @@ namespace SesothoLine
{
#region ¾²Ì¬³ÉÔ±
- ///
- /// ´Ë´¦ÌṩµÄµ¥ÀýÓ븸À൥ÀýÊǶÀÁ¢µÄ
- ///
public new static SesothoPeManager Inst => _inst;
private static SesothoPeManager _inst;
@@ -57,52 +56,47 @@ namespace SesothoLine
/// ¹â±êÏÂ×î½üµÄ¶ÔÏó
///
public static PlacementBase NearestObject => TrackingTool.TrackingCurrentTarget;
-
+
private static TrajectoryTrackingTool.TrackPersistentCommunicate _lineTangentTraceTool;
-
#endregion
#region µ÷ÊÔ¹¦ÄÜ
#if UNITY_EDITOR
-
+
public bool EnableGridDebugDraw = false;
public void DebugFunc()
{
if (EnableGridDebugDraw)
- {
- PlacementNeighbor.DebugDrawGrid();
- }
+ PlacementNeighbor.DebugDrawGrid();
}
-
+
#endif
-
+
#endregion
-
+
#region ÉúÃüÖÜÆÚ
-
+
protected override void Awake()
{
base.Awake();
_inst = this;
-
+
if (LineMaterial == null)
Debug.LogError("ÐèÒª¸ø¹ÜÀíÆ÷Ìṩһ¸öÏ߶βÄÖÊ");
if (PointMaterial == null)
Debug.LogError("ÐèÒª¸ø¹ÜÀíÆ÷Ìṩһ¸öµã²ÄÖÊ");
-
+
// ³õʼ»¯»Ïß¹¤¾ß
_wiresTool = new SesothoArrangementWiresTool();
_wiresTool.InitializeParent(transform);
_lineTangentTraceTool = TrackingTool.InstantiationTrackCaculate(PlaceholdersAreaType.LinearContinuity);
-
+
// ÊÖ¶¯¿ªÆô´úÀí¸üÐÂ
EnableUpdate = true;
-
-
}
protected override void Start()
@@ -127,7 +121,6 @@ namespace SesothoLine
// new SerializeUnion();
}
- private string serializeContext = null;
protected override void LateUpdate()
{
base.LateUpdate();
@@ -136,18 +129,27 @@ namespace SesothoLine
#if !UNITY_EDITOR || !_DEBUG_
return;
#endif
+ // È¡Ïû·Ïß»æÖÆ 2024.8.8
+ /*if (Input.GetKeyDown(KeyCode.Escape))
+ {
+ _wiresTool.EnableTool = false;
+
+ //DrawTerminalLine2T3_OpSlot.RemoveThis();
+ //DrawTerminalLine2T3_OpSlot.EndPrecondition();
+ }*/
+
// ¹¤¾ß¹¦ÄܲâÊÔ
- if (Input.GetKeyDown(KeyCode.L))
+ /*if (Input.GetKeyDown(KeyCode.L))
{
_wiresTool.EnableTool = !_wiresTool.EnableTool;
Debug.Log($"{(_wiresTool.EnableTool ? "»æÖƹ¤¾ßÒѼ¤»î" : "¹¤¾ßÒÑÈ¡Ïû¼¤»î")}");
- }
-
+ }*/
+
// ´æµµ¹¦ÄܲâÊÔ
- if (Input.GetKeyDown(KeyCode.S))
+ /*if (Input.GetKeyDown(KeyCode.S))
{
var obj = _wiresTool.ToolSerializeDispost();
- serializeContext = MacroFile.JsonSerializerFormatter.formatter.Serializer(obj);
+ serializeContext = JsonConvert.SerializeObject(obj);
Debug.Log(obj.ToString());
}
if (Input.GetKeyDown(KeyCode.D))
@@ -158,29 +160,31 @@ namespace SesothoLine
return;
}
- var obj = MacroFile.JsonSerializerFormatter.formatter.Deserializer(serializeContext);
+ var obj = JsonConvert.DeserializeObject(serializeContext);
_wiresTool.ToolDiserializDispost(obj);
}
if (Input.GetKeyDown(KeyCode.A))
{
_wiresTool.EnableCompress = !_wiresTool.EnableCompress;
- if (_wiresTool.EnableCompress )
+ if (_wiresTool.EnableCompress)
Debug.Log("¿ªÆôѹËõ");
else
Debug.Log("¹Ø±ÕѹËõ");
- }
-
-
+ }*/
+
+
// »æÖÆÒ»ÏÂÎü¸½µÄÄ¿±êλÖÃ
if (TrackingTool.EnableTool || TrackingTool._enableAuxiliaryTool)
{
- MacroDebugDraw.DrawDownArrow(NearestPoint, Quaternion.identity, Color.magenta);
- MacroDebugDraw.DrawDownArrow(NearestLineTangentPoint, Quaternion.identity, Color.green);
+ MacroDebugDraw.SetColor(Color.magenta);
+ MacroDebugDraw.DrawDownArrow(NearestPoint);
+ MacroDebugDraw.SetColor(Color.green);
+ MacroDebugDraw.DrawDownArrow(NearestLineTangentPoint);
+ MacroDebugDraw.ResetColor();
}
}
#endregion
-
}
}
diff --git a/Samples~/HorizonLineOrbit/TerminalLine2T3.cs b/Samples~/HorizonLineOrbit/TerminalLine2T3.cs
index 83137d0..85b865e 100644
--- a/Samples~/HorizonLineOrbit/TerminalLine2T3.cs
+++ b/Samples~/HorizonLineOrbit/TerminalLine2T3.cs
@@ -1,21 +1,14 @@
-using System;
using System.Collections.Generic;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Text;
using Deconstruction.Element;
-using Deconstruction.Interface;
#if UNITY_EDITOR
using UnityEditor;
#endif
using UnityEngine;
-using UnityEngine.Serialization;
+using UnityEngine.UIElements;
using XericLibrary.Runtime.Debuger;
using XericLibrary.Runtime.MacroLibrary;
-using XericLibrary.Runtime.Type;
namespace SesothoLine
{
@@ -38,7 +31,9 @@ namespace SesothoLine
private LineSegment2 _lineSegment = new LineSegment2();
public bool DebugDrawGrid = false;
-
+
+ public Vector3 ah, bh;
+
#endregion
#region ÉúÃüÖÜÆÚ
@@ -61,10 +56,7 @@ namespace SesothoLine
SesothoPeManager.Inst.RemoveEmbedded(this);
}
- protected virtual void OnDestroy()
- {
-
- }
+
protected override void AgencyOnEnable()
{
@@ -86,9 +78,10 @@ namespace SesothoLine
{
foreach (var index in indexs.Indexs)
{
+ MacroDebugDraw.SetColor(Color.red);
MacroDebugDraw.DrawDownArrow(
- index.GetCellWorldIndexPosition() + MacroMath.RandomVector3(0.1f, Identifier), Quaternion.identity,
- Color.red);
+ index.GetCellWorldIndexPosition() + MacroMath.RandomVector3(0.1f, Identifier));
+ MacroDebugDraw.ResetColor();
}
}
@@ -128,8 +121,12 @@ namespace SesothoLine
b.UpwardPlaneToVector2(),
ah.UpwardPlaneToVector2(),
bh.UpwardPlaneToVector2());
- // ah?.GetEndPointNormal ?? default,
- // bh?.GetStartPointNormal ?? default);
+ // ah?.GetEndPointNormal ?? default,
+ // bh?.GetStartPointNormal ?? default);
+
+ this.ah = ah;
+ this.bh = bh;
+
return _lineSegment;
}
@@ -145,7 +142,6 @@ namespace SesothoLine
AutomaticDrawCircularLine(straightLine);
}
-
///
/// ÖØмÆËãÔµã
///