Small tweaks

Author: gro-ove

included-apps/CspDebug/CspDebug.lua

@@ -51,7 +51,7 @@ local searchProviders = {
 
 local function userURL(input)
   return input:regfind(urlRegex) and input
-    or (searchProviders[ac.load('.WebBrowser.searchProvider')] or searchProviders.ddg):format(input:urlEncode())
+    or (searchProviders[ac.load('.WebBrowser.searchProvider')] or searchProviders.ddg).query:format(input:urlEncode())
 end
 
 local function searchIcon()

included-cars/android_auto/apps/web/app.lua

@@ -1,4 +1,4 @@
-local remoteExe = 'https://github.com/yt-dlp/yt-dlp/releases/download/2023.10.13/yt-dlp.exe'
+local remoteExe = 'https://github.com/yt-dlp/yt-dlp/releases/download/2024.10.07/yt-dlp.exe'
 
 ---Finds optimal format from list of formats returned by yt-dlp. Prefers something with both audio and video,
 ---looking for the largest file.

included-cars/android_auto/apps/youtube/youtube.lua

@@ -20,6 +20,7 @@ FORCE_WIND=0, 0
 LOADING_BACKGROUND=loading.jpg, 0
 LOADING_PROGRESS=loading_progress.jpg, 0.1, 0.9, 0.8, 0.059
 IMMEDIATE_START=1
+DISABLE_FLAGS=YELLOW, BLUE
 
 [OPPONENTS]
 ; Need to spawn some extra cars to match the original mission

included-new-modes/driver-interview/manifest.ini

@@ -10,3 +10,4 @@ SPEED_LIMIT=60
 PENALTIES=0
 AI_LEVEL=80
 ALLOWED_TRACKS=pits>1
+DISABLE_FLAGS=YELLOW, BLUE

included-new-modes/overtake/manifest.ini

@@ -165,13 +165,16 @@ function TrafficGraph:initialize(lanes, intersections)
   self._edgesFromIDMap = {}
   for i = 1, #self._gEdges do
     local edge = self._gEdges[i]
-    local fromPos = self:getGPos(edge.fromID)
-    local toPos = self:getGPos(edge.toID)
-    edge.dir = toPos:clone():sub(fromPos):normalize()
-
-    table.getOrCreate(self._edgesFromIDMap, edge.fromID, Array):push(edge)
     if edge.fromID ~= 0 and edge.toID ~= 0 then
-      self._graph:addEdge(edge.fromID, edge.toID, fromPos:distance(toPos))
+      local fromPos = self:getGPos(edge.fromID)
+      local toPos = self:getGPos(edge.toID)
+      print(i, edge.toID, edge.fromID, edge.lane.name, self._gVertices)
+      edge.dir = toPos:clone():sub(fromPos):normalize()
+
+      table.getOrCreate(self._edgesFromIDMap, edge.fromID, Array):push(edge)
+      if edge.fromID ~= 0 and edge.toID ~= 0 then
+        self._graph:addEdge(edge.fromID, edge.toID, fromPos:distance(toPos))
+      end
     end
   end
 end

included-tools/traffic/src/simulation/TrafficGraph.lua

@@ -2174,6 +2174,63 @@ _drawDisposed = function(self, p1, p2, realScale)
   return drawSkip(self, p1, p2, 'Browser has been disposed', 'crash', self:crash() or getCrash(self))
 end
 
+---Access texture for drawing it directly using commands such as `ui.drawImage()`. Be careful: if second argument is `true`,
+---texture is flipped upside down! Also, doesn’t include secondary layer with popups (such as default non-CSS dropdown lists),
+---anything about non-CEF pages including error messages, or touchscreen touches.
+---@return ui.ImageSource?
+---@return boolean @If true, image should be drawn upside down.
+function webBrowser:texture()
+  sync(self)
+
+  self._alive = false
+  local h = self._blankHeldPage or self._blankPage
+  if h then
+    return nil, false
+  end
+
+  if connect.cefState ~= 0 then
+    self._mm.beAliveTime = sim.systemTime
+    return nil, false
+  end
+
+  if self._loadError then
+    return nil, false
+  end
+
+  awakeRender(self)
+
+  if self._mm.handle == 0 then
+    if backendUnresponsive(self) then
+      self._installingCEF = nil
+      self._mm.beFlags = 0
+    end
+    return nil, false
+  end
+
+  if not self._texture or self._lastHandle ~= self._mm.handle then
+    self._working = true
+    if self._installingCEF then self._installingCEF = nil end
+    if self._texture then self._texture:dispose() end
+    self._lastHandle = self._mm.handle
+    if self._settings.directRender then
+      self._texture = ui.SharedTexture(self._prefix..'.'..tonumber(self._mm.handle))
+      self._textureResolution = self._texture:resolution():clone():scale(1 / self._pixelDensity)
+    else
+      self._texture = ui.SharedTexture(self._mm.handle)
+    end
+    if self._invalidatingViewCount and self._texture:valid() then
+      self._invalidatingViewCount = nil
+    end
+  end
+
+  if not self._texture:valid() then
+    return nil, false
+  end
+  
+  self._alive = true
+  return self._texture, self._settings.directRender
+end
+
 ---Draw browser within given rect. Uses up to two `ui.drawImage()` calls inside (second one for possible popup layer like
 ---an opened dropdown list). If there is an error, draws an error message instead.
 ---@param p1 vec2 @Position for the upper left corner.