josch/heroes-renaissance
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed heavy overlapping problems - only minor ones remaining

Browse source
This commit is contained in:
josch 2008-11-25 19:15:07 +01:00
parent 6f63bc97ca
commit 2c9c5c126b
3 changed files with 87 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/h3m.py
View file

@ -205,10 +205,10 @@ def extract(filename):
(obj_class, ) = struct.unpack("<I", h3m_data.read(4)) #class (obj_class, ) = struct.unpack("<I", h3m_data.read(4)) #class
(obj_number, ) = struct.unpack("<I", h3m_data.read(4)) #number (obj_number, ) = struct.unpack("<I", h3m_data.read(4)) #number
(obj_group, ) = struct.unpack("<B", h3m_data.read(1)) #group (obj_group, ) = struct.unpack("<B", h3m_data.read(1)) #group
h3m_data.read(1) #isOverlay (overlay, ) = struct.unpack("<B", h3m_data.read(1)) #isOverlay
h3m_data.read(16) #junk h3m_data.read(16) #junk
map_data["objects"].append({"filename":filename.lower(), "class":obj_class, map_data["objects"].append({"filename":filename.lower(), "class":obj_class,
"number":obj_number, "group":obj_group}) "number":obj_number, "group":obj_group, "overlay":overlay})
(map_data["tunedobj_count"], ) = struct.unpack("<I", h3m_data.read(4)) (map_data["tunedobj_count"], ) = struct.unpack("<I", h3m_data.read(4))

141
lib/mapset.py
View file

