Skip to content

Commit

Permalink
quick patch for python 3.10.
Browse files Browse the repository at this point in the history
3.10 is DEPRECATED
  • Loading branch information
Amorano committed Sep 24, 2024
1 parent 877074f commit b5beb02
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ If those nodes have descriptions written in HTML or Markdown, they will be conve

## UPDATES

**2024/09/21** @1.2.40:
**2024/09/21** @1.2.41:
* Colorizer panel ported to new frontend.
* numerical bit conversion for Number fields, String fields (character bits) and Image fields (pixels on/off)
* new `COLOR MEANS` node will generate color palettes of the top-k colors of an input
Expand Down
2 changes: 0 additions & 2 deletions core/calc.py
Original file line number Diff line number Diff line change
Expand Up @@ -765,7 +765,6 @@ def run(self, **kw) -> Tuple[torch.Tensor, torch.Tensor]:
return ([],)
# flat list of ALL the dynamic inputs...
data_list = flatten(data_list)
print(123, data_list)
# single operation mode -- like array node
op = parse_param(kw, Lexicon.FUNC, EnumConvertString, EnumConvertString.SPLIT.name)[0]
key = parse_param(kw, Lexicon.KEY, EnumConvertType.STRING, "")[0]
Expand Down Expand Up @@ -796,7 +795,6 @@ def run(self, **kw) -> Tuple[torch.Tensor, torch.Tensor]:
results.append(x)
if len(results) == 0:
results = [""]
print(results)
return (results, [len(r) for r in results],) if len(results) > 1 else (results[0], len(results[0]),)

class SwizzleNode(JOVBaseNode):
Expand Down
2 changes: 1 addition & 1 deletion core/create_glsl.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def __init__(self, *arg, **kw) -> None:
self.__glsl = GLSLShader()
self.__delta = 0

def run(self, ident, **kw) -> tuple[torch.Tensor]:
def run(self, ident, **kw) -> Tuple[torch.Tensor]:
batch = parse_param(kw, Lexicon.BATCH, EnumConvertType.INT, 0, 0, 1048576)[0]
delta = parse_param(kw, Lexicon.TIME, EnumConvertType.FLOAT, 0)[0]

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.2.40"
version = "1.2.41"
license = { file = "LICENSE" }
dependencies = [
"aenum>=3.1.15,<4",
Expand Down
2 changes: 1 addition & 1 deletion sup/image/color.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
# === TYPE ===
# ==============================================================================

TYPE_LUT = Tuple[256, 256, 256, 3]
TYPE_LUT = Tuple[int, int, int, int]

# ==============================================================================
# === ENUMERATION ===
Expand Down
2 changes: 1 addition & 1 deletion sup/shader.py
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ def render(self, time_delta:float=0.,
gl.glTexParameteri(gl.GL_TEXTURE_2D, gl.GL_TEXTURE_MAG_FILTER, gl.GL_LINEAR)

for idx, text_wrap in enumerate([gl.GL_TEXTURE_WRAP_S, gl.GL_TEXTURE_WRAP_T]):
match EnumGLSLEdge[tile_edge[idx]]:
match tile_edge[idx]:
case EnumGLSLEdge.WRAP:
gl.glTexParameteri(gl.GL_TEXTURE_2D, text_wrap, gl.GL_REPEAT)
case EnumGLSLEdge.MIRROR:
Expand Down

0 comments on commit b5beb02

Please sign in to comment.