Lua module update

Author: gro-ove

lua-module/.build/build.js

@@ -1,6 +1,6 @@
 let code = $.readText('module.lua');
 code = code.replace(/--@includes:start[\s\S]+--@includes:end/, () => $.glob('src/*.lua')
-  .map(x => `-- ${x}\n;(function ()\n${$.readText(x)}\nend)()`).join('\n\n'));
+  .map(x => `-- ${x}\nac.log('Module ${x}')\n;(function ()\n${$.readText(x)}\nend)()`).join('\n\n'));
 fs.writeFileSync('module.lua.compiled', code);
 
 const luaJit = $[process.env['LUA_JIT']];

lua-module/module.lua

@@ -11,17 +11,22 @@ AIRace = not Sim.isOnlineRace and not Sim.isReplayOnlyMode and Sim.carsCount > 1
 ---@diagnostic disable-next-line: undefined-field
 Config = ac.INIConfig(ac.INIFormat.Extended, _G.__config__ or {}) -- Small Tweaks config is as `__config__` in a compatible form.
 
-ConfigGamepadFX = ac.INIConfig.cspModule(ac.CSPModuleID.GamepadFX)
-ConfigGUI = ac.INIConfig.cspModule(ac.CSPModuleID.GUI)
-ConfigVRTweaks = ac.INIConfig.cspModule(ac.CSPModuleID.VRTweaks)
+ConfigGamepadFX = ac.INIConfig.cspModule(ac.CSPModuleID.GamepadFX) ---@type ac.INIConfig?
+ConfigGUI = ac.INIConfig.cspModule(ac.CSPModuleID.GUI) ---@type ac.INIConfig?
+ConfigVRTweaks = ac.INIConfig.cspModule(ac.CSPModuleID.VRTweaks) ---@type ac.INIConfig?
 
 ac.onCSPConfigChanged(ac.CSPModuleID.GamepadFX, __reloadScript__)
 ac.onCSPConfigChanged(ac.CSPModuleID.GUI, __reloadScript__)
 ac.onCSPConfigChanged(ac.CSPModuleID.VRTweaks, __reloadScript__)
 
+if not ConfigGamepadFX:get('BASIC', 'ENABLED', true) then ConfigGamepadFX = nil end
+if not ConfigGUI:get('BASIC', 'ENABLED', true) then ConfigGUI = nil end
+if not ConfigVRTweaks:get('BASIC', 'ENABLED', true) then ConfigVRTweaks = nil end
+
 if AIRace then
   ac.onCSPConfigChanged(ac.CSPModuleID.NewBehaviour, __reloadScript__)
-  ConfigNewBehaviour = ac.INIConfig.cspModule(ac.CSPModuleID.NewBehaviour)
+  ConfigNewBehaviour = ac.INIConfig.cspModule(ac.CSPModuleID.NewBehaviour) ---@type ac.INIConfig?
+  if not ConfigNewBehaviour:get('BASIC', 'ENABLED', true) then ConfigNewBehaviour = nil end
 end
 
 local fns = {

lua-module/res/controller-battery.png

@@ -1,7 +1,22 @@
-if not AIRace then
+if not AIRace or not ConfigNewBehaviour then
   return
 end
 
+if Sim.customAISplinesAllowed then
+  local aiFolder = '%s/ai' % ac.getFolder(ac.FolderID.CurrentTrackLayout)
+  local altSplines = io.scanDir(aiFolder, 'ext_alt_fast_lane_*.ai')
+  if #altSplines > 0 then
+    math.randomseed(math.randomKey())
+    for i = 0, Sim.carsCount - 1 do
+      local s = math.random(#altSplines + 1)
+      if s <= #altSplines then
+        physics.setAISpline(i, '%s/%s' % {aiFolder, altSplines[s]})
+        ac.log('AI #%s' % i, '%s/%s' % {aiFolder, altSplines[s]})
+      end
+    end
+  end
+end
+
 local fixRedlining = ConfigNewBehaviour:get('AI_TWEAKS', 'START_REDUCE_REDLINING', false)
 local fixTrajectory = ConfigNewBehaviour:get('AI_TWEAKS', 'START_STRAIGHTEN_TRAJECTORY', false)
 if not fixRedlining and not fixTrajectory then
@@ -10,7 +25,7 @@ end
 
 local carOffsets = {}
 local carOffsetsApplied = 0
-local throttleLimited = false
+local throttleLimited = false 
 
 local function randomNoise(seed)
   local time = os.preciseClock() + seed * 0.1

lua-module/src/ai_tweaks.lua

@@ -3,7 +3,7 @@
   of stereo effect in VR.
 ]]
 
