Merge remote-tracking branch 'upstream/master'

CMakeLists.txt

@@ -9,11 +9,11 @@ if (DTV)
 endif (DTV)
 
 if (PIRANHA_ENABLED)
-    add_compile_definitions(ATG_ENGINE_PIRANHA_ENABLED)
+    add_compile_definitions(ATG_ENGINE_SIM_PIRANHA_ENABLED)
 endif (PIRANHA_ENABLED)
 
 if (DISCORD_ENABLED)
-    add_compile_definitions(ATG_ENGINE_DISCORD_ENABLED)
+    add_compile_definitions(ATG_ENGINE_SIM_DISCORD_ENABLED)
 endif (DISCORD_ENABLED)
 
 # Enable group projects in folders
@@ -68,73 +68,88 @@ include_directories(${SDL2_IMAGE_INCLUDE_DIR})
 
 add_library(engine-sim STATIC
     # Source files
+    src/audio_buffer.cpp
+    src/camshaft.cpp
     src/crankshaft.cpp
-    src/cylinder_bank.cpp
-    src/connecting_rod.cpp
-    src/piston.cpp
-    src/part.cpp
-    src/engine.cpp
-    src/simulator.cpp
     src/combustion_chamber.cpp
-    src/gas_system.cpp
-    src/function.cpp
-    src/camshaft.cpp
+    src/connecting_rod.cpp
+    src/convolution_filter.cpp
+    src/cylinder_bank.cpp
     src/cylinder_head.cpp
+    src/derivative_filter.cpp
+    src/direct_throttle_linkage.cpp
     src/dynamometer.cpp
-    src/ignition_module.cpp
-    src/utilities.cpp
-    src/audio_buffer.cpp
-    src/filter.cpp
-    src/convolution_filter.cpp
+    src/engine.cpp
     src/exhaust_system.cpp
-    src/intake.cpp
     src/feedback_comb_filter.cpp
-    src/synthesizer.cpp
-    src/leveling_filter.cpp
+    src/filter.cpp
     src/fuel.cpp
+    src/function.cpp
+    src/gas_system.cpp
     src/gaussian_filter.cpp
+    src/governor.cpp
+    src/ignition_module.cpp
+    src/impulse_response.cpp
+    src/intake.cpp
+    src/jitter_filter.cpp
+    src/leveling_filter.cpp
+    src/low_pass_filter.cpp
+    src/part.cpp
+    src/piston.cpp
+    src/simulator.cpp
+    src/standard_valvetrain.cpp
     src/starter_motor.cpp
+    src/synthesizer.cpp
+    src/throttle.cpp
     src/transmission.cpp
+    src/utilities.cpp
+    src/valvetrain.cpp
     src/vehicle.cpp
-    src/derivative_filter.cpp
-    src/low_pass_filter.cpp
     src/vehicle_drag_constraint.cpp
-    src/impulse_response.cpp
+    src/vtec_valvetrain.cpp
 
     # Include files
+    include/audio_buffer.h
+    include/application_settings.h
+    include/camshaft.h
     include/crankshaft.h
-    include/cylinder_bank.h
-    include/connecting_rod.h
-    include/piston.h
-    include/part.h
-    include/engine.h
-    include/simulator.h
     include/combustion_chamber.h
-    include/units.h
-    include/gas_system.h
-    include/function.h
-    include/camshaft.h
+    include/connecting_rod.h
+    include/convolution_filter.h
+    include/cylinder_bank.h
     include/cylinder_head.h
+    include/derivative_filter.h
+    include/direct_throttle_linkage.h
     include/dynamometer.h
-    include/ignition_module.h
-    include/utilities.h
-    include/audio_buffer.h
-    include/filter.h
-    include/convolution_filter.h
+    include/engine.h
     include/exhaust_system.h
-    include/intake.h
     include/feedback_comb_filter.h
-    include/synthesizer.h
-    include/leveling_filter.h
+    include/filter.h
     include/fuel.h
+    include/function.h
+    include/gas_system.h
     include/gaussian_filter.h
+    include/governor.h
+    include/ignition_module.h
+    include/impulse_response.h
+    include/intake.h
+    include/jitter_filter.h
+    include/leveling_filter.h
+    include/low_pass_filter.h
+    include/part.h
+    include/piston.h
+    include/simulator.h
+    include/standard_valvetrain.h
     include/starter_motor.h
+    include/synthesizer.h
+    include/throttle.h
     include/transmission.h
+    include/units.h
+    include/utilities.h
+    include/valvetrain.h
     include/vehicle.h
-    include/derivative_filter.h
-    include/low_pass_filter.h
     include/vehicle_drag_constraint.h
-    include/impulse_response.h
+    include/vtec_valvetrain.h
 )
 
 target_link_libraries(engine-sim
@@ -179,6 +194,11 @@ if (PIRANHA_ENABLED)
         scripting/include/piranha.h
         scripting/include/piston_node.h
         scripting/include/rod_journal_node.h
+        scripting/include/standard_valvetrain_node.h
+        scripting/include/transmission_node.h
+        scripting/include/valvetrain_node.h
+        scripting/include/vtec_valvetrain_node.h
+		scripting/include/vehicle_node.h
     )
 
     target_include_directories(engine-sim-script-interpreter
@@ -287,15 +307,13 @@ if (PIRANHA_ENABLED)
 endif (PIRANHA_ENABLED)
 
 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)
-
+    add_library(discord-rpc STATIC IMPORTED)
+    set_property(TARGET discord-rpc PROPERTY IMPORTED_LOCATION ${PROJECT_SOURCE_DIR}/dependencies/discord/lib/discord-rpc.lib)
     target_link_libraries(engine-sim-app
     	discord
 	discord-rpc)
 endif (DISCORD_ENABLED)
 
-
 target_include_directories(engine-sim-app
     PUBLIC dependencies/submodules)
 

README.md

@@ -1,6 +1,5 @@
 # Engine Simulator - Turbo mod and other enhancements
 ## Please read below the controls! The turbo is controlled by controls
-## New versions are coming in the [mod loader](https://github.com/mod-loader/engine-sim-modloader)!
 ![Alt text](docs/public/screenshot_v01.png?raw=true)
 ---
 ## **Warning: project is in development and will change frequently**
@@ -29,7 +28,7 @@ The UI is extremely minimalistic and there are only a few controls used to inter
 | G + Scroll | Change hold speed |
 | F | Enter fullscreen mode |
 | I | Display dyno stats in the information panel |
-| Shift | Clutch (hold spacebar to slowly engage/disengage) |
+| Shift | Clutch (hold spacebar at the same time to slowly engage/disengage) |
 | Up Arrow | Up Gear | 
 | Down Arrow | Down Gear | 
 | Z + Scroll | Volume |
@@ -38,8 +37,9 @@ The UI is extremely minimalistic and there are only a few controls used to inter
 | V + Scroll | Low frequency noise |
 | B + Scroll | High frequency noise |
 | N + Scroll | Simulation frequency |
-| M | Increase View Layer |
-| , | Decrease View Layer |
+| M | Increase view layer |
+| , | Decrease view layer |
+| Enter | Reload engine script |
 | Escape | Exit the program |
 | Q, W, E, R | Change throttle position |
 | Space + Scroll | Fine throttle adjustment |