Merge pull request #157 from Bottinator22/main

Allow post process shaders to be grouped up and enabled/disabled via Lua or a shaders menu

10 files changed, 377 insertions, 1 deletions

diff --git a/assets/opensb/interface/opensb/shaders/body.png b/assets/opensb/interface/opensb/shaders/body.png
new file mode 100644
index 0000000..272ed29
--- /dev/null
+++ b/assets/opensb/interface/opensb/shaders/body.png
diff --git a/assets/opensb/interface/opensb/shaders/categoryname.png b/assets/opensb/interface/opensb/shaders/categoryname.png
new file mode 100644
index 0000000..3019556
--- /dev/null
+++ b/assets/opensb/interface/opensb/shaders/categoryname.png
diff --git a/assets/opensb/interface/opensb/shaders/footer.png b/assets/opensb/interface/opensb/shaders/footer.png
new file mode 100644
index 0000000..426f8a6
--- /dev/null
+++ b/assets/opensb/interface/opensb/shaders/footer.png
diff --git a/assets/opensb/interface/opensb/shaders/group.png b/assets/opensb/interface/opensb/shaders/group.png
new file mode 100644
index 0000000..66f5cdb
--- /dev/null
+++ b/assets/opensb/interface/opensb/shaders/group.png
diff --git a/assets/opensb/interface/opensb/shaders/groupback.png b/assets/opensb/interface/opensb/shaders/groupback.png
new file mode 100644
index 0000000..ed838f3
--- /dev/null
+++ b/assets/opensb/interface/opensb/shaders/groupback.png
diff --git a/assets/opensb/interface/opensb/shaders/header.png b/assets/opensb/interface/opensb/shaders/header.png
new file mode 100644
index 0000000..d4425f0
--- /dev/null
+++ b/assets/opensb/interface/opensb/shaders/header.png
diff --git a/assets/opensb/interface/opensb/shaders/optionname.png b/assets/opensb/interface/opensb/shaders/optionname.png
new file mode 100644
index 0000000..f7c4500
--- /dev/null
+++ b/assets/opensb/interface/opensb/shaders/optionname.png
diff --git a/assets/opensb/interface/opensb/shaders/shaders.config b/assets/opensb/interface/opensb/shaders/shaders.config
new file mode 100644
index 0000000..5154831
--- /dev/null
+++ b/assets/opensb/interface/opensb/shaders/shaders.config
@@ -0,0 +1,147 @@
+{
+  "scripts" : ["/interface/opensb/shaders/shaders.lua"],
+  "scriptDelta" : 0,
+  "scriptWidgetCallbacks" : [
+    "selectGroup",
+    "toggleGroupEnabled"
+  ],
+
+  "gui" : {
+    "panefeature" : {
+      "type" : "panefeature",
+        "positionLocked" : false
+    },
+    "background" : {
+      "type" : "background",
+      "fileHeader" : "/interface/opensb/shaders/header.png",
+      "fileBody" : "/interface/opensb/shaders/body.png",
+      "fileFooter" : "/interface/opensb/shaders/footer.png"
+    },
+    "banner" : {
+      "type" : "canvas",
+      "rect" : [146, 187, 398, 215]
+    },
+    "groups" : {
+      "type" : "scrollArea",
+      "rect" : [4, 16, 145, 214],
+      "children" : {
+        "list" : {
+          "type" : "list",
+          "schema" : {
+            "selectedBG" : "/interface/opensb/shaders/groupback.png?multiply=0f0",
+            "unselectedBG" : "/interface/opensb/shaders/groupback.png?multiply=222",
+            "spacing" : [0, 1],
+            "memberSize" : [130, 16],
+            "listTemplate" : {
+              "background" : {
+                "type" : "image",
+                "file" : "/interface/opensb/shaders/groupback.png?multiply=222",
+                "position" : [0, 0],
+                "zlevel" : -1
+              },
+              "button" : {
+                "type" : "button",
+                "callback" : "selectGroup",
+                "caption" : "Unnamed",
+                "base" : "/interface/opensb/shaders/group.png?replace;fff=fff0;000=0007",
+                "hover" : "/interface/opensb/shaders/group.png?replace;fff=fff7;000=3337",
+                "press" : "/interface/opensb/shaders/group.png?replace;fff=000;000=7777",
+                "pressedOffset" : [0, 0],
+                "position" : [0, 0]
+              }
+            }
+          }
+        }
+      },
+      "buttons" : {
+        "horizontal" : {
+          "forward" : { "base" : "", "hover" : "", "pressed" : "" },
+          "backward" : { "base" : "", "hover": "", "pressed" : "" }
+        },
+        "vertical" : {
+          "forward" : {
+            "base" : "/interface/scrollarea/varrow-forward.png?setcolor=fff",
+            "hover" : "/interface/scrollarea/varrow-forwardhover.png",
+            "pressed" : ""
+          },
+          "backward" : {
+            "base" : "/interface/scrollarea/varrow-backward.png?setcolor=fff",
+            "hover" : "/interface/scrollarea/varrow-backwardhover.png",
+            "pressed" : ""
+          }
+        }
+      },
+      "thumbs" : {
+        "horizontal" : {
+          "base" : { "begin" : "", "end" : "", "inner" : "" },
+          "hover" : { "begin" : "", "end" : "", "inner" : "" },
+          "pressed" : { "begin" : "", "end" : "", "inner" : "" }
+        },
+        "vertical" : {
+          "base" : {
+            "begin" : "/interface/scrollarea/vthumb-begin.png",
+            "end" : "/interface/scrollarea/vthumb-end.png",
+            "inner" : "/interface/scrollarea/vthumb-inner.png"
+          },
+          "hover" : {
+            "begin" : "/interface/scrollarea/vthumb-beginhover.png",
+            "end" : "/interface/scrollarea/vthumb-endhover.png",
+            "inner" : "/interface/scrollarea/vthumb-innerhover.png"
+          },
+          "pressed" : {
+            "begin" : "/interface/scrollarea/vthumb-beginhover.png",
+            "end" : "/interface/scrollarea/vthumb-endhover.png",
+            "inner" : "/interface/scrollarea/vthumb-innerhover.png"
+          }
+        }
+      }
+    },
+    "options" : {
+      "type" : "scrollArea",
+      "rect" : [147, 16, 398, 185],
+      "children" : {},
+      "buttons" : {
+        "horizontal" : {
+          "forward" : { "base" : "", "hover" : "", "pressed" : "" },
+          "backward" : { "base" : "", "hover": "", "pressed" : "" }
+        },
+        "vertical" : {
+          "forward" : {
+            "base" : "/interface/scrollarea/varrow-forward.png?setcolor=fff",
+            "hover" : "/interface/scrollarea/varrow-forwardhover.png",
+            "pressed" : ""
+          },
+          "backward" : {
+            "base" : "/interface/scrollarea/varrow-backward.png?setcolor=fff",
+            "hover" : "/interface/scrollarea/varrow-backwardhover.png",
+            "pressed" : ""
+          }
+        }
+      },
+      "thumbs" : {
+        "horizontal" : {
+          "base" : { "begin" : "", "end" : "", "inner" : "" },
+          "hover" : { "begin" : "", "end" : "", "inner" : "" },
+          "pressed" : { "begin" : "", "end" : "", "inner" : "" }
+        },
+        "vertical" : {
+          "base" : {
+            "begin" : "/interface/scrollarea/vthumb-begin.png",
+            "end" : "/interface/scrollarea/vthumb-end.png",
+            "inner" : "/interface/scrollarea/vthumb-inner.png"
+          },
+          "hover" : {
+            "begin" : "/interface/scrollarea/vthumb-beginhover.png",
+            "end" : "/interface/scrollarea/vthumb-endhover.png",
+            "inner" : "/interface/scrollarea/vthumb-innerhover.png"
+          },
+          "pressed" : {
+            "begin" : "/interface/scrollarea/vthumb-beginhover.png",
+            "end" : "/interface/scrollarea/vthumb-endhover.png",
+            "inner" : "/interface/scrollarea/vthumb-innerhover.png"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/assets/opensb/interface/opensb/shaders/shaders.lua b/assets/opensb/interface/opensb/shaders/shaders.lua
new file mode 100644
index 0000000..0030b5c
--- /dev/null
+++ b/assets/opensb/interface/opensb/shaders/shaders.lua
@@ -0,0 +1,219 @@
+--constants
+local PATH = "/interface/opensb/shaders/"
+local GROUP_LIST_WIDGET = "groups.list"
+local OPTIONS_WIDGET       = "options"
+
+local fmt = string.format
+local log = function() end
+
+function update()
+end
+
+
+local function alphabeticalNameSortGreater(a, b) return a.name > b.name end
+local function alphabeticalNameSortLesser(a, b)  return a.name < b.name end
+local sortedGroups = {}
+local groups = {}
+
+local widgetsToGroups = {}
+local allSettings = {}
+
+local function addGroupToList(data)
+  local name = widget.addListItem(GROUP_LIST_WIDGET)
+  widget.setText(fmt("%s.%s.button", GROUP_LIST_WIDGET, name), data.friendlyName)
+  log("Added group ^cyan;%s^reset; to list", data.friendlyName)
+  return name
+end
+
+local function parseGroups()
+  for name, data in next, renderer.postProcessGroups() do
+    if not data.hidden then
+      if not data.friendlyName then data.friendlyName = name end
+      data.groupId = name
+      data.name = data.friendlyName
+      groups[data.groupId] = data
+    end
+  end
+
+  for groupId, data in pairs(groups) do
+    sortedGroups[#sortedGroups + 1] = data
+  end
+  table.sort(sortedGroups, alphabeticalNameSortLesser)
+  for i = 1, #sortedGroups do
+    local data = sortedGroups[i]
+    data.index = i
+    local name = addGroupToList(data)
+    data.widget = name
+    widgetsToGroups[name] = data
+  end
+  if sortedGroups[1] then
+    local first = sortedGroups[1].widget
+    widget.setListSelected(GROUP_LIST_WIDGET, first)
+    selectGroup(first)
+  end
+end
+
+local activeGroup
+
+local function addOptionGroup(data, i, added)
+  local y = (i - 1) * -14
+  local bg = {
+    type = "image",
+    file = PATH .. "groupname.png",
+    position = {-12, y}
+  }
+  local name = "group_" .. i
+  widget.addChild(BINDS_WIDGET, bg, name)
+  added[#added + 1] = name
+  local label = {
+    type = "label",
+    value = data.name,
+    wrapWidth = 120,
+    fontSize = 8,
+    hAnchor = "mid",
+    vAnchor = "mid",
+    position = {120, 6}
+  }
+  widget.addChild(fmt("%s.%s", BINDS_WIDGET, name), label, "text")
+end
+
+local function addOption(data, i, added)
+  local y = (i - 1) * -14
+  local bg = {
+    type = "image",
+    file = PATH .. "optionname.png",
+    position = {-12, y}
+  }
+  local name = "label_" .. i
+  widget.addChild(OPTIONS_WIDGET, bg, name)
+  added[#added + 1] = name
+  local label = {
+    type = "label",
+    value = data.name,
+    wrapWidth = 120,
+    fontSize = 8,
+    hAnchor = "mid",
+    vAnchor = "mid",
+    position = {62, 6}
+  }
+  widget.addChild(fmt("%s.%s", OPTIONS_WIDGET, name), label, "text")
+  -- todo: finish this
+end
+
+local function addEnabled(groupname, i, added)
+  local y = (i - 1) * -14
+  local bg = {
+    type = "image",
+    file = PATH .. "optionname.png",
+    position = {-12, y}
+  }
+  local name = "label_" .. i
+  widget.addChild(OPTIONS_WIDGET, bg, name)
+  added[#added + 1] = name
+  local label = {
+    type = "label",
+    value = "Enabled",
+    wrapWidth = 120,
+    fontSize = 8,
+    hAnchor = "mid",
+    vAnchor = "mid",
+    position = {62, 6}
+  }
+  widget.addChild(fmt("%s.%s", OPTIONS_WIDGET, name), label, "text")
+  local checkbox = {
+    type = "button",
+    callback = "toggleGroupEnabled",
+    position = {165, y + 2},
+    pressedOffset = {0, 0},
+    base = "/interface/optionsmenu/checkboxnocheck.png",
+    hover = "/interface/optionsmenu/checkboxnocheckhover.png",
+    baseImageChecked = "/interface/optionsmenu/checkboxcheck.png",
+    hoverImageChecked = "/interface/optionsmenu/checkboxcheckhover.png",
+    checkable = true,
+    checked = renderer.postProcessGroupEnabled(groupname)
+  }
+  name = "check_"..groupname
+  added[#added + 1] = name
+  widget.addChild(OPTIONS_WIDGET, checkbox, name)
+end
+
+function toggleGroupEnabled(checkbox, cdata)
+  renderer.setPostProcessGroupEnabled(activeGroup, widget.getChecked(fmt("%s.%s",OPTIONS_WIDGET,checkbox)), true)
+end
+
+function selectGroup()
+  local selected = widget.getListSelected(GROUP_LIST_WIDGET)
+  local group = widgetsToGroups[selected]
+  local dataFromPrev = widget.getData(OPTIONS_WIDGET)
+  if dataFromPrev then
+    for i, v in pairs(dataFromPrev) do
+      widget.removeChild(OPTIONS_WIDGET, v)
+    end
+  end
+  widgetsToOptions = {}
+  
+  activeGroup = group.groupId
+  
+  local bannerOptions = widget.bindCanvas("banner")
+  bannerOptions:clear()
+
+  local bannerName = tostring(group.bannerName or group.name or group.groupId)
+  bannerOptions:drawText(bannerName, {position = {127, 13}, horizontalAnchor = "mid", verticalAnchor = "mid"}, 16)
+  
+  local added = {}
+  local index = 0
+  addEnabled(group.groupId,index,added)
+
+  --[[
+  local categories = group.categories or {}
+  if not categories.unsorted then
+    categories.unsorted = {name = "Unsorted"}
+  end
+
+  local sortedCategories = {}
+  for categoryId, data in pairs(categories) do
+    data.name = tostring(data.name or categoryId)
+    data.sortedOptions = {}
+    sortedCategories[#sortedCategories + 1] = data
+  end
+
+  table.sort(sortedCategories, alphabeticalNameSortLesser)
+
+  for categoryId, data in pairs(categories) do
+    table.sort(data.sortedOptions, alphabeticalNameSortLesser)
+  end
+
+  local onlyUnsorted = not sortedGroups[2] and sortedGroups[1] == categories.unsorted
+
+  for iA = 1, #sortedCategories do
+    local category = sortedCategories[iA]
+    local optionsCount = #category.sortedOptions
+    if optionsCount > 0 then
+      if not onlyUnsorted then
+        index = index + 1
+        addOptionCategory(category, index, added)
+      end
+      for iB = 1, optionsCount do
+        index = index + 1
+        addOption(category.sortedOptions[iB], index, added)
+      end
+    end
+  end]]
+  
+  widget.setData(OPTIONS_WIDGET, added)
+end
+
+
+local function initCallbacks()
+  widget.registerMemberCallback(GROUP_LIST_WIDGET, "selectGroup", selectGroup)
+end
+
+function init()
+  --log = chat and chat.addMessage or sb.logInfo
+
+  widget.clearListItems(GROUP_LIST_WIDGET)
+  initCallbacks()
+  parseGroups()
+
+  script.setUpdateDelta(1)
+end
diff --git a/assets/opensb/interface/windowconfig/graphicsmenu.config.patch.lua b/assets/opensb/interface/windowconfig/graphicsmenu.config.patch.lua
index 7d7ab44..b17053a 100644
--- a/assets/opensb/interface/windowconfig/graphicsmenu.config.patch.lua
+++ b/assets/opensb/interface/windowconfig/graphicsmenu.config.patch.lua
@@ -13,6 +13,12 @@ local function shift(thing, x, y)
   return thing
 end
 
+local function moveto(thing, otherthing)
+  thing.position[1] = otherthing.position[1]
+  thing.position[2] = otherthing.position[2]
+  return thing
+end
+
 -- patch function, called by the game
 function patch(config)
   local layout = config.paneLayout
@@ -41,10 +47,14 @@ function patch(config)
   -- Create hardware cursor toggle
   shift(clone(layout, "multiTextureLabel", "hardwareCursorLabel"), 98, -11).value = "HARDWARE CURSOR"
   shift(clone(layout, "multiTextureCheckbox", "hardwareCursorCheckbox"), 99, -11)
+  
+  -- Create shader menu button
+  shift(moveto(clone(layout, "accept", "showShadersMenu"), layout.interfaceScaleSlider), 112, -2).caption = "Shaders"
+  
 
   shift(layout.title, 0, 24)
   shift(layout.resLabel, 0, 28)
   shift(layout.resSlider, 0, 28)
   shift(layout.resValueLabel, 0, 28)
   return config
-end
\ No newline at end of file
+end