Change in building rendering to a different texture set

diff --git a/layergen.py b/layergen.py
index 8a676f5e20c10cee3b596eafbf790b13bcc6e882..d3c36329b0a2da0b3f25e3a8cc783f1f96ca2c7a 100644 (file)
--- a/layergen.py
+++ b/layergen.py
@@ -698,23 +698,21 @@ class mstr_layergen:
             bld_main = Image.new("RGBA", (self._imgsize, self._imgsize))\r
             osm_edge = mask.filter(ImageFilter.FIND_EDGES)\r
 \r
-            # Determine which sources to use.\r
-            src = self.findLayerSource()\r
+            # Find a source image to use\r
+            srclist = glob.glob(mstr_datafolder + "textures/" + self._tag + "/" + self._value + "/*.png")\r
+            srcnum = randrange(1, len(srclist)+1)\r
 \r
             # Patch and border sources. There can only be one for each.\r
             brd_src = None\r
             ptc_src = []\r
+            ptc_img = Image.open(mstr_datafolder + "textures/" + self._tag + "/" + self._value + "/" + str(srcnum) + ".png")\r
 \r
-            # Find this layer's predetermined contrast\r
+            # Set some contrast\r
             lyr_contrast = randrange(1, 4)\r
 \r
-            rg = mstr_resourcegen(self._tag, self._value, src)\r
-            rg.setLayerContrast(int(lyr_contrast))\r
-            bldg_src = rg.gensource()\r
-\r
             # Open the images\r
-            ptc_src.append(bldg_src[0])  # Used to be an array, so let's keep it\r
-            brd_src = bldg_src[1]\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
             samples = 250  # <- We need this in a moment\r
@@ -830,6 +828,7 @@ class mstr_layergen:
             shadow = shadow.filter(ImageFilter.GaussianBlur(radius=1))\r
             bld_comp.alpha_composite(shadow)\r
             #bld_comp = bld_comp.filter(ImageFilter.GaussianBlur(radius=1.1))\r
+            bld_main = ImageEnhance.Contrast(bld_main).enhance(lyr_contrast)\r
             bld_comp.alpha_composite(bld_main)\r
 \r
             return bld_comp\r