Skip to content

Commit b3492f8

Browse files
committed
1.9.16.2 General update
1 parent 7a2867c commit b3492f8

File tree

4 files changed

+30
-35
lines changed

4 files changed

+30
-35
lines changed

36zaika.py

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
0.0.0.1 Complete rewriting to more flexible project - 18 June 2024.
1919
1.7.22.12 Bugs seem to be eliminated. Prisms changed. Ready for release.
2020
1.9.1.0 Reworked normals, added triangle tile normal.
21-
1.9.13.5 Added global transform, changed globals to use UTF-8, added gamma note etc.
21+
1.9.16.2 Added global transform, changed randoms in normal and move from + to +/-,
22+
changed globals in export to UTF-8, added gamma note etc.
2223
2324
-------------------
2425
Main site:
@@ -34,7 +35,7 @@
3435
__copyright__ = "(c) 2007-2024 Ilya Razmanov"
3536
__credits__ = "Ilya Razmanov"
3637
__license__ = "unlicense"
37-
__version__ = "1.9.16.1"
38+
__version__ = "1.9.16.2"
3839
__maintainer__ = "Ilya Razmanov"
3940
__email__ = "ilyarazmanov@gmail.com"
4041
__status__ = "Production"
@@ -46,7 +47,7 @@
4647

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

49-
# --------------------------------------------------------------
50+
# -------------------------------------------------------------- {#888888, 11}
5051
# Creating dialog
5152

5253
sortir = Tk()
@@ -107,7 +108,7 @@
107108

108109
# Both files opened
109110

110-
def src(x, y, z):
111+
def src(x, y, z): # {#884400, 16}
111112
'''
112113
Analog of src from FM, force repeate edge instead of out of range.
113114
Returns int channel value z for pixel x, y
@@ -125,7 +126,7 @@ def src(x, y, z):
125126
return channelvalue
126127
# end of src function
127128

128-
def srcY(x, y):
129+
def srcY(x, y): # {#884400, 17}
129130
'''
130131
Returns brightness of pixel x, y
131132
@@ -144,7 +145,7 @@ def srcY(x, y):
144145
return Yntensity
145146
# end of srcY function
146147

