v1.0.0 update

BredaUniversityGames · Jun 19, 2023 · c8824b6 · c8824b6
1 parent f3373aa
commit c8824b6
Show file tree

Hide file tree

Showing 1,052 changed files with 12,901 additions and 8,551 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,92 +1,92 @@
-# CMakeList.txt : Top-level CMake project file, do global configuration
-# and include sub-projects here.
-#
-cmake_minimum_required (VERSION 3.13)
-project ("DXX-Raytracer")
-set (CMAKE_CXX_STANDARD 17)
-
-set(CMAKE_C_COMPILER_ID, "MSVC")
-set(CMAKE_CXX_COMPILER_ID, "MSVC")
-set(BUILD_ARGS "-w" "dupbuild=warn")
-
-#Version Control & Identification
-message("Build the Descent 1")
-add_compile_definitions(PUBLIC  
-
-#This enum decides if we are in the shipping build or not, this is for the future.
-#SHIPPING_BUILD 
-
-D1X_RAYTRACER_NAME="D1X_RAYTRACER"
-
-D1X_RAYTRACER_VERSION_MAJORi=0
-D1X_RAYTRACER_VERSION_MINORi=9
-D1X_RAYTRACER_VERSION_MICROi=2
-
-#DXX-Retro last used version
-DXX_VERSION_MAJORi=0 
-DXX_VERSION_MINORi=58 
-DXX_VERSION_MICROi=1
-
-BASE_SCREEN_SIZE_X=1280
-BASE_SCREEN_SIZE_Y=720
-BASE_SCREEN_ASPECT_X=4
-BASE_SCREEN_ASPECT_Y=3
-BASE_SCREEN_WINDOWED=1
-BASE_FPS_INDICATOR=1)
-
-#compile Definitions.
-if (WIN32)
-add_compile_definitions(PUBLIC 
-_WIN32 WINDOWS_IGNORE_PACKING_MISMATCH 
-WIN32_LEAN_AND_MEAN
-NOMINMAX
-)
-endif ()
-if(DEFINED ENV{EDITOR})
-message("Using editor")
-add_compile_definitions(PUBLIC EDITOR)
-endif()
-
-if(${GRAPHICS_API} STREQUAL "DirectX12")
-message("Render api is ${GRAPHICS_API}")
-add_compile_definitions(PUBLIC RT_DX12)
-elseif(${GRAPHICS_API} STREQUAL "OpenGL")
-message("Render api is ${GRAPHICS_API}")
-add_compile_definitions(PUBLIC OGL)
-else()
-message(FATAL_ERROR "No graphic API selected!")
-endif()
-
-if(CMAKE_BUILD_TYPE MATCHES Debug)
-add_compile_definitions(PUBLIC 
-DEBUG
-_DEBUG)
-message(STATUS, "Build type selected: Debug")
-elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
-add_compile_definitions(PUBLIC 
-RELEASE
-_RELEASE)
-message(STATUS, "Build type selected: RelWithDebInfo")
-elseif(CMAKE_BUILD_TYPE MATCHES Release)
-add_compile_definitions(PUBLIC 
-RELEASE
-_RELEASE
-SHIPPING_BUILD)
-message(STATUS, "Build type selected: Release")
-else()
-message(FATAL_ERROR, "No build type selected!")
-endif()
-
-if(DEFINED ENV{QUICK_START})
-add_compile_definitions(PUBLIC QUICK_START)
-message(STATUS "quick build selected, will immediatly go to level select.")
-message(STATUS ${QUICKSTART})
-else()
-message(STATUS "normal build selected")
-message(STATUS ${QUICKSTART})
-endif()
-
-add_subdirectory ("sdl-master")
-add_subdirectory ("physfs-main")
-add_subdirectory ("RT")
-add_subdirectory ("d1")
+# CMakeList.txt : Top-level CMake project file, do global configuration
+# and include sub-projects here.
+#
+cmake_minimum_required (VERSION 3.13)
+project ("DXX-Raytracer")
+set (CMAKE_CXX_STANDARD 17)
+
+set(CMAKE_C_COMPILER_ID, "MSVC")
+set(CMAKE_CXX_COMPILER_ID, "MSVC")
+set(BUILD_ARGS "-w" "dupbuild=warn")
+
+#Version Control & Identification
+message("Build the Descent 1")
+add_compile_definitions(PUBLIC  
+
+#This enum decides if we are in the shipping build or not, this is for the future.
+#SHIPPING_BUILD 
+
+D1X_RAYTRACER_NAME="D1X_RAYTRACER"
+
+D1X_RAYTRACER_VERSION_MAJORi=1
+D1X_RAYTRACER_VERSION_MINORi=0
+D1X_RAYTRACER_VERSION_MICROi=0
+
+#DXX-Retro last used version
+DXX_VERSION_MAJORi=0 
+DXX_VERSION_MINORi=58 
+DXX_VERSION_MICROi=1
+
+BASE_SCREEN_SIZE_X=1280
+BASE_SCREEN_SIZE_Y=720
+BASE_SCREEN_ASPECT_X=4
+BASE_SCREEN_ASPECT_Y=3
+BASE_SCREEN_WINDOWED=1
+BASE_FPS_INDICATOR=1)
+
+#compile Definitions.
+if (WIN32)
+add_compile_definitions(PUBLIC 
+_WIN32 WINDOWS_IGNORE_PACKING_MISMATCH 
+WIN32_LEAN_AND_MEAN
+NOMINMAX
+)
+endif ()
+if(DEFINED ENV{EDITOR})
+message("Using editor")
+add_compile_definitions(PUBLIC EDITOR)
+endif()
+
+if(${GRAPHICS_API} STREQUAL "DirectX12")
+message("Render api is ${GRAPHICS_API}")
+add_compile_definitions(PUBLIC RT_DX12)
+elseif(${GRAPHICS_API} STREQUAL "OpenGL")
+message("Render api is ${GRAPHICS_API}")
+add_compile_definitions(PUBLIC OGL)
+else()
+message(FATAL_ERROR "No graphic API selected!")
+endif()
+
+if(CMAKE_BUILD_TYPE MATCHES Debug)
+add_compile_definitions(PUBLIC 
+DEBUG
+_DEBUG)
+message(STATUS, "Build type selected: Debug")
+elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+add_compile_definitions(PUBLIC 
+RELEASE
+_RELEASE)
+message(STATUS, "Build type selected: RelWithDebInfo")
+elseif(CMAKE_BUILD_TYPE MATCHES Release)
+add_compile_definitions(PUBLIC 
+RELEASE
+_RELEASE
+SHIPPING_BUILD)
+message(STATUS, "Build type selected: Release")
+else()
+message(FATAL_ERROR, "No build type selected!")
+endif()
+
+if(DEFINED ENV{QUICK_START})
+add_compile_definitions(PUBLIC QUICK_START)
+message(STATUS "quick build selected, will immediatly go to level select.")
+message(STATUS ${QUICKSTART})
+else()
+message(STATUS "normal build selected")
+message(STATUS ${QUICKSTART})
+endif()
+
+add_subdirectory ("sdl-master")
+add_subdirectory ("physfs-main")
+add_subdirectory ("RT")
+add_subdirectory ("d1")
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -1,83 +1,83 @@
-{
-  "cmakeMinimumRequired": {
-    "major": 3,
-    "minor": 21,
-    "patch": 0
-  },
-  "version": 3,
-  "configurePresets": [
-    {
-      "hidden": true,
-      "name": "default",
-      "description": "default-for-all",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/out/build/${presetName}",
-      "cacheVariables": {
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
-      }
-    },
-    {
-      "name": "directx12-win-ship",
-      "description": "The shipping build for descent.",
-      "inherits": "default",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "GRAPHICS_API": "DirectX12"
-      }
-    },
-    {
-      "name": "directx12-win-debug",
-      "description": "Normal directx12 raytrace debug build.",
-      "inherits": "default",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "GRAPHICS_API": "DirectX12"
-      }
-    },
-    {
-      "name": "directx12-win-release",
-      "description": "Directx12_build",
-      "inherits": "default",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo ",
-        "GRAPHICS_API": "DirectX12"
-      }
-    },
-    {
-      "name": "directx12-win-debug-quick",
-      "description": "Directx12_build that skips skips the menu",
-      "inherits": "directx12-win-debug",
-      "cacheVariables": {
-        "QUICK_START": "true",
-        "GRAPHICS_API": "DirectX12"
-      }
-    },
-    {
-      "name": "directx12-win-release-quick",
-      "description": "Directx12_build that skips skips the menu",
-      "inherits": "directx12-win-release",
-      "cacheVariables": {
-        "QUICK_START": "true",
-        "GRAPHICS_API": "DirectX12"
-      }
-    },
-    {
-      "name": "openGL-x64-debug",
-      "description": "OpenGL Build for x64, no x86 build exists",
-      "inherits": "default",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "GRAPHICS_API": "OpenGL"
-      }
-    },
-    {
-      "name": "openGL-x64-release",
-      "description": "OpenGL Build for x64, no x86 build exists",
-      "inherits": "default",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "GRAPHICS_API": "OpenGL"
-      }
-    }
-  ]
+{
+  "cmakeMinimumRequired": {
+    "major": 3,
+    "minor": 21,
+    "patch": 0
+  },
+  "version": 3,
+  "configurePresets": [
+    {
+      "hidden": true,
+      "name": "default",
+      "description": "default-for-all",
+      "generator": "Ninja",
+      "binaryDir": "${sourceDir}/out/build/${presetName}",
+      "cacheVariables": {
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
+      }
+    },
+    {
+      "name": "directx12-win-ship",
+      "description": "The shipping build for descent.",
+      "inherits": "default",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "GRAPHICS_API": "DirectX12"
+      }
+    },
+    {
+      "name": "directx12-win-debug",
+      "description": "Normal directx12 raytrace debug build.",
+      "inherits": "default",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "GRAPHICS_API": "DirectX12"
+      }
+    },
+    {
+      "name": "directx12-win-release",
+      "description": "Directx12_build",
+      "inherits": "default",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
+        "GRAPHICS_API": "DirectX12"
+      }
+    },
+    {
+      "name": "directx12-win-debug-quick",
+      "description": "Directx12_build that skips skips the menu",
+      "inherits": "directx12-win-debug",
+      "cacheVariables": {
+        "QUICK_START": "true",
+        "GRAPHICS_API": "DirectX12"
+      }
+    },
+    {
+      "name": "directx12-win-release-quick",
+      "description": "Directx12_build that skips skips the menu",
+      "inherits": "directx12-win-release",
+      "cacheVariables": {
+        "QUICK_START": "true",
+        "GRAPHICS_API": "DirectX12"
+      }
+    },
+    {
+      "name": "openGL-x64-debug",
+      "description": "OpenGL Build for x64, no x86 build exists",
+      "inherits": "default",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
+        "GRAPHICS_API": "OpenGL"
+      }
+    },
+    {
+      "name": "openGL-x64-release",
+      "description": "OpenGL Build for x64, no x86 build exists",
+      "inherits": "default",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "GRAPHICS_API": "OpenGL"
+      }
+    }
+  ]
 }
