From 25ce88501dc21b84161880487a0c2bf80e1ef7c1 Mon Sep 17 00:00:00 2001 From: "j.mei7" Date: Wed, 9 Mar 2022 19:02:26 +0100 Subject: [PATCH] added Gridinfo --- Assets/GridInfo.cs | 17 +++++++++++++++++ Assets/GridInfo.cs.meta | 11 +++++++++++ Assets/PathfindingSystem.cs | 6 +++++- Assets/Scenes/GridScene.unity | 20 ++++++++++++++++++++ Assets/Scripts/Grid/GridBuildingSystem.cs | 6 +++--- Assets/Scripts/Pathfinding/PathNode.cs | 14 +------------- Assets/Scripts/Pathfinding/Pathfinding.cs | 4 ++-- 7 files changed, 59 insertions(+), 19 deletions(-) create mode 100644 Assets/GridInfo.cs create mode 100644 Assets/GridInfo.cs.meta diff --git a/Assets/GridInfo.cs b/Assets/GridInfo.cs new file mode 100644 index 0000000..cd0c40a --- /dev/null +++ b/Assets/GridInfo.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class GridInfo : MonoBehaviour +{ + public static GridInfo instance; + + public int gridWidth = 20; + public int gridHeight = 20; + public float cellSize = 1f; + + private void Awake() + { + instance = this; + } +} diff --git a/Assets/GridInfo.cs.meta b/Assets/GridInfo.cs.meta new file mode 100644 index 0000000..6df9311 --- /dev/null +++ b/Assets/GridInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a9ff0826ad15d5c43859748285744c87 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PathfindingSystem.cs b/Assets/PathfindingSystem.cs index d4da0dc..fd6643e 100644 --- a/Assets/PathfindingSystem.cs +++ b/Assets/PathfindingSystem.cs @@ -12,7 +12,11 @@ public class PathfindingSystem : MonoBehaviour void Start() { instance = this; - pathfinding = new Pathfinding(20, 10); + int gridWidth = GridInfo.instance.gridWidth; + int gridHeight = GridInfo.instance.gridHeight; + float cellSize = GridInfo.instance.cellSize; + + pathfinding = new Pathfinding(gridWidth, gridHeight, cellSize); } void Update() diff --git a/Assets/Scenes/GridScene.unity b/Assets/Scenes/GridScene.unity index ded300e..b8cd70c 100644 --- a/Assets/Scenes/GridScene.unity +++ b/Assets/Scenes/GridScene.unity @@ -313,6 +313,10 @@ PrefabInstance: propertyPath: city value: objectReference: {fileID: 0} + - target: {fileID: 3391280458837659705, guid: 4b478a82c8aed4e4e9f09083bf6afa01, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3391280458837659708, guid: 4b478a82c8aed4e4e9f09083bf6afa01, type: 3} propertyPath: m_Name value: Person @@ -377,6 +381,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1522634446} + - component: {fileID: 1522634448} - component: {fileID: 1522634445} - component: {fileID: 1522634447} m_Layer: 0 @@ -427,6 +432,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: db134add0ff65f04aa54ed5edf6d6df2, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1522634448 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1522634444} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a9ff0826ad15d5c43859748285744c87, type: 3} + m_Name: + m_EditorClassIdentifier: + gridWidth: 100 + gridHeight: 100 + cellSize: 1 --- !u!1001 &1762203019 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Grid/GridBuildingSystem.cs b/Assets/Scripts/Grid/GridBuildingSystem.cs index 50db64b..d2782b0 100644 --- a/Assets/Scripts/Grid/GridBuildingSystem.cs +++ b/Assets/Scripts/Grid/GridBuildingSystem.cs @@ -15,9 +15,9 @@ public class GridBuildingSystem : MonoBehaviour if (instance == null) instance = this; - int gridWidth = 20; - int gridHeight = 20; - float cellSize = 1f; + int gridWidth = GridInfo.instance.gridWidth; + int gridHeight = GridInfo.instance.gridHeight; + float cellSize = GridInfo.instance.cellSize; buildingGrid = new Grid(gridWidth, gridHeight, cellSize, Vector3.zero, (Grid g, int x, int y) => new GridObject(g, x, y)); placedObjectTypeSO = placedObjectTypeSOList[0]; diff --git a/Assets/Scripts/Pathfinding/PathNode.cs b/Assets/Scripts/Pathfinding/PathNode.cs index ef9a6f8..b202b57 100644 --- a/Assets/Scripts/Pathfinding/PathNode.cs +++ b/Assets/Scripts/Pathfinding/PathNode.cs @@ -1,16 +1,4 @@ -/* - ------------------- Code Monkey ------------------- - - Thank you for downloading this package - I hope you find it useful in your projects - If you have any questions let me know - Cheers! - - unitycodemonkey.com - -------------------------------------------------- - */ - -using System.Collections; +using System.Collections; using System.Collections.Generic; using UnityEngine; diff --git a/Assets/Scripts/Pathfinding/Pathfinding.cs b/Assets/Scripts/Pathfinding/Pathfinding.cs index 9b5c5e5..c911acf 100644 --- a/Assets/Scripts/Pathfinding/Pathfinding.cs +++ b/Assets/Scripts/Pathfinding/Pathfinding.cs @@ -13,9 +13,9 @@ public class Pathfinding { private List openList; private List closedList; - public Pathfinding(int width, int height) { + public Pathfinding(int width, int height, float cellSize) { Instance = this; - grid = new Grid(width, height, 1f, Vector3.zero, (Grid g, int x, int y) => new PathNode(g, x, y)); + grid = new Grid(width, height, cellSize, Vector3.zero, (Grid g, int x, int y) => new PathNode(g, x, y)); } public Grid GetGrid() {