Camera and Tilemaps fixed at 1x res

This commit is contained in:
2022-05-01 11:00:51 -04:00
parent 9f4007bb79
commit fb20b8d868
3 changed files with 16 additions and 14 deletions

View File

@ -34,7 +34,7 @@ public:
// std::tuple <int,int> oPosition;
std::vector<std::tuple<int,int>> initialPositions;
// std::array destRects;
int totalTiles;
int tileSetTotal;
TileMapComponent() = default;
@ -51,9 +51,9 @@ public:
setTex(map.tilesetCollection[0].name);
globalScale = gScale;
// =========== Setup Tile Set ===========
totalTiles = map.tilesetCollection[0].colCount*map.tilesetCollection[0].rowCount;
// std::cout << "Number of Tiles: " << totalTiles << std::endl;
tileSet.resize(totalTiles);
tileSetTotal = map.tilesetCollection[0].colCount*map.tilesetCollection[0].rowCount;
// std::cout << "Number of Tiles: " << tileSetTotal << std::endl;
tileSet.resize(tileSetTotal);
for (int r=0;r<map.tilesetCollection[0].rowCount;r++){
for (int c=0;c<map.tilesetCollection[0].colCount;c++){
@ -74,11 +74,13 @@ public:
for (int c = 0;c<map.width;c++){
int elem = c+r*map.width;
SDL_Rect thisRect = SDL_Rect();
thisRect.x = c*map.tilesetCollection[0].tileWidth*globalScale-offsetX*globalScale;
thisRect.y = r*map.tilesetCollection[0].tileWidth*globalScale-offsetY*globalScale;
thisRect.x = c*map.tilesetCollection[0].tileWidth*globalScale;
thisRect.y = r*map.tilesetCollection[0].tileWidth*globalScale;
thisRect.w = thisRect.h = map.tileWidth * globalScale;
std::tuple<int,int> ogPos = std::make_tuple(thisRect.x,thisRect.y);
initialPositions[elem] = ogPos;
thisRect.x = thisRect.x-offsetX*globalScale;
thisRect.y = thisRect.y-offsetY*globalScale;
destRects[elem] = thisRect;
// std::cout << "destRects[" << elem << "].x = " << destRects[elem].x << "].y = " << destRects[elem].y << "].w = " << destRects[elem].w << std::endl;
}