147-
def srcYL(x, y):
148+
def srcYL(x, y): # {#884400, 23}
148149
"""
149150
Analog of srcY above, but returns bilinearly interpolated brightness of pixel x, y
150151
@@ -158,7 +159,7 @@ def srcYL(x, y):
158159
x0 = int(x); x1 = x0 + 1
159160
y0 = int(y); y1 = y0 + 1
160161

161-
# Reading corners src (see scr above) and interpolating
162+
# Reading corners src (see scr above) and interpolating # {#880000, 6}
162163
channelvalue = (
163164
srcY(x0, y0) * (x1 - fx) * (y1 - fy) +
164165
srcY(x0, y1) * (x1 - fx) * (fy - y0) +
@@ -314,7 +315,7 @@ def srcYL(x, y):
314315

315316
for y in range(0, Ycount, 1):
316317

317-
sortir.deiconify()
318+
sortir.deiconify() # {#888888, 3}
318319
progressbar.config(value=y)
319320
sortir.update()
320321
sortir.update_idletasks()
@@ -390,10 +391,7 @@ def srcYL(x, y):
390391
# Close output
391392
resultfile.close()
392393

393-
# --------------------------------------------------------------
394-
# Destroying dialog
395-
394+
# -------------------------------------------------------------- {#888888, 3}
396395
sortir.destroy()
397396
sortir.mainloop()
398397
# Dialog destroyed and closed
399-
# --------------------------------------------------------------

44zaika.py

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@
2323
1.7.17.1 Global/individual texture switch added for pseudo-heightmap effects.
2424
1.7.22.12 Renamed to 44zaika to reflect regular plane partition class 4/4. Ready for release.
2525
1.9.1.0 Reworked normals.
26-
1.9.13.5 Added global transform, changed globals to use UTF-8, added gamma note etc.
26+
1.9.16.2 Added global transform, changed randoms in normal and move from + to +/-,
27+
changed globals in export to UTF-8, added gamma note etc.
2728
2829
-------------------
2930
Main site:
@@ -39,7 +40,7 @@
3940
__copyright__ = "(c) 2007-2024 Ilya Razmanov"
4041
__credits__ = "Ilya Razmanov"
4142
__license__ = "unlicense"
42-
__version__ = "1.9.16.1"
43+
__version__ = "1.9.16.2"
4344
__maintainer__ = "Ilya Razmanov"
4445
__email__ = "ilyarazmanov@gmail.com"
4546
__status__ = "Production"
@@ -51,7 +52,7 @@
5152

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

54-
# --------------------------------------------------------------
55+
# -------------------------------------------------------------- {#888888, 11}
5556
# Creating dialog
5657

5758
sortir = Tk()
@@ -112,7 +113,7 @@
112113

113114
# Both files opened
114115

115-
def src(x, y, z):
116+
def src(x, y, z): # {#884400, 16}
116117
'''
117118
Analog of src from FM, force repeate edge instead of out of range.
118119
Returns int channel value z for pixel x, y
@@ -130,7 +131,7 @@ def src(x, y, z):
130131
return channelvalue
131132
# end of src function
132133

133-
def srcY(x, y):
134+
def srcY(x, y): # {#884400, 17}
134135
'''
135136
Returns brightness of pixel x, y
136137
@@ -300,7 +301,7 @@ def srcY(x, y):
300301

301302
for y in range(0, Y, 1):
302303

303-
sortir.deiconify()
304+
sortir.deiconify() # {#888888, 3}
304305
progressbar.config(value=y)
305306
sortir.update()
306307
sortir.update_idletasks()
@@ -372,10 +373,7 @@ def srcY(x, y):
372373
# Close output
373374
resultfile.close()
374375

375-
# --------------------------------------------------------------
376-
# Destroying dialog
377-
376+
# -------------------------------------------------------------- {#888888, 3}
378377
sortir.destroy()
379378
sortir.mainloop()
380379
# Dialog destroyed and closed
381-
# --------------------------------------------------------------

63zaika.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@
2222
1.7.16.17 Coordinate system match Photoshop, origin is top left, z points to the viewer.
2323
Camera improved. Global color modifier changed to transfer function. Scaling changed from subtractive to additive, be careful with old presets if they include scaling!
2424
1.7.17.1 Global/individual texture switch added for pseudo-heightmap effects.
25-
1.7.22.12 Renamed to 63zaika to reflect regular plane partition class 6/3. Prisms changed. Ready for release.
25+
1.7.22.12 Renamed to 63zaika to reflect regular plane partition class 6/3. Prisms changed.
26+
Ready for release.
2627
1.7.24.15 Changed even/odd rotate to even/odd transform. Updated presets for compatibility.
2728
1.9.1.0 Reworked normals.
28-
1.9.13.5 Added global transform, changed globals to use UTF-8, added gamma note etc.
29+
1.9.16.2 Added global transform, changed randoms in normal and move from + to +/-,
30+
changed globals in export to UTF-8, added gamma note etc.
2931
3032
-------------------
3133
Main site:
@@ -41,7 +43,7 @@
4143
__copyright__ = "(c) 2007-2024 Ilya Razmanov"
4244
__credits__ = "Ilya Razmanov"
4345
__license__ = "unlicense"
44-
__version__ = "1.9.16.1"
46+
__version__ = "1.9.16.2"
4547
__maintainer__ = "Ilya Razmanov"
4648
__email__ = "ilyarazmanov@gmail.com"
4749
__status__ = "Production"
@@ -53,7 +55,7 @@
5355

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

56-
# --------------------------------------------------------------
58+
# -------------------------------------------------------------- {#888888, 11}
5759
# Creating dialog
5860

5961
sortir = Tk()
@@ -114,7 +116,7 @@
114116

115117
# Both files opened
116118

117-
def src(x, y, z):
119+
def src(x, y, z): # {#884400, 16}
118120
'''
119121
Analog of src from FM, force repeate edge instead of out of range.
120122
Returns int channel value z for pixel x, y
@@ -132,7 +134,7 @@ def src(x, y, z):
132134
return channelvalue
133135
# end of src function
134136

135-
def srcY(x, y):
137+
def srcY(x, y): # {#884400, 17}
136138
'''
137139
Returns brightness of pixel x, y
138140
@@ -151,7 +153,7 @@ def srcY(x, y):
151153
return Yntensity
152154
# end of srcY function
153155

154-
def srcYL(x, y):
156+
def srcYL(x, y): # {#884400, 23}
155157
"""
156158
Analog of srcY above, but returns bilinearly interpolated brightness of pixel x, y
157159
@@ -165,7 +167,7 @@ def srcYL(x, y):
165167
x0 = int(x); x1 = x0 + 1
166168
y0 = int(y); y1 = y0 + 1
167169

168-
# Reading corners src (see scr above) and interpolating
170+
# Reading corners src (see scr above) and interpolating # {#880000, 6}
169171
channelvalue = (
170172
srcY(x0, y0) * (x1 - fx) * (y1 - fy) +
171173
srcY(x0, y1) * (x1 - fx) * (fy - y0) +
@@ -333,7 +335,7 @@ def srcYL(x, y):
333335

334336
for y in range(0, Ycount, 1):
335337

336-
sortir.deiconify()
338+
sortir.deiconify() # {#888888, 3}
337339
progressbar.config(value=y)
338340
sortir.update()
339341
sortir.update_idletasks()
@@ -405,10 +407,7 @@ def srcYL(x, y):
405407
# Close output
406408
resultfile.close()
407409

408-
# --------------------------------------------------------------
409-
# Destroying dialog
410-
410+
# -------------------------------------------------------------- {#888888, 3}
411411
sortir.destroy()
412412
sortir.mainloop()
413413
# Dialog destroyed and closed
414-
# --------------------------------------------------------------
File renamed without changes.

0 commit comments

Comments
 (0)