Fixced the mouse position bug for real this time

Empaerior/Empaerior.vcxproj

@@ -127,7 +127,7 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2_image.lib;SDL2_ttf.lib;SDL2_mixer.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\SDL2\lib\x86;..\SDL2_image\lib\x86;..\SDL2_mixer\lib\x86;..\SDL2_ttf\lib\x86;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -218,4 +218,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <ItemGroup>
+    <ResourceCompile Include="icon.rc">
+    </ResourceCompile>
+  </ItemGroup>
 </Project>

Empaerior/Empaerior.vcxproj.filters

@@ -280,4 +280,7 @@
       <Filter>utilities</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="icon.rc" />
+  </ItemGroup>
 </Project>

Empaerior/Src/State.cpp

@@ -3,6 +3,7 @@
 #include "Game.h"
 #include <SDL.h>
 #include "utilities/collisions.h"
+#include "utilities/Utilities.h"
 #include <SDL_mouse.h>
 #include <random>
 //for testing
@@ -89,7 +90,7 @@ State::State()
 	std::uniform_int_distribution<int> yDist(0, 15);
 	std::uniform_int_distribution<int> mines_rng(lower_bound, upper_bound);
 	int mines = mines_rng(rng);
-	std::cout << "mines: " << mines << '\n';
+
 	while (mines != 0)
 	{
 		field_matrix[xDist( rng)][yDist( rng)] = -1;
@@ -178,30 +179,11 @@ State::State()
 		{
 
 			//mouse coordinates 
-			int m_x = 0;
-			int m_y = 0;
-			SDL_GetMouseState(&m_x, &m_y);
-
-
-
-			m_x *= kamera.rect.w;
-			m_y *= kamera.rect.h;
-
-
-
-			m_x /= 960;
-			m_y /= 800;
-
-			m_x += kamera.rect.x;
-			m_y += kamera.rect.y;
-
-
-			SDL_Rect renderer_viewport;
-			SDL_RenderGetViewport(Empaerior::Game::window.renderer, &renderer_viewport);
-
-
-			m_x += renderer_viewport.x;
-			m_y += renderer_viewport.y;
+			auto f_m = Empaerior::get_world_mouse_coords(kamera);
+
+			int m_x = int(f_m.first);
+			int m_y = int(f_m.second);
+
 
 
 			if (rect_contains_point(Ecs.get_component<Empaerior::Sprite_Component>(face_boi_id).sprites[0].get_dimensions(), m_x, m_y))
@@ -230,29 +212,11 @@ State::State()
 	{
 
 		//mouse coordinates 
-		int m_x = 0;
-		int m_y = 0;
-		SDL_GetMouseState(&m_x, &m_y);
-
-
-
-		m_x *= kamera.rect.w;
-		m_y *= kamera.rect.h;
-
-
-
-		m_x /= 960;
-		m_y /= 800;
-
-		m_x += kamera.rect.x;
-		m_y += kamera.rect.y;
-
-		SDL_Rect renderer_viewport;
-		SDL_RenderGetViewport(Empaerior::Game::window.renderer, &renderer_viewport);
-
+
+		auto f_m = Empaerior::get_world_mouse_coords(kamera);
 
-		m_x += renderer_viewport.x;
-		m_y += renderer_viewport.y;
+		int m_x = int(f_m.first);
+		int m_y = int(f_m.second);
 
 		if (rect_contains_point(Ecs.get_component<Empaerior::Sprite_Component>(face_boi_id).sprites[0].get_dimensions(), m_x, m_y))
 		{
@@ -307,29 +271,11 @@ State::State()
 			#define l_tile Ecs.get_component<Mine_field>(map).field[i][j]
 
 					//mouse coordinates 
-					int m_x = 0;
-					int m_y = 0;
-					SDL_GetMouseState(&m_x, &m_y);
-
-
-
-					m_x *= kamera.rect.w;
-					m_y *= kamera.rect.h;
-
-
-
-					m_x /= 960;
-					m_y /= 800;
-
-					m_x += kamera.rect.x;
-					m_y += kamera.rect.y;
-
-					SDL_Rect renderer_viewport;
-					SDL_RenderGetViewport(Empaerior::Game::window.renderer, &renderer_viewport);
-
+
+					auto f_m = Empaerior::get_world_mouse_coords(kamera);
 
-					m_x -= renderer_viewport.x;
-					m_y -= renderer_viewport.y;
+					int m_x = int(f_m.first);
+					int m_y = int(f_m.second);
 
 
 

Empaerior/Src/main.cpp

@@ -1,6 +1,8 @@
+
 #include "pch.h"
 
 
+#include <Windows.h>
 
 #ifdef _DEBUG   
 #ifndef DBG_NEW      
@@ -13,7 +15,7 @@
 //
 
 
-
+#include "SDL_Main.h"
 #include "Game.h"
 
 #include <crtdbg.h>
@@ -49,8 +51,11 @@ Empaerior::Window Empaerior::Game::window;
 
 
 
-int main(int argc, char** argv)
+int SDL_main(int argc, char* argv[])
 {
+	HWND hWnd = GetConsoleWindow();
+	ShowWindow(hWnd, SW_HIDE);
+
 	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 	_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_DEBUG);
 	#pragma region SDL_Inititalization

Empaerior/Src/utilities/Utilities.cpp

@@ -1 +1,57 @@
-#include "pch.h"
+#include "pch.h"
+#include "Utilities.h"
+#include "Game.h"
+std::pair<float, float> Empaerior::get_world_mouse_coords(const Empaerior::Camera& camera)
+{
+	//get the positions
+	std::pair<int, int> pos;
+	std::pair<float, float> f_pos;
+
+
+	SDL_GetMouseState(&pos.first, &pos.second);
+
+
+
+	f_pos.first = float(pos.first);
+	f_pos.second = float(pos.second);
+
+
+
+	//Scale down the positions to match the world
+	float sx = 0;
+	float sy = 0;
+	SDL_RenderGetScale(Empaerior::Game::window.renderer, &sx, &sy);
+
+	f_pos.first /= sx;
+	f_pos.second /= sy;
+
+
+
+
+	//Transform for the position of the renderer
+	SDL_Rect renderer_viewport;
+
+	SDL_RenderGetViewport(Empaerior::Game::window.renderer, &renderer_viewport);
+	f_pos.first -= renderer_viewport.x;
+	f_pos.second -= renderer_viewport.y;
+
+	//Transform the position relative to the camera dimesnions
+	f_pos.first *= camera.rect.w;
+	f_pos.second *= camera.rect.h;
+
+
+
+	f_pos.first /= renderer_viewport.w;
+	f_pos.second /= renderer_viewport.h;
+
+
+
+	//Tranform for position
+	f_pos.first += camera.rect.x;
+	f_pos.second += camera.rect.y;
+
+
+
+
+	return f_pos;
+}

Empaerior/Src/utilities/Utilities.h

@@ -2,10 +2,12 @@
 #include <SDL.h>
 #include <string>
 #include <iostream>
+#include "graphics/rendering/Camera.h"
+#include "Exceptions/Exceptions.h"
 namespace Empaerior
 {
 	//clipboard functions
-	std::string get_clipboard_text()
+	inline std::string get_clipboard_text()
 	{
 		if (SDL_HasClipboardText())//if there's text
 		{
@@ -16,7 +18,7 @@ namespace Empaerior
 		}
 		return "";
 	}
-	void set_clipboard_text(const char* text)
+	inline void set_clipboard_text(const char* text)
 	{
 		try
 		{
@@ -35,7 +37,7 @@ namespace Empaerior
 
 
 	//system functions
-	std::string get_platform()//gets the current platform
+	inline std::string get_platform()//gets the current platform
 	{
 		const char* sdl_platform = SDL_GetPlatform();
 		std::string e_platform = sdl_platform;
@@ -44,22 +46,22 @@ namespace Empaerior
 
 	}
 
-	int cpu_cache_size()//returns the size of the cpu  cache in bytes
+	inline	int cpu_cache_size()//returns the size of the cpu  cache in bytes
 	{
 		return SDL_GetCPUCacheLineSize();
 	}
 
-	int get_core_number()// get the number of CPU cores available
+	inline	int get_core_number()// get the number of CPU cores available
 	{
 		return SDL_GetCPUCount();
 	}
 
-	int get_system_ram()//get the amount of RAM configured in the system.
+	inline	int get_system_ram()//get the amount of RAM configured in the system.
 	{
 		return SDL_GetSystemRAM();
 	}
 
-
+	std::pair<float,float> get_world_mouse_coords(const Empaerior::Camera& camera);
 
 
 }

premake5.lua

@@ -1,4 +1,5 @@
 workspace "Empaerior"
+
 	architecture "x86"
 
 	configurations