Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .vs/WinterGame/xs/UserPrefs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Properties StartupConfiguration="{D1800BB4-C760-9125-B657-3B591839070B}|">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/EdgeHandler.cs">
<Files>
<File FileName="Assets/Scripts/EdgeHandler.cs" Line="132" Column="89" />
<File FileName="Assets/Scripts/MazeHandler.cs" Line="15" Column="15" />
<File FileName="Assets/Scripts/TileHolder.cs" Line="12" Column="14" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
Empty file.
Binary file added .vs/WinterGame/xs/sqlite3/storage.ide
Binary file not shown.
Binary file added .vs/WinterGame/xs/sqlite3/storage.ide-shm
Binary file not shown.
Binary file added .vs/WinterGame/xs/sqlite3/storage.ide-wal
Binary file not shown.
813 changes: 411 additions & 402 deletions Assembly-CSharp-Editor.csproj

Large diffs are not rendered by default.

939 changes: 471 additions & 468 deletions Assembly-CSharp.csproj

Large diffs are not rendered by default.

87 changes: 80 additions & 7 deletions Assets/Scripts/EdgeHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,21 @@ public void OnMouseEnter ()

myRenderer.material.color = Color.red;

UpdatePreviewTile();

}

}

public void OnMouseExit ()
{
MeshRenderer myRenderer = GetComponent <MeshRenderer> ();
if (mazeHandler.previewTileNode != null)
{
Destroy(mazeHandler.previewTileNode.transform.parent.gameObject);
}

mazeHandler.previewTileNode = null;

MeshRenderer myRenderer = GetComponent <MeshRenderer> ();

myRenderer.material.color = startColor;

Expand All @@ -67,12 +76,66 @@ public void OnMouseOver ()
//areTilesShifting = true;

ShiftTilesV2 ();
UpdatePreviewTile ();

}

}

public void GenerateNodesArray ()
public void UpdatePreviewTile ()
{
if (mazeHandler.previewTileNode != null)
{
Destroy(mazeHandler.previewTileNode.transform.parent.gameObject);
}

mazeHandler.previewTileNode = null;

GameObject preview = null;

switch ((TileTypes)mazeHandler.spareTileType)
{
case TileTypes.Corner:
preview = Instantiate(mazeHandler.spareHolder.tileCorner, new Vector3(1000, 0, 1000), Quaternion.identity);
break;
case TileTypes.Straight:
preview = Instantiate(mazeHandler.spareHolder.tileStraight, new Vector3(1000, 0, 1000), Quaternion.identity);
break;
case TileTypes.TShape:
preview = Instantiate(mazeHandler.spareHolder.tileTShape, new Vector3(1000, 0, 1000), Quaternion.identity);
break;
}

foreach (Transform part in preview.gameObject.GetComponentsInChildren<Transform>())
{
part.gameObject.layer = 2;
}

preview.name = "Preview Tile";

switch (thisEdgeDirection)
{
case EdgeDirections.NegX:
preview.transform.position = new Vector3(20, 0.5f, transform.position.z);
break;
case EdgeDirections.PosX:
preview.transform.position = new Vector3(-20, 0.5f, transform.position.z);
break;
case EdgeDirections.NegZ:
preview.transform.position = new Vector3(transform.position.x, 0.5f, 20);
break;
case EdgeDirections.PosZ:
preview.transform.position = new Vector3(transform.position.x, 0.5f, -20);
break;
}

preview.transform.rotation = mazeHandler.spareTileNode.transform.parent.rotation;

mazeHandler.previewTileNode = preview.GetComponentInChildren<TileNode>();

}

public void GenerateNodesArray ()
{
nodes = new Transform[7];

Expand Down Expand Up @@ -196,8 +259,8 @@ public void ShiftTilesV2 () //Move tiles in the direction equivalent to the edge
//Set spareTileNode to the tile which will be pushed out
mazeHandler.spareTileNode = nodes[6].GetComponentInChildren<TileNode>();

//Move the tiles up the array (so nodes[6] becomes nodes[5], 5 becomes 4, all the way to 1 becomes 0)
for (int i = 6; i > 0; i--)
//Move the tiles up the array (so nodes[6] becomes nodes[5], 5 becomes 4, all the way to 1 becomes 0)
for (int i = 6; i > 0; i--)
{
nodes[i] = nodes [i - 1];

Expand All @@ -212,8 +275,18 @@ public void ShiftTilesV2 () //Move tiles in the direction equivalent to the edge

Vector3 startPosition = startTransform.position;

//Used to determine how the tiles should be offset, only one value should be non-zero and will be +/- 1.
int xOffset = 0;
// If the tile which will be pushed out has a player on it, move the player to the opposite end
PlayerController player;
if (player = mazeHandler.spareTileNode.transform.GetComponentInChildren<PlayerController>())
{
player.transform.parent = null; // Clear the old parent
player.currentNode = nodes[0].GetComponentInChildren<TileNode>(); // Set the new tile as the current node
player.transform.position = player.currentNode.transform.position; // Move the player to the new tile
player.transform.parent = player.currentNode.transform; // Set the new tile as the parent
}

//Used to determine how the tiles should be offset, only one value should be non-zero and will be +/- 1.
int xOffset = 0;
int zOffset = 0;

//This was taken out of the loop to speed it up a little bit
Expand Down
1 change: 1 addition & 0 deletions Assets/Scripts/MazeHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public class MazeHandler : MonoBehaviour
public TileHolder[] tileHolders;
public TileHolder spareHolder;
public TileNode spareTileNode;
public TileNode previewTileNode;
public EdgeHandler[] arrows;
public TileNode[] allTileNodes;

Expand Down
9 changes: 7 additions & 2 deletions Assets/Scripts/PlayerController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,11 @@ void Start ()
{
pathFinder = GetComponent <PathFinding> ();

//currentNode = startNode;
//currentNode = startNode;

//transform.position = currentNode.transform.position;
//transform.position = currentNode.transform.position;

transform.parent = currentNode.transform;

}

Expand All @@ -43,11 +45,14 @@ void Update ()

if ((path = pathFinder.DoesAnyPathExist (currentNode, hitNode)) != null)
{
transform.parent = null;

MoveAlongPath(path);

Debug.Log("Path is " + path.Count + " tiles long.");
//transform.position = hitNode.transform.position;
currentNode = hitNode;
transform.parent = currentNode.transform;

} else
{
Expand Down
2 changes: 1 addition & 1 deletion Library/AssetImportState
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5;0;4;0;0
2;0;196608;0;0
Loading