Less buggy Kivy 1.7 hackery

[erdslangetjie.git] / erdslangetjie / __main__.py

diff --git a/erdslangetjie/__main__.py b/erdslangetjie/__main__.py
index 08d7154a09b356b98be3981aeb96468cfab17621..e8f4f9823c1d0aa1c9a0dce7780bd4fdaaaa2bd4 100644 (file)
--- a/erdslangetjie/__main__.py
+++ b/erdslangetjie/__main__.py
@@ -1,66 +1,13 @@
-import sys
-import os
-import kivy
+from kivy.utils import platform
+from kivy.config import Config
 
-kivy.require('1.6.0')
-
-from kivy.app import App
-from kivy.uix.widget import Widget
-from kivy.uix.floatlayout import FloatLayout
-from kivy.graphics import Color, Rectangle
-
-from erdslangetjie.data import filepath, load
-from erdslangetjie.level import Level
-
-
-class GameWindow(FloatLayout):
-
-    def __init__(self, level):
-        super(GameWindow, self).__init__(size=(960, 960))
-        if os.path.exists(filepath(level)):
-            level_data = load(level)
-            self.level = level
-        elif os.path.exists(filepath('levels/' + level)):
-            level_data = load('levels/' + level)
-            self.level = 'levels/' + level
-        else:
-            print 'Unable to find %s - treating this as a new level' % level
-            sys.exit(1)
-        self.level_obj = Level()
-        self.level_obj.load(level_data)
-        level_data.close()
-
-    def build(self):
-        self.clear_widgets()
-        tiles = self.level_obj.get_tiles()
-        tile_size = 24
-        bx, by = 0, 0
-        for tile_line in tiles:
-            bx = 0
-            for tile in tile_line:
-                node = Widget(size=(tile_size, tile_size), pos=(bx, by))
-                with node.canvas:
-                    Color(1, 1, 1)
-                    Rectangle(pos=node.pos, size=node.size,
-                            texture=tile.texture)
-                self.add_widget(node)
-                bx += tile_size
-            by += tile_size
-
-
-class GameApp(App):
-
-    def __init__(self):
-        self.level = 'level1.txt'
-        super(GameApp, self).__init__()
-
-    def build(self):
-        game = GameWindow(self.level)
-        game.build()
-        return game
+if platform() != 'android':
+    Config.set('graphics', 'width', '1026')
+    Config.set('graphics', 'height', '760')
 
 
 def main():
     """ Erdslangetjie, a maze game of eluding nemesis
     """
+    from erdslangetjie.localwidgets import GameApp
     GameApp().run()