]> marstr Code Repo - orthographic/commitdiff
Adjustment to photogen, added missing textures
authorMarcus Str. <marcus@marstr.online>
Mon, 2 Dec 2024 06:26:25 +0000 (07:26 +0100)
committerMarcus Str. <marcus@marstr.online>
Mon, 2 Dec 2024 06:26:25 +0000 (07:26 +0100)
53 files changed:
photogen.py
textures/landuse/cemetery/brd/b1.png [new file with mode: 0644]
textures/landuse/cemetery/brd/b2.png [new file with mode: 0644]
textures/landuse/cemetery/brd/b3.png [new file with mode: 0644]
textures/landuse/cemetery/brd/b4.png [new file with mode: 0644]
textures/landuse/cemetery/brd/b5.png [new file with mode: 0644]
textures/landuse/cemetery/ptc/b1_p1.png [new file with mode: 0644]
textures/landuse/cemetery/ptc/b2_p1.png [new file with mode: 0644]
textures/landuse/cemetery/ptc/b2_p2.png [new file with mode: 0644]
textures/landuse/cemetery/ptc/b3_p1.png [new file with mode: 0644]
textures/landuse/cemetery/ptc/b3_p2.png [new file with mode: 0644]
textures/landuse/cemetery/ptc/b4_p1.png [new file with mode: 0644]
textures/landuse/cemetery/ptc/b4_p2.png [new file with mode: 0644]
textures/landuse/cemetery/ptc/b5_p1.png [new file with mode: 0644]
textures/landuse/cemetery/ptc/b5_p2.png [new file with mode: 0644]
textures/landuse/military/brd/b1.png [new file with mode: 0644]
textures/landuse/military/brd/b2.png [new file with mode: 0644]
textures/landuse/military/brd/b3.png [new file with mode: 0644]
textures/landuse/military/brd/b4.png [new file with mode: 0644]
textures/landuse/military/ptc/b1_p1.png [new file with mode: 0644]
textures/landuse/military/ptc/b1_p2.png [new file with mode: 0644]
textures/landuse/military/ptc/b2_p1.png [new file with mode: 0644]
textures/landuse/military/ptc/b2_p2.png [new file with mode: 0644]
textures/landuse/military/ptc/b3_p1.png [new file with mode: 0644]
textures/landuse/military/ptc/b3_p2.png [new file with mode: 0644]
textures/landuse/military/ptc/b4_p1.png [new file with mode: 0644]
textures/landuse/military/ptc/b4_p2.png [new file with mode: 0644]
textures/landuse/recreation_ground/brd/b1.png [new file with mode: 0644]
textures/landuse/recreation_ground/brd/b2.png [new file with mode: 0644]
textures/landuse/recreation_ground/brd/b3.png [new file with mode: 0644]
textures/landuse/recreation_ground/brd/b4.png [new file with mode: 0644]
textures/landuse/recreation_ground/ptc/b1_p1.png [new file with mode: 0644]
textures/landuse/recreation_ground/ptc/b1_p2.png [new file with mode: 0644]
textures/landuse/recreation_ground/ptc/b2_p1.png [new file with mode: 0644]
textures/landuse/recreation_ground/ptc/b2_p2.png [new file with mode: 0644]
textures/landuse/recreation_ground/ptc/b3_p1.png [new file with mode: 0644]
textures/landuse/recreation_ground/ptc/b3_p2.png [new file with mode: 0644]
textures/landuse/recreation_ground/ptc/b4_p1.png [new file with mode: 0644]
textures/landuse/recreation_ground/ptc/b4_p2.png [new file with mode: 0644]
textures/leisure/swimming_pool/brd/b1.png [new file with mode: 0644]
textures/leisure/swimming_pool/brd/b2.png [new file with mode: 0644]
textures/leisure/swimming_pool/brd/b3.png [new file with mode: 0644]
textures/leisure/swimming_pool/brd/b4.png [new file with mode: 0644]
textures/leisure/swimming_pool/brd/b5.png [new file with mode: 0644]
textures/leisure/swimming_pool/ptc/b1_p1.png [new file with mode: 0644]
textures/leisure/swimming_pool/ptc/b2_p1.png [new file with mode: 0644]
textures/leisure/swimming_pool/ptc/b2_p2.png [new file with mode: 0644]
textures/leisure/swimming_pool/ptc/b3_p1.png [new file with mode: 0644]
textures/leisure/swimming_pool/ptc/b3_p2.png [new file with mode: 0644]
textures/leisure/swimming_pool/ptc/b4_p1.png [new file with mode: 0644]
textures/leisure/swimming_pool/ptc/b4_p2.png [new file with mode: 0644]
textures/leisure/swimming_pool/ptc/b5_p1.png [new file with mode: 0644]
textures/leisure/swimming_pool/ptc/b5_p2.png [new file with mode: 0644]

