diff --git a/core/calc.py b/core/calc.py index 9514b7e..56f06f0 100644 --- a/core/calc.py +++ b/core/calc.py @@ -297,6 +297,7 @@ def run(self, **kw) -> Tuple[bool]: for idx, (A, B, a_x, a_xy, a_xyz, a_xyzw, b_x, b_xy, b_xyz, b_xyzw, op, typ, flip) in enumerate(params): + #logger.debug(f'val {A}, {B}, {a_x}, {b_x}') # use everything as float for precision typ = EnumConvertType[typ] if typ in [EnumConvertType.VEC2, EnumConvertType.VEC2INT]: @@ -309,10 +310,9 @@ def run(self, **kw) -> Tuple[bool]: val_a = parse_value(A, EnumConvertType.VEC4, A if A is not None else a_xyzw) val_b = parse_value(B, EnumConvertType.VEC4, B if B is not None else b_xyzw) else: - # logger.debug('val', A, B) val_a = parse_value(A, EnumConvertType.VEC4, A if A is not None else a_x) - val_b = parse_value(B, EnumConvertType.VEC4, B if B is not None else a_x) - + val_b = parse_value(B, EnumConvertType.VEC4, B if B is not None else b_x) + #logger.debug(f'val {val_a}, {val_b}') if flip: val_a, val_b = val_b, val_a size = max(1, int(typ.value / 10)) diff --git a/pyproject.toml b/pyproject.toml index 07b4c62..0b11005 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "jovimetrix" description = "Compose like Substance Designer. Webcams, Media Streams (in/out), Tick animation, Color correction, Geometry manipulation, Pixel shader, Polygonal shape generator, Remap images gometry and color, Heavily inspired by WAS and MTB Node Suites." -version = "1.0.4" +version = "1.0.5" license = "LICENSE" dependencies = ["torch", "numpy", "matplotlib", "opencv-contrib-python", "ffmpeg-python", "librosa", "loguru", "moderngl", "mss", "requests", "Pillow", "pywin32==306; platform_system==\"Windows\"", "scikit-image", "blendmodes", "mido[ports-rtmidi]", "pyaudio", "daltonlens", "numba", "PyOpenGL", "PyOpenGL-accelerate", "SpoutGL; platform_system==\"Windows\"", "vnoise", "stereoscopy[auto_align]", "aenum<4,>=3.1.15"]