Advance through the levels

[erdslangetjie.git] / erdslangetjie / editor / editor.py

diff --git a/erdslangetjie/editor/editor.py b/erdslangetjie/editor/editor.py
index ecdbec7cc61f3c3cc36f65248d656042ba7a60ee..08c5f6b32bf987a7a81a4c7946540a7624a949fa 100644 (file)
--- a/erdslangetjie/editor/editor.py
+++ b/erdslangetjie/editor/editor.py
@@ -1,24 +1,23 @@
 import sys
 import os
 import kivy
 import sys
 import os
 import kivy

-from erdslangetjie.data import filepath, load
-from erdslangetjie.level import Level

 
 kivy.require('1.6.0')
 
 from kivy.app import App
 from kivy.logger import Logger, LoggerHistory
 from kivy.uix.widget import Widget
 
 kivy.require('1.6.0')
 
 from kivy.app import App
 from kivy.logger import Logger, LoggerHistory
 from kivy.uix.widget import Widget

-

 from kivy.uix.floatlayout import FloatLayout
 from kivy.uix.floatlayout import FloatLayout

-from kivy.uix.scatter import Scatter

 from kivy.graphics import Color, Rectangle
 
 from kivy.graphics import Color, Rectangle
 

+from erdslangetjie.data import filepath, load
+from erdslangetjie.level import Level
+

 
 class EditorWindow(FloatLayout):
 
     def __init__(self, level):
 
 class EditorWindow(FloatLayout):
 
     def __init__(self, level):

-        super(EditorWindow, self).__init__()
+        super(EditorWindow, self).__init__(size=(648, 480))

         if os.path.exists(filepath(level)):
             level_data = load(level)
             self.level = level
         if os.path.exists(filepath(level)):
             level_data = load(level)
             self.level = level


@@ -32,9 +31,9 @@ class EditorWindow(FloatLayout):
                 self.level = level
             else:
                 self.level = 'levels/' + level
                 self.level = level
             else:
                 self.level = 'levels/' + level

-        self.level_obj = Level()
-        self.level_obj.load(level_data)
+        self.level_obj = Level(level_data)

         level_data.close()
         level_data.close()

+        self.level_obj.load_tiles()

 
     def build(self):
         self.clear_widgets()
 
     def build(self):
         self.clear_widgets()


@@ -44,10 +43,11 @@ class EditorWindow(FloatLayout):
         for tile_line in tiles:
             bx = 0
             for tile in tile_line:
         for tile_line in tiles:
             bx = 0
             for tile in tile_line:

-                node = Scatter(pos=(bx, by), size=(tile_size, tile_size))
+                node = Widget(size=(tile_size, tile_size), pos=(bx, by))

                 with node.canvas:
                     Color(1, 1, 1)
                 with node.canvas:
                     Color(1, 1, 1)

-                    Rectangle(size=node.size, texture=tile.texture)
+                    Rectangle(pos=node.pos, size=node.size,
+                            texture=tile.texture)

                 self.add_widget(node)
                 bx += tile_size
             by += tile_size
                 self.add_widget(node)
                 bx += tile_size
             by += tile_size