Skip to content

M
man-in-the-mirror
Commit efa56abc authored by 18신대성's avatar 18신대성
Browse files
Options

반사 로직 다시짜는중 WIP

parent 79b286f6
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 21 deletions
Assets/Scripts/Map/Map.cs
View file @ efa56abc
...@@ -27,6 +27,10 @@ public class Map : MonoBehaviour ...@@ -27,6 +27,10 @@ public class Map : MonoBehaviour
{ {
return floorGrid.ContainsKey(pos) ? floorGrid[pos] : null; return floorGrid.ContainsKey(pos) ? floorGrid[pos] : null;
} }
public Floor GetFloorAtPos(int x, int y)
{
return GetFloorAtPos(new Vector2Int(x, y));
}
/// <summary> /// <summary>
/// Get floor at position. /// Get floor at position.
/// </summary> /// </summary>
......
Assets/Scripts/Map/Mirror.cs
View file @ efa56abc
...@@ -206,35 +206,58 @@ public class Mirror : Wall, IBulletInteractor, IBreakable ...@@ -206,35 +206,58 @@ public class Mirror : Wall, IBulletInteractor, IBreakable
} }
} }
//Debug.Log(i + "th Wall End"); //Debug.Log(i + "th Wall End");
float range = i - 0.5f; float range = i + 0.5f * side;
float minMap = -1 * MapManager.inst.currentMap.maxMapSize / 2 - 1.5f; float minMap = -1 * MapManager.inst.currentMap.maxMapSize / 2 - 1.5f;
float maxMap = MapManager.inst.currentMap.maxMapSize / 2 + 1.5f; float maxMap = MapManager.inst.currentMap.maxMapSize / 2 + 1.5f;
for (float j = minMap; Mathf.Abs(j) < maxMap; j++) for (float j = minMap; Mathf.Abs(j) < maxMap; j++)
{ {
/* Vector2 point = dir ? new Vector2(j, range) : new Vector2(range, j);
* if ((range, j) is in ray) if (IsInRay(parRay, PointToParRay(stPos, point, true)))
* { {
* 사방에 있는거 카피, 그위의 오브젝트도 카피 // 사방의 바닥 카피, 그 위의 오브젝트도 카피
* } Floor floor = MapManager.inst.currentMap.GetFloorAtPos(Mathf.FloorToInt(point.x), Mathf.FloorToInt(point.y));
* */ if (floor != null)
{
int nextx = dir ? floor.mapPos.x : Mathf.RoundToInt(2 * ldPos.x - floor.mapPos.x);
int nexty = dir ? Mathf.RoundToInt(2 * ldPos.y - floor.mapPos.y) : floor.mapPos.y;
MapManager.inst.currentMap.CreateFloor(new Vector2Int(nextx, nexty), floor.isGoalFloor);
if (floor.objOnFloor != null)
MapManager.inst.currentMap.CreateObject(new Vector2Int(nextx, nexty), floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite));
yield return null;
} }
//Debug.Log(i + "th Floor End"); floor = MapManager.inst.currentMap.GetFloorAtPos(Mathf.FloorToInt(point.x), Mathf.CeilToInt(point.y));
foreach (var obj in copyObjGrid) if (floor != null)
{ {
if ((dir ? obj.Key.y : obj.Key.x) == i) int nextx = dir ? floor.mapPos.x : Mathf.RoundToInt(2 * ldPos.x - floor.mapPos.x);
int nexty = dir ? Mathf.RoundToInt(2 * ldPos.y - floor.mapPos.y) : floor.mapPos.y;
MapManager.inst.currentMap.CreateFloor(new Vector2Int(nextx, nexty), floor.isGoalFloor);
if (floor.objOnFloor != null)
MapManager.inst.currentMap.CreateObject(new Vector2Int(nextx, nexty), floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite));
yield return null;
}
floor = MapManager.inst.currentMap.GetFloorAtPos(Mathf.CeilToInt(point.x), Mathf.FloorToInt(point.y));
if (floor != null)
{ {
if (IsInRay(parRay, PointToParRay(stPos, obj.Key, true))) int nextx = dir ? floor.mapPos.x : Mathf.RoundToInt(2 * ldPos.x - floor.mapPos.x);
int nexty = dir ? Mathf.RoundToInt(2 * ldPos.y - floor.mapPos.y) : floor.mapPos.y;
MapManager.inst.currentMap.CreateFloor(new Vector2Int(nextx, nexty), floor.isGoalFloor);
if (floor.objOnFloor != null)
MapManager.inst.currentMap.CreateObject(new Vector2Int(nextx, nexty), floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite));
yield return null;
}
floor = MapManager.inst.currentMap.GetFloorAtPos(Mathf.CeilToInt(point.x), Mathf.CeilToInt(point.y));
if (floor != null)
{ {
/*copy object*/ int nextx = dir ? floor.mapPos.x : Mathf.RoundToInt(2 * ldPos.x - floor.mapPos.x);
int nextx = dir ? obj.Key.x : Mathf.RoundToInt(2 * ldPos.x - obj.Key.x); int nexty = dir ? Mathf.RoundToInt(2 * ldPos.y - floor.mapPos.y) : floor.mapPos.y;
int nexty = dir ? Mathf.RoundToInt(2 * ldPos.y - obj.Key.y) : obj.Key.y; MapManager.inst.currentMap.CreateFloor(new Vector2Int(nextx, nexty), floor.isGoalFloor);
ObjType type = obj.Value.GetType(); if (floor.objOnFloor != null)
MapManager.inst.currentMap.CreateObject(new Vector2Int(nextx, nexty), floor.objOnFloor.GetType(), (floor.objOnFloor.GetType() != ObjType.Mannequin ? true : ((Mannequin)floor.objOnFloor).isWhite));
MapManager.inst.currentMap.CreateObject(new Vector2Int(nextx, nexty), type, (type == ObjType.Mannequin ? ((Mannequin)(obj.Value)).isWhite : true));
yield return null; yield return null;
} }
} }
} }
//Debug.Log(i + "th Floor End");
foreach (var ply in copyPlayers) foreach (var ply in copyPlayers)
{ {
Floor plyFloor = ply.GetComponent<Player>().currentFloor; Floor plyFloor = ply.GetComponent<Player>().currentFloor;
...@@ -251,7 +274,7 @@ public class Mirror : Wall, IBulletInteractor, IBreakable ...@@ -251,7 +274,7 @@ public class Mirror : Wall, IBulletInteractor, IBreakable
} }
} }
} }
//Debug.Log(i + "th Object End"); //Debug.Log(i + "th Player End");
} }
MapManager.inst.currentMap.RemoveWall(mapPos); MapManager.inst.currentMap.RemoveWall(mapPos);
} }
...@@ -337,7 +360,7 @@ public class Mirror : Wall, IBulletInteractor, IBreakable ...@@ -337,7 +360,7 @@ public class Mirror : Wall, IBulletInteractor, IBreakable
{ {
foreach (Pair pair in _parRay) foreach (Pair pair in _parRay)
{ {
if (pair.l <= _obj && pair.r >= _obj) return true; if (pair.l < _obj && pair.r > _obj) return true;
} }
return false; return false;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment