From: marstr Date: Fri, 30 Aug 2024 21:03:14 +0000 (+0200) Subject: Adjusted forest rendering and other blur factors. Added rooftop textures for building... X-Git-Url: https://marstr.online/code/gitweb.cgi?a=commitdiff_plain;h=949e3057110d31d88a39b91e079969d58119f8e0;p=orthographic Adjusted forest rendering and other blur factors. Added rooftop textures for building types. --- diff --git a/Textures/building/common/brd/b1.png b/Textures/building/common/brd/b1.png index 042e585..29432c2 100644 Binary files a/Textures/building/common/brd/b1.png and b/Textures/building/common/brd/b1.png differ diff --git a/Textures/building/common/brd/b2.png b/Textures/building/common/brd/b2.png new file mode 100644 index 0000000..bbcd3ae Binary files /dev/null and b/Textures/building/common/brd/b2.png differ diff --git a/Textures/building/common/ptc/b1_p1.png b/Textures/building/common/ptc/b1_p1.png index d7834f3..567ca3f 100644 Binary files a/Textures/building/common/ptc/b1_p1.png and b/Textures/building/common/ptc/b1_p1.png differ diff --git a/Textures/building/common/ptc/b1_p2.png b/Textures/building/common/ptc/b1_p2.png index c300cda..30459a0 100644 Binary files a/Textures/building/common/ptc/b1_p2.png and b/Textures/building/common/ptc/b1_p2.png differ diff --git a/Textures/building/common/ptc/b2_p1.png b/Textures/building/common/ptc/b2_p1.png new file mode 100644 index 0000000..e7ddf2d Binary files /dev/null and b/Textures/building/common/ptc/b2_p1.png differ diff --git a/Textures/building/common/ptc/b2_p2.png b/Textures/building/common/ptc/b2_p2.png new file mode 100644 index 0000000..afa793e Binary files /dev/null and b/Textures/building/common/ptc/b2_p2.png differ diff --git a/Textures/building/industrial/brd/b1.png b/Textures/building/industrial/brd/b1.png new file mode 100644 index 0000000..36894f2 Binary files /dev/null and b/Textures/building/industrial/brd/b1.png differ diff --git a/Textures/building/industrial/brd/b2.png b/Textures/building/industrial/brd/b2.png new file mode 100644 index 0000000..8e4bcaf Binary files /dev/null and b/Textures/building/industrial/brd/b2.png differ diff --git a/Textures/building/industrial/ptc/b1_p1.png b/Textures/building/industrial/ptc/b1_p1.png new file mode 100644 index 0000000..8b0d4cc Binary files /dev/null and b/Textures/building/industrial/ptc/b1_p1.png differ diff --git a/Textures/building/industrial/ptc/b1_p2.png b/Textures/building/industrial/ptc/b1_p2.png new file mode 100644 index 0000000..1d130fc Binary files /dev/null and b/Textures/building/industrial/ptc/b1_p2.png differ diff --git a/Textures/building/industrial/ptc/b2_p1.png b/Textures/building/industrial/ptc/b2_p1.png new file mode 100644 index 0000000..a30f142 Binary files /dev/null and b/Textures/building/industrial/ptc/b2_p1.png differ diff --git a/Textures/building/industrial/ptc/b2_p2.png b/Textures/building/industrial/ptc/b2_p2.png new file mode 100644 index 0000000..9e6671a Binary files /dev/null and b/Textures/building/industrial/ptc/b2_p2.png differ diff --git a/Textures/building/office/brd/b1.png b/Textures/building/office/brd/b1.png new file mode 100644 index 0000000..0fdffa6 Binary files /dev/null and b/Textures/building/office/brd/b1.png differ diff --git a/Textures/building/office/brd/b2.png b/Textures/building/office/brd/b2.png new file mode 100644 index 0000000..8db3623 Binary files /dev/null and b/Textures/building/office/brd/b2.png differ diff --git a/Textures/building/office/ptc/b1_p1.png b/Textures/building/office/ptc/b1_p1.png new file mode 100644 index 0000000..7691c48 Binary files /dev/null and b/Textures/building/office/ptc/b1_p1.png differ diff --git a/Textures/building/office/ptc/b1_p2.png b/Textures/building/office/ptc/b1_p2.png new file mode 100644 index 0000000..8b9c28b Binary files /dev/null and b/Textures/building/office/ptc/b1_p2.png differ diff --git a/Textures/building/office/ptc/b2_p1.png b/Textures/building/office/ptc/b2_p1.png new file mode 100644 index 0000000..9b62d73 Binary files /dev/null and b/Textures/building/office/ptc/b2_p1.png differ diff --git a/Textures/building/office/ptc/b2_p2.png b/Textures/building/office/ptc/b2_p2.png new file mode 100644 index 0000000..b0681a7 Binary files /dev/null and b/Textures/building/office/ptc/b2_p2.png differ diff --git a/defines.py b/defines.py index 4050009..d7dc54d 100644 --- a/defines.py +++ b/defines.py @@ -45,7 +45,14 @@ mstr_shadow_shift = 24 # The tags that cast shadows mstr_shadow_casters = [ ("landuse", "forest"), - ("leisure", "nature_reserve") + ("leisure", "nature_reserve"), + ("building", "semidetached_house"), + ("building", "apartments"), + ("building", "garage"), + ("building", "office"), + ("building", "retail"), + ("building", "industrial"), + ("building", "yes") ] @@ -96,6 +103,13 @@ mstr_ortho_layers = [ ("landuse", "military", "landuse", "residential-boundary"), # Z-Order 2 ("highway", "service", 6), + ("highway", "residential", 12), + ("highway", "footway", 4), + ("highway", "primary", 25), + ("highway", "secondary", 13), + ("highway", "tertiary", 20), + ("highway", "unclassified", 17), + ("highway", "living_street", 12), ("waterway", "river", 10), ("waterway", "stream", 10), ("leisure", "nature_reserve", "landuse", "forest"), @@ -111,17 +125,13 @@ mstr_ortho_layers = [ ("highway", "pedestrian", 4), # Z-Order 4 ("highway", "motorway", 32), - ("highway", "primary", 25), - ("highway", "secondary", 13), - ("highway", "tertiary", 20), - ("highway", "unclassified", 17), - ("highway", "living_street", 12), - ("highway", "residential", 12), - ("highway", "footway", 4), ("railway", "rail", 5), # Z-Order 5 ("aeroway", "taxiway", 42), ("aeroway", "runway", 80), + ("building", "semidetached_house", "building", "common"), + ("building", "apartments", "building", "common"), + ("building", "garage", "building", "industrial"), ("building", "office", "building", "office"), ("building", "retail", "building", "industrial"), ("building", "industrial", "building", "industrial"), @@ -152,12 +162,12 @@ mstr_mask_blur = [ ("leisure", "dog_park", 35), ("leisure", "garden", 20), ("leisure", "sports_centre", 15), - ("leisure", "pitch", 10), + ("leisure", "pitch", 5), ("landuse", "farmland", 15), ("landuse", "farmyard", 15), # Z-Order 2 - ("landuse", "forest", 30), - ("leisure", "nature_reserve", 30), + ("landuse", "forest", 15), + ("leisure", "nature_reserve", 15), ("landuse", "military", 30), # Z-Order 3 ("natural", "bare_rock", 25), @@ -187,10 +197,13 @@ mstr_mask_blur = [ # Z-Order 5 ("aeroway", "taxiway", 12), ("aeroway", "runway", 12), - ("building", "office", 4), - ("building", "retail", 4), - ("building", "industrial", 4), - ("building", "yes", 4) + ("building", "semidetached_house", 3), + ("building", "apartments", 1), + ("building", "garage", 1), + ("building", "office", 1), + ("building", "retail", 1), + ("building", "industrial", 1), + ("building", "yes", 1) ] diff --git a/maskgen.py b/maskgen.py index c762778..8ee9680 100644 --- a/maskgen.py +++ b/maskgen.py @@ -184,6 +184,7 @@ class mstr_maskgen: mstr_msg("mstr_maskgen", "Mask built.") +#mg = mstr_maskgen([51, 1, 7, 1], 0.0100691262567974, "building", "yes", False) #mg = mstr_maskgen([51, 1, 7, 1], 0.0100691262567974, "natural", "bare_rock") #mg = mstr_maskgen([51, 1, 7, 1], 0.0100691262567974, "highway", "track") #mg = mstr_maskgen([51, 1, 7, 1], 0.0100691262567974, "landuse", "forest", False)