Skip to content

Commit 1201b0f

Browse files
author
JasonNumberThirteen
committed
Remove unnecessary constant from several scripts
1 parent bd2fd1b commit 1201b0f

5 files changed

Lines changed: 13 additions & 15 deletions

File tree

Assets/Project/Scripts/Extensions/VectorExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
public static class VectorExtensions
44
{
5-
public static Vector3 ToTiledPosition(this Vector3 vector, float tileSize)
5+
public static Vector3 ToTiledPosition(this Vector3 vector)
66
{
7-
var x = MathMethods.GetTiledCoordinate(vector.x, tileSize);
8-
var y = MathMethods.GetTiledCoordinate(vector.y, tileSize);
7+
var x = MathMethods.GetTiledCoordinate(vector.x, 1);
8+
var y = MathMethods.GetTiledCoordinate(vector.y, 1);
99

1010
return new Vector3(x, y, 0f);
1111
}

Assets/Project/Scripts/Game Objects/Map Tile/MapTile.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
[RequireComponent(typeof(MapTileNode))]
55
public class MapTile : MonoBehaviour
66
{
7-
public static readonly float GRID_SIZE = 1f;
87
public static readonly int MIN_WEIGHT = -1;
98
public static readonly int MAX_WEIGHT = 10;
109

Assets/Project/Scripts/Managers/MapGenerationManager.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public class MapGenerationManager : MonoBehaviour
2020

2121
private Vector2 mapDimensions;
2222

23-
public Vector2 GetCenterOfMap() => (GetMapSize() - Vector2.one*MapTile.GRID_SIZE)*0.5f;
24-
public Vector2 GetMapSize() => GetMapDimensions()*MapTile.GRID_SIZE;
23+
public Vector2 GetCenterOfMap() => (GetMapSize() - Vector2.one)*0.5f;
24+
public Vector2 GetMapSize() => GetMapDimensions();
2525
public Vector2 GetMapDimensions() => mapDimensions;
2626
public List<MapTile> GetMapTiles() => mapTiles;
2727
public int GetMaximumMapDimension() => (int)Mathf.Max(mapDimensions.x, mapDimensions.y);
@@ -115,7 +115,7 @@ private List<MapTile> GetMapTilesToAdd(Vector2 newMapSize)
115115

116116
if(!mapTiles.Any(mapTile => (Vector2)mapTile.transform.position == position))
117117
{
118-
mapTilesToAdd.Add(Instantiate(mapTilePrefab, position*MapTile.GRID_SIZE, Quaternion.identity, goParentTransform));
118+
mapTilesToAdd.Add(Instantiate(mapTilePrefab, position, Quaternion.identity, goParentTransform));
119119
}
120120
}
121121
}

Assets/Project/Scripts/Managers/SelectedMapTileMovementManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private void Update()
9393
}
9494

9595
var mapTileRealPosition = GetMousePositionToWorldPoint() + translationPositionOffset;
96-
var mapTileTiledPosition = mapTileRealPosition.ToTiledPosition(MapTile.GRID_SIZE);
96+
var mapTileTiledPosition = mapTileRealPosition.ToTiledPosition();
9797

9898
if(!DetectedAnyUnacceptableCollider(mapTileTiledPosition))
9999
{
@@ -110,7 +110,7 @@ private Vector3 GetMousePositionToWorldPoint()
110110

111111
private bool DetectedAnyUnacceptableCollider(Vector2 position)
112112
{
113-
var collisionBoxSize = Vector2.one*MapTile.GRID_SIZE;
113+
var collisionBoxSize = Vector2.one;
114114
var collisionBoxSizeOffset = Vector2.one*COLLISION_BOX_SIZE_OFFSET;
115115
var colliders = Physics2D.OverlapBoxAll(position, collisionBoxSize - collisionBoxSizeOffset, 0f, unacceptableGameObjects);
116116

Assets/Project/Scripts/Static Methods/VectorMethods.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,17 @@ public static class VectorMethods
1010

1111
public static List<Vector2> GetDirectionsForFindingNeighbouringNodes(bool allowDiagonal)
1212
{
13-
var gridSize = MapTile.GRID_SIZE;
1413
var directions = new List<Vector2>()
1514
{
16-
Vector2.up*gridSize,
17-
Vector2.down*gridSize,
18-
Vector2.left*gridSize,
19-
Vector2.right*gridSize
15+
Vector2.up,
16+
Vector2.down,
17+
Vector2.left,
18+
Vector2.right
2019
};
2120

2221
if(allowDiagonal)
2322
{
24-
directions.AddRange(GetNorthEastDirection()*gridSize, GetSouthEastDirection()*gridSize, GetSouthWestDirection()*gridSize, GetNorthWestDirection()*gridSize);
23+
directions.AddRange(GetNorthEastDirection(), GetSouthEastDirection(), GetSouthWestDirection(), GetNorthWestDirection());
2524
}
2625

2726
return directions;

0 commit comments

Comments
 (0)