Skip to content

Commit

Permalink
regex entries default to [5] fields
Browse files Browse the repository at this point in the history
(issue #4)[Amorano/Jovi_GLSL#4] value in uniforms for `GLSL nodes` were cancelling  values being set
  • Loading branch information
Amorano committed Feb 6, 2025
1 parent 61b8823 commit d9a93e6
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 8 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ You can colorize nodes via their `title background`, `node body` or `title text`

## UPDATES

**2024/02/05** @1.7.0:
* regex entries default to [5] fields
* [issue #4](https://github.com/Amorano/Jovi_GLSL/issues/4) value in uniforms for `GLSL nodes` were cancelling values being set

**2024/02/04** @1.6.10:
* adjusted new default color config to old defaults

Expand Down
4 changes: 2 additions & 2 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -932,8 +932,8 @@ def loader():
key=lambda item: getattr(item[1], 'SORT', 0))}

keys = NODE_CLASS_MAPPINGS.keys()
for name in keys:
logger.debug(f"✅ {name}")
#for name in keys:
# logger.debug(f"✅ {name}")
logger.info(f"{len(keys)} nodes loaded")

# only do the list on local runs...
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[project]
name = "jovimetrix"
description = "Integrates Webcam, MIDI, Spout and GLSL shader support. Animation via tick. Parameter manipulation with wave generator. Math operations with Unary and Binary support. Value conversion for all major types (int, string, list, dict, Image, Mask). Shape mask generation, image stacking and channel ops, batch splitting, merging and randomizing, load images and video from anywhere, dynamic bus routing with a single node, export support for GIPHY, save output anywhere! flatten, crop, transform; check colorblindness, make stereogram or stereoscopic images, or liner interpolate values and more."
version = "1.6.10"
version = "1.7.0"
license = { file = "LICENSE" }
readme = "README.md"
authors = [{ name = "Alexander G. Morano", email = "[email protected]" }]
Expand Down
2 changes: 1 addition & 1 deletion sup/shader.py
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ def render(self, time_delta:float=0.,

gl.glUniform1i(p_loc, texture_index)
texture_index += 1
elif val:
else:
funct = LAMBDA_UNIFORM[p_type]
if isinstance(p_value, EnumType):
val = p_value[val].value
Expand Down
17 changes: 13 additions & 4 deletions web/core/core_color.js
Original file line number Diff line number Diff line change
Expand Up @@ -597,11 +597,20 @@ app.registerExtension({
NODE_LIST = Object.fromEntries(NODE_LIST);

const CONFIG_CORE = await apiGet("/jovimetrix/config");

if (!Array.isArray(app.extensionManager.setting.get(setting_regex))) {
const CONFIG_REGEX = CONFIG_CORE?.user?.default?.color?.regex || [];
await app.extensionManager.setting.set(setting_regex, CONFIG_REGEX);
let CONFIG_REGEX = app.extensionManager.setting.get(setting_regex);
if (!Array.isArray(CONFIG_REGEX)) {
CONFIG_REGEX = CONFIG_CORE?.user?.default?.color?.regex || [
{ "regex": "" },
{ "regex": "" },
{ "regex": "" },
{ "regex": "" },
{ "regex": "" }
];
}
while (CONFIG_REGEX.length < 5) {
CONFIG_REGEX.push({ "regex": "" });
}
await app.extensionManager.setting.set(setting_regex, CONFIG_REGEX);

if (!Array.isArray(app.extensionManager.setting.get(setting_theme))) {
const CONFIG_THEME = CONFIG_CORE?.user?.default?.color?.theme || {
Expand Down

0 comments on commit d9a93e6

Please sign in to comment.