Merge branch 'llf-amy-llfkj'

helloworld.kv

@@ -1,6 +0,0 @@
-
-#:include debug.kv
-
-<HelloWorld>:
-    DebugLabel:
-        text: 'hello world'

main.py

@@ -1,12 +1,85 @@
-from kivy.app import App
+import collections
+import random
+import math
+
+from kivy import app, properties
+from kivy.uix import button, label
 from kivy.uix.floatlayout import FloatLayout
+from kivy.graphics import Color, Ellipse, Line
+from kivy.logger import Logger
+import kivy.utils
+from kivy.vector import Vector
 
-class HelloWorld(FloatLayout):
-    pass
+MapCoords = collections.namedtuple('MapCoords', ['row', 'col'])
 
-class HelloWorldApp(App):
+
+class StrategyGame(FloatLayout):
+    main_map = properties.ObjectProperty(None)
+    map_rows = properties.NumericProperty(0)
+    map_cols = properties.NumericProperty(0)
+
+    def __init__(self, **kwargs):
+        super(StrategyGame, self).__init__(**kwargs)
+
+        number_of_regions = self.map_rows * self.map_cols
+        for region in xrange(0, number_of_regions):
+            row = region / self.map_cols
+            col = region % self.map_cols
+
+            # Add hex cells to make up the map.
+            hex_cell = HexMapCell()
+            self.main_map.add_widget(hex_cell)
+
+            # Add overlay conditionally.
+            if (row % 6 == 1 and col % 2 == 1) or (row % 6 == 4 and col % 2 == 0):
+                print('({}, {})'.format(row, col))
+                #radius = math.sqrt(hex_cell.width**2 + hex_cell.height**2)
+                radius = 2*hex_cell.height
+                solid_x = hex_cell.x - hex_cell.height*2
+                solid_y = hex_cell.y - hex_cell.height*2
+                solid_size = (4*hex_cell.height, 4*hex_cell.height)
+                with hex_cell.canvas.after:
+                    Color(1,0,1,1)
+                    hex_cell.ell = Line(circle=(hex_cell.x, hex_cell.y,radius, 0, 360, 6), width=2)
+                    Color(*kivy.utils.get_random_color(alpha = .5))
+                    hex_cell.solid = Ellipse(pos = (solid_x, solid_y), size = solid_size, segments = 6 )
+                hex_cell.bind(pos=hex_cell.update_pos, size=hex_cell.update_pos)
+
+
+class HexMapCell(label.Label):
+    def __init__(self, row=0, col=0, **kwargs):
+        super(HexMapCell, self).__init__(**kwargs)
+        self.coords = MapCoords(row, col)
+
+    def update_pos(self, instance, value):
+        #radius = math.sqrt(self.width**2 + self.height**2)
+        radius = 2*self.height
+        solid_x = self.x - self.height*2
+        solid_y = self.y - self.height*2
+        solid_size = (4*self.height, 4*self.height)
+        self.ell.circle = (self.x, self.y, radius, 0, 360, 6)
+        self.solid.pos  = (solid_x, solid_y)
+        self.solid.size = solid_size
+
+class HexMapControlCell(button.Button):
+    def __init__(self, hex_bind=None, **kwargs):
+        super(HexMapControlCell, self).__init__(**kwargs)
+        self.hex_bind = hex_bind
+        self.background_color = random.random(), random.random(), random.random(), 1
+        self.bind(pos=self.reposition_control_cell, size=self.resize_control_cell)
+        self.text = '({}, {})'.format(self.hex_bind.coords.row, self.hex_bind.coords.col)
+
+    def reposition_control_cell(self, obj, value):
+        self.pos = self.hex_bind.pos
+
+    def resize_control_cell(self, obj, value):
+        self.height = self.hex_bind.height * 2
+        self.width = self.hex_bind.width * 2
+
+
+class StrategyGameApp(app.App):
     def build(self):
-        return HelloWorld()
+        return StrategyGame()
 
 if __name__ == '__main__':
-    HelloWorldApp().run()
+    StrategyGameApp().run()

strategygame.kv

@@ -0,0 +1,46 @@
+#:import math math
+##:include debug.kv
+
+<StrategyGame>:
+    id: _game
+    main_map: _main_map
+    map_rows: 30
+    map_cols: 10
+    BoxLayout:
+        orientation: 'horizontal'
+        GridLayout:
+            id: _main_map
+            game: _game
+            cols: root.map_cols
+            size_hint: .75, 1
+        BoxLayout:
+            orientation: 'vertical'
+            size_hint: .25, 1
+            Label:
+                id: _stats
+                text: 'status'
+                size_hint: 1, .66
+                canvas.before:
+                    Color:
+                        rgba: .49, .49, .81, 1
+                    Rectangle:
+                        pos: _stats.pos
+                        size: _stats.size
+            Button:
+                text: 'mini-map'
+                size_hint: 1, .33
+                background_color: .75, .71, .99, 1
+
+<Hex@Label>:
+    pos_hint: {'center_x':.5, 'center_y':.5}
+    canvas.after:
+        Color:
+            rgba: 1,1,1,1
+        Ellipse:
+            segments: 6
+            pos: self.pos
+            size: min(self.width, self.height), min(self.width, self.height)
+
+<HexMapCell>:
+    size_hint: 1, None
+    height: self.width / math.sqrt(3)