diff --git a/README.md b/README.md index b395ec0..f346d97 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,9 @@ Please consider sponsoring me if you enjoy the results of my work, code or docum ## UPDATES +**2024/02/05** @1.1.02: +* polish on regex parsing for uniforms -- supports are much more lenient on spacing + **2024/02/05** @1.1.0: * fixed value not updating when uniforms set to 0.0 [issue #4](https://github.com/Amorano/Jovi_GLSL/issues/4#issuecomment-2638367429) diff --git a/core/__init__.py b/core/__init__.py index 7a253e5..b8bcec9 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -30,7 +30,7 @@ class CompileException(Exception): pass # === GLOBAL === # ============================================================================== -RE_VARIABLE = re.compile(r"^uniform\s+(\w+)\s+(\w+);\s*(?:\/\/\s*([^;|]*))?\s*(?:;\s*([^;|]*))?\s*(?:;\s*([^;|]*))?\s*(?:;\s*([^;|]*))?\s*(?:;\s*([^;|]*))?\s*(?:\|\s*(.*))?$", re.MULTILINE) +RE_VARIABLE = re.compile(r"^\s*uniform\s+(\w+)\s+(\w+)\s*;\s*(?:\/\/\s*([^;|]*))?(?:\s*;\s*([^;|]*))?(?:\s*;\s*([^;|]*))?(?:\s*;\s*([^;|]*))?(?:\s*;\s*([^;|]*))?(?:\s*\|[\t\f ]*([^\r\n]*))?$", re.MULTILINE) IMAGE_SIZE_DEFAULT: int = 512 IMAGE_SIZE_MIN: int = 64 diff --git a/pyproject.toml b/pyproject.toml index 331308b..0eac42a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "jovi_glsl" description = "ComfyUI Nodes that integrate GLSL shader support." -version = "1.1.0" +version = "1.1.02" license = { file = "LICENSE" } readme = "README.md" authors = [{ name = "Alexander G. Morano", email = "amorano@gmail.com" }]