paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lua cmake dependency. Use specified frequency as base frequency for engine effects

This commit is contained in:
Paul Dino Jones 2025-03-11 12:01:24 -04:00
parent 84f336f40c
commit 11bd2f71ef
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -20,6 +20,9 @@ set(CMAKE_EXE_LINKER_FLAGS "-Wl,--no-as-needed -ldl")
set(LIBUSB_INCLUDE_DIR /usr/include/libusb-1.0) set(LIBUSB_INCLUDE_DIR /usr/include/libusb-1.0)
set(LIBXML_INCLUDE_DIR /usr/include/libxml2) set(LIBXML_INCLUDE_DIR /usr/include/libxml2)
FIND_PACKAGE(Lua 5.3 REQUIRED)
set(INCLUDE_DIRS ${LUA_INCLUDE_DIR})
#FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h #FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
# HINTS $ENV{LIBUSB_ROOT} # HINTS $ENV{LIBUSB_ROOT}
# PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS} # PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}
@ -37,10 +40,10 @@ add_executable(monocoque src/monocoque/monocoque.c)
if(USE_PULSEAUDIO) if(USE_PULSEAUDIO)
message("Using pulseaudio backend...") message("Using pulseaudio backend...")
add_compile_definitions(USE_PULSEAUDIO=true) add_compile_definitions(USE_PULSEAUDIO=true)
target_link_libraries(monocoque m hidapi-hidraw pulse serialport xml2 argtable2 config gameloop helper devices slog simulatorapi uv xdg-basedir lua5.4) target_link_libraries(monocoque m hidapi-hidraw pulse serialport xml2 argtable2 config gameloop helper devices slog simulatorapi uv xdg-basedir ${LUA_LIBRARY})
else() else()
message("Using portaudio backend...") message("Using portaudio backend...")
target_link_libraries(monocoque m hidapi-hidraw portaudio serialport xml2 argtable2 config gameloop helper devices slog simulatorapi uv xdg-basedir lua5.4) target_link_libraries(monocoque m hidapi-hidraw portaudio serialport xml2 argtable2 config gameloop helper devices slog simulatorapi uv xdg-basedir ${LUA_LIBRARY})
endif() endif()
target_include_directories(monocoque PUBLIC config ${LIBXML_INCLUDE_DIR}) target_include_directories(monocoque PUBLIC config ${LIBXML_INCLUDE_DIR})

6
src/monocoque/devices/serial/arduinoledlua.h
View File

@ -1,9 +1,9 @@
#ifndef _ARDUINOLEDLUA_H #ifndef _ARDUINOLEDLUA_H
#define _ARDUINOLEDLUA_H #define _ARDUINOLEDLUA_H
#include "lua5.4/lua.h" #include "lua.h"
#include "lua5.4/lauxlib.h" #include "lauxlib.h"
#include "lua5.4/lualib.h" #include "lualib.h"
#include "../../simulatorapi/simapi/simapi/simdata.h" #include "../../simulatorapi/simapi/simapi/simdata.h"

2
src/monocoque/devices/simdevice.h
View File

@ -3,7 +3,7 @@
#include <stdbool.h> #include <stdbool.h>
#include "lua5.4/lua.h" #include "lua.h"
#include "usbdevice.h" #include "usbdevice.h"
#include "sounddevice.h" #include "sounddevice.h"

7
src/monocoque/devices/sounddevice.c
View File

@ -24,7 +24,7 @@ int gear_sound_set(SoundDevice* sounddevice, SimData* simdata)
} }
sounddevice->sounddata.last_gear = simdata->gear; sounddevice->sounddata.last_gear = simdata->gear;
slogt("set gear frequency to %i", sounddevice->sounddata.frequency); slogt("set gear frequency to %i", sounddevice->sounddata.curr_frequency);
} }
// we could make a vtable for these different effects too // we could make a vtable for these different effects too
@ -32,10 +32,10 @@ int sounddev_engine_update(SimDevice* this, SimData* simdata)
{ {
SoundDevice* sounddevice = (void *) this->derived; SoundDevice* sounddevice = (void *) this->derived;
sounddevice->sounddata.curr_frequency = simdata->rpms/60; sounddevice->sounddata.curr_frequency = simdata->rpms/60 + sounddevice->sounddata.frequency;
//sounddevice->sounddata.table_size = 48000/(sounddevice->sounddata.frequency); //sounddevice->sounddata.table_size = 48000/(sounddevice->sounddata.frequency);
slogt("set engine frequency to %i", sounddevice->sounddata.frequency); slogt("set engine frequency to %i", sounddevice->sounddata.curr_frequency);
} }
double modulate(SoundDevice* sounddevice, double raw_effect, SoundEffectModulationType modulation) double modulate(SoundDevice* sounddevice, double raw_effect, SoundEffectModulationType modulation)
@ -278,4 +278,3 @@ SoundDevice* new_sound_device(DeviceSettings* ds, MonocoqueSettings* ms) {
return this; return this;
} }