@ -22,47 +22,18 @@ from ctypes import create_string_buffer, memmove
from lib import h3m from lib import h3m
import os import os
class OrderedTextureGroup(pyglet.graphics.Group):
def __init__(self, order, texture, parent=None):
super(OrderedTextureGroup, self).__init__(parent)
self.texture = texture
self.order = order
def set_state(self):
pyglet.gl.glEnable(self.texture.target)
pyglet.gl.glBindTexture(self.texture.target, self.texture.id)
def unset_state(self):
pyglet.gl.glDisable(self.texture.target)
def __hash__(self):
return hash((self.order, self.texture.target, self.texture.id,
self.parent))
def __eq__(self, other):
return (self.__class__ is other.__class__ and
self.order == other.order and
self.texture.target == other.texture.target and
self.texture.id == other.texture.id and
self.parent == self.parent)
def __repr__(self):
return '%s(id=%d)' % (self.__class__.__name__, self.order,
self.texture.id)
def __cmp__(self, other):
if isinstance(other, OrderedTextureGroup):
return cmp(self.order, other.order)
return -1
class Animation(object): class Animation(object):
def __init__(self, tex_region, frames, flip_x=False, flip_y=False): def __init__(self, tex_region, frames, overlay=False, flip_x=False, flip_y=False):
self.overlay = overlay
self.texgroup = tex_region.group self.texgroup = tex_region.group
self.atlas = tex_region.atlas
if flip_x or flip_y: if flip_x or flip_y:
self.tex = tex_region.get_transform(flip_x=flip_x, flip_y=flip_y) self.tex = tex_region.get_transform(flip_x=flip_x, flip_y=flip_y)
else: else:
self.tex = tex_region self.tex = tex_region
self.__frames = [] self.__frames = []
self.__hash = hash(frames[0])
if len(frames) > 1:
for img in frames: for img in frames:
data_pitch = abs(img._current_pitch) data_pitch = abs(img._current_pitch)
buf = create_string_buffer(len(img._current_data)) buf = create_string_buffer(len(img._current_data))
@ -73,28 +44,44 @@ class Animation(object):
-1, -abs(data_pitch))] -1, -abs(data_pitch))]
self.__frames.append(''.join(rows)) self.__frames.append(''.join(rows))
self.__animation = 0 self.__animation = 0
self.width = self.tex.width
self.height = self.tex.height
self.__hash = hash(self.__frames[0])
def next_frame(self): def next_frame(self):
self.__animation = (self.__animation + 1) % len(self.__frames) self.__animation = (self.__animation + 1) % len(self.__frames)
return self.__frames[self.__animation] return self.__frames[self.__animation]
@property
def tex_coords(self):
return self.tex.tex_coords
@property
def group(self):
return self.texgroup
def __hash__(self): def __hash__(self):
return self.__hash return self.__hash
def __eq__(self, other): def __eq__(self, other):
return self.__hash == other.__hash return self.__hash == other.__hash
def __len__(self):
return len(self.__frames)
class Animation_Object(object):
def __init__(self, animation, group=None):
if group:
self.texgroup = group
else:
self.texgroup = animation.texgroup
self.animation = animation
@property
def width(self):
return self.animation.tex.width
@property
def height(self):
return self.animation.tex.height
@property
def group(self):
return self.texgroup
@property
def tex_coords(self):
return self.animation.tex.tex_coords
class MapSet(object): class MapSet(object):
def load_map_object(self, file, order=0): def load_map_object(self, file, order=0):
image = pyglet.image.load(None, file=pyglet.resource.file(file)) image = pyglet.image.load(None, file=pyglet.resource.file(file))
@ -103,12 +90,15 @@ class MapSet(object):
except pyglet.image.atlas.AllocatorException: except pyglet.image.atlas.AllocatorException:
self.current_atlas = pyglet.image.atlas.TextureAtlas(1024, 1024) self.current_atlas = pyglet.image.atlas.TextureAtlas(1024, 1024)
texture_region = self.current_atlas.add(image) texture_region = self.current_atlas.add(image)
group = OrderedTextureGroup(order, self.current_atlas.texture) self.atlases.append(self.current_atlas)
group = pyglet.graphics.OrderedGroup(order)
group = pyglet.graphics.TextureGroup(self.current_atlas.texture, parent=group)
if group not in self.groups: if group not in self.groups:
self.groups.append(group) self.groups.append(group)
texture_region.group = self.groups.index(group) texture_region.group = self.groups.index(group)
texture_region.atlas = self.atlases.index(self.atlases[-1])
return texture_region return texture_region
def __init__(self, map_name): def __init__(self, map_name):
@ -147,6 +137,8 @@ class MapSet(object):
self.current_atlas = pyglet.image.atlas.TextureAtlas(1024, 1024) self.current_atlas = pyglet.image.atlas.TextureAtlas(1024, 1024)
self.atlases = [self.current_atlas]
self.groups = [] self.groups = []
self.__tiles = {} self.__tiles = {}
@ -155,7 +147,7 @@ class MapSet(object):
for x, tile in enumerate(line): for x, tile in enumerate(line):
if tile[0] == -1: #edge if tile[0] == -1: #edge
if "edg" not in list(tile_textures.keys()): if "edg" not in list(tile_textures.keys()):
tile_textures["edg"] = [self.load_map_object('data/advmap_tiles/edg.def/%d.png'%i, 100) for i in range(36)] tile_textures["edg"] = [self.load_map_object('data/advmap_tiles/edg.def/%d.png'%i, 1000) for i in range(36)]
self.__tiles[x,y] = [tile_textures["edg"][tile[1]]] self.__tiles[x,y] = [tile_textures["edg"][tile[1]]]
elif tile[0] == 0: #dirt elif tile[0] == 0: #dirt
if "dirttl" not in list(tile_textures.keys()): if "dirttl" not in list(tile_textures.keys()):
@ -232,10 +224,10 @@ class MapSet(object):
textures = [self.load_map_object('data/advmap_tiles/watrtl.def/%d/0.png'%i, 0) for i in range(33)] textures = [self.load_map_object('data/advmap_tiles/watrtl.def/%d/0.png'%i, 0) for i in range(33)]
images = [[pyglet.image.load(None, file=pyglet.resource.file('data/advmap_tiles/watrtl.def/%d/%d.png'%(i,j))) for j in range(12)] for i in range(33)] images = [[pyglet.image.load(None, file=pyglet.resource.file('data/advmap_tiles/watrtl.def/%d/%d.png'%(i,j))) for j in range(12)] for i in range(33)]
tile_textures["watrtl"] = { tile_textures["watrtl"] = {
(0,0):[Animation(texture, images[i]) for i, texture in enumerate(textures)], (0,0):[Animation_Object(Animation(texture, images[i])) for i, texture in enumerate(textures)],
(1,0):[Animation(texture, images[i], flip_x=True) for i, texture in enumerate(textures)], (1,0):[Animation_Object(Animation(texture, images[i], flip_x=True)) for i, texture in enumerate(textures)],
(0,1):[Animation(texture, images[i], flip_y=True) for i, texture in enumerate(textures)], (0,1):[Animation_Object(Animation(texture, images[i], flip_y=True)) for i, texture in enumerate(textures)],
(1,1):[Animation(texture, images[i], flip_x=True, flip_y=True) for i, texture in enumerate(textures)], (1,1):[Animation_Object(Animation(texture, images[i], flip_x=True, flip_y=True)) for i, texture in enumerate(textures)],
} }
flip_x = (tile[6]>>0)&1 flip_x = (tile[6]>>0)&1
flip_y = (tile[6]>>1)&1 flip_y = (tile[6]>>1)&1
@ -254,10 +246,10 @@ class MapSet(object):
textures = [self.load_map_object('data/advmap_tiles/clrrvr.def/%d/0.png'%i, 1) for i in range(13)] textures = [self.load_map_object('data/advmap_tiles/clrrvr.def/%d/0.png'%i, 1) for i in range(13)]
images = [[pyglet.image.load(None, file=pyglet.resource.file('data/advmap_tiles/clrrvr.def/%d/%d.png'%(i,j))) for j in range(12)] for i in range(13)] images = [[pyglet.image.load(None, file=pyglet.resource.file('data/advmap_tiles/clrrvr.def/%d/%d.png'%(i,j))) for j in range(12)] for i in range(13)]
tile_textures["clrrvr"] = { tile_textures["clrrvr"] = {
(0,0):[Animation(texture, images[i]) for i, texture in enumerate(textures)], (0,0):[Animation_Object(Animation(texture, images[i])) for i, texture in enumerate(textures)],
(1,0):[Animation(texture, images[i], flip_x=True) for i, texture in enumerate(textures)], (1,0):[Animation_Object(Animation(texture, images[i], flip_x=True)) for i, texture in enumerate(textures)],
(0,1):[Animation(texture, images[i], flip_y=True) for i, texture in enumerate(textures)], (0,1):[Animation_Object(Animation(texture, images[i], flip_y=True)) for i, texture in enumerate(textures)],
(1,1):[Animation(texture, images[i], flip_x=True, flip_y=True) for i, texture in enumerate(textures)], (1,1):[Animation_Object(Animation(texture, images[i], flip_x=True, flip_y=True)) for i, texture in enumerate(textures)],
} }
flip_x = (tile[6]>>2)&1 flip_x = (tile[6]>>2)&1
flip_y = (tile[6]>>3)&1 flip_y = (tile[6]>>3)&1
@ -278,10 +270,10 @@ class MapSet(object):
textures = [self.load_map_object('data/advmap_tiles/mudrvr.def/%d/0.png'%i, 1) for i in range(13)] textures = [self.load_map_object('data/advmap_tiles/mudrvr.def/%d/0.png'%i, 1) for i in range(13)]
images = [[pyglet.image.load(None, file=pyglet.resource.file('data/advmap_tiles/clrrvr.def/%d/%d.png'%(i,j))) for j in range(12)] for i in range(13)] images = [[pyglet.image.load(None, file=pyglet.resource.file('data/advmap_tiles/clrrvr.def/%d/%d.png'%(i,j))) for j in range(12)] for i in range(13)]
tile_textures["mudrvr"] = { tile_textures["mudrvr"] = {
(0,0):[Animation(texture, images[i]) for i, texture in enumerate(textures)], (0,0):[Animation_Object(Animation(texture, images[i])) for i, texture in enumerate(textures)],
(1,0):[Animation(texture, images[i], flip_x=True) for i, texture in enumerate(textures)], (1,0):[Animation_Object(Animation(texture, images[i], flip_x=True)) for i, texture in enumerate(textures)],
(0,1):[Animation(texture, images[i], flip_y=True) for i, texture in enumerate(textures)], (0,1):[Animation_Object(Animation(texture, images[i], flip_y=True)) for i, texture in enumerate(textures)],
(1,1):[Animation(texture, images[i], flip_x=True, flip_y=True) for i, texture in enumerate(textures)], (1,1):[Animation_Object(Animation(texture, images[i], flip_x=True, flip_y=True)) for i, texture in enumerate(textures)],
} }
flip_x = (tile[6]>>2)&1 flip_x = (tile[6]>>2)&1
flip_y = (tile[6]>>3)&1 flip_y = (tile[6]>>3)&1
@ -291,10 +283,10 @@ class MapSet(object):
textures = [self.load_map_object('data/advmap_tiles/lavrvr.def/%d/0.png'%i, 1) for i in range(13)] textures = [self.load_map_object('data/advmap_tiles/lavrvr.def/%d/0.png'%i, 1) for i in range(13)]
images = [[pyglet.image.load(None, file=pyglet.resource.file('data/advmap_tiles/clrrvr.def/%d/%d.png'%(i,j))) for j in range(9)] for i in range(13)] images = [[pyglet.image.load(None, file=pyglet.resource.file('data/advmap_tiles/clrrvr.def/%d/%d.png'%(i,j))) for j in range(9)] for i in range(13)]
tile_textures["lavrvr"] = { tile_textures["lavrvr"] = {
(0,0):[Animation(texture, images[i]) for i, texture in enumerate(textures)], (0,0):[Animation_Object(Animation(texture, images[i])) for i, texture in enumerate(textures)],
(1,0):[Animation(texture, images[i], flip_x=True) for i, texture in enumerate(textures)], (1,0):[Animation_Object(Animation(texture, images[i], flip_x=True)) for i, texture in enumerate(textures)],
(0,1):[Animation(texture, images[i], flip_y=True) for i, texture in enumerate(textures)], (0,1):[Animation_Object(Animation(texture, images[i], flip_y=True)) for i, texture in enumerate(textures)],
(1,1):[Animation(texture, images[i], flip_x=True, flip_y=True) for i, texture in enumerate(textures)], (1,1):[Animation_Object(Animation(texture, images[i], flip_x=True, flip_y=True)) for i, texture in enumerate(textures)],
} }
flip_x = (tile[6]>>2)&1 flip_x = (tile[6]>>2)&1
flip_y = (tile[6]>>3)&1 flip_y = (tile[6]>>3)&1
@ -349,7 +341,7 @@ class MapSet(object):
i += 1 i += 1
if "data/advmap_objects/" + obj["filename"] + "/%d.png" % i not in list(pyglet.resource._default_loader._index.keys()): if "data/advmap_objects/" + obj["filename"] + "/%d.png" % i not in list(pyglet.resource._default_loader._index.keys()):
break; break;
images.append((imgs, order)) images.append((imgs, obj["overlay"], order))
self.objects = [] self.objects = []
for imgs in sorted(images, key=lambda i:i[0][0].height, reverse=True): for imgs in sorted(images, key=lambda i:i[0][0].height, reverse=True):
@ -358,18 +350,23 @@ class MapSet(object):
except pyglet.image.atlas.AllocatorException: except pyglet.image.atlas.AllocatorException:
self.current_atlas = pyglet.image.atlas.TextureAtlas(1024, 1024) self.current_atlas = pyglet.image.atlas.TextureAtlas(1024, 1024)
texture = self.current_atlas.add(imgs[0][0]) texture = self.current_atlas.add(imgs[0][0])
group = OrderedTextureGroup(2, self.current_atlas.texture) self.atlases.append(self.current_atlas)
if group not in self.groups: texture.group = None
self.groups.append(group) texture.atlas = self.atlases.index(self.atlases[-1])
group = self.groups.index(group) self.objects.append((Animation(texture, imgs[0], overlay=imgs[1]), imgs[2]))
texture.group = group
self.objects.append((Animation(texture, imgs[0]), imgs[1]))
self.objects = [i[0] for i in sorted(self.objects, key=lambda i:i[1])] self.objects = [i[0] for i in sorted(self.objects, key=lambda i:i[1])]
self.tunedobj = {}
for obj in [i for i in h3m_data["tunedobj"] if i["z"]==0]: for obj in [i for i in h3m_data["tunedobj"] if i["z"]==0]:
self.__tiles[obj["x"] + 9,obj["y"] + 8].append(self.objects[obj["id"]]) order = obj["y"]
if self.objects[obj["id"]].overlay:
order = order - self.objects[obj["id"]].tex.height // 32
group = pyglet.graphics.OrderedGroup(order)
group = pyglet.graphics.TextureGroup(self.atlases[self.objects[obj["id"]].tex.atlas].texture, parent=group)
if group not in self.groups:
self.groups.append(group)
group = self.groups.index(group)
self.__tiles[obj["x"] + 9, obj["y"] + 8].append(Animation_Object(self.objects[obj["id"]], group))
def get_tiles(self, tiles_x, tiles_y, div_x, div_y): def get_tiles(self, tiles_x, tiles_y, div_x, div_y):
for y in range(tiles_y - 1, -6, -1): for y in range(tiles_y - 1, -6, -1):

