From e5a4a170222f98a650b5ab3f1422f02419c69fe4 Mon Sep 17 00:00:00 2001 From: dereelatwit <54997325+dereelatwit@users.noreply.github.com> Date: Tue, 8 Aug 2023 19:30:56 -0400 Subject: [PATCH] Slider for speed implemented --- .../Assets/Scenes/Testing.unity | 152 +++++++++++++++++- .../UI Elements/UI/Scripts/SliderScript.cs | 28 ++++ .../UI/Scripts/SliderScript.cs.meta | 11 ++ .../Assets/UI Elements/UI/Scripts/nMain.cs | 10 +- 4 files changed, 197 insertions(+), 4 deletions(-) create mode 100644 Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/SliderScript.cs create mode 100644 Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/SliderScript.cs.meta diff --git a/Pathfinding Visualizer/Assets/Scenes/Testing.unity b/Pathfinding Visualizer/Assets/Scenes/Testing.unity index 519e1a3..e094a69 100644 --- a/Pathfinding Visualizer/Assets/Scenes/Testing.unity +++ b/Pathfinding Visualizer/Assets/Scenes/Testing.unity @@ -600,6 +600,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: cellMesh: {fileID: 885170986} + speed: 3 agent: {x: 0, y: 0} obstacles: [] samples: [] @@ -1232,6 +1233,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 532021750} m_CullTransparentMesh: 1 +--- !u!1 &644958005 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 644958006} + - component: {fileID: 644958008} + - component: {fileID: 644958007} + m_Layer: 5 + m_Name: CurSped + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &644958006 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644958005} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1180983251} + 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: 29.000061, y: 2.6699982} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &644958007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644958005} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Current Speed + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6199a8d09f6d80b44afa2ad06a271be7, type: 2} + m_sharedMaterial: {fileID: -3238282194751116107, guid: 6199a8d09f6d80b44afa2ad06a271be7, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 20 + m_fontSizeBase: 20 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &644958008 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 644958005} + m_CullTransparentMesh: 1 --- !u!1 &762819648 GameObject: m_ObjectHideFlags: 0 @@ -2177,6 +2312,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 644958006} - {fileID: 1606952144} - {fileID: 1249508208} - {fileID: 2069650738} @@ -2231,13 +2367,25 @@ MonoBehaviour: m_FillRect: {fileID: 2130071965} m_HandleRect: {fileID: 368052878} m_Direction: 1 - m_MinValue: 0 + m_MinValue: 0.01 m_MaxValue: 5 m_WholeNumbers: 0 m_Value: 3 m_OnValueChanged: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 246942501} + m_TargetAssemblyTypeName: nMain, Assembly-CSharp + m_MethodName: AdjustSpeed + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &1214747637 GameObject: m_ObjectHideFlags: 0 diff --git a/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/SliderScript.cs b/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/SliderScript.cs new file mode 100644 index 0000000..e930245 --- /dev/null +++ b/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/SliderScript.cs @@ -0,0 +1,28 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using TMPro; +using UnityEngine.UI; + +public class SliderScript : MonoBehaviour +{ + + [SerializeField] private Slider _slider; + [SerializeField] private TextMeshProUGUI _sliderText; + + // Start is called before the first frame update + void Start() + { + _slider.onValueChanged.AddListener((v) => + { + _sliderText.text = v.ToString("0.00"); + }); + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/SliderScript.cs.meta b/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/SliderScript.cs.meta new file mode 100644 index 0000000..e857d64 --- /dev/null +++ b/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/SliderScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 55075ed3d579c274786d0d73ac889061 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/nMain.cs b/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/nMain.cs index cd4c5df..e6f9cef 100644 --- a/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/nMain.cs +++ b/Pathfinding Visualizer/Assets/UI Elements/UI/Scripts/nMain.cs @@ -10,6 +10,8 @@ public class nMain : MonoBehaviour private LogicGrid world; int placementValue; + public float speed = 3.0f; + int algorithm; bool astarSelected; bool bfsSelected; @@ -150,12 +152,16 @@ public class nMain : MonoBehaviour if (true) { Pathfinder astar = new Pathfinder(world, agent, obstacles, samples, algorithm, 0); - astar.go(); + } } - + public void AdjustSpeed(float newSpeed) + { + speed = newSpeed; + Debug.Log(speed); + } public void AstarToggle(bool tickOn) {