From 530fdc7494b1e2294296be4e7533ef49ec4cb8f0 Mon Sep 17 00:00:00 2001
From: sigonasr2 <sigonasr2@gmail.com>
Date: Sat, 17 Aug 2024 22:13:03 -0500
Subject: [PATCH] Scale and camera correction almost fixed. Still need to
 solidify zoom factors somehow.

---
 src/Hamster.cpp     |  8 ++++++--
 src/HamsterGame.cpp | 19 +++++++++----------
 src/HamsterGame.h   |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Hamster.cpp b/src/Hamster.cpp
index e078c05..22bead6 100644
--- a/src/Hamster.cpp
+++ b/src/Hamster.cpp
@@ -176,11 +176,15 @@ void Hamster::HandlePlayerControls(){
 	if(HamsterGame::Game().GetKey(A).bHeld){
 		aimingDir+=vf2d{-1,0};
 	}
-	if(HamsterGame::Game().GetKey(PGUP).bHeld){
+	if(HamsterGame::Game().GetKey(PGUP).bPressed){
+		HamsterGame::Game().tv.ZoomAtScreenPos(0.95f,HamsterGame::Game().tv.WorldToScreen(GetPos()));
+		HamsterGame::Game().camera.SetViewSize(HamsterGame::Game().camera.GetViewSize()*1.05f);
 		z+=HamsterGame::Game().GetElapsedTime();
 	}
-	if(HamsterGame::Game().GetKey(PGDN).bHeld){
+	if(HamsterGame::Game().GetKey(PGDN).bPressed){
 		z=std::max(0.f,z-HamsterGame::Game().GetElapsedTime());
+		HamsterGame::Game().tv.ZoomAtScreenPos(1.05f,HamsterGame::Game().tv.WorldToScreen(GetPos()));
+		HamsterGame::Game().camera.SetViewSize(HamsterGame::Game().camera.GetViewSize()*0.95f);
 	}
 	if(aimingDir!=vf2d{}){
 		targetRot=aimingDir.norm().polar().y;
diff --git a/src/HamsterGame.cpp b/src/HamsterGame.cpp
index 78e0b79..852de8b 100644
--- a/src/HamsterGame.cpp
+++ b/src/HamsterGame.cpp
@@ -96,13 +96,14 @@ void HamsterGame::LoadLevel(const std::string_view mapName){
 
 void HamsterGame::UpdateGame(const float fElapsedTime){
 	/*if(Hamster::GetPlayer().GetZ()>1.f){
-		tv.SetZoom(1.f/sqrt(Hamster::GetPlayer().GetZ()),tv.WorldToScreen(Hamster::GetPlayer().GetPos())-SCREEN_FRAME.pos);
+		tv.SetZoom(1/Hamster::GetPlayer().GetZ(),tv.WorldToScreen(Hamster::GetPlayer().GetPos()));
 	}else{
-		tv.SetZoom(1.f,tv.WorldToScreen(Hamster::GetPlayer().GetPos())-SCREEN_FRAME.pos);
+		tv.SetZoom(1.f,tv.WorldToScreen(Hamster::GetPlayer().GetPos()));
 	}*/
+
+
 	camera.Update(fElapsedTime);
-	tv.HandlePanAndZoom();
-	//std::cout<<tv.GetWorldScale().str()<<std::endl;
+	tv.SetWorldOffset(-SCREEN_FRAME.pos*(camera.GetViewSize()/SCREEN_FRAME.size)+camera.GetViewPosition());
 	Hamster::UpdateHamsters(fElapsedTime);
 	Powerup::UpdatePowerups(fElapsedTime);
 	border.Update(fElapsedTime);
@@ -113,8 +114,6 @@ void HamsterGame::DrawGame(){
 	Powerup::DrawPowerups(tv);
 	Hamster::DrawHamsters(tv);
 	border.Draw();
-	DrawStringDecal(SCREEN_FRAME.pos+vf2d{1,1},"Terrain Type: "+Terrain::TerrainToString(Hamster::GetPlayer().GetTerrainStandingOn()),BLACK);
-	DrawStringDecal(SCREEN_FRAME.pos,"Terrain Type: "+Terrain::TerrainToString(Hamster::GetPlayer().GetTerrainStandingOn()));
 
 	#pragma region Powerup Display
 		for(int y:std::ranges::iota_view(0,4)){
@@ -145,6 +144,8 @@ void HamsterGame::DrawGame(){
 			GradientFillRectDecal(vf2d{12.f,240.f}+vf2d{12.f,5.f},vf2d{Hamster::GetPlayer().GetBurnRatio()*57.f,4.f},{250,177,163},{226,228,255},{226,228,255},{250,177,163});
 		}
 	#pragma endregion
+
+		tv.FillRectDecal(GetMousePos(),{2,2},GREEN);
 }
 
 const Terrain::TerrainType HamsterGame::GetTerrainTypeAtPos(const vf2d pos)const{
@@ -163,11 +164,9 @@ const Terrain::TerrainType HamsterGame::GetTerrainTypeAtPos(const vf2d pos)const
 void HamsterGame::DrawLevelTiles(){
 	float extendedBounds{SCREEN_FRAME.pos.x};
 	extendedBounds*=1/tv.GetWorldScale().x;
-	std::cout<<tv.GetWorldTL().str()<<std::endl;
-	std::cout<<tv.GetWorldBR().str()<<std::endl;
 	for(const LayerTag&layer:currentMap.value().GetData().GetLayers()){
-		for(float y=tv.GetWorldTL().y-16;y<=tv.GetWorldBR().y+16;y+=16){
-			for(float x=tv.GetWorldTL().x-1+extendedBounds;x<=tv.GetWorldBR().x+16+extendedBounds;x+=16){
+		for(float y=tv.GetWorldTL().y-17;y<=tv.GetWorldBR().y+16;y+=16){
+			for(float x=tv.GetWorldTL().x-17+extendedBounds;x<=tv.GetWorldBR().x+16+extendedBounds;x+=16){
 				if(x<=0.f||y<=0.f||x>=currentMap.value().GetData().GetMapData().width*16||y>=currentMap.value().GetData().GetMapData().height*16)continue;
 				const int numTilesWide{GetGFX("gametiles.png").Sprite()->width/16};
 				const int numTilesTall{GetGFX("gametiles.png").Sprite()->height/16};
diff --git a/src/HamsterGame.h b/src/HamsterGame.h
index a9edb7d..3574be9 100644
--- a/src/HamsterGame.h
+++ b/src/HamsterGame.h
@@ -70,10 +70,10 @@ public:
 	static std::unordered_map<uint32_t,Animate2D::FrameSequence>ANIMATED_TILE_IDS;
 	const double GetRuntime()const;
 	const Terrain::TerrainType GetTerrainTypeAtPos(const vf2d pos)const;
+	Camera2D camera;
 private:
 	void UpdateGame(const float fElapsedTime);
 	void DrawGame();
-	Camera2D camera;
 	void LoadGraphics();
 	void LoadAnimations();
 	void LoadLevel(const std::string_view mapName);