Merge pull request #109 from ocadotechnology/RemoveBoardTranslations

Remove board translations

Author: Luk3s

.travis.yml

@@ -42,7 +42,7 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 9
+  serializedVersion: 11
   m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
@@ -54,7 +54,7 @@ LightmapSettings:
     m_EnableBakedLightmaps: 0
     m_EnableRealtimeLightmaps: 0
   m_LightmapEditorSettings:
-    serializedVersion: 8
+    serializedVersion: 9
     m_Resolution: 2
     m_BakeResolution: 40
     m_TextureWidth: 1024
@@ -77,17 +77,19 @@ LightmapSettings:
     m_PVRDirectSampleCount: 32
     m_PVRSampleCount: 500
     m_PVRBounces: 2
-    m_PVRFiltering: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
     m_PVRFilteringMode: 1
     m_PVRCulling: 1
     m_PVRFilteringGaussRadiusDirect: 1
     m_PVRFilteringGaussRadiusIndirect: 5
     m_PVRFilteringGaussRadiusAO: 2
-    m_PVRFilteringAtrousColorSigma: 1
-    m_PVRFilteringAtrousNormalSigma: 1
-    m_PVRFilteringAtrousPositionSigma: 1
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
   m_LightingDataAsset: {fileID: 0}
-  m_ShadowMaskMode: 2
+  m_UseShadowmask: 1
 --- !u!196 &4
 NavMeshSettings:
   serializedVersion: 2
@@ -107,6 +109,8 @@ NavMeshSettings:
     manualTileSize: 0
     tileSize: 256
     accuratePlacement: 0
+    debug:
+      m_Flags: 0
   m_NavMeshData: {fileID: 0}
 --- !u!1 &82044745
 GameObject:
@@ -282,13 +286,13 @@ MonoBehaviour:
   NumericBoundaries: {fileID: 1667658928}
   AreBoundariesRelative: 1
   UseTopBoundary: 1
-  TopBoundary: 6
+  TopBoundary: 14
   UseBottomBoundary: 1
-  BottomBoundary: -7
+  BottomBoundary: 0
   UseLeftBoundary: 1
-  LeftBoundary: -10
+  LeftBoundary: -1
   UseRightBoundary: 1
-  RightBoundary: 9
+  RightBoundary: 19
   TransitionDuration: 1
   TransitionEaseType: 0
   ChangeZoom: 0
@@ -391,8 +395,8 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 343341755}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 845, y: 446, z: 0}
+  m_LocalScale: {x: 1.6503906, y: 1.6503906, z: 1.6503906}
   m_Children:
   - {fileID: 1140445874}
   m_Father: {fileID: 0}
