LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Merged in agrif's blending fixes

Browse Source 
Merge branch 'blending-fixes' of https://github.com/agrif/Minecraft-Overviewer
This commit is contained in:
Andrew Chin
2010-12-04 20:33:38 -05:00
parent 9125919d3e e4b5a10b9a
commit 251a89b7dc
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -3,8 +3,15 @@ build
terrain.png terrain.png
cachedir* cachedir*
# header files that may be copied over, if missing
ImPlatform.h
Imaging.h
# various forms of compiled _composite extensions # various forms of compiled _composite extensions
_composite.so _composite.so
_composite.pyd _composite.pyd
_composite_d.pyd _composite_d.pyd
_composite.dylib _composite.dylib
# Mac OS X noise
.DS_Store

6
setup.py
View File

@@ -32,7 +32,7 @@ if py2exe != None:
# _composite.c extension # _composite.c extension
# #
setup_kwargs['ext_modules'].append(Extension('_composite', ['_composite.c'])) setup_kwargs['ext_modules'].append(Extension('_composite', ['_composite.c'], include_dirs=['.']))
# tell build_ext to build the extension in-place # tell build_ext to build the extension in-place
# (NOT in build/) # (NOT in build/)
setup_kwargs['options']['build_ext'] = {'inplace' : 1} setup_kwargs['options']['build_ext'] = {'inplace' : 1}
@@ -48,8 +48,8 @@ class CustomClean(clean):
# try to remove '_composite.{so,pyd,...}' extension, # try to remove '_composite.{so,pyd,...}' extension,
# regardless of the current system's extension name convention # regardless of the current system's extension name convention
build_ext = self.get_finalized_command('build_ext') build_ext = self.get_finalized_command('build_ext')
fname = build_ext.get_ext_fullpath('_composite') pretty_fname = build_ext.get_ext_filename('_composite')
pretty_fname = os.path.split(fname)[1] fname = pretty_fname
if os.path.exists(fname): if os.path.exists(fname):
try: try:
if not self.dry_run: if not self.dry_run:

18
textures.py
View File

@@ -402,9 +402,9 @@ def generate_special_texture(blockID, data):
img = Image.new("RGBA", (24,24), (38,92,255,0)) img = Image.new("RGBA", (24,24), (38,92,255,0))
img.paste(side1, (0,6), side1) composite.alpha_over(img, side1, (0,6), side1)
img.paste(side2, (12,6), side2) composite.alpha_over(img, side2, (12,6), side2)
img.paste(top, (0,0), top) composite.alpha_over(img, top, (0,0), top)
return (img.convert("RGB"), img.split()[3]) return (img.convert("RGB"), img.split()[3])
if blockID == 62: # lit furnace if blockID == 62: # lit furnace
@@ -504,9 +504,9 @@ def generate_special_texture(blockID, data):
img = Image.new("RGBA", (24,24), (38,92,255,0)) img = Image.new("RGBA", (24,24), (38,92,255,0))
img.paste(side1, (0,6), side1) composite.alpha_over(img, side1, (0,6), side1)
img.paste(side2, (12,6), side2) composite.alpha_over(img, side2, (12,6), side2)
img.paste(top, (0,0), top) composite.alpha_over(img, top, (0,0), top)
return (img.convert("RGB"), img.split()[3]) return (img.convert("RGB"), img.split()[3])
if blockID == 18: # leaves if blockID == 18: # leaves
@@ -517,9 +517,9 @@ def generate_special_texture(blockID, data):
img = Image.new("RGBA", (24,24), (38,92,255,0)) img = Image.new("RGBA", (24,24), (38,92,255,0))
img.paste(side1, (0,6), side1) composite.alpha_over(img, side1, (0,6), side1)
img.paste(side2, (12,6), side2) composite.alpha_over(img, side2, (12,6), side2)
img.paste(top, (0,0), top) composite.alpha_over(img, top, (0,0), top)
return (img.convert("RGB"), img.split()[3]) return (img.convert("RGB"), img.split()[3])