|
|
@ -831,13 +831,10 @@ void Crawler::LoadLevel(MapName map){ |
|
|
|
int tileSheetY=tileSheetIndex/tileSheetWidth; |
|
|
|
int tileSheetY=tileSheetIndex/tileSheetWidth; |
|
|
|
if(IsForegroundTile(tileSheet,tileSheetIndex)){ |
|
|
|
if(IsForegroundTile(tileSheet,tileSheetIndex)){ |
|
|
|
TileRenderData tile={tileSheet.tileset.tileset->Decal(),vi2d{x,y}*24,vi2d{tileSheetX,tileSheetY}*24}; |
|
|
|
TileRenderData tile={tileSheet.tileset.tileset->Decal(),vi2d{x,y}*24,vi2d{tileSheetX,tileSheetY}*24}; |
|
|
|
std::cout<<"Tile "<<vi2d{x,y}<<" w/Tile ID "<<tileSheetIndex<<" is foreground tile."<<std::endl; |
|
|
|
|
|
|
|
bool foundGroup=false; |
|
|
|
bool foundGroup=false; |
|
|
|
for(TileGroup&group:foregroundTileGroups){ |
|
|
|
for(TileGroup&group:foregroundTileGroups){ |
|
|
|
if(geom2d::overlaps(geom2d::rect<int>{vi2d{x,y}*24-vi2d{1,1},{26,26}},group.GetRange())){ |
|
|
|
if(geom2d::overlaps(geom2d::rect<int>{vi2d{x,y}*24-vi2d{1,1},{26,26}},group.GetRange())){ |
|
|
|
std::cout<<" Group found: "<<group.GetRange().pos<<"/"<<group.GetRange().size<<std::endl; |
|
|
|
|
|
|
|
group.InsertTile(tile); |
|
|
|
group.InsertTile(tile); |
|
|
|
std::cout<<" After: "<<group.GetRange().pos<<"/"<<group.GetRange().size<<std::endl; |
|
|
|
|
|
|
|
foundGroup=true; |
|
|
|
foundGroup=true; |
|
|
|
break; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
@ -845,7 +842,6 @@ void Crawler::LoadLevel(MapName map){ |
|
|
|
if(!foundGroup){ |
|
|
|
if(!foundGroup){ |
|
|
|
TileGroup group; |
|
|
|
TileGroup group; |
|
|
|
group.InsertTile(tile); |
|
|
|
group.InsertTile(tile); |
|
|
|
std::cout<<" No Group found. New group: "<<group.GetRange().pos<<"/"<<group.GetRange().size<<std::endl; |
|
|
|
|
|
|
|
foregroundTileGroups.push_back(group); |
|
|
|
foregroundTileGroups.push_back(group); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|