Fixes
This commit is contained in:
@ -43,7 +43,7 @@ namespace ia::iae
|
||||
TextureComponent::FixedUpdate();
|
||||
}
|
||||
|
||||
VOID TileMapComponent::Setup(IN InitializerList<TileEntryDesc> tileDescs, IN INT32 tileWidth, IN INT32 tileHeight,
|
||||
VOID TileMapComponent::Setup(IN CONST Vector<TileEntryDesc> &tileDescs, IN INT32 tileWidth, IN INT32 tileHeight,
|
||||
IN INT32 tileCountX, IN INT32 tileCountY)
|
||||
{
|
||||
Vector<Handle> textures;
|
||||
@ -56,9 +56,14 @@ namespace ia::iae
|
||||
m_tileEntries.reset();
|
||||
m_tileEntries.reserve(tileDescs.size());
|
||||
for (const auto &td : tileDescs)
|
||||
{
|
||||
if (td.TileTexture != INVALID_HANDLE)
|
||||
textures.pushBack(td.TileTexture);
|
||||
else
|
||||
{
|
||||
const auto tileSet = (TileSet *) Engine::GetTileSet(td.TileSetName);
|
||||
textures.pushBack(tileSet->GetTileTexture(td.TileIndex));
|
||||
}
|
||||
m_tileEntries.pushBack(TileEntry{.IsWalkable = td.IsWalkable});
|
||||
}
|
||||
|
||||
@ -70,11 +75,13 @@ namespace ia::iae
|
||||
|
||||
BOOL TileMapComponent::CanWalkX(IN Vec2 pixelPosition, IN FLOAT32 d)
|
||||
{
|
||||
return true;
|
||||
const auto p = pixelPosition.x + d;
|
||||
return GetTileEntry((INT32)(p/m_tileWidth), (INT32)(pixelPosition.y/m_tileHeight)).IsWalkable;
|
||||
}
|
||||
|
||||
BOOL TileMapComponent::CanWalkY(IN Vec2 pixelPosition, IN FLOAT32 d)
|
||||
{
|
||||
return true;
|
||||
const auto p = pixelPosition.y + d;
|
||||
return GetTileEntry((INT32)(pixelPosition.x/m_tileWidth), (INT32)(p/m_tileHeight)).IsWalkable;
|
||||
}
|
||||
} // namespace ia::iae
|
||||
@ -34,6 +34,7 @@ namespace ia::iae
|
||||
BOOL IsWalkable{};
|
||||
INT32 TileIndex{};
|
||||
String TileSetName{};
|
||||
Handle TileTexture{INVALID_HANDLE};
|
||||
};
|
||||
|
||||
public:
|
||||
@ -50,7 +51,7 @@ namespace ia::iae
|
||||
VIRTUAL VOID FixedUpdate();
|
||||
|
||||
public:
|
||||
VOID Setup(IN InitializerList<TileEntryDesc> tileDescs,
|
||||
VOID Setup(IN CONST Vector<TileEntryDesc>& tileDescs,
|
||||
IN INT32 tileWidth, IN INT32 tileHeight, IN INT32 tileCountX, IN INT32 tileCountY);
|
||||
|
||||
TileEntry &GetTileEntry(IN INT32 index)
|
||||
|
||||
Reference in New Issue
Block a user