From 682cefb90274ff61c10d86c034a919b3c20766d6 Mon Sep 17 00:00:00 2001 From: Aaron Griffith Date: Tue, 20 Mar 2012 00:24:53 -0300 Subject: [PATCH 1/3] changed _load_image to self.load_image in textures.py (thanks Nightgunner5) --- overviewer_core/textures.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index db0a2ce..42d07a7 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -290,7 +290,7 @@ class Textures(object): if hasattr(self, "lightcolor"): return self.lightcolor try: - lightcolor = list(_load_image("light_normal.png").getdata()) + lightcolor = list(self.load_image("light_normal.png").getdata()) except Exception: logging.warning("Light color image could not be found.") lightcolor = None From e758bee77f58ec19941b0846f5a6fc2b1ce1a668 Mon Sep 17 00:00:00 2001 From: Sean Kilgore Date: Mon, 19 Mar 2012 23:55:06 -0700 Subject: [PATCH 2/3] Updated signs documentation, including genPOI.py usage. --- docs/signs.rst | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/docs/signs.rst b/docs/signs.rst index 1a2177f..62bc42e 100644 --- a/docs/signs.rst +++ b/docs/signs.rst @@ -42,7 +42,7 @@ A more advanced filter may also look at other entity fields, such as the sign te def goldFilter(poi): "Gold" return poi['id'] == 'Sign' and (\ - 'gold' in poi['Text1] or + 'gold' in poi['Text1'] or 'gold' in poi['Text2']) This looks for the word 'gold' in either the first or second line of the signtext. @@ -66,6 +66,32 @@ rendered map. For example:: + +Generating the POI Markers +========================== + +genPOI.py +--------- + +In order to actually generate the markers and add them to your map, the script +genPOI.py must be run. For example:: + + genpoi.py --config=/path/to/your/config.file + +.. note:: + Markers will not be updated or added during a regular overviewer.py + map render! + +This will generate the necessary JavaScript files needed in your config file's +outputdir. + +Options +------- + +genPOI.py has a single option:: --config. You should use the same configfile as +used for your normal renders. + + .. _predefined_filter_functions: Predefined Filter Functions From 3a179f5df213e9fcd4819614a00ea6a6cad7db95 Mon Sep 17 00:00:00 2001 From: Alejandro Aguilera Date: Thu, 22 Mar 2012 22:52:13 +0100 Subject: [PATCH 3/3] Add 1.2.4 new blocks: sandstone and wooden planks --- overviewer_core/textures.py | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 42d07a7..36f7d4f 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -759,8 +759,18 @@ def grass(self, blockid, data): block(blockid=3, top_index=2) # cobblestone block(blockid=4, top_index=16) -# wooden plank -block(blockid=5, top_index=4) + +# wooden planks +@material(blockid=5, data=range(4), solid=True) +def wooden_planks(self, blockid, data): + if data == 0: # normal + return self.build_block(self.terrain_images[4],self.terrain_images[4]) + if data == 1: # pine + return self.build_block(self.terrain_images[198],self.terrain_images[198]) + if data == 2: # birch + return self.build_block(self.terrain_images[214],self.terrain_images[214]) + if data == 3: # jungle wood + return self.build_block(self.terrain_images[199],self.terrain_images[199]) @material(blockid=6, data=range(16), transparent=True) def saplings(self, blockid, data): @@ -910,7 +920,16 @@ def furnaces(self, blockid, data): return self.build_full_block(top, None, None, side, side) # sandstone -block(blockid=24, top_index=176, side_index=192) +@material(blockid=24, data=range(3), solid=True) +def wood(self, blockid, data): + top = self.terrain_images[176] + if data == 0: # normal + return self.build_block(top, self.terrain_images[192]) + if data == 1: # hieroglyphic + return self.build_block(top, self.terrain_images[229]) + if data == 2: # soft + return self.build_block(top, self.terrain_images[230]) + # note block block(blockid=25, top_index=74)