Merge pull request #35 from amerkoleci/improvements

Improvements
FosterFramework · Nov 7, 2023 · 023c72e · 023c72e
2 parents e8a2327 + 18c3532
commit 023c72e
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 18 deletions.
diff --git a/Framework/Graphics/Graphics.cs b/Framework/Graphics/Graphics.cs
@@ -53,7 +53,7 @@ public static void Clear(Color color)
 		/// <summary>
 		/// Clears the Back Buffer
 		/// </summary>
-		public static void Clear(Color color, int depth, int stencil, ClearMask mask)
+		public static void Clear(Color color, float depth, int stencil, ClearMask mask)
 		{
 			Platform.FosterClearCommand clear = new()
 			{
@@ -152,4 +152,4 @@ internal static void QueueDeleteResource(IntPtr ptr, Action<IntPtr> deleteMethod
 			}
 		}
 	}
-}
+}
diff --git a/Framework/Graphics/Target.cs b/Framework/Graphics/Target.cs
@@ -85,7 +85,7 @@ public void Clear(Color color)
 	/// <summary>
 	/// Clears the Target
 	/// </summary>
-	public void Clear(Color color, int depth, int stencil, ClearMask mask)
+	public void Clear(Color color, float depth, int stencil, ClearMask mask)
 	{
 		Debug.Assert(!IsDisposed, "Target is Disposed");
 

diff --git a/Framework/Platform.cs b/Framework/Platform.cs
@@ -141,7 +141,7 @@ public struct FosterClearCommand
 		public IntPtr target;
 		public FosterRect clip;
 		public Color color;
-		public int depth;
+		public float depth;
 		public int stencil;
 		public ClearMask mask;
 	}
@@ -265,4 +265,4 @@ public static void FreeUTF8(IntPtr ptr)
 	public static extern void FosterDraw(ref FosterDrawCommand command);
 	[DllImport(DLL)]
 	public static extern void FosterClear(ref FosterClearCommand command);
-}
+}
diff --git a/Platform/CMakeLists.txt b/Platform/CMakeLists.txt
@@ -17,15 +17,19 @@ if(NOT CMAKE_BUILD_TYPE)
 	set(CMAKE_BUILD_TYPE Release)
 endif()
 
-add_library(FosterPlatform SHARED
+# Define target name
+set (TARGET_NAME FosterPlatform)
+
+add_library(${TARGET_NAME} SHARED
+	include/foster_platform.h
 	src/foster_platform.c
 	src/foster_image.c
 	src/foster_renderer.c
 	src/foster_renderer_d3d11.c
 	src/foster_renderer_opengl.c
 )
 
-target_include_directories(FosterPlatform
+target_include_directories(${TARGET_NAME}
 	PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 	PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
 )
@@ -42,7 +46,7 @@ else()
 endif()
 
 # Output libs to platform-specific library
-set_target_properties(FosterPlatform
+set_target_properties(${TARGET_NAME}
 	PROPERTIES
 	ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libs/${FosterTarget}"
 	ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/libs/${FosterTarget}"
@@ -52,25 +56,38 @@ set_target_properties(FosterPlatform
 	RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/libs/${FosterTarget}"
 )
 
+if (MSVC)
+    # Set warning level 3
+    target_compile_options(${TARGET_NAME} PRIVATE /W3)
+
+    # Warnings as Errors Enabled
+    target_compile_options(${TARGET_NAME} PRIVATE /WX)
+endif()
+
+if(WIN32)
+    target_compile_definitions(${TARGET_NAME} PRIVATE _UNICODE UNICODE _CRT_SECURE_NO_WARNINGS)
+    target_compile_definitions(${TARGET_NAME} PRIVATE NOMINMAX)
+endif ()
+
 # tracks which libraries we need to link, depends on Options above
 set(LIBS "")
 
 # use the OpenGL Renderer Backend
 if (FOSTER_OPENGL_ENABLED)
-	add_compile_definitions(FOSTER_OPENGL_ENABLED)
+	target_compile_definitions(${TARGET_NAME} PRIVATE FOSTER_OPENGL_ENABLED)
 endif()
 
 # use the D3D11 Renderer Backend
 if (FOSTER_D3D11_ENABLED)
-	add_compile_definitions(FOSTER_D3D11_ENABLED)
+	target_compile_definitions(${TARGET_NAME} PRIVATE FOSTER_D3D11_ENABLED)
 	set(LIBS ${LIBS} d3d11.lib dxguid.lib D3Dcompiler.lib)
 endif()
 
 # Emscripten can import SDL2 directly
 if (EMSCRIPTEN)
 
-	set_target_properties(FosterPlatform PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
-	target_link_libraries(FosterPlatform "-s USE_SDL=2 -s USE_WEBGL2=1")
+	set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_FLAGS "-s USE_SDL=2")
+	target_link_libraries(${TARGET_NAME} "-s USE_SDL=2 -s USE_WEBGL2=1")
 
 # Pull SDL2 from its Github repo
 else()
@@ -84,7 +101,7 @@ else()
 		FetchContent_Declare(
 			SDL2
 			GIT_REPOSITORY https://github.com/libsdl-org/SDL
-			GIT_TAG release-2.28.2
+			GIT_TAG release-2.28.5
 			GIT_PROGRESS TRUE
 		)
 		FetchContent_MakeAvailable(SDL2)
@@ -94,11 +111,11 @@ else()
 
 	# statically link SDL2 since we're building it ourselve
 	set(LIBS ${LIBS} ${FOSTER_SDL2_LIBS})
-	target_include_directories(FosterPlatform PRIVATE ${FOSTER_SDL2_INCLUDE})
+	target_include_directories(${TARGET_NAME} PRIVATE ${FOSTER_SDL2_INCLUDE})
 endif()
 
 # Tell SDL it's going to be a shared lib
 set_property(TARGET ${FOSTER_SDL2_LIBS} PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 # Link SDL
-target_link_libraries(FosterPlatform PRIVATE ${LIBS})
+target_link_libraries(${TARGET_NAME} PRIVATE ${LIBS})
diff --git a/Platform/include/foster_platform.h b/Platform/include/foster_platform.h
@@ -513,7 +513,7 @@ typedef struct FosterClearCommand
 	FosterTarget* target;
 	FosterRect clip;
 	FosterColor color;
-	int depth;
+	float depth;
 	int stencil;
 	FosterClearMask mask;
 } FosterClearCommand;
@@ -624,4 +624,4 @@ FOSTER_API void FosterClear(FosterClearCommand* clear);
 }
 #endif
 
-#endif
+#endif
diff --git a/Platform/libs/osx/libFosterPlatform.dylib b/Platform/libs/osx/libFosterPlatform.dylib
diff --git a/Platform/libs/x64/FosterPlatform.dll b/Platform/libs/x64/FosterPlatform.dll
diff --git a/Platform/src/foster_platform.c b/Platform/src/foster_platform.c
@@ -176,7 +176,7 @@ void FosterPollEvents()
 		}
 		else if (event.type == SDL_MOUSEWHEEL)
 		{
-			fstate.desc.onMouseWheel(event.wheel.x, event.wheel.y);
+			fstate.desc.onMouseWheel((float)event.wheel.x, (float)event.wheel.y);
 		}
 		// Keyboard
 		else if (event.type == SDL_KEYDOWN || event.type == SDL_KEYUP)