From: marstr Date: Wed, 28 Aug 2024 12:46:11 +0000 (+0200) Subject: Corrected residential and forest textures, fixed bug in layergen with river and strea... X-Git-Url: https://marstr.online/code/gitweb.cgi?a=commitdiff_plain;h=c412a41291271e88106601358b4c05ab13742584;p=orthographic Corrected residential and forest textures, fixed bug in layergen with river and stream rendering, corrected order for nature reserve and forests in defines.py . --- diff --git a/Textures/landuse/forest/brd/b13.png b/Textures/landuse/forest/brd/b13.png index adfec0e..7bdd2ec 100644 Binary files a/Textures/landuse/forest/brd/b13.png and b/Textures/landuse/forest/brd/b13.png differ diff --git a/Textures/landuse/forest/brd/b14.png b/Textures/landuse/forest/brd/b14.png index 0c346f9..f40cf16 100644 Binary files a/Textures/landuse/forest/brd/b14.png and b/Textures/landuse/forest/brd/b14.png differ diff --git a/Textures/landuse/forest/brd/b15.png b/Textures/landuse/forest/brd/b15.png index 408a177..101299f 100644 Binary files a/Textures/landuse/forest/brd/b15.png and b/Textures/landuse/forest/brd/b15.png differ diff --git a/Textures/landuse/forest/ptc/b13_p1.png b/Textures/landuse/forest/ptc/b13_p1.png index 4fd8be8..25802a4 100644 Binary files a/Textures/landuse/forest/ptc/b13_p1.png and b/Textures/landuse/forest/ptc/b13_p1.png differ diff --git a/Textures/landuse/forest/ptc/b13_p2.png b/Textures/landuse/forest/ptc/b13_p2.png index 5df61f1..25761ef 100644 Binary files a/Textures/landuse/forest/ptc/b13_p2.png and b/Textures/landuse/forest/ptc/b13_p2.png differ diff --git a/Textures/landuse/forest/ptc/b14_p1.png b/Textures/landuse/forest/ptc/b14_p1.png index 60f16f4..329b591 100644 Binary files a/Textures/landuse/forest/ptc/b14_p1.png and b/Textures/landuse/forest/ptc/b14_p1.png differ diff --git a/Textures/landuse/forest/ptc/b14_p2.png b/Textures/landuse/forest/ptc/b14_p2.png index a78816e..1730c18 100644 Binary files a/Textures/landuse/forest/ptc/b14_p2.png and b/Textures/landuse/forest/ptc/b14_p2.png differ diff --git a/Textures/landuse/forest/ptc/b15_p1.png b/Textures/landuse/forest/ptc/b15_p1.png index 91f0f2e..a1faa3f 100644 Binary files a/Textures/landuse/forest/ptc/b15_p1.png and b/Textures/landuse/forest/ptc/b15_p1.png differ diff --git a/Textures/landuse/forest/ptc/b15_p2.png b/Textures/landuse/forest/ptc/b15_p2.png index cb3eb1f..043a2d1 100644 Binary files a/Textures/landuse/forest/ptc/b15_p2.png and b/Textures/landuse/forest/ptc/b15_p2.png differ diff --git a/Textures/landuse/residential-boundary/brd/b1.png b/Textures/landuse/residential-boundary/brd/b1.png index 1bca2e6..9db9a74 100644 Binary files a/Textures/landuse/residential-boundary/brd/b1.png and b/Textures/landuse/residential-boundary/brd/b1.png differ diff --git a/Textures/landuse/residential-boundary/brd/b2.png b/Textures/landuse/residential-boundary/brd/b2.png index 523ab37..aae185a 100644 Binary files a/Textures/landuse/residential-boundary/brd/b2.png and b/Textures/landuse/residential-boundary/brd/b2.png differ diff --git a/Textures/landuse/residential-boundary/brd/b3.png b/Textures/landuse/residential-boundary/brd/b3.png index d124f15..e8af885 100644 Binary files a/Textures/landuse/residential-boundary/brd/b3.png and b/Textures/landuse/residential-boundary/brd/b3.png differ diff --git a/Textures/landuse/residential-boundary/ptc/b1_p1.png b/Textures/landuse/residential-boundary/ptc/b1_p1.png index ab39df6..e54040b 100644 Binary files a/Textures/landuse/residential-boundary/ptc/b1_p1.png and b/Textures/landuse/residential-boundary/ptc/b1_p1.png differ diff --git a/Textures/landuse/residential-boundary/ptc/b1_p2.png b/Textures/landuse/residential-boundary/ptc/b1_p2.png index 3fe6dd9..cdc40ba 100644 Binary files a/Textures/landuse/residential-boundary/ptc/b1_p2.png and b/Textures/landuse/residential-boundary/ptc/b1_p2.png differ diff --git a/Textures/landuse/residential-boundary/ptc/b2_p1.png b/Textures/landuse/residential-boundary/ptc/b2_p1.png index ee8e114..bb1e769 100644 Binary files a/Textures/landuse/residential-boundary/ptc/b2_p1.png and b/Textures/landuse/residential-boundary/ptc/b2_p1.png differ diff --git a/Textures/landuse/residential-boundary/ptc/b2_p2.png b/Textures/landuse/residential-boundary/ptc/b2_p2.png index 7a90ce5..e8f8fa7 100644 Binary files a/Textures/landuse/residential-boundary/ptc/b2_p2.png and b/Textures/landuse/residential-boundary/ptc/b2_p2.png differ diff --git a/Textures/landuse/residential-boundary/ptc/b3_p1.png b/Textures/landuse/residential-boundary/ptc/b3_p1.png index 568affd..aeb528b 100644 Binary files a/Textures/landuse/residential-boundary/ptc/b3_p1.png and b/Textures/landuse/residential-boundary/ptc/b3_p1.png differ diff --git a/Textures/landuse/residential-boundary/ptc/b3_p2.png b/Textures/landuse/residential-boundary/ptc/b3_p2.png index 42a60c3..b1b96af 100644 Binary files a/Textures/landuse/residential-boundary/ptc/b3_p2.png and b/Textures/landuse/residential-boundary/ptc/b3_p2.png differ diff --git a/defines.py b/defines.py index 0421b43..531494d 100644 --- a/defines.py +++ b/defines.py @@ -97,10 +97,10 @@ mstr_ortho_layers = [ ("leisure", "pitch", "leisure", "green"), ("landuse", "farmland", "landuse", "farmland"), ("landuse", "farmyard", "landuse", "farmland"), + ("landuse", "military", "landuse", "residential-boundary"), # Z-Order 2 - ("landuse", "forest", "landuse", "forest"), ("leisure", "nature_reserve", "landuse", "forest"), - ("landuse", "military", "landuse", "residential-boundary"), + ("landuse", "forest", "landuse", "forest"), # Z-Order 3 ("natural", "water", "natural", "water"), ("natural", "bay", "natural", "beach"), @@ -108,7 +108,7 @@ mstr_ortho_layers = [ ("water", "lake", "natural", "water"), ("water", "pond", "natural", "water"), ("water", "river", "natural", "water"), - ("waterway", "river", "natural", "water"), + ("waterway", "river", 10), ("waterway", "stream", 10), ("amenity", "parking", "amenities", "parking"), ("highway", "pedestrian", 4), diff --git a/layergen.py b/layergen.py index bc0ded0..074a3f6 100644 --- a/layergen.py +++ b/layergen.py @@ -391,7 +391,7 @@ class mstr_layergen: if self._tag == "highway": d = randrange(81, 101) layer_comp_pix[x, y] = ( d,d,d,a[3] ) - if self._tag == "waterway" and self._value == "stream": + if self._tag == "waterway" and (self._value == "stream" or self._value == "river"): d = randrange(1, 15) layer_comp_pix[x, y] = ( 19-d, 62-d, 71-d, a[3] ) if self._tag == "building":