Merge branch 'ange-yaghi-master'

DDev247 · DDev247 · commit 25110b5fdb70 · 2022-08-28T14:54:48.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,12 +1,8 @@
 cmake_minimum_required(VERSION 3.10)
 
 option(DTV "Enable video output" OFF)
-<<<<<<< HEAD
-=======
 option(PIRANHA_ENABLED "Enable scripting input" ON)
->>>>>>> 6c6b4f317473b728d8a6c0cc64d0644b445bd355
 option(DISCORD_ENABLED "Enable Discord Rich Presence" ON)
-option(PIRANHA_ENABLED "Enable scripting input" ON)
 
 if (DTV)
     add_compile_definitions(ATG_ENGINE_SIM_VIDEO_CAPTURE)
diff --git a/assets/engines/chevrolet/chev_truck_454.mr b/assets/engines/chevrolet/chev_truck_454.mr
@@ -77,12 +77,8 @@ public node chev_truck_454 {
     chevy_bbc_stock_intake intake(
         carburetor_cfm: 750.0,
         idle_flow_rate_cfm: 0.007,
-<<<<<<< HEAD
         idle_throttle_plate_position: 0.973,
         throttle_gamma: 1.5
-=======
-        idle_throttle_plate_position: 0.991
->>>>>>> 6c6b4f317473b728d8a6c0cc64d0644b445bd355
     )
 
     exhaust_system_parameters es_params(
diff --git a/assets/main.mr b/assets/main.mr
@@ -22,4 +22,3 @@ use_default_theme()
 
 set_engine(
     engine: kohler_V8()
-)
diff --git a/include/application_settings.h b/include/application_settings.h
@@ -4,11 +4,11 @@
 
 struct ApplicationSettings {
     bool startFullscreen = false;
-    std::string powerUnits = "HP";
-    std::string torqueUnits = "FTLBS";
-    std::string speedUnits = "MPH";
-    std::string pressureUnits = "INHG";
-    std::string boostUnits = "PSI";
+    std::string powerUnits = "hp";
+    std::string torqueUnits = "lb-ft";
+    std::string speedUnits = "mph";
+    std::string pressureUnits = "inHg";
+    std::string boostUnits = "psi";
 
     int colorBackground = 0x0E1012;
     int colorForeground = 0xFFFFFF;
diff --git a/include/engine.h b/include/engine.h
@@ -93,18 +93,16 @@ class Engine : public Part {
         CombustionChamber *getChamber(int i) const { return &m_combustionChambers[i]; }
         Fuel *getFuel() { return &m_fuel; }
 
-<<<<<<< HEAD
     public:
         double press;
         double flow;
 
         void UpdateShit();
-=======
+
         double getSimulationFrequency() const { return m_initialSimulationFrequency; }
         double getInitialHighFrequencyGain() const { return m_initialHighFrequencyGain; }
         double getInitialNoise() const { return m_initialNoise; }
         double getInitialJitter() const { return m_initialJitter; }
->>>>>>> 6c6b4f317473b728d8a6c0cc64d0644b445bd355
 
     protected:
         std::string m_name;
diff --git a/include/jitter_filter.h b/include/jitter_filter.h
@@ -18,7 +18,7 @@ class JitterFilter : public Filter {
         float audioFrequency);
     virtual float f(float sample) override;
 
-    __forceinline float fast_f(float sample) {
+    __forceinline float fast_f(float sample, float jitterScale = 1.0f) {
         m_history[m_offset] = sample;
         ++m_offset;
 
@@ -30,7 +30,7 @@ class JitterFilter : public Filter {
             0.0f,
             static_cast<float>(m_maxJitter - 1));
         
-        const float s = m_noiseFilter.fast_f(dist(m_generator) * m_jitterScale);
+        const float s = m_noiseFilter.fast_f(dist(m_generator) * m_jitterScale * jitterScale);
         const float s_i_0 = std::floor(s);
         const float s_i_1 = std::ceil(s);
 
diff --git a/include/oscilloscope_cluster.h b/include/oscilloscope_cluster.h
@@ -21,8 +21,6 @@ class OscilloscopeCluster : public UiElement {
         virtual void update(float dt);
         virtual void render();
 
-        double getPower(double torque);
-
         void sample();
         void setSimulator(Simulator *simulator);
 
diff --git a/include/right_gauge_cluster.h b/include/right_gauge_cluster.h
@@ -23,9 +23,9 @@ class RightGaugeCluster : public UiElement {
         virtual void update(float dt);
         virtual void render();
 
-        void   setEngine(Engine *engine);
-        void   setUnits();
-        double getPressureVaccuum(double ambientPressure);
+        void setEngine(Engine *engine);
+        void setUnits();
+        double getManifoldPressureWithUnits(double ambientPressure);
         Simulator *m_simulator;
 
     protected:
diff --git a/include/units.h b/include/units.h
@@ -70,8 +70,8 @@ namespace units {
     extern constexpr double MPa = Pa * 1000000.0;
     extern constexpr double atm = 101.325 * kPa;
 
-    extern constexpr double mBar = Pa * 100.0;
-    extern constexpr double Bar = mBar * 1000.0;
+    extern constexpr double mbar = Pa * 100.0;
+    extern constexpr double bar = mbar * 1000.0;
 
     extern constexpr double psi = lbf / (inch * inch);
     extern constexpr double psig = psi;
diff --git a/scripting/include/set_application_settings_node.h b/scripting/include/set_application_settings_node.h
diff --git a/src/engine_sim_application.cpp b/src/engine_sim_application.cpp
@@ -208,10 +208,14 @@ void EngineSimApplication::initialize() {
     }
     else {
         m_iceEngine = nullptr;
-        Logger::DebugLine("Failed to compile main.mr");
-        MessageBox(NULL, "I'm sorry, the compiler failed to compile the main.mr file.\nI'm not sure what you did wrong, but please check the error log for more info.\nThank you.", NULL, MB_OK);
         m_vehicle = nullptr;
         m_transmission = nullptr;
+        m_vehicle = nullptr;
+        m_transmission = nullptr;
+
+        Logger::DebugLine("Failed to compile main.mr");
+        MessageBox(NULL, "I'm sorry, the compiler failed to compile the main.mr file.\nI'm not sure what you did wrong, but please check the error log for more info.\nThank you.", NULL, MB_OK);
+
         exit(1);
     }
 
@@ -326,11 +330,11 @@ void EngineSimApplication::initialize() {
     // Enable it, this needs to be set via a config file of some sort. 
     GetDiscordManager()->SetUseDiscord(true);
     DiscordRichPresence passMe = { 0 };
+
     GetDiscordManager()->SetStatus(passMe, m_iceEngine->getName() + " | Mods loaded: " + getModAmount(), s_buildVersion + " | Mod loader: " + s_modLoaderVersion);
-#endif
+#endif /* ATG_ENGINE_DISCORD_ENABLED */
 
     luaLoadConfig(luaScriptsPath);
-
 }
 
 void EngineSimApplication::process(float frame_dt) {
diff --git a/src/load_simulation_cluster.cpp b/src/load_simulation_cluster.cpp
@@ -156,7 +156,6 @@ void LoadSimulationCluster::update(float dt) {
     if (m_app->getEngine()->ProcessKeyDown(ysKey::Code::I)) {
         std::stringstream ss;
         ss << std::setprecision(0) << std::fixed;
-<<<<<<< HEAD
 
         /*
         if (EngineSimApplication::instance->UNIT_TYPE_TORQUE == "metric")
diff --git a/src/oscilloscope_cluster.cpp b/src/oscilloscope_cluster.cpp
@@ -240,7 +240,9 @@ void OscilloscopeCluster::update(float dt) {
         ? (units::convert(m_simulator->getDynoPower(), units::kW))
         : (units::convert(m_simulator->getDynoPower(), units::hp));
 
-    const double hp = getPower(torque);
+    const double power = (m_powerUnits == "kW")
+        ? (units::convert(m_simulator->getDynoPower(), units::kW))
+        : (units::convert(m_simulator->getDynoPower(), units::hp));
 
     m_torque = m_torque * 0.95 + 0.05 * torque;
     m_power = m_power * 0.95 + 0.05 * power;
@@ -390,23 +392,3 @@ void OscilloscopeCluster::renderScope(
 
     osc->m_bounds = bounds;
 }
-
-double OscilloscopeCluster::getPower(double torque)
-{
-    double power = 0;
-    if (m_powerUnits == "HP")
-    {
-        if (m_torqueUnits == "NM")
-            power = torque * m_simulator->getEngine()->getRpm() / 7127.0;
-        else
-            power = torque * m_simulator->getEngine()->getRpm() / 5252.0;
-    }
-    else if (m_powerUnits == "KW")
-    {
-        if (m_torqueUnits == "NM")
-            power = torque * m_simulator->getEngine()->getRpm() / 9549.0;
-        else
-            power = torque * m_simulator->getEngine()->getRpm() / 7127.0;
-    }
-    return power;
-}
diff --git a/src/right_gauge_cluster.cpp b/src/right_gauge_cluster.cpp
diff --git a/src/synthesizer.cpp b/src/synthesizer.cpp

Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,3 @@ use_default_theme()`
`22`	`22`
`23`	`23`	`set_engine(`
`24`	`24`	`engine: kohler_V8()`
`25`		`-)`