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

finally fixing overlapping completely - at least as far as i see it...

Browse source
This commit is contained in:
josch 2008-11-28 13:31:31 +01:00
parent c58daa947c
commit feb013ce13
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/mapset.py
View file

@ -360,21 +360,19 @@ class MapSet(object):
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])]
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]:
order = obj["y"] # order objects by row in which they are placed
# 8 levels offset because of objects 6 tiles high
order = obj["y"] + 8
# if the overlay attribute is set, object is drawn below all
# objects ove it - so substract its hight
if self.objects[obj["id"]].overlay: if self.objects[obj["id"]].overlay:
order = order - self.objects[obj["id"]].tex.height // 32 order = order - self.objects[obj["id"]].tex.height // 32
# each row two levels - woods and mountains in the back and the
# rest in front
order *= 2 order *= 2
if self.objects[obj["id"]].objclass in [5, 6, 17, 20, 26, 33, 34, # put wood and mountains behind other objects on the same level
36, 42, 53, 54, 59, 62, 65, if self.objects[obj["id"]].objclass in [119, 134, 135, 137, 155, 199]:
66, 67, 68, 69, 70, 71, 72, order -= 1
73, 74, 75, 76, 77, 79, 81,
83, 87, 88, 89, 90, 91, 93,
98, 112, 113, 162, 163,
164, 215, 216, 217, 218,
219, 220,
#here comes new ones:
100, 16]:
order += 1
group = pyglet.graphics.OrderedGroup(order) group = pyglet.graphics.OrderedGroup(order)
group = pyglet.graphics.TextureGroup(self.atlases[self.objects[obj["id"]].tex.atlas].texture, parent=group) group = pyglet.graphics.TextureGroup(self.atlases[self.objects[obj["id"]].tex.atlas].texture, parent=group)
if group not in self.groups: if group not in self.groups: