mirrors/OpenTS2
1
0
Fork 0
mirror of https://github.com/LazyDuchess/OpenTS2.git synced 2025-01-23 08:41:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix imposter positioning/rotation

Browse source
This commit is contained in:
Ammar Askar 2023-07-31 21:16:31 -04:00
parent f2fc1bd63d
commit a7812ef513
2 changed files with 34 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Assets/Scripts/OpenTS2/Content/DBPF/LotInfoAsset.cs
View file

@ -39,27 +39,15 @@
FrontEdge = frontEdge; FrontEdge = frontEdge;
} }
public float WorldLocationX => LocationX * NeighborhoodTerrainAsset.TerrainGridSize;
public float WorldLocationY => LocationY * NeighborhoodTerrainAsset.TerrainGridSize;
public float WorldWidth => Width * NeighborhoodTerrainAsset.TerrainGridSize;
public float WorldDepth => Depth * NeighborhoodTerrainAsset.TerrainGridSize;
public bool HasRoadAlongEdge(LotEdge edge) public bool HasRoadAlongEdge(LotEdge edge)
{ {
return ((1 << (int)edge) & RoadsAlongEdges) != 0; return ((1 << (int)edge) & RoadsAlongEdges) != 0;
} }
/// <summary>
/// Gets the center of the lot in tiles accounting for roads and the facing direction.
/// </summary>
public (float, float) GetLotCenter()
{
var width = Width;
var depth = Depth;
if (CreationFrontEdge - FrontEdge % 2 != 0)
{
width = Depth;
depth = Width;
}
return (width / 2.0f, depth / 2.0f);
}
} }
/// <summary> /// <summary>

56
Assets/Scripts/OpenTS2/Content/Lot.cs
View file

@ -50,40 +50,42 @@ namespace OpenTS2.Content
var gameObject = imposter.CreateRootGameObject(); var gameObject = imposter.CreateRootGameObject();
gameObject.transform.position = new Vector3( // Rotate based on the whether the frontEdge has changed from the lot's creation time.
_lotInfo.LocationX * NeighborhoodTerrainAsset.TerrainGridSize, var rotation = (_lotInfo.CreationFrontEdge - _lotInfo.FrontEdge) * -90;
_lotInfo.NeighborhoodToLotHeightOffset,
_lotInfo.LocationY * NeighborhoodTerrainAsset.TerrainGridSize);
// We have to create a GameObject right at the center of the lot so we can pivot our rotation around the // Lot imposters are always stored rotated as per their CreationFrontEdge. So a lot facing a road in the
// center instead of at the corner. // positive x direction, i.e the "front" of the house is towards positive y will have its imposter model
Debug.Log($"{_lotInfo.LotName}, creationFront: {_lotInfo.CreationFrontEdge}, frontEdge: {_lotInfo.FrontEdge}, Width: {_lotInfo.Width}, Depth: {_lotInfo.Depth}, Flags: {_lotInfo.Flags:X}, Edges: {_lotInfo.RoadsAlongEdges:X}, Type: {_lotInfo.LotType:X}"); // have the house starting at (0, 0) and ending at (width, depth).
var rotationObject = new GameObject("imposter_rotation_" + _lotInfo.LotName) //
// However, regardless of rotation, a lot in the neighborhood is stored with its grid coordinates
// corresponding to the bottom-right of the grid. Thus when a lot is rotated, we need to rotate the imposter
// from the correct pivot point.
var frontEdgeDiff = (_lotInfo.CreationFrontEdge - _lotInfo.FrontEdge) % 4;
Vector3 pivot;
if (frontEdgeDiff == 0) // No rotation.
pivot = new Vector3(0, 0, 0);
else if (frontEdgeDiff == -1 || frontEdgeDiff == -3) // Counter-clockwise 90
pivot = new Vector3(_lotInfo.WorldWidth, 0, 0);
else if (frontEdgeDiff == 1 || frontEdgeDiff == 3) // Clockwise 90
pivot = new Vector3(0, 0, _lotInfo.WorldDepth);
else if (frontEdgeDiff == 2 || frontEdgeDiff == -2) // Full 180 rotation.
pivot = new Vector3(_lotInfo.WorldWidth, 0, _lotInfo.WorldDepth);
else
throw new IndexOutOfRangeException();
var position = new GameObject($"imposter_position_{_lotInfo.LotName}")
{ {
transform = transform =
{ {
position = gameObject.transform.position position = pivot
} }
}; };
var lotCenter = _lotInfo.GetLotCenter(); gameObject.transform.SetParent(position.transform, worldPositionStays:true);
rotationObject.transform.position += position.transform.position = new Vector3(_lotInfo.WorldLocationX, _lotInfo.NeighborhoodToLotHeightOffset, _lotInfo.WorldLocationY);
new Vector3(lotCenter.Item1 * NeighborhoodTerrainAsset.TerrainGridSize, position.transform.Rotate(0, rotation, 0);
0,
lotCenter.Item2 * NeighborhoodTerrainAsset.TerrainGridSize);
gameObject.transform.SetParent(rotationObject.transform);
// Rotate based on the whether the frontEdge has changed from the lot's creation time. return position;
var rotation = (_lotInfo.CreationFrontEdge - _lotInfo.FrontEdge) * -90;
rotationObject.transform.Rotate(0, rotation, 0);
// For debugging...
var positionRef = new GameObject("imposter_debug_position_" + _lotInfo.LotName);
positionRef.transform.position = new Vector3(
_lotInfo.LocationX * NeighborhoodTerrainAsset.TerrainGridSize,
_lotInfo.NeighborhoodToLotHeightOffset,
_lotInfo.LocationY * NeighborhoodTerrainAsset.TerrainGridSize);
return gameObject;
} }
} }
} }