clean up biome code
This commit is contained in:
committed by
Andrew Chin
parent
89d8e3653a
commit
22db7bb3cd
3
chunk.py
3
chunk.py
@@ -475,7 +475,6 @@ class ChunkRenderer(object):
|
|||||||
For cave mode, all blocks that have any direct sunlight are not
|
For cave mode, all blocks that have any direct sunlight are not
|
||||||
rendered, and blocks are drawn with a color tint depending on their
|
rendered, and blocks are drawn with a color tint depending on their
|
||||||
depth."""
|
depth."""
|
||||||
|
|
||||||
blocks = self.blocks
|
blocks = self.blocks
|
||||||
|
|
||||||
if cave:
|
if cave:
|
||||||
@@ -547,7 +546,7 @@ class ChunkRenderer(object):
|
|||||||
c = textures.foliagecolor[index]
|
c = textures.foliagecolor[index]
|
||||||
#i = textures.tintTexture(t,c)
|
#i = textures.tintTexture(t,c)
|
||||||
i = ImageOps.colorize(ImageOps.grayscale(t[0]), (0,0,0), c)
|
i = ImageOps.colorize(ImageOps.grayscale(t[0]), (0,0,0), c)
|
||||||
i.putalpha(t[1])
|
i.putalpha(t[1])
|
||||||
t = (i, t[1])
|
t = (i, t[1])
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -136,7 +136,7 @@
|
|||||||
var markersInit = false;
|
var markersInit = false;
|
||||||
|
|
||||||
function prepareSignMarker(marker, item) {
|
function prepareSignMarker(marker, item) {
|
||||||
|
|
||||||
var c = "<div class=\"infoWindow\"><img src=\"signpost.png\" /><p>" + item.msg.replace(/\n/g,"<br/>") + "</p></div>";
|
var c = "<div class=\"infoWindow\"><img src=\"signpost.png\" /><p>" + item.msg.replace(/\n/g,"<br/>") + "</p></div>";
|
||||||
var infowindow = new google.maps.InfoWindow({
|
var infowindow = new google.maps.InfoWindow({
|
||||||
content: c
|
content: c
|
||||||
@@ -149,7 +149,7 @@ google.maps.event.addListener(marker, 'click', function() {
|
|||||||
|
|
||||||
function initMarkers() {
|
function initMarkers() {
|
||||||
if (markersInit) { return; }
|
if (markersInit) { return; }
|
||||||
|
|
||||||
markersInit = true;
|
markersInit = true;
|
||||||
|
|
||||||
for (i in markerData) {
|
for (i in markerData) {
|
||||||
@@ -157,7 +157,7 @@ google.maps.event.addListener(marker, 'click', function() {
|
|||||||
|
|
||||||
// a default:
|
// a default:
|
||||||
var iconURL = '';
|
var iconURL = '';
|
||||||
|
|
||||||
if (item.type == 'spawn') { iconURL = 'http://google-maps-icons.googlecode.com/files/home.png';}
|
if (item.type == 'spawn') { iconURL = 'http://google-maps-icons.googlecode.com/files/home.png';}
|
||||||
if (item.type == 'sign') { iconURL = 'signpost_icon.png';}
|
if (item.type == 'sign') { iconURL = 'signpost_icon.png';}
|
||||||
|
|
||||||
@@ -165,7 +165,7 @@ google.maps.event.addListener(marker, 'click', function() {
|
|||||||
var marker = new google.maps.Marker({
|
var marker = new google.maps.Marker({
|
||||||
position: converted,
|
position: converted,
|
||||||
map: map,
|
map: map,
|
||||||
title: item.msg,
|
title: item.msg,
|
||||||
icon: iconURL
|
icon: iconURL
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -26,13 +26,6 @@ from PIL import Image, ImageEnhance, ImageOps
|
|||||||
import util
|
import util
|
||||||
import composite
|
import composite
|
||||||
|
|
||||||
sys.path.append("../python-gearman")
|
|
||||||
|
|
||||||
from gearman.client import GearmanClient
|
|
||||||
|
|
||||||
gmc = GearmanClient(["localhost"])
|
|
||||||
|
|
||||||
|
|
||||||
def _find_file(filename, mode="rb"):
|
def _find_file(filename, mode="rb"):
|
||||||
"""Searches for the given file and returns an open handle to it.
|
"""Searches for the given file and returns an open handle to it.
|
||||||
This searches the following locations in this order:
|
This searches the following locations in this order:
|
||||||
@@ -581,7 +574,6 @@ def prepareBiomeData(worlddir, chunkX, chunkY):
|
|||||||
|
|
||||||
t.currentBiomeData = data
|
t.currentBiomeData = data
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
# This set holds block ids that require special pre-computing. These are typically
|
# This set holds block ids that require special pre-computing. These are typically
|
||||||
# things that require ancillary data to render properly (i.e. ladder plus orientation)
|
# things that require ancillary data to render properly (i.e. ladder plus orientation)
|
||||||
|
|||||||
Reference in New Issue
Block a user