marstr/orthographic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Further fine-tuning to layering and completion generation ahead of release

Browse Source
This commit is contained in:
Marcus Str. 2024-10-05 09:45:04 +02:00
parent 08019c5db3
commit b0f4a81aca
3 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
defines.py
View File

@ -121,9 +121,6 @@ mstr_ortho_layers = [
# Z-Order 0 # Z-Order 0
("boundary", "administrative", "admin_level", ["8", "9", "10", "12"], "landuse", "residential-boundary"), ("boundary", "administrative", "admin_level", ["8", "9", "10", "12"], "landuse", "residential-boundary"),
# Z-Order 1 # Z-Order 1
("landuse", "grass", "landuse", "grass"),
("landuse", "cemetery", "landuse", "grass"),
("landuse", "greenfield", "landuse", "grass"),
("landuse", "orchard", "landuse", "meadow"), ("landuse", "orchard", "landuse", "meadow"),
("landuse", "meadow", "landuse", "meadow"), ("landuse", "meadow", "landuse", "meadow"),
("landuse", "recreation_ground", "landuse", "meadow"), ("landuse", "recreation_ground", "landuse", "meadow"),
@ -201,7 +198,10 @@ mstr_ortho_layers = [
("building", "yes", "building", "common"), ("building", "yes", "building", "common"),
("place", "sea", "natural", "sea"), ("place", "sea", "natural", "sea"),
("place", "ocean", "natural", "sea"), ("place", "ocean", "natural", "sea"),
("landuse", "residential", "landuse", "residential-boundary") ("landuse", "residential", "landuse", "residential-boundary"),
("landuse", "grass", "landuse", "grass"),
("landuse", "cemetery", "landuse", "grass"),
("landuse", "greenfield", "landuse", "grass")
] ]

2
layergen.py
View File

@ -445,7 +445,7 @@ class mstr_layergen:
for y in range(img.height): for y in range(img.height):
for x in range(img.width): for x in range(img.width):
c = imgp[x,y] c = imgp[x,y]
nc = (c[0], c[1], c[2], int(imgp[x,y][3]*0.25)) nc = (c[0], c[1], c[2], int(imgp[x,y][3]*0.5))
imgp[x,y] = nc imgp[x,y] = nc
lx = randrange( self._imgsize - img.width ) lx = randrange( self._imgsize - img.width )
ly = randrange( self._imgsize - img.height ) ly = randrange( self._imgsize - img.height )

7
photogen.py
View File

@ -113,11 +113,8 @@ class mstr_photogen:
# aforementioned fix: # aforementioned fix:
if emptyspace == True: if emptyspace == True:
# Choose a suitable layer type # Choose a suitable layer type
lt = [6,14,17] tag = "landuse"
pick = randrange(0,len(lt)-1) value = "meadow"
ltp = lt[pick]
tag = mstr_ortho_layers[ltp][0]
value = mstr_ortho_layers[ltp][1]
mstr_msg("photogen", "Patching empty space") mstr_msg("photogen", "Patching empty space")
self.buildCompletionMask() self.buildCompletionMask()