index c50bb866f07ce21339d2f914762db7ae1b5ed8cc..56a4fba052a3777874e1d9bce1f642ce772264e0 100644 (file)
@@ -102,6 +102,11 @@ class mstr_photogen:
                 ptc = Image.open(mstr_datafolder + "textures/tile/completion/p" + str(randrange(1, len(patches)+1)) + ".png")\r
                 # Rotate it\r
                 ptc = ptc.rotate(randrange(0, 360), expand=True)\r
+\r
+                # Make sure ortho generation does not crash\r
+                if ptc.width >= mstr_photores:\r
+                    ptc = ptc.resize((1536, 1536), Image.Resampling.BILINEAR)\r
+\r
                 # Adjust alpha on this image\r
                 ptc_p = ptc.load()\r
                 for y in range(ptc.height):\r
diff --git a/textures/landuse/cemetery/brd/b1.png b/textures/landuse/cemetery/brd/b1.png
new file mode 100644 (file)
index 0000000..e140282
Binary files /dev/null and b/textures/landuse/cemetery/brd/b1.png differ
diff --git a/textures/landuse/cemetery/brd/b2.png b/textures/landuse/cemetery/brd/b2.png
new file mode 100644 (file)
index 0000000..3358762
Binary files /dev/null and b/textures/landuse/cemetery/brd/b2.png differ
diff --git a/textures/landuse/cemetery/brd/b3.png b/textures/landuse/cemetery/brd/b3.png
new file mode 100644 (file)
index 0000000..a3254af
Binary files /dev/null and b/textures/landuse/cemetery/brd/b3.png differ
diff --git a/textures/landuse/cemetery/brd/b4.png b/textures/landuse/cemetery/brd/b4.png
new file mode 100644 (file)
index 0000000..82d5839
Binary files /dev/null and b/textures/landuse/cemetery/brd/b4.png differ
diff --git a/textures/landuse/cemetery/brd/b5.png b/textures/landuse/cemetery/brd/b5.png
new file mode 100644 (file)
index 0000000..9630292
Binary files /dev/null and b/textures/landuse/cemetery/brd/b5.png differ
diff --git a/textures/landuse/cemetery/ptc/b1_p1.png b/textures/landuse/cemetery/ptc/b1_p1.png
new file mode 100644 (file)
index 0000000..d97b974
Binary files /dev/null and b/textures/landuse/cemetery/ptc/b1_p1.png differ
diff --git a/textures/landuse/cemetery/ptc/b2_p1.png b/textures/landuse/cemetery/ptc/b2_p1.png
new file mode 100644 (file)
index 0000000..a68bb51
Binary files /dev/null and b/textures/landuse/cemetery/ptc/b2_p1.png differ
diff --git a/textures/landuse/cemetery/ptc/b2_p2.png b/textures/landuse/cemetery/ptc/b2_p2.png
new file mode 100644 (file)
index 0000000..a8edf6c
Binary files /dev/null and b/textures/landuse/cemetery/ptc/b2_p2.png differ
diff --git a/textures/landuse/cemetery/ptc/b3_p1.png b/textures/landuse/cemetery/ptc/b3_p1.png
new file mode 100644 (file)
index 0000000..a6c0506
Binary files /dev/null and b/textures/landuse/cemetery/ptc/b3_p1.png differ
diff --git a/textures/landuse/cemetery/ptc/b3_p2.png b/textures/landuse/cemetery/ptc/b3_p2.png
new file mode 100644 (file)
index 0000000..dc31e0f
Binary files /dev/null and b/textures/landuse/cemetery/ptc/b3_p2.png differ
diff --git a/textures/landuse/cemetery/ptc/b4_p1.png b/textures/landuse/cemetery/ptc/b4_p1.png
new file mode 100644 (file)
index 0000000..4195505
Binary files /dev/null and b/textures/landuse/cemetery/ptc/b4_p1.png differ
diff --git a/textures/landuse/cemetery/ptc/b4_p2.png b/textures/landuse/cemetery/ptc/b4_p2.png
new file mode 100644 (file)
index 0000000..46e31ae
Binary files /dev/null and b/textures/landuse/cemetery/ptc/b4_p2.png differ
diff --git a/textures/landuse/cemetery/ptc/b5_p1.png b/textures/landuse/cemetery/ptc/b5_p1.png
new file mode 100644 (file)
index 0000000..6349358
Binary files /dev/null and b/textures/landuse/cemetery/ptc/b5_p1.png differ
diff --git a/textures/landuse/cemetery/ptc/b5_p2.png b/textures/landuse/cemetery/ptc/b5_p2.png
new file mode 100644 (file)
index 0000000..e09374f
Binary files /dev/null and b/textures/landuse/cemetery/ptc/b5_p2.png differ
diff --git a/textures/landuse/military/brd/b1.png b/textures/landuse/military/brd/b1.png
new file mode 100644 (file)
index 0000000..6be9ba8
Binary files /dev/null and b/textures/landuse/military/brd/b1.png differ
diff --git a/textures/landuse/military/brd/b2.png b/textures/landuse/military/brd/b2.png
new file mode 100644 (file)
index 0000000..268b38b
Binary files /dev/null and b/textures/landuse/military/brd/b2.png differ
diff --git a/textures/landuse/military/brd/b3.png b/textures/landuse/military/brd/b3.png
new file mode 100644 (file)
index 0000000..cd73d2e
Binary files /dev/null and b/textures/landuse/military/brd/b3.png differ
diff --git a/textures/landuse/military/brd/b4.png b/textures/landuse/military/brd/b4.png
new file mode 100644 (file)
index 0000000..6e53e94
Binary files /dev/null and b/textures/landuse/military/brd/b4.png differ
diff --git a/textures/landuse/military/ptc/b1_p1.png b/textures/landuse/military/ptc/b1_p1.png
new file mode 100644 (file)
index 0000000..c1d1a3a
Binary files /dev/null and b/textures/landuse/military/ptc/b1_p1.png differ
diff --git a/textures/landuse/military/ptc/b1_p2.png b/textures/landuse/military/ptc/b1_p2.png
new file mode 100644 (file)
index 0000000..708dc34
Binary files /dev/null and b/textures/landuse/military/ptc/b1_p2.png differ
diff --git a/textures/landuse/military/ptc/b2_p1.png b/textures/landuse/military/ptc/b2_p1.png
new file mode 100644 (file)
index 0000000..057d796
Binary files /dev/null and b/textures/landuse/military/ptc/b2_p1.png differ
diff --git a/textures/landuse/military/ptc/b2_p2.png b/textures/landuse/military/ptc/b2_p2.png
new file mode 100644 (file)
index 0000000..c9631c3
Binary files /dev/null and b/textures/landuse/military/ptc/b2_p2.png differ
diff --git a/textures/landuse/military/ptc/b3_p1.png b/textures/landuse/military/ptc/b3_p1.png
new file mode 100644 (file)
index 0000000..916014b
Binary files /dev/null and b/textures/landuse/military/ptc/b3_p1.png differ
diff --git a/textures/landuse/military/ptc/b3_p2.png b/textures/landuse/military/ptc/b3_p2.png
new file mode 100644 (file)
index 0000000..872f736
Binary files /dev/null and b/textures/landuse/military/ptc/b3_p2.png differ
diff --git a/textures/landuse/military/ptc/b4_p1.png b/textures/landuse/military/ptc/b4_p1.png
new file mode 100644 (file)
index 0000000..cee27fe
Binary files /dev/null and b/textures/landuse/military/ptc/b4_p1.png differ
diff --git a/textures/landuse/military/ptc/b4_p2.png b/textures/landuse/military/ptc/b4_p2.png
new file mode 100644 (file)
index 0000000..547a0fe
Binary files /dev/null and b/textures/landuse/military/ptc/b4_p2.png differ
diff --git a/textures/landuse/recreation_ground/brd/b1.png b/textures/landuse/recreation_ground/brd/b1.png
new file mode 100644 (file)
index 0000000..439abf0
Binary files /dev/null and b/textures/landuse/recreation_ground/brd/b1.png differ
diff --git a/textures/landuse/recreation_ground/brd/b2.png b/textures/landuse/recreation_ground/brd/b2.png
new file mode 100644 (file)
index 0000000..85cc8e8
Binary files /dev/null and b/textures/landuse/recreation_ground/brd/b2.png differ
diff --git a/textures/landuse/recreation_ground/brd/b3.png b/textures/landuse/recreation_ground/brd/b3.png
new file mode 100644 (file)
index 0000000..4cf033c
Binary files /dev/null and b/textures/landuse/recreation_ground/brd/b3.png differ
diff --git a/textures/landuse/recreation_ground/brd/b4.png b/textures/landuse/recreation_ground/brd/b4.png
new file mode 100644 (file)
index 0000000..1790836
Binary files /dev/null and b/textures/landuse/recreation_ground/brd/b4.png differ
diff --git a/textures/landuse/recreation_ground/ptc/b1_p1.png b/textures/landuse/recreation_ground/ptc/b1_p1.png
new file mode 100644 (file)
index 0000000..46b4f89
Binary files /dev/null and b/textures/landuse/recreation_ground/ptc/b1_p1.png differ
diff --git a/textures/landuse/recreation_ground/ptc/b1_p2.png b/textures/landuse/recreation_ground/ptc/b1_p2.png
new file mode 100644 (file)
index 0000000..32e40f3
Binary files /dev/null and b/textures/landuse/recreation_ground/ptc/b1_p2.png differ
diff --git a/textures/landuse/recreation_ground/ptc/b2_p1.png b/textures/landuse/recreation_ground/ptc/b2_p1.png
new file mode 100644 (file)
index 0000000..566c220
Binary files /dev/null and b/textures/landuse/recreation_ground/ptc/b2_p1.png differ
diff --git a/textures/landuse/recreation_ground/ptc/b2_p2.png b/textures/landuse/recreation_ground/ptc/b2_p2.png
new file mode 100644 (file)
index 0000000..10a211d
Binary files /dev/null and b/textures/landuse/recreation_ground/ptc/b2_p2.png differ
diff --git a/textures/landuse/recreation_ground/ptc/b3_p1.png b/textures/landuse/recreation_ground/ptc/b3_p1.png
new file mode 100644 (file)
index 0000000..4322b13
Binary files /dev/null and b/textures/landuse/recreation_ground/ptc/b3_p1.png differ
diff --git a/textures/landuse/recreation_ground/ptc/b3_p2.png b/textures/landuse/recreation_ground/ptc/b3_p2.png
new file mode 100644 (file)
index 0000000..1cc9162
Binary files /dev/null and b/textures/landuse/recreation_ground/ptc/b3_p2.png differ
diff --git a/textures/landuse/recreation_ground/ptc/b4_p1.png b/textures/landuse/recreation_ground/ptc/b4_p1.png
new file mode 100644 (file)
index 0000000..7a09e4e
Binary files /dev/null and b/textures/landuse/recreation_ground/ptc/b4_p1.png differ
diff --git a/textures/landuse/recreation_ground/ptc/b4_p2.png b/textures/landuse/recreation_ground/ptc/b4_p2.png
new file mode 100644 (file)
index 0000000..fff420c
Binary files /dev/null and b/textures/landuse/recreation_ground/ptc/b4_p2.png differ
diff --git a/textures/leisure/swimming_pool/brd/b1.png b/textures/leisure/swimming_pool/brd/b1.png
new file mode 100644 (file)
index 0000000..c0d4267
Binary files /dev/null and b/textures/leisure/swimming_pool/brd/b1.png differ
diff --git a/textures/leisure/swimming_pool/brd/b2.png b/textures/leisure/swimming_pool/brd/b2.png
new file mode 100644 (file)
index 0000000..acea7aa
Binary files /dev/null and b/textures/leisure/swimming_pool/brd/b2.png differ
diff --git a/textures/leisure/swimming_pool/brd/b3.png b/textures/leisure/swimming_pool/brd/b3.png
new file mode 100644 (file)
index 0000000..4cf2eed
Binary files /dev/null and b/textures/leisure/swimming_pool/brd/b3.png differ
diff --git a/textures/leisure/swimming_pool/brd/b4.png b/textures/leisure/swimming_pool/brd/b4.png
new file mode 100644 (file)
index 0000000..8bfd39e
Binary files /dev/null and b/textures/leisure/swimming_pool/brd/b4.png differ
diff --git a/textures/leisure/swimming_pool/brd/b5.png b/textures/leisure/swimming_pool/brd/b5.png
new file mode 100644 (file)
index 0000000..e399fea
Binary files /dev/null and b/textures/leisure/swimming_pool/brd/b5.png differ
diff --git a/textures/leisure/swimming_pool/ptc/b1_p1.png b/textures/leisure/swimming_pool/ptc/b1_p1.png
new file mode 100644 (file)
index 0000000..f883c3c
Binary files /dev/null and b/textures/leisure/swimming_pool/ptc/b1_p1.png differ
diff --git a/textures/leisure/swimming_pool/ptc/b2_p1.png b/textures/leisure/swimming_pool/ptc/b2_p1.png
new file mode 100644 (file)
index 0000000..196c988
Binary files /dev/null and b/textures/leisure/swimming_pool/ptc/b2_p1.png differ
diff --git a/textures/leisure/swimming_pool/ptc/b2_p2.png b/textures/leisure/swimming_pool/ptc/b2_p2.png
new file mode 100644 (file)
index 0000000..9395ee9
Binary files /dev/null and b/textures/leisure/swimming_pool/ptc/b2_p2.png differ
diff --git a/textures/leisure/swimming_pool/ptc/b3_p1.png b/textures/leisure/swimming_pool/ptc/b3_p1.png
new file mode 100644 (file)
index 0000000..26dc7c2
Binary files /dev/null and b/textures/leisure/swimming_pool/ptc/b3_p1.png differ
diff --git a/textures/leisure/swimming_pool/ptc/b3_p2.png b/textures/leisure/swimming_pool/ptc/b3_p2.png
new file mode 100644 (file)
index 0000000..c735718
Binary files /dev/null and b/textures/leisure/swimming_pool/ptc/b3_p2.png differ
diff --git a/textures/leisure/swimming_pool/ptc/b4_p1.png b/textures/leisure/swimming_pool/ptc/b4_p1.png
new file mode 100644 (file)
index 0000000..65cbe36
Binary files /dev/null and b/textures/leisure/swimming_pool/ptc/b4_p1.png differ
diff --git a/textures/leisure/swimming_pool/ptc/b4_p2.png b/textures/leisure/swimming_pool/ptc/b4_p2.png
new file mode 100644 (file)
index 0000000..cb68715
Binary files /dev/null and b/textures/leisure/swimming_pool/ptc/b4_p2.png differ
diff --git a/textures/leisure/swimming_pool/ptc/b5_p1.png b/textures/leisure/swimming_pool/ptc/b5_p1.png
new file mode 100644 (file)
index 0000000..148b8e3
Binary files /dev/null and b/textures/leisure/swimming_pool/ptc/b5_p1.png differ
diff --git a/textures/leisure/swimming_pool/ptc/b5_p2.png b/textures/leisure/swimming_pool/ptc/b5_p2.png
new file mode 100644 (file)
index 0000000..93a478a
Binary files /dev/null and b/textures/leisure/swimming_pool/ptc/b5_p2.png differ