Production-ready change to building rendering

diff --git a/layergen.py b/layergen.py
index d3c36329b0a2da0b3f25e3a8cc783f1f96ca2c7a..8ef320814bdf309c61db004ac3d299aae33f84ab 100644 (file)
--- a/layergen.py
+++ b/layergen.py
@@ -704,14 +704,19 @@ class mstr_layergen:
 \r
             # Patch and border sources. There can only be one for each.\r
             brd_src = None\r
+            numbers = list(range(1, len(srclist)))\r
+            res = random.sample(numbers, 4)\r
             ptc_src = []\r
-            ptc_img = Image.open(mstr_datafolder + "textures/" + self._tag + "/" + self._value + "/" + str(srcnum) + ".png")\r
+\r
+            for p in range(0, len(res)):\r
+                ptc_src.append(Image.open(mstr_datafolder + "textures/" + self._tag + "/" + self._value + "/" + str(res[p]) + ".png"))\r
 \r
             # Set some contrast\r
-            lyr_contrast = randrange(1, 4)\r
+            lyr_contrast = 0.85\r
 \r
             # Open the images\r
-            ptc_src.append( ptc_img )  # Used to be an array, so let's keep it\r
+            \r
+            #ptc_src.append( ptc_img )  # Used to be an array, so let's keep it\r
             #brd_src = bldg_src[1]\r
 \r
             # Begin producing a largely random image\r
@@ -720,12 +725,13 @@ class mstr_layergen:
                 imgid = 0\r
                 if len(ptc_src) == 1: imgid = 0\r
                 if len(ptc_src) >= 2:\r
-                    imgid = randrange(1, len(ptc_src) + 1) - 1\r
-                l = 0 - int(ptc_src[imgid].width / 2)\r
-                r = layer.width - int(ptc_src[imgid].width / 2)\r
-                t = 0 - int(ptc_src[imgid].height / 2)\r
-                b = layer.height - int(ptc_src[imgid].height / 2)\r
-                bld_src.alpha_composite(ptc_src[imgid], (randrange(l, r), randrange(t, b)))\r
+                    imgid = randrange(0, len(ptc_src))\r
+                i = ptc_src[imgid].rotate(randrange(0, 360), expand=True)\r
+                l = 0 - int(i.width / 2)\r
+                r = layer.width - int(i.width / 2)\r
+                t = 0 - int(i.height / 2)\r
+                b = layer.height - int(i.height / 2)\r
+                bld_src.alpha_composite(i, (randrange(l, r), randrange(t, b)))\r
             mstr_msg("layergen", "Layer image generated")\r
 \r
             bld_src_pix = bld_src.load()\r

diff --git a/orthographic.py b/orthographic.py
index 3a7e4d9d00abe7ae071811dea502ddf3388c9735..e2b309ec86a10226014d935bdc22e13ef452c27a 100644 (file)
--- a/orthographic.py
+++ b/orthographic.py
@@ -225,7 +225,7 @@ class mstr_orthographic:
                 osmxml.acquire_osm(grid_lat, grid_lng)\r
 \r
                 # Let the user know\r
-                mstr_msg("orthographic", "Generating missing orthophoto " + str(grid_lat) + "-" + str(grid_lng))\r
+                mstr_important_msg("orthographic", "Generating missing orthophoto " + str(grid_lat) + "-" + str(grid_lng))\r
 \r
                 # Check for work to be done\r
                 layers = self.determineLayerWork(osmxml)\r

diff --git a/photogen.py b/photogen.py
index fe3e605075607b635384b32af691071c5b6f6924..0dbdb7bd8dc0e7637a56b11ddd15d4b363a84ee5 100644 (file)
--- a/photogen.py
+++ b/photogen.py
@@ -353,7 +353,7 @@ class mstr_photogen:
                     lx = randrange(0, self._imgsize)\r
                     ly = randrange(0, self._imgsize)\r
                     lp = lyrmask[lx,ly]\r
-                    if lp[3] > 0:\r
+                    if lp[3] == 255:\r
                         tree = self.generate_tree()\r
                         trees.alpha_composite(tree, (lx, ly))\r
 \r