Compare commits

..

No commits in common. "hex-grid-layout-experiment" and "master" have entirely different histories.

6 changed files with 2 additions and 321 deletions

View File

@ -36,7 +36,7 @@ version = 0.1
# (list) Application requirements
# comma seperated e.g. requirements = sqlite3,kivy
requirements = kivy,python3crystax
requirements = kivy,python2
# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
@ -90,7 +90,7 @@ fullscreen = 1
#android.private_storage = True
# (str) Android NDK directory (if empty, it will be automatically downloaded.)
android.ndk_path = ~/colonia/crystax-ndk-10.3.2
#android.ndk_path =
# (str) Android SDK directory (if empty, it will be automatically downloaded.)
#android.sdk_path =

View File

@ -14,10 +14,6 @@ class StrategyGame(BoxLayout):
def __init__(self, **kwargs):
super(StrategyGame, self).__init__(**kwargs)
# TODO: Need to figure out dimensions of map... better isolate in standalone FloatLayout setup.
# TODO: Add in calculation of number of tiles placeable in map? Or using scroll view?
# TODO: Learn about scrollable maps and mini-maps
for row in range(0, self.map_rows):
hex_map_row = BoxLayout(orientation='horizontal')

View File

@ -1,227 +0,0 @@
[app]
# (str) Title of your application
title = Doric Render test
# (str) Package name
package.name = doric_remder_test
# (str) Package domain (needed for android/ios packaging)
package.domain = ca.dorianpula
# (str) Source code where the main.py live
source.dir = .
# (list) Source files to include (let empty to include all the files)
source.include_exts = py,png,jpg,kv,atlas
# (list) List of inclusions using pattern matching
#source.include_patterns = assets/*,images/*.png
# (list) Source files to exclude (let empty to not exclude anything)
#source.exclude_exts = spec
# (list) List of directory to exclude (let empty to not exclude anything)
#source.exclude_dirs = tests, bin
# (list) List of exclusions using pattern matching
source.exclude_patterns = license,images/*/*.jpg
# (str) Application versioning (method 1)
version = 0.1
# (str) Application versioning (method 2)
# version.regex = __version__ = ['"](.*)['"]
# version.filename = %(source.dir)s/main.py
# (list) Application requirements
# comma seperated e.g. requirements = sqlite3,kivy
requirements = kivy,python3crystax
# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
# requirements.source.kivy = ../../kivy
# (list) Garden requirements
#garden_requirements =
# (str) Presplash of the application
#presplash.filename = %(source.dir)s/data/presplash.png
# (str) Icon of the application
#icon.filename = %(source.dir)s/data/icon.png
# (str) Supported orientation (one of landscape, portrait or all)
orientation = landscape
# (list) List of service to declare
#services = NAME:ENTRYPOINT_TO_PY,NAME2:ENTRYPOINT2_TO_PY
#
# OSX Specific
#
#
# author = © Copyright Info
#
# Android specific
#
# (bool) Indicate if the application should be fullscreen or not
fullscreen = 1
# (list) Permissions
#android.permissions = INTERNET
# (int) Android API to use
#android.api = 19
# (int) Minimum API required
#android.minapi = 9
# (int) Android SDK version to use
#android.sdk = 20
# (str) Android NDK version to use
#android.ndk = 9c
# (bool) Use --private data storage (True) or --dir public storage (False)
#android.private_storage = True
# (str) Android NDK directory (if empty, it will be automatically downloaded.)
android.ndk_path = ~/colonia/crystax-ndk-10.3.2
# (str) Android SDK directory (if empty, it will be automatically downloaded.)
#android.sdk_path =
# (str) ANT directory (if empty, it will be automatically downloaded.)
#android.ant_path =
# (str) python-for-android git clone directory (if empty, it will be automatically cloned from github)
#android.p4a_dir =
# (list) python-for-android whitelist
#android.p4a_whitelist =
# (bool) If True, then skip trying to update the Android sdk
# This can be useful to avoid excess Internet downloads or save time
# when an update is due and you just want to test/build your package
# android.skip_update = False
# (str) Android entry point, default is ok for Kivy-based app
#android.entrypoint = org.renpy.android.PythonActivity
# (list) List of Java .jar files to add to the libs so that pyjnius can access
# their classes. Don't add jars that you do not need, since extra jars can slow
# down the build process. Allows wildcards matching, for example:
# OUYA-ODK/libs/*.jar
#android.add_jars = foo.jar,bar.jar,path/to/more/*.jar
# (list) List of Java files to add to the android project (can be java or a
# directory containing the files)
#android.add_src =
# (str) python-for-android branch to use, if not master, useful to try
# not yet merged features.
#android.branch = master
# (str) OUYA Console category. Should be one of GAME or APP
# If you leave this blank, OUYA support will not be enabled
#android.ouya.category = GAME
# (str) Filename of OUYA Console icon. It must be a 732x412 png image.
#android.ouya.icon.filename = %(source.dir)s/data/ouya_icon.png
# (str) XML file to include as an intent filters in <activity> tag
#android.manifest.intent_filters =
# (list) Android additionnal libraries to copy into libs/armeabi
#android.add_libs_armeabi = libs/android/*.so
#android.add_libs_armeabi_v7a = libs/android-v7/*.so
#android.add_libs_x86 = libs/android-x86/*.so
#android.add_libs_mips = libs/android-mips/*.so
# (bool) Indicate whether the screen should stay on
# Don't forget to add the WAKE_LOCK permission if you set this to True
#android.wakelock = False
# (list) Android application meta-data to set (key=value format)
#android.meta_data =
# (list) Android library project to add (will be added in the
# project.properties automatically.)
#android.library_references =
# (str) Android logcat filters to use
#android.logcat_filters = *:S python:D
# (bool) Copy library instead of making a libpymodules.so
#android.copy_libs = 1
#
# iOS specific
#
# (str) Path to a custom kivy-ios folder
#ios.kivy_ios_dir = ../kivy-ios
# (str) Name of the certificate to use for signing the debug version
# Get a list of available identities: buildozer ios list_identities
#ios.codesign.debug = "iPhone Developer: <lastname> <firstname> (<hexstring>)"
# (str) Name of the certificate to use for signing the release version
#ios.codesign.release = %(ios.codesign.debug)s
[buildozer]
# (int) Log level (0 = error only, 1 = info, 2 = debug (with command output))
log_level = 2
# (int) Display warning if buildozer is run as root (0 = False, 1 = True)
warn_on_root = 1
# (str) Path to build artifact storage, absolute or relative to spec file
# build_dir = ./.buildozer
# (str) Path to build output (i.e. .apk, .ipa) storage
# bin_dir = ./bin
# -----------------------------------------------------------------------------
# List as sections
#
# You can define all the "list" as [section:key].
# Each line will be considered as a option to the list.
# Let's take [app] / source.exclude_patterns.
# Instead of doing:
#
#[app]
#source.exclude_patterns = license,data/audio/*.wav,data/images/original/*
#
# This can be translated into:
#
#[app:source.exclude_patterns]
#license
#data/audio/*.wav
#data/images/original/*
#
# -----------------------------------------------------------------------------
# Profiles
#
# You can extend section / key with a profile
# For example, you want to deploy a demo version of your application without
# HD content. You could first change the title to add "(demo)" in the name
# and extend the excluded directories to remove the HD content.
#
#[app@demo]
#title = My Application (demo)
#
#[app:source.exclude_patterns@demo]
#images/hd/*
#
# Then, invoke the command line with the "demo" profile:
#
#buildozer --profile demo android debug

View File

@ -1,14 +0,0 @@
#:import utils kivy.utils
BoxLayout:
orientation: 'horizontal'
HexMap:
id: map
coords_display: coords
size_hint: .8, 1
MapLabel:
id: coords
size_hint: .2, 1
<MapLabel@Label>:
text: 'Change me'

View File

@ -1,73 +0,0 @@
from kivy.app import App
from kivy.graphics import *
from kivy.properties import ObjectProperty
from kivy.uix.widget import Widget
from kivy.utils import get_color_from_hex
HEX_SIZE = 100
HORIZONTAL_BUFFER = 0.9
VERTICAL_BUFFER = 0.8
class HexMap(Widget):
# TODO: Incorporate design into main application.
coords_display = ObjectProperty(None)
def __init__(self, **kwargs):
super(HexMap, self).__init__(**kwargs)
self.redraw_scene()
# It is crucial to redraw the scene whenever the scene or position changes.
self.bind(size=self.redraw_scene, pos=self.redraw_scene)
self.updates = 0
self.on_touch_down = self.update_coords
def redraw_scene(self, *args):
with self.canvas:
# Clear scene
Color(*get_color_from_hex("#000000ff"))
Rectangle(
pos=(0, 0),
size=(self.width, self.height)
)
# Draw a hexagon in a decent spot.
tiles_in_even_row = int(self.width / (HEX_SIZE * HORIZONTAL_BUFFER))
tiles_in_odd_row = int((self.width - HEX_SIZE / 2) / (HEX_SIZE * HORIZONTAL_BUFFER))
tiles_in_col = int(self.height / (HEX_SIZE * VERTICAL_BUFFER))
for y in range(tiles_in_col):
even_row = y % 2 == 0
hex_color = "#0000dd55" if even_row else "#dd000055"
tiles_in_row = tiles_in_even_row if even_row else tiles_in_odd_row
y_position = y * HEX_SIZE * VERTICAL_BUFFER
for x in range(tiles_in_row):
Color(*get_color_from_hex(hex_color))
x_position = x * HEX_SIZE * HORIZONTAL_BUFFER
if not even_row:
x_position += 0.5 * HEX_SIZE * HORIZONTAL_BUFFER
Ellipse(
pos=(x_position, y_position),
segments=6,
size=(HEX_SIZE, HEX_SIZE),
)
def update_coords(self, touch_event):
self.coords_display.text = "Touched at {}".format(touch_event.spos)
# TODO: Add in finding of hexes by what position found at touch event.
# TODO: May need a buffer around "untouchable" regions"
return True
class HexMapApp(App):
pass
if __name__ == '__main__':
HexMapApp().run()

View File

@ -9,7 +9,6 @@
map_cols: 5
BoxLayout:
orientation: 'horizontal'
# FloatLayout:
BoxLayout:
id: _main_map
game: _game