GUI

Yuria-Shikibe · Dec 30, 2023 · 39056fb · 39056fb
1 parent 9076591
commit 39056fb
Show file tree

Hide file tree

Showing 63 changed files with 2,428 additions and 1,716 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.27)
+cmake_minimum_required(VERSION 3.26)
 
 message(STATUS "Preparing Env...")
 
@@ -7,15 +7,15 @@ set(CMAKE_CXX_STANDARD 23)
 
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if (CMAKE_VERSION EQUAL 3.25)
-    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "3c375311-a3c9-4396-a187-3227ef642046")
-elseif (CMAKE_VERSION EQUAL 3.26)
-    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
-elseif (CMAKE_VERSION EQUAL 3.27)
-    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "aa1f7df0-828a-4fcd-9afc-2dc80491aca7")
-else()
-    message(WARNING "Newer CMake version, CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API may not be set.")
-endif()
+#if (CMAKE_VERSION EQUAL 3.25)
+#    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "3c375311-a3c9-4396-a187-3227ef642046")
+#elseif (CMAKE_VERSION EQUAL 3.26)
+#    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "2182bf5c-ef0d-489a-91da-49dbc3090d2a")
+#elseif (CMAKE_VERSION EQUAL 3.27)
+#    set(CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API "aa1f7df0-828a-4fcd-9afc-2dc80491aca7")
+#else()
+#    message(WARNING "Newer CMake version, CMAKE_EXPERIMENTAL_CXX_MODULE_CMAKE_API may not be set.")
+#endif()
 
 project(GameEngine
     VERSION 0.0.1
@@ -25,6 +25,24 @@ message(STATUS "Type: ${CMAKE_BUILD_TYPE}")
 
 message(STATUS "Using Generator : ${CMAKE_CXX_COMPILER_ID}")
 
+#if(${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
+#    set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP ON)
+#
+#    string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE
+#            "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E -x c++ <SOURCE>"
+#            " -MT <DYNDEP_FILE> -MD -MF <DEP_FILE>"
+#            " -fmodules-ts -fdep-file=<DYNDEP_FILE> -fdep-output=<OBJECT>"
+#            " -fdep-format=trtbd")
+#
+#    set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG
+#            " -fmodules-ts -fmodule-mapper=<MODULE_MAP_FILE>"
+#            " -fdep-format=trtbd -x c++")
+#
+#    set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fmodules-ts")
+#
+#    message(STATUS "Flags: ${CMAKE_CXX_FLAGS}")
+#endif()
+
 set(SRC_DIR src)
 set(RES_DIR resource)
 set(REF_DIR include)
@@ -56,14 +74,6 @@ else()
     file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/${RES_DIR} DESTINATION
             ${EXE_DIR}
     )
-
-    file(GLOB_RECURSE BIN
-            ${EXE_DIR}/${RES_DIR}/*.dll
-    )
-
-    file(COPY ${BIN} DESTINATION
-            ${EXE_DIR}
-    )
 endif ()
 
 add_compile_definitions(APPLICATION_NAME=\"Game_Engine_Demo-${PROJECT_VERSION}\")
@@ -138,20 +148,5 @@ message(STATUS "Compile Complete...")
 
 #if(0#[[CMAKE_CXX_COMPILER_ID STREQUAL "GNU"]])
 #
-#    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmodules-ts")
-#    set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP ON)
-#
-#    #    string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE
-#    #            "<CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS> -E -x c++ <SOURCE>"
-#    #            " -MT <DYNDEP_FILE> -MD -MF <DEP_FILE>"
-#    #            " -fmodules-ts -fdep-file=<DYNDEP_FILE> -fdep-output=<OBJECT>"
-#    #            " -fdep-format=trtbd")
-#
-#    #    set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG
-#    #            " -fmodules-ts -fmodule-mapper=<MODULE_MAP_FILE>"
-#    #            " -fdep-format=trtbd -x c++")
-#
-#    #    set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-fmodules-ts")
-#
-#    message(STATUS "Flags: ${CMAKE_CXX_FLAGS}")
+
 #endif()
diff --git a/include/ik_irrKlangTypes.h b/include/ik_irrKlangTypes.h
@@ -55,13 +55,13 @@ namespace irrklang
 
     // some constants
 
-	constexpr ik_f32 IK_ROUNDING_ERROR_32	= 0.000001f;
-	constexpr ik_f64 IK_PI64			    = 3.1415926535897932384626433832795028841971693993751;
-	constexpr ik_f32 IK_PI32			    = 3.14159265359f;
-	constexpr ik_f32 IK_RADTODEG            = 180.0f / IK_PI32;
-	constexpr ik_f32 IK_DEGTORAD            = IK_PI32 / 180.0f;
-	constexpr ik_f64 IK_RADTODEG64          = 180.0 / IK_PI64;
-	constexpr ik_f64 IK_DEGTORAD64          = IK_PI64 / 180.0;
+	inline constexpr ik_f32 IK_ROUNDING_ERROR_32	= 0.000001f;
+	inline constexpr ik_f64 IK_PI64			    = 3.1415926535897932384626433832795028841971693993751;
+	inline constexpr ik_f32 IK_PI32			    = 3.14159265359f;
+	inline constexpr ik_f32 IK_RADTODEG            = 180.0f / IK_PI32;
+	inline constexpr ik_f32 IK_DEGTORAD            = IK_PI32 / 180.0f;
+	inline constexpr ik_f64 IK_RADTODEG64          = 180.0 / IK_PI64;
+	inline constexpr ik_f64 IK_DEGTORAD64          = IK_PI64 / 180.0;
 
 	//! returns if a float equals the other one, taking floating
 	//! point rounding errors into account

diff --git a/include/irrKlang.h b/include/irrKlang.h
@@ -952,7 +952,7 @@ namespace irrklang
 	IRRKLANG_API ISoundEngine* IRRKLANGCALLCONV createIrrKlangDevice(
 		E_SOUND_OUTPUT_DRIVER driver = ESOD_AUTO_DETECT,
 		int options = ESEO_DEFAULT_OPTIONS,
-		const char* deviceID = 0,
+		const char* deviceID = nullptr,
 		const char* sdk_version_do_not_use = IRR_KLANG_VERSION);