DJUI color interpolation / combiner editing / transforms

autogen/exposed_lists.py

@@ -51,6 +51,7 @@
     "include/PR/gbi.h",
     "include/PR/gbi_extension.h",
     "src/pc/gfx/gfx_pc.h",
+    "src/pc/djui/djui_gfx.h",
     "src/engine/surface_load.h",
     "src/pc/lua/utils/smlua_audio_utils.h",
 ]
@@ -117,6 +118,7 @@
     "src/pc/lua/smlua_hooks.h": [ "^LUA_BEHAVIOR_.*", "MAX_HOOKED_.*", "^HOOK_RETURN_.*", "^ACTION_HOOK_.*", "^MOD_MENU_ELEMENT_.*" ],
     "src/pc/djui/djui_panel_menu.h": [ "RAINBOW_TEXT_LEN" ],
     "src/pc/mods/mod_fs.h": [ "INT_TYPE_MAX", "FLOAT_TYPE_MAX", "FILE_SEEK_MAX" ],
+    "src/pc/djui/djui_gfx.h": [ "MTX_" ],
     "src/engine/surface_load.h": [ "NUM_CELLS" ],
     "src/pc/network/version.h": [ "VERSION_OFFSET" ],
 }

autogen/lua_definitions/constants.lua

@@ -2753,6 +2753,33 @@ CONSOLE_MESSAGE_ERROR   = 2 --- @type ConsoleMessageLevel
 --- | `CONSOLE_MESSAGE_WARNING`
 --- | `CONSOLE_MESSAGE_ERROR`
 
+CS_KEEP           = -1 --- @type CombinerSource
+CS_0              =  0 --- @type CombinerSource
+CS_1              =  1 --- @type CombinerSource
+CS_TEXTURE        =  2 --- @type CombinerSource
+CS_COLOR          =  3 --- @type CombinerSource
+CS_TEXT           =  4 --- @type CombinerSource
+CS_COMBINED       =  5 --- @type CombinerSource
+CS_NOISE          =  6 --- @type CombinerSource
+CS_TEXTURE_ALPHA  =  7 --- @type CombinerSource
+CS_COLOR_ALPHA    =  8 --- @type CombinerSource
+CS_TEXT_ALPHA     =  9 --- @type CombinerSource
+CS_COMBINED_ALPHA = 10 --- @type CombinerSource
+
+--- @alias CombinerSource
+--- | `CS_KEEP`
+--- | `CS_0`
+--- | `CS_1`
+--- | `CS_TEXTURE`
+--- | `CS_COLOR`
+--- | `CS_TEXT`
+--- | `CS_COMBINED`
+--- | `CS_NOISE`
+--- | `CS_TEXTURE_ALPHA`
+--- | `CS_COLOR_ALPHA`
+--- | `CS_TEXT_ALPHA`
+--- | `CS_COMBINED_ALPHA`
+
 --- @type number
 ROTATION_PIVOT_X_LEFT = 0.0
 

autogen/lua_definitions/functions.lua

@@ -3980,6 +3980,19 @@ function djui_hud_set_color(r, g, b, a)
     -- ...
 end
 
+--- @param prevR integer
+--- @param prevG integer
+--- @param prevB integer
+--- @param prevA integer
+--- @param r integer
+--- @param g integer
+--- @param b integer
+--- @param a integer
+--- Sets the current DJUI HUD global color interpolated
+function djui_hud_set_color_interpolated(prevR, prevG, prevB, prevA, r, g, b, a)
+    -- ...
+end
+
 --- Resets the current DJUI HUD global color
 function djui_hud_reset_color()
     -- ...
@@ -4005,6 +4018,30 @@ function djui_hud_reset_text_color()
     -- ...
 end
 
