From b3492f82875f865745cab8f7e4b6cf712b994ed6 Mon Sep 17 00:00:00 2001 From: Ilya Razmanov Date: Mon, 16 Sep 2024 17:20:34 +0300 Subject: [PATCH] 1.9.16.2 General update --- 36zaika.py | 22 ++++++++-------- 44zaika.py | 18 ++++++------- 63zaika.py | 25 +++++++++---------- .../{44_pass_you_by.inc => 44_surprise.inc} | 0 4 files changed, 30 insertions(+), 35 deletions(-) rename presets/{44_pass_you_by.inc => 44_surprise.inc} (100%) diff --git a/36zaika.py b/36zaika.py index dd2c839..d7f49fd 100644 --- a/36zaika.py +++ b/36zaika.py @@ -18,7 +18,8 @@ 0.0.0.1 Complete rewriting to more flexible project - 18 June 2024. 1.7.22.12 Bugs seem to be eliminated. Prisms changed. Ready for release. 1.9.1.0 Reworked normals, added triangle tile normal. -1.9.13.5 Added global transform, changed globals to use UTF-8, added gamma note etc. +1.9.16.2 Added global transform, changed randoms in normal and move from + to +/-, + changed globals in export to UTF-8, added gamma note etc. ------------------- Main site: @@ -34,7 +35,7 @@ __copyright__ = "(c) 2007-2024 Ilya Razmanov" __credits__ = "Ilya Razmanov" __license__ = "unlicense" -__version__ = "1.9.16.1" +__version__ = "1.9.16.2" __maintainer__ = "Ilya Razmanov" __email__ = "ilyarazmanov@gmail.com" __status__ = "Production" @@ -46,7 +47,7 @@ import png # PNG reading: PyPNG from: https://gitlab.com/drj11/pypng -# -------------------------------------------------------------- +# -------------------------------------------------------------- {#888888, 11} # Creating dialog sortir = Tk() @@ -107,7 +108,7 @@ # Both files opened -def src(x, y, z): +def src(x, y, z): # {#884400, 16} ''' Analog of src from FM, force repeate edge instead of out of range. Returns int channel value z for pixel x, y @@ -125,7 +126,7 @@ def src(x, y, z): return channelvalue # end of src function -def srcY(x, y): +def srcY(x, y): # {#884400, 17} ''' Returns brightness of pixel x, y @@ -144,7 +145,7 @@ def srcY(x, y): return Yntensity # end of srcY function -def srcYL(x, y): +def srcYL(x, y): # {#884400, 23} """ Analog of srcY above, but returns bilinearly interpolated brightness of pixel x, y @@ -158,7 +159,7 @@ def srcYL(x, y): x0 = int(x); x1 = x0 + 1 y0 = int(y); y1 = y0 + 1 - # Reading corners src (see scr above) and interpolating + # Reading corners src (see scr above) and interpolating # {#880000, 6} channelvalue = ( srcY(x0, y0) * (x1 - fx) * (y1 - fy) + srcY(x0, y1) * (x1 - fx) * (fy - y0) + @@ -314,7 +315,7 @@ def srcYL(x, y): for y in range(0, Ycount, 1): - sortir.deiconify() + sortir.deiconify() # {#888888, 3} progressbar.config(value=y) sortir.update() sortir.update_idletasks() @@ -390,10 +391,7 @@ def srcYL(x, y): # Close output resultfile.close() -# -------------------------------------------------------------- -# Destroying dialog - +# -------------------------------------------------------------- {#888888, 3} sortir.destroy() sortir.mainloop() # Dialog destroyed and closed -# -------------------------------------------------------------- diff --git a/44zaika.py b/44zaika.py index 366659d..82ba15b 100644 --- a/44zaika.py +++ b/44zaika.py @@ -23,7 +23,8 @@ 1.7.17.1 Global/individual texture switch added for pseudo-heightmap effects. 1.7.22.12 Renamed to 44zaika to reflect regular plane partition class 4/4. Ready for release. 1.9.1.0 Reworked normals. -1.9.13.5 Added global transform, changed globals to use UTF-8, added gamma note etc. +1.9.16.2 Added global transform, changed randoms in normal and move from + to +/-, + changed globals in export to UTF-8, added gamma note etc. ------------------- Main site: @@ -39,7 +40,7 @@ __copyright__ = "(c) 2007-2024 Ilya Razmanov" __credits__ = "Ilya Razmanov" __license__ = "unlicense" -__version__ = "1.9.16.1" +__version__ = "1.9.16.2" __maintainer__ = "Ilya Razmanov" __email__ = "ilyarazmanov@gmail.com" __status__ = "Production" @@ -51,7 +52,7 @@ import png # PNG reading: PyPNG from: https://gitlab.com/drj11/pypng -# -------------------------------------------------------------- +# -------------------------------------------------------------- {#888888, 11} # Creating dialog sortir = Tk() @@ -112,7 +113,7 @@ # Both files opened -def src(x, y, z): +def src(x, y, z): # {#884400, 16} ''' Analog of src from FM, force repeate edge instead of out of range. Returns int channel value z for pixel x, y @@ -130,7 +131,7 @@ def src(x, y, z): return channelvalue # end of src function -def srcY(x, y): +def srcY(x, y): # {#884400, 17} ''' Returns brightness of pixel x, y @@ -300,7 +301,7 @@ def srcY(x, y): for y in range(0, Y, 1): - sortir.deiconify() + sortir.deiconify() # {#888888, 3} progressbar.config(value=y) sortir.update() sortir.update_idletasks() @@ -372,10 +373,7 @@ def srcY(x, y): # Close output resultfile.close() -# -------------------------------------------------------------- -# Destroying dialog - +# -------------------------------------------------------------- {#888888, 3} sortir.destroy() sortir.mainloop() # Dialog destroyed and closed -# -------------------------------------------------------------- diff --git a/63zaika.py b/63zaika.py index 51ab6b2..b122c2e 100644 --- a/63zaika.py +++ b/63zaika.py @@ -22,10 +22,12 @@ 1.7.16.17 Coordinate system match Photoshop, origin is top left, z points to the viewer. Camera improved. Global color modifier changed to transfer function. Scaling changed from subtractive to additive, be careful with old presets if they include scaling! 1.7.17.1 Global/individual texture switch added for pseudo-heightmap effects. -1.7.22.12 Renamed to 63zaika to reflect regular plane partition class 6/3. Prisms changed. Ready for release. +1.7.22.12 Renamed to 63zaika to reflect regular plane partition class 6/3. Prisms changed. + Ready for release. 1.7.24.15 Changed even/odd rotate to even/odd transform. Updated presets for compatibility. 1.9.1.0 Reworked normals. -1.9.13.5 Added global transform, changed globals to use UTF-8, added gamma note etc. +1.9.16.2 Added global transform, changed randoms in normal and move from + to +/-, + changed globals in export to UTF-8, added gamma note etc. ------------------- Main site: @@ -41,7 +43,7 @@ __copyright__ = "(c) 2007-2024 Ilya Razmanov" __credits__ = "Ilya Razmanov" __license__ = "unlicense" -__version__ = "1.9.16.1" +__version__ = "1.9.16.2" __maintainer__ = "Ilya Razmanov" __email__ = "ilyarazmanov@gmail.com" __status__ = "Production" @@ -53,7 +55,7 @@ import png # PNG reading: PyPNG from: https://gitlab.com/drj11/pypng -# -------------------------------------------------------------- +# -------------------------------------------------------------- {#888888, 11} # Creating dialog sortir = Tk() @@ -114,7 +116,7 @@ # Both files opened -def src(x, y, z): +def src(x, y, z): # {#884400, 16} ''' Analog of src from FM, force repeate edge instead of out of range. Returns int channel value z for pixel x, y @@ -132,7 +134,7 @@ def src(x, y, z): return channelvalue # end of src function -def srcY(x, y): +def srcY(x, y): # {#884400, 17} ''' Returns brightness of pixel x, y @@ -151,7 +153,7 @@ def srcY(x, y): return Yntensity # end of srcY function -def srcYL(x, y): +def srcYL(x, y): # {#884400, 23} """ Analog of srcY above, but returns bilinearly interpolated brightness of pixel x, y @@ -165,7 +167,7 @@ def srcYL(x, y): x0 = int(x); x1 = x0 + 1 y0 = int(y); y1 = y0 + 1 - # Reading corners src (see scr above) and interpolating + # Reading corners src (see scr above) and interpolating # {#880000, 6} channelvalue = ( srcY(x0, y0) * (x1 - fx) * (y1 - fy) + srcY(x0, y1) * (x1 - fx) * (fy - y0) + @@ -333,7 +335,7 @@ def srcYL(x, y): for y in range(0, Ycount, 1): - sortir.deiconify() + sortir.deiconify() # {#888888, 3} progressbar.config(value=y) sortir.update() sortir.update_idletasks() @@ -405,10 +407,7 @@ def srcYL(x, y): # Close output resultfile.close() -# -------------------------------------------------------------- -# Destroying dialog - +# -------------------------------------------------------------- {#888888, 3} sortir.destroy() sortir.mainloop() # Dialog destroyed and closed -# -------------------------------------------------------------- diff --git a/presets/44_pass_you_by.inc b/presets/44_surprise.inc similarity index 100% rename from presets/44_pass_you_by.inc rename to presets/44_surprise.inc