-local cfgMode = ConfigVRTweaks:get('EXTRA_TWEAKS', 'AUDIO_STEREO_FIX', 0)
+local cfgMode = ConfigVRTweaks and ConfigVRTweaks:get('EXTRA_TWEAKS', 'AUDIO_STEREO_FIX', 0) or 0
 if cfgMode == 0 or cfgMode == 1 and not Sim.isVRConnected then
   return
 end

lua-module/src/audio_spatial_fix.lua

@@ -2,7 +2,7 @@
   Pauses AC in background.
 ]]
 
-if not Config:get('MISCELLANEOUS', 'PAUSE_IN_BACKGROUND', false) then
+if not Config:get('MISCELLANEOUS', 'PAUSE_IN_BACKGROUND', false) or Sim.isShowroomMode then
   return
 end
 

lua-module/src/background_pause.lua

@@ -5,6 +5,9 @@ local connect = ac.connect{
   cefState = ac.StructItem.byte(), -- 0: ready, 1: installing, ≥10: errors
   cefLoop = ac.StructItem.boolean(),
   noProxyServer = ac.StructItem.boolean(),
+  useTimer = ac.StructItem.boolean(),
+  setGPUDevicePriority = ac.StructItem.int8(),
+  setGPUProcessPriority = ac.StructItem.int8(),
   targetFPS = ac.StructItem.int32(),
 }
 connect.tabsCount = 0
@@ -25,13 +28,16 @@ local reinstalledOnce = false
 local function runWebHostProcess(filename, key, closeCallback)
   ac.store('.SmallTweaks.CEFLaunchedOnce', 1)
   ac.log('CEF loop: '..tostring(connect.cefLoop and 1 or 0))
+  
+  if __util.dev then
+    local devFilename = 'C:/Development/temp-alt/cef-mixer-master/bin/Debug/cefmixer.exe'
+    if io.fileExists(devFilename) then
+      filename = devFilename
+      ac.warn('Using debug cefmixer build')
+    end
+  end
 
-  -- local devFilename = 'C:/Development/temp-alt/cef-mixer-master/bin/Debug/cefmixer.exe'
-  -- if io.fileExists(devFilename) then
-  --   filename = devFilename
-  --   ac.warn('Using debug cefmixer build')
-  -- end
-
+  local setPriority = Config:get('MISCELLANEOUS', 'SET_CEF_PRIORITY', true)
   local startTime = os.time()
   local errData = {}
   connect.cefState = 0
@@ -54,7 +60,9 @@ local function runWebHostProcess(filename, key, closeCallback)
       ACCSPWB_AUTOPLAY = 1,
       ACCSPWB_NO_PROXY_SERVER = connect.noProxyServer and 1 or nil,
       ACCSPWB_CEF_THREADING = connect.cefLoop and 1 or nil,
-      ACCSPWB_USE_TIMER = false,
+      ACCSPWB_USE_TIMER = connect.useTimer and 1 or nil,
+      ACCSPWB_GPU_PROCESS_PRIORITY = connect.setGPUProcessPriority ~= 0 and connect.setGPUProcessPriority or setPriority and 3 or nil,
+      ACCSPWB_GPU_PRIORITY = connect.setGPUDevicePriority ~= 0 and connect.setGPUDevicePriority or setPriority and 5 or nil,
       ACCSPWB_TARGET_FPS = connect.targetFPS < 1 and 60 or connect.targetFPS,
       ACCSPWB_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.134 Safari/537.36 AssettoCorsa/1.16.3',
       ACCSPWB_DATA_DIRECTORY = ac.getFolder(ac.FolderID.AppDataLocal)..'/ac-cef-layer',
@@ -218,9 +226,11 @@ local function rebuildWebHost()
   else
     -- 33554432 is a special value for when the actual list is being updated
     webHost.mapped.count = 33554432
+    ac.memoryBarrier()
     for i = 1, #webHost.tabs do
       webHost.mapped.tabs[i - 1] = webHost.tabs[i].key
     end
+    ac.memoryBarrier()
     webHost.mapped.count = #webHost.tabs
   end
 end
