things

Author: DDev247

assets/main.mr

@@ -22,3 +22,4 @@ use_default_theme()
 
 set_engine(
     engine: kohler_V8()
+)

include/engine_sim_application.h

@@ -109,6 +109,7 @@ class EngineSimApplication {
         std::string UNIT_TYPE_SPEED = "imperial";
         std::string UNIT_TYPE_AIRFLOW = "imperial";
         std::string UNIT_TYPE_PRESSURE = "imperial";
+        bool rpmOn;
 
     protected:
         void renderScene();

src/engine_sim_application.cpp

@@ -627,7 +627,12 @@ void EngineSimApplication::run() {
 
         speedSetting = targetSpeedSetting * 0.5 + 0.5 * speedSetting;
 
-        m_iceEngine->setSpeedControl(speedSetting);
+        if (rpmOn) {
+            m_iceEngine->setSpeedControl(1);
+        }
+        else {
+            m_iceEngine->setSpeedControl(speedSetting);
+        }
 
         if (m_engine.ProcessKeyDown(ysKey::Code::M)) {
             const int currentLayer = getViewParameters().Layer0;

src/firing_order_display.cpp

@@ -88,22 +88,6 @@ void FiringOrderDisplay::render() {
         bankToIndex[orderedBanks[i]] = i;
     }
 
-    std::vector<CylinderBank *> orderedBanks;
-    std::map<CylinderBank *, int> bankToIndex;
-    for (int i = 0; i < m_engine->getCylinderBankCount(); ++i) {
-        orderedBanks.push_back(m_engine->getCylinderBank(i));
-    }
-
-    std::sort(
-        orderedBanks.begin(),
-        orderedBanks.end(),
-        [](CylinderBank *a, CylinderBank *b) {
-            return a->getAngle() < b->getAngle();
-        });
-    for (int i = 0; i < m_engine->getCylinderBankCount(); ++i) {
-        bankToIndex[orderedBanks[i]] = i;
-    }
-
     for (int i = 0; i < m_engine->getCylinderCount(); ++i) {
         Piston *piston = m_engine->getPiston(i);
         CombustionChamber *chamber = m_engine->getChamber(i);

src/main.cpp

@@ -20,7 +20,7 @@ int WINAPI WinMain(
 
     bool recording = false;
     int rpm = 0;
-    bool rpmOn = false;
+    bool on = false;
 
     std::ifstream paramFile("params.txt");
     std::string line;
@@ -34,7 +34,7 @@ int WINAPI WinMain(
                 rpm = units::rpm(rpm - 1000);
             }
             if (line._Starts_with("on")) {
-                rpmOn = true;
+                on = true;
             }
         }
         paramFile.close();
@@ -46,12 +46,16 @@ int WINAPI WinMain(
     EngineSimApplication application;
     application.initialize((void*)&hInstance, ysContextObject::DeviceAPI::DirectX11);
 
-    application.getSimulator()->getEngine()->getIgnitionModule()->m_enabled = true;
-    application.getSimulator()->m_dyno.m_enabled = true;
-    application.getSimulator()->m_dyno.m_hold = true;
-    application.m_dynoSpeed = rpm;
-    if (rpmOn)
-        application.getSimulator()->getEngine()->setThrottle(0);
+    if (recording) {
+        application.getSimulator()->getEngine()->getIgnitionModule()->m_enabled = true;
+        application.getSimulator()->m_dyno.m_enabled = true;
+        application.getSimulator()->m_dyno.m_hold = true;
+        application.m_dynoSpeed = rpm;
+        application.rpmOn = on;
+    }
+    else {
+        application.rpmOn = false;
+    }
 
     application.run();
     application.destroy();

src/oscilloscope_cluster.cpp

@@ -240,10 +240,6 @@ void OscilloscopeCluster::update(float dt) {
         ? (units::convert(m_simulator->getDynoPower(), units::kW))
         : (units::convert(m_simulator->getDynoPower(), units::hp));
 
-    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;
 

src/right_gauge_cluster.cpp

@@ -110,6 +110,7 @@ void RightGaugeCluster::initialize(EngineSimApplication *app) {
         m_speedometer->m_gauge->setBandCount(0);
     }
     */
+    /*
     m_speedometer->m_title = "VEHICLE SPEED";
     m_speedometer->m_unit = "MPH";
 
@@ -186,7 +187,8 @@ void RightGaugeCluster::initialize(EngineSimApplication *app) {
         m_manifoldVacuumGauge->m_gauge->setBand(
             { m_app->getWhite(), -30, -22, 3.0f, 6.0f, shortenAngle, shortenAngle }, 4);
     }
-=======
+    */
+
     m_speedometer->m_title = "VEHICLE SPEED";
     m_speedometer->m_unit = "MPH";