From e17d4282ac5b9eb850a57ab673178053a5cb15d9 Mon Sep 17 00:00:00 2001
From: josch <j.schauer@email.de>
Date: Thu, 26 Jun 2014 09:21:11 +0200
Subject: [PATCH] bulk commit

---
 hr.py          |  7 +++----
 lib/mapset.py  | 21 +++++++++------------
 lib/mapview.py |  2 ++
 setup.py       |  9 +++++++++
 4 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 setup.py

diff --git a/hr.py b/hr.py
index 4762734..9b6e1f0 100644
--- a/hr.py
+++ b/hr.py
@@ -45,15 +45,14 @@ class LoadScreen(object):
         self.window.push_handlers(interface)
         
 if __name__ == '__main__':
+    pyglet.gl.glBlendFunc(pyglet.gl.GL_SRC_ALPHA,
+        pyglet.gl.GL_ONE_MINUS_SRC_ALPHA)
+    window = Window(width=1024, height=768)
     if len(sys.argv) < 2:
         sys.exit("specify the map you want to load from the map folder\nusage: python hr.py \"A Viking We Shall Go\"")
     
     if not os.path.exists(os.path.join(pyglet.resource._default_loader._script_home,"maps","%s.h3m" % sys.argv[1])):
         sys.exit("cannot find file %s" % os.path.join(pyglet.resource._default_loader._script_home,"maps","%s.h3m" % sys.argv[1]))
-
-    pyglet.gl.glBlendFunc(pyglet.gl.GL_SRC_ALPHA,
-        pyglet.gl.GL_ONE_MINUS_SRC_ALPHA)
-    window = Window(width=1024, height=768)
     window.push_handlers(LoadScreen(window, sys.argv[1]))
     img = pyglet.resource.image("data/cursors/cradvntr.def/0.png")
     window.set_mouse_cursor(pyglet.window.ImageMouseCursor(img, 0, 40))
diff --git a/lib/mapset.py b/lib/mapset.py
index 6fbbfe2..715d321 100644
--- a/lib/mapset.py
+++ b/lib/mapset.py
@@ -23,27 +23,24 @@ from lib import h3m
 import os
 
 class OrderedTextureGroup(pyglet.graphics.Group):
-    def __init__(self, order, texture, parent=None):
-        super(OrderedTextureGroup, self).__init__(parent)
+    def __init__(self, order, texture):
+        super(OrderedTextureGroup, self).__init__()
         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)
-
+        pyglet.gl.glBindTexture(pyglet.gl.GL_TEXTURE_2D, self.texture.id)
+    
     def unset_state(self):
-        pyglet.gl.glDisable(self.texture.target)
+        pass
 
     def __hash__(self):
-        return hash((self.order, self.texture.target, self.texture.id, self.parent))
+        return hash((self.order, self.texture.id))
 
     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)
+            self.texture.id == other.texture.id)
 
     def __repr__(self):
         return '%s(order=%d, id=%d)' % (self.__class__.__name__, self.order, self.texture.id)
@@ -93,7 +90,7 @@ class Animation(object):
 
 class Animation_Object(object):
     def __init__(self, animation, group=None):
-        if group:
+        if group != None:
             self.texgroup = group
         else:
             self.texgroup = animation.texgroup
@@ -179,7 +176,7 @@ class MapSet(object):
             for x, tile in enumerate(line):
                 if tile[0] == -1: #edge
                     if "edg" not in list(tile_textures.keys()):
-                        tile_textures["edg"] = [self.load_map_object('data/advmap_tiles/edg.def/%d.png'%i, 1000) for i in range(36)]
+                        tile_textures["edg"] = [self.load_map_object('data/advmap_tiles/edg.def/%d.png'%i, 100) for i in range(36)]
                     self.__tiles[x,y] = [tile_textures["edg"][tile[1]]]
                 elif tile[0] == 0: #dirt
                     if "dirttl" not in list(tile_textures.keys()):
diff --git a/lib/mapview.py b/lib/mapview.py
index b5d225e..cc8ae65 100644
--- a/lib/mapview.py
+++ b/lib/mapview.py
@@ -131,7 +131,9 @@ class MapView(object):
     def draw(self):
         pyglet.gl.glTranslatef(self.view_x+IF_LEFT, self.view_y+IF_BOTTOM, 0)
         pyglet.gl.glScalef(self.tile_size/32.0, self.tile_size/32.0, 0.0)
+        pyglet.gl.glEnable(pyglet.gl.GL_TEXTURE_2D)
         self.batch.draw()
+        pyglet.gl.glDisable(pyglet.gl.GL_TEXTURE_2D)
     
     def _move(self, dx, dy):
         # new map position
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..b72de33
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,9 @@
+from distutils.core import setup
+from distutils.extension import Extension
+from Cython.Distutils import build_ext
+
+setup(
+    cmdclass = {'build_ext': build_ext},
+    ext_modules = [Extension("blit_into", ["lib/blit_into.pyx"]),
+                   Extension("batch", ["lib/batch.pyx"])]
+)