@@ -236,7 +246,10 @@ local function startWebHost()
   awaitingWebHostStart = true
   connect.cefState = 1
   connect.cefLoop = ac.load('.SmallTweaks.CEF.useCEFLoop') == 1
+  connect.useTimer = ac.load('.SmallTweaks.CEF.useTimer') == 1
   connect.noProxyServer = ac.load('.SmallTweaks.CEF.skipProxyServer') == 1
+  connect.setGPUDevicePriority = ac.load('.SmallTweaks.CEF.setGPUDevicePriority') or 0
+  connect.setGPUProcessPriority = ac.load('.SmallTweaks.CEF.setGPUProcessPriority') or 0
   connect.targetFPS = ac.load('.SmallTweaks.CEF.targetFPS') or 60
   if connect.targetFPS < 1 then connect.targetFPS = 60 end
 

lua-module/src/cef.lua

@@ -3,6 +3,10 @@
   so that other apps could override the state.
 ]]
 
+if not ConfigGamepadFX then
+  return
+end
+
 local function implementation()
   local settings = ConfigGamepadFX:mapSection('ADVANCED_GAMEPADS', {
     ENABLED = true,
@@ -265,7 +269,7 @@ local function implementation()
   if settings.LOW_BATTERY_WARNING then
     Register('drawGameUI', function (dt)
       if minBatteryLevel < 0.2 then
-        ui.drawCarIcon('res/controller-battery.png', minBatteryLevel < 0.05 and rgbm.colors.red
+        ui.drawCarIcon('?internal\\lua-module\\res\\controller-battery.png', minBatteryLevel < 0.05 and rgbm.colors.red
           or minBatteryLevel < 0.1 and rgbm.colors.orange or rgbm.colors.yellow)
       end
     end)

lua-module/src/dualsense_lights.lua

@@ -10,6 +10,10 @@ __CM_DISCORD_REQUEST_ACCEPT
 __CM_DISCORD_REQUEST_DENY
 ]]
 
+if Config:get('MISCELLANEOUS', 'DISABLE_CM_HOTKEYS', false) then
+  return
+end
+
 local buttons = {} ---@type {button: ac.ControlButton, action: fun(), delayed: {label: string, icon: string, condition: nil|fun(): boolean}?}[]
 local buttonsCount = 0
 local delayActive = false
@@ -26,6 +30,20 @@ local function addButton(button, action, delayed)
   end
 end
 
+local msgs = {}
+local function log(str)
+  if #msgs > 50 then
+    table.remove(msgs, 1)
+  end
+  msgs[#msgs + 1] = str
+end 
+
+if Config:get('MISCELLANEOUS', 'DEBUG_SYSTEM_KEYBINDINGS', false) then
+  ui.onExclusiveHUD(function (mode)
+    ui.text(table.concat(msgs, '\n'))
+  end)
+end
+
 for k, v in pairs{
   HIDE_APPS = 'Hide Show Apps',
   HIDE_DAMAGE = 'Hide Damage',
@@ -51,7 +69,12 @@ for k, v in pairs{
   __CM_ENGINE_BRAKE = 'Engine Brake',
   __CM_NEXT_APPS_DESKTOP = 'Cycle Virtual Desktop',
 } do
-  ac.ControlButton(k, nil, {remap = true}):onPressed(ac.trySimKeyPressCommand:bind(v))
+  local btn = ac.ControlButton(k, nil, {remap = true})
+  log(string.format('System binding: %s, configured: %s, bound to: %s', k, btn:configured(), btn:boundTo()))
+  btn:onPressed((function (id)
+    local s = ac.trySimKeyPressCommand(id)
+    log('System binding pressed: %s, %s' % {id, s})
+  end):bind(v))
 end
 
 ac.ControlButton('__CM_RESET_CAMERA_VR', nil, {remap = true}):onPressed(ac.recenterVR)

lua-module/src/extra_buttons.lua

@@ -0,0 +1,12 @@
+ac.ControlButton('__EXT_MUSIC_PLAYPAUSE'):onPressed(function ()
+  ac.mediaPlayPause()
+end)
+
+ac.ControlButton('__EXT_MUSIC_NEXT'):onPressed(function ()
+  ac.mediaNextTrack()
+end)
+
+ac.ControlButton('__EXT_MUSIC_PREVIOUS'):onPressed(function ()
+  ac.mediaPreviousTrack()
+end)
+