SDL build

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "dependencies/submodules/piranha"]
 	path = dependencies/submodules/piranha
 	url = https://github.com/ange-yaghi/piranha.git
+[submodule "dependencies/discord"]
+	path = dependencies/discord
+	url = https://github.com/discord/discord-rpc.git

CMakeLists.txt

@@ -1,9 +1,16 @@
 cmake_minimum_required(VERSION 3.10)
 
+include(CMakeDependentOption)
+
 option(DTV "Enable video output" OFF)
 option(PIRANHA_ENABLED "Enable scripting input" ON)
 option(DISCORD_ENABLED "Enable Discord Rich Presence" ON)
 
+# Default to compiling as Release in single-configuration generators
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Build type" FORCE)
+endif()
+
 if (DTV)
     add_compile_definitions(ATG_ENGINE_SIM_VIDEO_CAPTURE)
 endif (DTV)
@@ -20,7 +27,7 @@ endif (DISCORD_ENABLED)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "cmake")
 
-project(engine-sim)
+project(engine-sim VERSION 0.1.12)
 
 set(CMAKE_CXX_STANDARD 17)
 
@@ -191,18 +198,6 @@ if (PIRANHA_ENABLED)
         piranha)
 endif (PIRANHA_ENABLED)
 
-if (DISCORD_ENABLED)
-    add_library(discord STATIC
-        # Source files
-        dependencies/discord/Discord.cpp
-
-        # Include files
-        dependencies/discord/Discord.h
-        dependencies/discord/discord_register.h
-        dependencies/discord/discord_rpc.h
-    )
-endif (DISCORD_ENABLED)
-
 add_executable(engine-sim-app WIN32
     # Source files
     src/main.cpp
@@ -274,10 +269,6 @@ add_executable(engine-sim-app WIN32
     include/info_cluster.h
 )
 
-target_link_libraries(engine-sim-app
-    engine-sim
-)
-
 if (DTV)
     target_link_libraries(engine-sim-app
         direct-to-video)
@@ -288,19 +279,43 @@ if (PIRANHA_ENABLED)
         engine-sim-script-interpreter)
 endif (PIRANHA_ENABLED)
 
+target_include_directories(engine-sim-app
+    PUBLIC dependencies/submodules)
+
+add_subdirectory(dependencies)
+
 if (DISCORD_ENABLED)
-    add_library(discord-rpc STATIC IMPORTED)
-    set_property(TARGET discord-rpc PROPERTY IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/dependencies/discord/lib/discord-rpc.lib)
+    target_sources(engine-sim-app PUBLIC
+        src/discord.cpp
+        include/discord.h
+    )
+    target_include_directories(engine-sim-app PUBLIC
+        dependencies/discord/include
+    )
     target_link_libraries(engine-sim-app
-    	discord
-	discord-rpc)
+        discord-rpc
+    )
 endif (DISCORD_ENABLED)
 
-target_include_directories(engine-sim-app
-    PUBLIC dependencies/submodules)
+target_link_libraries(engine-sim-app
+    engine-sim
+)
 
-add_subdirectory(dependencies)
+# ========================================================
+# Generated build info
 
+# Fallback to '..' if not provided
+if (NOT DEFINED ENGINE_SIM_DATA_ROOT)
+    set(ENGINE_SIM_DATA_ROOT ".." CACHE STRING "Where to look for data")
+endif()
+message(STATUS "Data root set to '${ENGINE_SIM_DATA_ROOT}'")
+
+configure_file(include/build_info.h.in
+    generated/build_info.h @ONLY)
+target_include_directories(engine-sim-app
+    PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/generated)
+
+# ========================================================
 # GTEST
 
 enable_testing()

include/build_info.h.in

@@ -0,0 +1,9 @@
+#ifndef ATG_ENGINE_SIM_BUILD_OPTIONS_H
+#define ATG_ENGINE_SIM_BUILD_OPTIONS_H
+
+/* Grab info from CMake */
+#define ENGINE_SIM_PROJECT_VERSION "@PROJECT_VERSION@"
+#define ENGINE_SIM_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@"
+#define ENGINE_SIM_DATA_ROOT "@ENGINE_SIM_DATA_ROOT@"
+
+#endif /* ATG_ENGINE_SIM_BUILD_OPTIONS_H */

include/combustion_chamber.h