diff --git a/RT/CMakeLists.txt b/RT/CMakeLists.txt
@@ -1,13 +1,13 @@
-# CMakeList.txt : Cmake project for including the RT code
-cmake_minimum_required (VERSION 3.8)
-
-set(ENV{RT_EXT_CODE_DIR}
-"${CMAKE_CURRENT_LIST_DIR}"
-)
-
-message("RT Dir is: $ENV{RT_EXT_CODE_DIR}")
-
-add_subdirectory("Core")
-target_include_directories(RT_CORE INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-add_subdirectory("Renderer/Backend/Common")
-add_subdirectory("Renderer/Backend/DX12")
+# CMakeList.txt : Cmake project for including the RT code
+cmake_minimum_required (VERSION 3.8)
+
+set(ENV{RT_EXT_CODE_DIR}
+"${CMAKE_CURRENT_LIST_DIR}"
+)
+
+message("RT Dir is: $ENV{RT_EXT_CODE_DIR}")
+
+add_subdirectory("Core")
+target_include_directories(RT_CORE INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+add_subdirectory("Renderer/Backend/Common")
+add_subdirectory("Renderer/Backend/DX12")
diff --git a/RT/Core/Arena.c b/RT/Core/Arena.c
@@ -139,7 +139,7 @@ void *RT_ArenaAllocNoZero_(RT_ARENA_DEBUG_PARAMS RT_Arena *arena, size_t size, s
 
     char *result = NULL;
 
-    if (ALWAYS(RT_ArenaSizeRemainingForAlign(arena, align) >= size))
+    if (size > 0 && ALWAYS(RT_ArenaSizeRemainingForAlign(arena, align) >= size))
     {
 #if defined(RT_ARENA_DEBUG)
         {