+--- @param cycles integer
+--- Sets the number of cycles used by the combiner
+function djui_hud_set_combiner_cycles(cycles)
+    -- ...
+end
+
+--- @param cycle integer
+--- @param alpha boolean
+--- @param a? CombinerSource
+--- @param b? CombinerSource
+--- @param c? CombinerSource
+--- @param d? CombinerSource
+--- Sets the current DJUI HUD combiner.<br>
+--- Each part uses the following equation: `P = (A - B) * C + D`.<br>
+--- Cycle 2 may be used to extend the equation, with the result of the previous cycle accessible through CS_COMBINED
+function djui_hud_set_combiner(cycle, alpha, a, b, c, d)
+    -- ...
+end
+
+--- Resets the current DJUI HUD combiner
+function djui_hud_reset_combiner()
+    -- ...
+end
+
 --- @return integer rotation
 --- @return number pivotX
 --- @return number pivotY
@@ -4014,8 +4051,8 @@ function djui_hud_get_rotation()
 end
 
 --- @param rotation integer
---- @param pivotX number
---- @param pivotY number
+--- @param pivotX? number
+--- @param pivotY? number
 --- Sets the current DJUI HUD rotation
 function djui_hud_set_rotation(rotation, pivotX, pivotY)
     -- ...
@@ -4161,6 +4198,38 @@ function djui_hud_reset_scissor()
     -- ...
 end
 
+--- @param x number
+--- @param y number
+--- @param scaleX number
+--- @param scaleY number
+--- Applies a transformation (translate, rotate, scale) to subsequent DJUI HUD elements until closed
+function djui_hud_transform(x, y, scaleX, scaleY)
+    -- ...
+end
+
+--- @param prevX number
+--- @param prevY number
+--- @param prevScaleX number
+--- @param prevScaleY number
+--- @param x number
+--- @param y number
+--- @param scaleX number
+--- @param scaleY number
+--- Applies an interpolated transformation (translate, rotate, scale) to subsequent DJUI HUD elements until closed
+function djui_hud_transform_interpolated(prevX, prevY, prevScaleX, prevScaleY, x, y, scaleX, scaleY)
+    -- ...
+end
+
+--- Closes the previous transformation
+function djui_hud_close_transform()
+    -- ...
+end
+
+--- Resets the transformation to a fullscreen state
+function djui_hud_reset_transform()
+    -- ...
+end
+
 --- @param message string
 --- @return number width
 --- @return number height

docs/lua/constants.md

@@ -17,6 +17,8 @@
     - [enum DialogId](#enum-DialogId)
 - [djui_console.h](#djui_consoleh)
     - [enum ConsoleMessageLevel](#enum-ConsoleMessageLevel)
+- [djui_gfx.h](#djui_gfxh)
+    - [enum CombinerSource](#enum-CombinerSource)
 - [djui_hud_utils.h](#djui_hud_utilsh)
     - [enum HudUtilsResolution](#enum-HudUtilsResolution)
     - [enum HudUtilsFilter](#enum-HudUtilsFilter)
@@ -1193,6 +1195,28 @@
 
 <br />
 
+## [djui_gfx.h](#djui_gfx.h)
+
+### [enum CombinerSource](#CombinerSource)
+| Identifier | Value |
+| :--------- | :---- |
+| CS_KEEP | -1 |
+| CS_0 | 0 |
+| CS_1 | 1 |
+| CS_TEXTURE | 2 |
+| CS_COLOR | 3 |
+| CS_TEXT | 4 |
+| CS_COMBINED | 5 |
+| CS_NOISE | 6 |
+| CS_TEXTURE_ALPHA | 7 |
+| CS_COLOR_ALPHA | 8 |
+| CS_TEXT_ALPHA | 9 |
+| CS_COMBINED_ALPHA | 10 |
+
+[:arrow_up_small:](#)
+
+<br />
+
 ## [djui_hud_utils.h](#djui_hud_utils.h)
 - ROTATION_PIVOT_X_LEFT
 - ROTATION_PIVOT_X_CENTER