@@ -13,9 +13,9 @@ class Engine;
 class CombustionChamber : public atg_scs::ForceGenerator {
     public:
         struct Parameters {
-            Piston *Piston;
+            Piston *piston;
             CylinderHead *Head;
-            Fuel *Fuel;
+            Fuel *fuel;
             Function *MeanPistonSpeedToTurbulence;
 
             double StartingPressure;

include/constants.h

@@ -3,10 +3,10 @@
 
 namespace constants {
 
-    extern constexpr double pi = 3.14159265359;
-    extern constexpr double R = 8.31446261815324;
-    extern constexpr double root_2 = 1.41421356237309504880168872420969807856967187537694807317667973799;
-    extern constexpr double e = 2.71828182845904523536028747135266249775724709369995;
+    static constexpr double pi = 3.14159265359;
+    static constexpr double R = 8.31446261815324;
+    static constexpr double root_2 = 1.41421356237309504880168872420969807856967187537694807317667973799;
+    static constexpr double e = 2.71828182845904523536028747135266249775724709369995;
 
 } /* namespace Constants */
 

include/convolution_filter.h

@@ -10,7 +10,7 @@ class ConvolutionFilter : public Filter {
 
         void initialize(int samples);
         virtual float f(float sample) override;
-        virtual void destroy();
+        virtual void destroy() override;
 
         int getSampleCount() const { return m_sampleCount; }
         float *getImpulseResponse() { return m_impulseResponse; }

include/cylinder_head.h

@@ -18,7 +18,7 @@ class CylinderHead : public Part {
             Function *ExhaustPortFlow;
             Function *IntakePortFlow;
 
-            Valvetrain *Valvetrain;
+            Valvetrain *valvetrain;
 
             double CombustionChamberVolume;
 

dependencies/discord/Discord.h → include/discord.h

@@ -15,7 +15,6 @@
 
 #include <string>
 #include "discord_rpc.h"
-#pragma comment(lib, "discord-rpc.lib")
 
 class CDiscord
 {
@@ -79,4 +78,4 @@ static CDiscord* GetDiscordManager()
 };
 
 
-#endif
+#endif

include/engine_sim_application.h

@@ -121,6 +121,10 @@ class EngineSimApplication {
         dbasic::DeltaEngine m_engine;
         dbasic::AssetManager m_assetManager;
 
+        dbasic::Path m_dataRoot;
+        dbasic::Path m_userData;
+        dbasic::Path m_outputPath;
+
         std::string m_assetPath;
 
         ysRenderTarget *m_mainRenderTarget;
@@ -184,6 +188,8 @@ class EngineSimApplication {
         int m_oscillatorSampleOffset;
         int m_screen;
 
+        struct LoggingErrorHandler *m_error_handler;
+
 #ifdef ATG_ENGINE_SIM_VIDEO_CAPTURE
         atg_dtv::Encoder m_encoder;
 #endif /* ATG_ENGINE_SIM_VIDEO_CAPTURE */

include/feedback_comb_filter.h

@@ -10,7 +10,7 @@ class FeedbackCombFilter : public Filter {
 
         void initialize(int M);
         virtual float f(float sample) override;
-        virtual void destroy();
+        virtual void destroy() override;
 
         float a_M;
 

include/gas_system.h

@@ -10,6 +10,7 @@
 class GasSystem {
     public:
         struct Mix {
+            Mix() {} // Ctor must exist and can't be =default if used as an aggregate (= {})
             double p_fuel = 0.0;
             double p_inert = 1.0;
             double p_o2 = 0.0;

include/gauge.h

@@ -34,8 +34,8 @@ class Gauge : public UiElement {
         float m_thetaMin;
         float m_thetaMax;
 
-        int m_min;
-        int m_max;
+        float m_min;
+        float m_max;
         int m_maxMinorTick;
         float m_gamma;
 

include/low_pass_filter.h

@@ -5,6 +5,11 @@
 
 #include "constants.h"
 
+#ifndef _MSC_VER
+// Trust in the compiler
+#define __forceinline inline
+#endif
+
 class LowPassFilter : public Filter {
     public:
         LowPassFilter();

include/ring_buffer.h

@@ -46,7 +46,7 @@ class RingBuffer {
     }
 
     inline void overwrite(T_Data data, size_t index) {
-        if (start + index < m_capacity) {
+        if (m_start + index < m_capacity) {
             m_buffer[m_start + index] = data;
         }
         else {