12
lib/mapview.py
View file

@ -212,15 +212,15 @@ class MapView(object):
vertices = [[] for value in self.mapset.groups] vertices = [[] for value in self.mapset.groups]
tex_coords = [[] for value in self.mapset.groups] tex_coords = [[] for value in self.mapset.groups]
count = [0 for value in self.mapset.groups] count = [0 for value in self.mapset.groups]
self.cur_objects = [[] for value in self.mapset.groups] self.cur_objects = [[] for value in self.mapset.atlases]
# for each tile in the viewport, update the list of the specific group # for each tile in the viewport, update the list of the specific group
for obj, coords in self.mapset.get_tiles(self.tiles_x, self.tiles_y, for obj, coords in self.mapset.get_tiles(self.tiles_x, self.tiles_y,
self.div_x, self.div_y): self.div_x, self.div_y):
tex_coords[obj.group].extend(obj.tex_coords) tex_coords[obj.group].extend(obj.tex_coords)
vertices[obj.group].extend(coords) vertices[obj.group].extend(coords)
count[obj.group]+=4 count[obj.group]+=4
if isinstance(obj, Animation): if isinstance(obj, Animation_Object) and len(obj.animation) > 1:
self.cur_objects[obj.group].append(obj) self.cur_objects[obj.animation.atlas].append(obj.animation)
for i, group in enumerate(self.mapset.groups): for i, group in enumerate(self.mapset.groups):
if count[i] == 0: if count[i] == 0:
if self.vl_objects[i] is None: if self.vl_objects[i] is None:
@ -246,6 +246,7 @@ class MapView(object):
self.vl_objects[i].vertices = vertices[i] self.vl_objects[i].vertices = vertices[i]
self.vl_objects[i].colors = (255,255,255,255)*count[i] self.vl_objects[i].colors = (255,255,255,255)*count[i]
# make object list unique # make object list unique
for i, atlas in enumerate(self.mapset.atlases):
self.cur_objects[i] = list(set(self.cur_objects[i])) self.cur_objects[i] = list(set(self.cur_objects[i]))
def update(self, dt): def update(self, dt):
@ -311,10 +312,9 @@ class MapView(object):
self._init_view() self._init_view()
def animate_water(self, dt): def animate_water(self, dt):
for i, group in enumerate(self.mapset.groups): for i, atlas in enumerate(self.mapset.atlases):
if len(self.cur_objects[i]) > 0: if len(self.cur_objects[i]) > 0:
pyglet.gl.glBindTexture(self.cur_objects[i][0].tex.target, pyglet.gl.glBindTexture(atlas.texture.target, atlas.texture.id)
self.cur_objects[i][0].tex.id)
for obj in self.cur_objects[i]: for obj in self.cur_objects[i]:
pyglet.gl.glTexSubImage2D(obj.tex.owner.target, pyglet.gl.glTexSubImage2D(obj.tex.owner.target,
obj.tex.owner.level, obj.tex.owner.level,