dorian
/
doric-engine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve the bounding box detection behaviour.

This commit is contained in:
Dorian 2016-07-16 21:24:45 -04:00
parent 21a5431071
commit dd2864186e
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
main.py
View File

@ -1,6 +1,7 @@
import collections import collections
from kivy import app, properties from kivy import app, properties
from kivy.logger import Logger
from kivy.uix.label import Label from kivy.uix.label import Label
from kivy.uix.floatlayout import FloatLayout from kivy.uix.floatlayout import FloatLayout
from kivy.graphics import Color, Ellipse, Line, Rectangle from kivy.graphics import Color, Ellipse, Line, Rectangle
@ -102,22 +103,19 @@ class HexMapCell(Label):
if super(HexMapCell, self).on_touch_down(touch): if super(HexMapCell, self).on_touch_down(touch):
return False return False
coord_x, coord_y = self.map_coordinates()
if not self.visible_on_map: if not self.visible_on_map:
return False return False
if not self.collide_point(touch.x, touch.y): Logger.debug("Visibly Touched! {}, {} at {}, {}".format(touch.x, touch.y, coord_x, coord_y))
if not self.collide_with_bounding_circle(touch.x, touch.y):
with self.canvas.after: with self.canvas.after:
Color(*kivy.utils.get_color_from_hex('#A1A5AA')) Color(*kivy.utils.get_color_from_hex('#A1A5AA'))
radius = 2 * self.height radius = 2 * self.height
self.ell = Line(circle=(self.x, self.y, radius, 0, 360, 6), width=2) self.ell = Line(circle=(self.x, self.y, radius, 0, 360, 6), width=2)
return False return False
# Register if within bounds of circle that the hex is inscribed in. Logger.debug('Selected: ({}, {})'.format(coord_x, coord_y))
radius = 2 * self.height
dist = Vector(self.x, self.y).distance((touch.x, touch.y))
if radius - dist < 0:
return False
with self.canvas.after: with self.canvas.after:
if 'button' in touch.profile and touch.button == 'left': if 'button' in touch.profile and touch.button == 'left':
Color(*kivy.utils.get_color_from_hex('#00FF00')) Color(*kivy.utils.get_color_from_hex('#00FF00'))
@ -131,6 +129,15 @@ class HexMapCell(Label):
self.parent.game.update_selected_cell(self.map_coordinates(), self.terrain_colour) self.parent.game.update_selected_cell(self.map_coordinates(), self.terrain_colour)
return True return True
def collide_with_bounding_circle(self, coord_x, coord_y):
# Register if within bounds of circle that the hex is inscribed in.
Logger.debug('Detected: ({}, {})'.format(coord_x, coord_y))
radius = 2 * self.height
dist = Vector(self.x, self.y).distance((coord_x, coord_y))
Logger.debug('({}, {}) -> ({}, {})'.format(self.x, self.y, coord_x, coord_y))
Logger.debug('Dist: {} Diff: {}'.format(dist, dist - radius))
return dist - radius <= 0
class StrategyGameApp(app.App): class StrategyGameApp(app.App):
def build(self): def build(self):