@@ -458,7 +462,7 @@ RectTransform:
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1324909128}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 56, y: 963, z: 0}
   m_LocalScale: {x: 1.1240234, y: 1.1240234, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -547,7 +551,6 @@ Camera:
   m_OcclusionCulling: 1
   m_StereoConvergence: 10
   m_StereoSeparation: 0.022
-  m_StereoMirrorMode: 0
 --- !u!4 &1667658925
 Transform:
   m_ObjectHideFlags: 0

Assets/Scenes/GameScene.unity

@@ -66,13 +66,11 @@ public class BoardManager : MonoBehaviour, IInitializable
 
     private static Transform boardHolder;
 
-    [Inject]
-    BoardTranslator translator;
-
     [Inject]
     Installer.Settings.MapSettings mapDimensions;
 
 	public static HashSet<Coordinate> roadCoordinates = new HashSet<Coordinate>();
+	private const float BackgroundLeftBoundaryPadding = -0.5f;
 
     [PostInject]
     public void Initialize() {
@@ -102,16 +100,18 @@ private void SetupLevel(int levelNumber)
 
 	private void SetupBoard()
 	{
+		GameObject backgroundTileParent = new GameObject("BackgroundTiles");
 		for (int x = 0; x < columns; x++)
 		{
 			for (int y = 0; y < rows; y++)
 			{
-				SetStaticWithBoardAsParent(
-					Instantiate(floorTiles.grassTile, 
-								new Vector3(translator.translateToSceneRow(x, true), translator.translateToSceneColumn(y, true), 0f),
-								Quaternion.identity) as GameObject);
+				GameObject tile = Instantiate(floorTiles.grassTile, new Vector3(x, y, 0f), Quaternion.identity) as GameObject;
+				SetStatic(tile);
+				tile.transform.SetParent(backgroundTileParent.transform);
 			}
 		}
+		backgroundTileParent.transform.position = new Vector3(BackgroundLeftBoundaryPadding, 0f, 0f);
+		SetBoardAsParent(backgroundTileParent);
 	}
 
 	private void SetupRoute() 
@@ -120,7 +120,7 @@ private void SetupRoute()
 		RoadSegment[] roadSegments = roadBuilder.CreateRoadSegments (currentLevel.path);
 		GameObject[] roadObjects = roadDrawer.DrawRoad(roadSegments);
 		foreach (GameObject roadObject in roadObjects) {
-			Coordinate currCoord = new Coordinate(roadObject.transform.position);
+			Coordinate currCoord = new Coordinate(roadObject.transform.localPosition);
 			roadCoordinates.Add(currCoord);
 		}
 
@@ -138,7 +138,7 @@ private GameObject SetupOrigin(OriginNode origin)
 	{
 		Direction direction = RoadDrawer.StringToDirection(origin.direction);
 		Coordinate coords = origin.coords;
-		return Instantiate(roadTiles.cfcTile, new Vector3(translator.translateToSceneRow(coords.x), translator.translateToSceneColumn(coords.y), 0f),
+		return Instantiate(roadTiles.cfcTile, new Vector3(coords.x, coords.y, 0f),
 			Quaternion.Euler(0, 0, (float)direction)) as GameObject;
 	}
 
@@ -157,29 +157,32 @@ private void SetupDecorations() {
 	private void SetupVan() 
 	{
 		GameObject van = GameObject.Find ("Van");
-		van.transform.position = translator.translateToSceneVector(currentLevel.origin.coords.vector);
+		van.transform.localPosition = currentLevel.origin.coords.vector;
 		int direction = (int)RoadDrawer.StringToDirection(currentLevel.origin.direction);
 
 		van.transform.rotation = Quaternion.identity;
 		van.transform.Rotate(new Vector3(0, 0, direction));
 		van.transform.localScale = new Vector3(0.5f, 0.5f, 0.5f);
-		van.transform.position += VehicleMover.ForwardABit(van.transform, 0.5f);
+		van.transform.localPosition += VehicleMover.ForwardABit(van.transform, 0.5f);
 		DOTween.defaultEaseOvershootOrAmplitude = 0;
         van.GetComponent<SpriteRenderer>().color = Color.white;
 
         BoardManager.SetBoardAsParent (van);
 	}
 
-	private static void SetStaticWithBoardAsParent(GameObject childObject) {
+	private static void SetStaticWithBoardAsParent(GameObject childObject)
+	{
 		SetStatic (childObject);
 		SetBoardAsParent (childObject);
 	}
 
-	private static void SetStatic(GameObject staticObject) {
+	private static void SetStatic(GameObject staticObject)
+	{
 		staticObject.isStatic = true;
 	}
 
-	public static void SetBoardAsParent(GameObject childObject) {
+	public static void SetBoardAsParent(GameObject childObject)
+	{
 		childObject.transform.SetParent(boardHolder);
 	}
 }

Assets/Scripts/BoardManager.cs

@@ -6,9 +6,6 @@
 
 public class DecorDrawer : MonoBehaviour
 {
-    [Inject]
-    BoardTranslator translator;
-
     [Inject]
     Installer.Settings.DecorationTiles tiles;
 
@@ -27,8 +24,8 @@ public GameObject[] SetupDecorations(LevelDecor[] decorations)
             tile = null;
             if (nameToTile.TryGetValue(decoration.decorName, out tile))
             {
-                float row = translator.translateToSceneRow(decoration.x / 100f, false);
-                float column = translator.translateToSceneColumn(decoration.y / 100f, false);
+                float row = decoration.x / 100f;
+                float column = decoration.y / 100f;
                 decorationObjects[currentIndex] = Instantiate(tile,
                                     new Vector3(row, column, 0f),
                                     Quaternion.identity) as GameObject;