Skip to content

Commit

Permalink
1.9.16.2 General update
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dnyarri
Dnyarri committed Sep 16, 2024
1 parent 7a2867c commit b3492f8
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 35 deletions.
22 changes: 10 additions & 12 deletions 36zaika.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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__ = "[email protected]"
__status__ = "Production"
Expand All @@ -46,7 +47,7 @@

import png # PNG reading: PyPNG from: https://gitlab.com/drj11/pypng

# --------------------------------------------------------------
# -------------------------------------------------------------- {#888888, 11}
# Creating dialog

sortir = Tk()
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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) +
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -390,10 +391,7 @@ def srcYL(x, y):
# Close output
resultfile.close()

# --------------------------------------------------------------
# Destroying dialog

# -------------------------------------------------------------- {#888888, 3}
sortir.destroy()
sortir.mainloop()
# Dialog destroyed and closed
# --------------------------------------------------------------
18 changes: 8 additions & 10 deletions 44zaika.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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__ = "[email protected]"
__status__ = "Production"
Expand All @@ -51,7 +52,7 @@

import png # PNG reading: PyPNG from: https://gitlab.com/drj11/pypng

# --------------------------------------------------------------
# -------------------------------------------------------------- {#888888, 11}
# Creating dialog

sortir = Tk()
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -372,10 +373,7 @@ def srcY(x, y):
# Close output
resultfile.close()

# --------------------------------------------------------------
# Destroying dialog

# -------------------------------------------------------------- {#888888, 3}
sortir.destroy()
sortir.mainloop()
# Dialog destroyed and closed
# --------------------------------------------------------------
25 changes: 12 additions & 13 deletions 63zaika.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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__ = "[email protected]"
__status__ = "Production"
Expand All @@ -53,7 +55,7 @@

import png # PNG reading: PyPNG from: https://gitlab.com/drj11/pypng

# --------------------------------------------------------------
# -------------------------------------------------------------- {#888888, 11}
# Creating dialog

sortir = Tk()
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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) +
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -405,10 +407,7 @@ def srcYL(x, y):
# Close output
resultfile.close()

# --------------------------------------------------------------
# Destroying dialog

# -------------------------------------------------------------- {#888888, 3}
sortir.destroy()
sortir.mainloop()
# Dialog destroyed and closed
# --------------------------------------------------------------
0 presets/44_pass_you_by.inc → presets/44_surprise.inc
View file
File renamed without changes.

0 comments on commit b3492f8

Please sign in to comment.