From 20928b686773cfe6f8ea02a8a209c4a50dc9c570 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Thu, 11 Jan 2024 01:26:58 -0600 Subject: [PATCH] Add in floating-point support for collision boxes. Remove ceil() calls for transformed view DrawRectDecal and FillRectDecal functions (why are they there?) --- .../AdventuresInLestoria.cpp | 54 ++++++++++++------- Adventures in Lestoria/AdventuresInLestoria.h | 4 +- Adventures in Lestoria/Map.h | 6 +-- Adventures in Lestoria/Monster.cpp | 4 +- Adventures in Lestoria/Pathfinding.cpp | 2 +- Adventures in Lestoria/Player.cpp | 4 +- Adventures in Lestoria/TSXParser.h | 4 +- Adventures in Lestoria/Version.h | 2 +- .../assets/config/configuration.txt | 3 ++ .../maps/Decorations_c1_No_Shadow24x24.tsx | 2 +- .../olcPGEX_TransformedView.h | 4 +- 11 files changed, 54 insertions(+), 35 deletions(-) diff --git a/Adventures in Lestoria/AdventuresInLestoria.cpp b/Adventures in Lestoria/AdventuresInLestoria.cpp index 5174c93f..4503b662 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.cpp +++ b/Adventures in Lestoria/AdventuresInLestoria.cpp @@ -898,9 +898,9 @@ void AiL::RenderWorld(float fElapsedTime){ #ifdef _DEBUG if("debug_collision_boxes"_I){ if(tileSheet.tileset->collision.find(tileSheetIndex)!=tileSheet.tileset->collision.end()){ - geom2d::rectcollision=tileSheet.tileset->collision[tileSheetIndex].collision; - view.FillRectDecal(vi2d{x,y}*GetCurrentMapData().tilewidth+collision.pos,collision.size,{0,0,0,128}); - view.DrawRectDecal(vi2d{x,y}*GetCurrentMapData().tilewidth+collision.pos,collision.size,GREY); + geom2d::rectcollision=tileSheet.tileset->collision[tileSheetIndex].collision; + view.FillRectDecal(vf2d{float(x),float(y)}*float(GetCurrentMapData().tilewidth)+collision.pos,collision.size,{0,0,0,128}); + view.DrawRectDecal(vf2d{float(x),float(y)}*float(GetCurrentMapData().tilewidth)+collision.pos,collision.size,GREY); } } #endif @@ -926,9 +926,9 @@ void AiL::RenderWorld(float fElapsedTime){ #ifdef _DEBUG if("debug_collision_boxes"_I){ if(tileSheet.tileset->collision.find(tileSheetIndex)!=tileSheet.tileset->collision.end()){ - geom2d::rectcollision=tileSheet.tileset->collision[tileSheetIndex].collision; - view.FillRectDecal(vi2d{x,y}*GetCurrentMapData().tilewidth+collision.pos,collision.size,{0,0,0,128}); - view.DrawRectDecal(vi2d{x,y}*GetCurrentMapData().tilewidth+collision.pos,collision.size,GREY); + geom2d::rectcollision=tileSheet.tileset->collision[tileSheetIndex].collision; + view.FillRectDecal(vf2d{float(x),float(y)}*float(GetCurrentMapData().tilewidth)+collision.pos,collision.size,{0,0,0,128}); + view.DrawRectDecal(vf2d{float(x),float(y)}*float(GetCurrentMapData().tilewidth)+collision.pos,collision.size,GREY); } } #endif @@ -1067,11 +1067,19 @@ void AiL::RenderWorld(float fElapsedTime){ RenderTile(*tile,{255,255,255,uint8_t(255-tile->tileOpacity/TileGroup::FADE_TIME*TileGroup::FADE_AMT)}); float distToPlayer=geom2d::line(player->GetPos(),tile->pos+vf2d{12,12}).length(); if(distToPlayer<24*3&&tile->tileOpacity>0&&tile->tileSheet.tileset->collision.find(tile->tileID)!=tile->tileSheet.tileset->collision.end()){ - geom2d::rectcollision=tile->tileSheet.tileset->collision[tile->tileID].collision; + geom2d::rectcollision=tile->tileSheet.tileset->collision[tile->tileID].collision; distToPlayer/=4; if(distToPlayer<1){distToPlayer=1;} view.FillRectDecal(tile->pos+collision.pos,collision.size,{255,0,0,uint8_t(128*tile->tileOpacity/sqrt(distToPlayer))}); view.DrawRectDecal(tile->pos+collision.pos,collision.size,{128,0,0,uint8_t(255/sqrt(distToPlayer))}); + #ifdef _DEBUG + if("debug_collision_boxes_snapping"_I){ + if(fmod(tile->pos.x+collision.pos.x,1.f)!=0.f||fmod(tile->pos.y+collision.pos.y,1.f)!=0.f){ + view.DrawShadowStringPropDecal(tile->pos+collision.pos-vf2d{0,24},(tile->pos+collision.pos).str(),RED,BLACK,{0.5f,1.f},24.f); + view.DrawShadowStringPropDecal(tile->pos+collision.pos+vf2d{0,24},((tile->pos+collision.pos)+(collision.size)).str(),GREEN,BLACK,{0.5f,1.f},24.f); + } + } + #endif } } #pragma endregion @@ -1092,11 +1100,19 @@ void AiL::RenderWorld(float fElapsedTime){ RenderTile(*tile,{255,255,255,uint8_t(255-tile->tileOpacity/TileGroup::FADE_TIME*TileGroup::FADE_AMT)}); float distToPlayer=geom2d::line(player->GetPos(),tile->pos+vf2d{12,12}).length(); if(distToPlayer<24*3&&tile->tileOpacity>0&&tile->tileSheet.tileset->collision.find(tile->tileID)!=tile->tileSheet.tileset->collision.end()){ - geom2d::rectcollision=tile->tileSheet.tileset->collision[tile->tileID].collision; + geom2d::rectcollision=tile->tileSheet.tileset->collision[tile->tileID].collision; distToPlayer/=4; if(distToPlayer<1){distToPlayer=1;} view.FillRectDecal(tile->pos+collision.pos,collision.size,{255,0,0,uint8_t(128*tile->tileOpacity/sqrt(distToPlayer))}); view.DrawRectDecal(tile->pos+collision.pos,collision.size,{128,0,0,uint8_t(255/sqrt(distToPlayer))}); + #ifdef _DEBUG + if("debug_collision_boxes_snapping"_I){ + if(fmod(tile->pos.x+collision.pos.x,1.f)!=0.f||fmod(tile->pos.y+collision.pos.y,1.f)!=0.f){ + view.DrawShadowStringPropDecal(tile->pos+collision.pos-vf2d{0,24},(tile->pos+collision.pos).str(),RED,BLACK,{0.5f,1.f},24.f); + view.DrawShadowStringPropDecal(tile->pos+collision.pos+vf2d{0,24},((tile->pos+collision.pos)+(collision.size)).str(),GREEN,BLACK,{0.5f,1.f},24.f); + } + } + #endif } } #pragma endregion @@ -1124,9 +1140,9 @@ void AiL::RenderWorld(float fElapsedTime){ #ifdef _DEBUG if("debug_collision_boxes"_I){ if(tileSheet.tileset->collision.find(tileSheetIndex)!=tileSheet.tileset->collision.end()){ - geom2d::rectcollision=tileSheet.tileset->collision[tileSheetIndex].collision; - view.FillRectDecal(vi2d{x,y}*game->GetCurrentMapData().tilewidth+collision.pos,collision.size,{0,0,0,128}); - view.DrawRectDecal(vi2d{x,y}*game->GetCurrentMapData().tilewidth+collision.pos,collision.size,GREY); + geom2d::rectcollision=tileSheet.tileset->collision[tileSheetIndex].collision; + view.FillRectDecal(vf2d{float(x),float(y)}*float(game->GetCurrentMapData().tilewidth)+collision.pos,collision.size,{0,0,0,128}); + view.DrawRectDecal(vf2d{float(x),float(y)}*float(game->GetCurrentMapData().tilewidth)+collision.pos,collision.size,GREY); } } #endif @@ -1210,7 +1226,7 @@ void AiL::RenderWorld(float fElapsedTime){ RenderTile(*tile,{255,255,255,uint8_t(255-tile->tileOpacity/TileGroup::FADE_TIME*TileGroup::FADE_AMT)}); float distToPlayer=geom2d::line(player->GetPos(),tile->pos+vf2d{12,12}).length(); if(distToPlayer<24*3&&tile->tileOpacity>0&&tile->tileSheet.tileset->collision.find(tile->tileID)!=tile->tileSheet.tileset->collision.end()){ - geom2d::rectcollision=tile->tileSheet.tileset->collision[tile->tileID].collision; + geom2d::rectcollision=tile->tileSheet.tileset->collision[tile->tileID].collision; distToPlayer/=4; if(distToPlayer<1){distToPlayer=1;} view.FillRectDecal(tile->pos+collision.pos,collision.size,{255,0,0,uint8_t(128*tile->tileOpacity/sqrt(distToPlayer))}); @@ -1235,7 +1251,7 @@ void AiL::RenderWorld(float fElapsedTime){ RenderTile(*tile,{255,255,255,uint8_t(255-tile->tileOpacity/TileGroup::FADE_TIME*TileGroup::FADE_AMT)}); float distToPlayer=geom2d::line(player->GetPos(),tile->pos+vf2d{12,12}).length(); if(distToPlayer<24*3&&tile->tileOpacity>0&&tile->tileSheet.tileset->collision.find(tile->tileID)!=tile->tileSheet.tileset->collision.end()){ - geom2d::rectcollision=tile->tileSheet.tileset->collision[tile->tileID].collision; + geom2d::rectcollision=tile->tileSheet.tileset->collision[tile->tileID].collision; distToPlayer/=4; if(distToPlayer<1){distToPlayer=1;} view.FillRectDecal(tile->pos+collision.pos,collision.size,{255,0,0,uint8_t(128*tile->tileOpacity/sqrt(distToPlayer))}); @@ -1895,7 +1911,7 @@ TilesheetData AiL::GetTileSheet(MapName map,int tileID){ } bool AiL::HasTileCollision(MapName map,vf2d pos,bool upperLevel){ - geom2d::rectcollisionRect=GetTileCollision(map,pos,upperLevel); + geom2d::rectcollisionRect=GetTileCollision(map,pos,upperLevel); vi2d collisionRectSnapPos=vi2d{pos/float(game->GetCurrentMapData().tilewidth)}*game->GetCurrentMapData().tilewidth; collisionRect.pos+=collisionRectSnapPos; return geom2d::overlaps(collisionRect,pos); @@ -1905,7 +1921,7 @@ bool AiL::IsBridgeLayer(LayerTag&layer){ return layer.tag.data.find("class")!=layer.tag.data.end()&&layer.tag.data["class"]=="Bridge"; } -geom2d::rectAiL::GetTileCollision(MapName map,vf2d pos,bool upperLevel){ +geom2d::rectAiL::GetTileCollision(MapName map,vf2d pos,bool upperLevel){ if(pos.x<0||pos.y<0||pos.x>=GetCurrentMapData().width*game->GetCurrentMapData().tilewidth||pos.y>=GetCurrentMapData().height*game->GetCurrentMapData().tilewidth)return NO_COLLISION; if(GetCurrentMap().optimizedTile)return NO_COLLISION; //Overworld map has no collision. @@ -1919,13 +1935,13 @@ geom2d::rectAiL::GetTileCollision(MapName map,vf2d pos,bool upperLevel){ break; } } - if(!hasTerrain)return geom2d::rect({0,0},{GetCurrentMapData().tilewidth,GetCurrentMapData().tilewidth}); //We assume no terrain means we can't walk on this. + if(!hasTerrain)return geom2d::rect({0.f,0.f},{float(GetCurrentMapData().tilewidth),float(GetCurrentMapData().tilewidth)}); //We assume no terrain means we can't walk on this. #pragma region Lower Bridge Collision Check if(!upperLevel){ //We are looking for lower bridge collisions. for(ZoneData&zone:MAP_DATA[map].ZoneData["LowerBridgeCollision"]){ if(geom2d::contains(zone.zone,pos)){ - return {{0,0},{game->GetCurrentMapData().tilewidth,game->GetCurrentMapData().tilewidth}}; + return {{0,0},{float(game->GetCurrentMapData().tilewidth),float(game->GetCurrentMapData().tilewidth)}}; } } } @@ -1940,13 +1956,13 @@ geom2d::rectAiL::GetTileCollision(MapName map,vf2d pos,bool upperLevel){ return NO_COLLISION; } } - geom2d::rectfoundRect=NO_COLLISION; + geom2d::rectfoundRect=NO_COLLISION; for(int counter=0;LayerTag&layer:MAP_DATA[map].LayerData){ //auto HasNoClass=[&](){return layer.tag.data.find("class")==layer.tag.data.end();}; if(counter!=bridgeLayerIndex){ int tileID=layer.tiles[int(pos.y)/GetCurrentMapData().tilewidth][int(pos.x)/GetCurrentMapData().tilewidth]-1; if(tileID!=-1&&GetTileSheet(map,tileID%1000000).tileset->collision.find(tileID%1000000-GetTileSheet(map,tileID%1000000).firstgid+1)!=GetTileSheet(map,tileID%1000000).tileset->collision.end()){ - geom2d::rectcollisionRect=GetTileSheet(map,tileID%1000000).tileset->collision[tileID%1000000-GetTileSheet(map,tileID%1000000).firstgid+1].collision; + geom2d::rectcollisionRect=GetTileSheet(map,tileID%1000000).tileset->collision[tileID%1000000-GetTileSheet(map,tileID%1000000).firstgid+1].collision; if(foundRect.pos==NO_COLLISION.pos&&foundRect.size==NO_COLLISION.size){ foundRect=collisionRect; }else{ diff --git a/Adventures in Lestoria/AdventuresInLestoria.h b/Adventures in Lestoria/AdventuresInLestoria.h index 137917dd..38f1a994 100644 --- a/Adventures in Lestoria/AdventuresInLestoria.h +++ b/Adventures in Lestoria/AdventuresInLestoria.h @@ -133,7 +133,7 @@ public: bool OnUserUpdate(float fElapsedTime) override; bool OnUserDestroy() override; public: - geom2d::rectNO_COLLISION={}; + geom2d::rectNO_COLLISION={{0.f,0.f,},{0.f,0.f}}; TileTransformedView view; void InitializeLevel(std::string mapFile,MapName map); void LoadLevel(MapName map); @@ -166,7 +166,7 @@ public: //tileID is the tile number from the tilesets. TilesheetData GetTileSheet(MapName map,int tileID); //Gets the rectangle of the tile collision at this tile. If upperLevel is set to true, the collision tile must be in a Bridge class layer for the tile to hit. Also, zones containing LowerBridgeCollision will apply when upperLevel is set to false. - geom2d::rectGetTileCollision(MapName map,vf2d pos,bool upperLevel=false); + geom2d::rectGetTileCollision(MapName map,vf2d pos,bool upperLevel=false); //Checks if the point resides inside of a collision tile. bool HasTileCollision(MapName map,vf2d pos,bool upperLevel=false); const MapName&GetCurrentLevel()const; diff --git a/Adventures in Lestoria/Map.h b/Adventures in Lestoria/Map.h index 3eecc87d..811b777d 100644 --- a/Adventures in Lestoria/Map.h +++ b/Adventures in Lestoria/Map.h @@ -50,7 +50,7 @@ public: }; struct TileCollisionData{ - geom2d::rectcollision; + geom2d::rectcollision; }; struct TilesetData{ @@ -59,7 +59,7 @@ struct TilesetData{ bool isTerrain=false; std::mapforegroundTiles; std::mapupperForegroundTiles; - std::mapcollision; + std::mapcollision; std::mapstaircaseTiles; std::map>animationData; std::setreflectiveData; @@ -75,7 +75,7 @@ struct TilesheetData{ struct TileRenderData{ TilesheetData tileSheet; - vi2d pos; + vf2d pos; vi2d tileSheetPos; int tileID; int layerID; diff --git a/Adventures in Lestoria/Monster.cpp b/Adventures in Lestoria/Monster.cpp index 8aa7dc11..213f7ebb 100644 --- a/Adventures in Lestoria/Monster.cpp +++ b/Adventures in Lestoria/Monster.cpp @@ -116,7 +116,7 @@ void Monster::PerformIdleAnimation(){ bool Monster::SetX(float x){ vf2d newPos={x,pos.y}; vi2d tilePos=vi2d(newPos/float(game->GetCurrentMapData().tilewidth))*game->GetCurrentMapData().tilewidth; - geom2d::rectcollisionRect=game->GetTileCollision(game->GetCurrentLevel(),newPos,upperLevel); + geom2d::rectcollisionRect=game->GetTileCollision(game->GetCurrentLevel(),newPos,upperLevel); if(collisionRect.pos==vi2d{0,0}&&collisionRect.size==vi2d{1,1}){ pos.x=std::clamp(x,game->GetCurrentMapData().tilewidth/2.f*GetSizeMult(),float(game->GetCurrentMapData().width*game->GetCurrentMapData().tilewidth-game->GetCurrentMapData().tilewidth/2.f*GetSizeMult())); Moved(); @@ -135,7 +135,7 @@ bool Monster::SetX(float x){ bool Monster::SetY(float y){ vf2d newPos={pos.x,y}; vi2d tilePos=vi2d(newPos/float(game->GetCurrentMapData().tilewidth))*game->GetCurrentMapData().tilewidth; - geom2d::rectcollisionRect=game->GetTileCollision(game->GetCurrentLevel(),newPos,upperLevel); + geom2d::rectcollisionRect=game->GetTileCollision(game->GetCurrentLevel(),newPos,upperLevel); if(collisionRect.pos==vi2d{0,0}&&collisionRect.size==vi2d{1,1}){ pos.y=std::clamp(y,game->GetCurrentMapData().tilewidth/2.f*GetSizeMult(),float(game->GetCurrentMapData().height*game->GetCurrentMapData().tilewidth-game->GetCurrentMapData().tilewidth/2.f*GetSizeMult())); Moved(); diff --git a/Adventures in Lestoria/Pathfinding.cpp b/Adventures in Lestoria/Pathfinding.cpp index eff23de2..6d5bdf63 100644 --- a/Adventures in Lestoria/Pathfinding.cpp +++ b/Adventures in Lestoria/Pathfinding.cpp @@ -50,7 +50,7 @@ void Pathfinding::Initialize(){ sNode&node=nodes[{x,y}]; node.x = x; // ...because we give each node its own coordinates node.y = y; // ...because we give each node its own coordinates - geom2d::recttile=game->GetTileCollision(game->GetCurrentLevel(),{float(x*gridSpacing.x),float(y*gridSpacing.y)}); + geom2d::recttile=game->GetTileCollision(game->GetCurrentLevel(),{float(x*gridSpacing.x),float(y*gridSpacing.y)}); node.bObstacle = tile.pos!=game->NO_COLLISION.pos||tile.size!=game->NO_COLLISION.size; tile=game->GetTileCollision(game->GetCurrentLevel(),{float(x*gridSpacing.x),float(y*gridSpacing.y)},true); node.bObstacleUpper = tile.pos!=game->NO_COLLISION.pos||tile.size!=game->NO_COLLISION.size; diff --git a/Adventures in Lestoria/Player.cpp b/Adventures in Lestoria/Player.cpp index 1007c40b..efec135f 100644 --- a/Adventures in Lestoria/Player.cpp +++ b/Adventures in Lestoria/Player.cpp @@ -107,7 +107,7 @@ void Player::ForceSetPos(vf2d pos){ bool Player::SetX(float x){ vf2d newPos={x,pos.y}; vi2d tilePos=vi2d(newPos/float(game->GetCurrentMapData().tilewidth))*game->GetCurrentMapData().tilewidth; - geom2d::rectcollisionRect=game->GetTileCollision(game->GetCurrentLevel(),newPos,upperLevel); + geom2d::rectcollisionRect=game->GetTileCollision(game->GetCurrentLevel(),newPos,upperLevel); #pragma region lambdas auto NoTileCollisionExistsHere=[&](){return collisionRect.pos==game->NO_COLLISION.pos&&collisionRect.size==game->NO_COLLISION.size;}; #pragma endregion @@ -133,7 +133,7 @@ bool Player::SetX(float x){ bool Player::SetY(float y){ vf2d newPos={pos.x,y}; vi2d tilePos=vi2d(newPos/float(game->GetCurrentMapData().tilewidth))*game->GetCurrentMapData().tilewidth; - geom2d::rectcollisionRect=game->GetTileCollision(game->GetCurrentLevel(),newPos,upperLevel); + geom2d::rectcollisionRect=game->GetTileCollision(game->GetCurrentLevel(),newPos,upperLevel); #pragma region lambdas auto NoTileCollisionExistsHere=[&](){return collisionRect.pos==game->NO_COLLISION.pos&&collisionRect.size==game->NO_COLLISION.size;}; #pragma endregion diff --git a/Adventures in Lestoria/TSXParser.h b/Adventures in Lestoria/TSXParser.h index 5a718b3b..6daa6062 100644 --- a/Adventures in Lestoria/TSXParser.h +++ b/Adventures in Lestoria/TSXParser.h @@ -51,7 +51,7 @@ struct Tileset{ bool isTerrain=false; std::map ForegroundTileData; std::map UpperForegroundTileData; - std::map CollisionData; + std::map CollisionData; std::map StaircaseData; std::map> AnimationData; std::set ReflectiveData; @@ -178,7 +178,7 @@ class TSXParser{ } else if (newTag.tag=="object"&&previousTag=="tile"){ TileCollisionData data; - data.collision=geom2d::rect{{newTag.GetInteger("x"),newTag.GetInteger("y")},{newTag.GetInteger("width"),newTag.GetInteger("height")}}; + data.collision=geom2d::rect{{newTag.GetFloat("x"),newTag.GetFloat("y")},{newTag.GetFloat("width"),newTag.GetFloat("height")}}; if(parsedTilesetInfo.CollisionData.count(previousTagID)){ #ifdef _DEBUG if(_DEBUG_MAP_LOAD_INFO)ERR("WARNING! There was already collision data defined for tile "< - + diff --git a/Adventures in Lestoria/olcPGEX_TransformedView.h b/Adventures in Lestoria/olcPGEX_TransformedView.h index 2955c70f..10201b3c 100644 --- a/Adventures in Lestoria/olcPGEX_TransformedView.h +++ b/Adventures in Lestoria/olcPGEX_TransformedView.h @@ -644,12 +644,12 @@ namespace olc void TransformedView::FillRectDecal(const olc::vf2d & pos, const olc::vf2d & size, const olc::Pixel col) { - pge->FillRectDecal(WorldToScreen(pos), (size * m_vWorldScale).ceil(), col); + pge->FillRectDecal(WorldToScreen(pos), size * m_vWorldScale, col); } void TransformedView::DrawRectDecal(const olc::vf2d& pos, const olc::vf2d& size, const olc::Pixel col) { - pge->DrawRectDecal(WorldToScreen(pos), (size * m_vWorldScale).ceil(), col); + pge->DrawRectDecal(WorldToScreen(pos), size * m_vWorldScale, col); } void TransformedView::DrawLineDecal(const olc::vf2d& pos1, const olc::vf2d& pos2, Pixel p)