sigonasr2/VirusAttack
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implemented zooming and minimap navigation.

Browse Source
This commit is contained in:
sigonasr2 2023-08-26 00:08:40 -05:00
parent ab6c43f347
commit e632af5d58
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
olcCodeJam2023Entry/VirusAttack.cpp
View File

@ -34,7 +34,9 @@ bool VirusAttack::OnUserCreate(){
} }
void VirusAttack::HandleDraggingSelection(){ void VirusAttack::HandleDraggingSelection(){
auto NotClickingOnMinimap=[&](){return !(GetMouseX()>=ScreenWidth()-64&&GetMouseY()>=ScreenHeight()-64);};
if(GetMouse(0).bPressed){ if(GetMouse(0).bPressed){
if(NotClickingOnMinimap()){
for(auto&u:units){ for(auto&u:units){
u->Deselect(); u->Deselect();
} }
@ -42,7 +44,8 @@ void VirusAttack::HandleDraggingSelection(){
startingDragPos=GetWorldMousePos(); startingDragPos=GetWorldMousePos();
} }
} }
if(GetMouse(0).bReleased){ }
if(GetMouse(0).bReleased&&startingDragPos!=CONSTANT::UNSELECTED){
vf2d endDragPos=GetWorldMousePos(); vf2d endDragPos=GetWorldMousePos();
if(endDragPos.x<startingDragPos.x){std::swap(startingDragPos.x,endDragPos.x);} if(endDragPos.x<startingDragPos.x){std::swap(startingDragPos.x,endDragPos.x);}
if(endDragPos.y<startingDragPos.y){std::swap(startingDragPos.y,endDragPos.y);} if(endDragPos.y<startingDragPos.y){std::swap(startingDragPos.y,endDragPos.y);}
@ -160,10 +163,18 @@ void VirusAttack::HandlePanAndZoom(float fElapsedTime){
} }
} }
void VirusAttack::HandleMinimapClick(){
if(startingDragPos==CONSTANT::UNSELECTED&&GetMouse(0).bHeld&&GetMouseX()>=ScreenWidth()-64&&GetMouseY()>=ScreenHeight()-64){
vf2d minimapTL=GetScreenSize()-vf2d{64,64};
game.SetWorldOffset(vf2d(GetMousePos()-minimapTL)/64*CONSTANT::WORLD_SIZE*CONSTANT::TILE_SIZE-vf2d(GetScreenSize())/game.GetWorldScale()/2.f);
}
}
bool VirusAttack::OnUserUpdate(float fElapsedTime){ bool VirusAttack::OnUserUpdate(float fElapsedTime){
HandleDraggingSelection(); HandleDraggingSelection();
HandleRightClickMove(); HandleRightClickMove();
HandlePanAndZoom(fElapsedTime); HandlePanAndZoom(fElapsedTime);
HandleMinimapClick();
for(auto&u:units){ for(auto&u:units){
Unit*closestUnit=nullptr; Unit*closestUnit=nullptr;

1
olcCodeJam2023Entry/VirusAttack.h
View File

@ -21,6 +21,7 @@ private:
vf2d GetWorldMousePos(); vf2d GetWorldMousePos();
void HandlePanAndZoom(float fElapsedTime); void HandlePanAndZoom(float fElapsedTime);
void DrawMinimap(); void DrawMinimap();
void HandleMinimapClick();
public: public:
VirusAttack(); VirusAttack();