RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-04 14:33:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed bs_meta to ba_meta

Browse Source
This commit is contained in:
Eric Froemling 2020-03-20 16:18:32 -07:00
parent 4ef4bc60cb
commit 823fc6b8a2
21 changed files with 57 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/dictionaries/ericf.xml generated
View File

@ -34,6 +34,7 @@
<w>activitytypes</w> <w>activitytypes</w>
<w>activityutils</w> <w>activityutils</w>
<w>actorclass</w> <w>actorclass</w>
<w>adbcfaca</w>
<w>adbpath</w> <w>adbpath</w>
<w>addgame</w> <w>addgame</w>
<w>addr</w> <w>addr</w>
@ -791,6 +792,7 @@
<w>icns</w> <w>icns</w>
<w>iconpicker</w> <w>iconpicker</w>
<w>iconscale</w> <w>iconscale</w>
<w>ident</w>
<w>idevices</w> <w>idevices</w>
<w>ifeq</w> <w>ifeq</w>
<w>ifneq</w> <w>ifneq</w>

7
assets/src/ba_data/python/ba/_assetmanager.py
View File

@ -24,6 +24,7 @@ from __future__ import annotations
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from pathlib import Path from pathlib import Path
import threading
import urllib.request import urllib.request
import logging import logging
import weakref import weakref
@ -56,6 +57,7 @@ class AssetManager:
def __init__(self, rootdir: Path) -> None: def __init__(self, rootdir: Path) -> None:
print('AssetManager()') print('AssetManager()')
assert isinstance(rootdir, Path) assert isinstance(rootdir, Path)
self.thread_ident = threading.get_ident()
self._rootdir = rootdir self._rootdir = rootdir
self._started = False self._started = False
if not self._rootdir.is_dir(): if not self._rootdir.is_dir():
@ -139,6 +141,7 @@ class AssetGather:
"""Wrangles a gather of assets.""" """Wrangles a gather of assets."""
def __init__(self, manager: AssetManager) -> None: def __init__(self, manager: AssetManager) -> None:
assert threading.get_ident() == manager.thread_ident
self._manager = weakref.ref(manager) self._manager = weakref.ref(manager)
self._valid = True self._valid = True
print('AssetGather()') print('AssetGather()')
@ -168,7 +171,6 @@ def fetch_url(url: str, filename: Path, asset_gather: AssetGather) -> None:
# pylint: disable=too-many-locals # pylint: disable=too-many-locals
import socket import socket
import threading
# We don't want to keep the provided AssetGather alive, but we want # We don't want to keep the provided AssetGather alive, but we want
# to abort if it dies. # to abort if it dies.
@ -186,7 +188,7 @@ def fetch_url(url: str, filename: Path, asset_gather: AssetGather) -> None:
print('dir', type(req.fp), dir(req.fp)) print('dir', type(req.fp), dir(req.fp))
print('WOULD DO IT', flush=True) print('WOULD DO IT', flush=True)
# req.close() # req.close()
req.fp.close() # req.fp.close()
threading.Thread(target=doit).run() threading.Thread(target=doit).run()
@ -228,3 +230,4 @@ def fetch_url(url: str, filename: Path, asset_gather: AssetGather) -> None:
status = f'{file_size_dl:20,} Bytes [{percent:.2%}] received' status = f'{file_size_dl:20,} Bytes [{percent:.2%}] received'
sys.stdout.write('\r' + status) sys.stdout.write('\r' + status)
sys.stdout.flush() sys.stdout.flush()
print('done with', req.fp)

24
assets/src/ba_data/python/ba/_meta.py
View File

@ -175,7 +175,7 @@ class DirectoryScan:
flines = infile.readlines() flines = infile.readlines()
meta_lines = { meta_lines = {
lnum: l[1:].split() lnum: l[1:].split()
for lnum, l in enumerate(flines) if 'bs_meta' in l for lnum, l in enumerate(flines) if 'ba_meta' in l
} }
toplevel = len(subpath.parts) <= 1 toplevel = len(subpath.parts) <= 1
required_api = self.get_api_requirement(subpath, meta_lines, toplevel) required_api = self.get_api_requirement(subpath, meta_lines, toplevel)
@ -213,25 +213,25 @@ class DirectoryScan:
def _process_module_meta_tags(self, subpath: pathlib.Path, def _process_module_meta_tags(self, subpath: pathlib.Path,
flines: List[str], flines: List[str],
meta_lines: Dict[int, List[str]]) -> None: meta_lines: Dict[int, List[str]]) -> None:
"""Pull data from a module based on its bs_meta tags.""" """Pull data from a module based on its ba_meta tags."""
for lindex, mline in meta_lines.items(): for lindex, mline in meta_lines.items():
# meta_lines is just anything containing 'bs_meta'; make sure # meta_lines is just anything containing 'ba_meta'; make sure
# the bs_meta is in the right place. # the ba_meta is in the right place.
if mline[0] != 'bs_meta': if mline[0] != 'ba_meta':
self.results['warnings'] += ( self.results['warnings'] += (
'Warning: ' + str(subpath) + 'Warning: ' + str(subpath) +
': malformed bs_meta statement on line ' + ': malformed ba_meta statement on line ' +
str(lindex + 1) + '.\n') str(lindex + 1) + '.\n')
elif (len(mline) == 4 and mline[1] == 'require' elif (len(mline) == 4 and mline[1] == 'require'
and mline[2] == 'api'): and mline[2] == 'api'):
# Ignore 'require api X' lines in this pass. # Ignore 'require api X' lines in this pass.
pass pass
elif len(mline) != 3 or mline[1] != 'export': elif len(mline) != 3 or mline[1] != 'export':
# Currently we only support 'bs_meta export FOO'; # Currently we only support 'ba_meta export FOO';
# complain for anything else we see. # complain for anything else we see.
self.results['warnings'] += ( self.results['warnings'] += (
'Warning: ' + str(subpath) + 'Warning: ' + str(subpath) +
': unrecognized bs_meta statement on line ' + ': unrecognized ba_meta statement on line ' +
str(lindex + 1) + '.\n') str(lindex + 1) + '.\n')
else: else:
# Looks like we've got a valid export line! # Looks like we've got a valid export line!
@ -273,7 +273,7 @@ class DirectoryScan:
if classname is None: if classname is None:
self.results['warnings'] += ( self.results['warnings'] += (
'Warning: ' + str(subpath) + ': class definition not found' 'Warning: ' + str(subpath) + ': class definition not found'
' below "bs_meta export" statement on line ' + ' below "ba_meta export" statement on line ' +
str(lindexorig + 1) + '.\n') str(lindexorig + 1) + '.\n')
return classname return classname
@ -285,7 +285,7 @@ class DirectoryScan:
Malformed api requirement strings will be logged as warnings. Malformed api requirement strings will be logged as warnings.
""" """
lines = [ lines = [
l for l in meta_lines.values() if len(l) == 4 and l[0] == 'bs_meta' l for l in meta_lines.values() if len(l) == 4 and l[0] == 'ba_meta'
and l[1] == 'require' and l[2] == 'api' and l[3].isdigit() and l[1] == 'require' and l[2] == 'api' and l[3].isdigit()
] ]
@ -297,14 +297,14 @@ class DirectoryScan:
if len(lines) > 1: if len(lines) > 1:
self.results['warnings'] += ( self.results['warnings'] += (
'Warning: ' + str(subpath) + 'Warning: ' + str(subpath) +
': multiple "# bs_meta api require <NUM>" lines found;' ': multiple "# ba_meta api require <NUM>" lines found;'
' ignoring module.\n') ' ignoring module.\n')
elif not lines and toplevel and meta_lines: elif not lines and toplevel and meta_lines:
# If we're a top-level module containing meta lines but # If we're a top-level module containing meta lines but
# no valid api require, complain. # no valid api require, complain.
self.results['warnings'] += ( self.results['warnings'] += (
'Warning: ' + str(subpath) + 'Warning: ' + str(subpath) +
': no valid "# bs_meta api require <NUM>" line found;' ': no valid "# ba_meta api require <NUM>" line found;'
' ignoring module.\n') ' ignoring module.\n')
return None return None

2
assets/src/ba_data/python/bastd/__init__.py
View File

@ -20,4 +20,4 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""BallisticaCore standard library: games, UI, etc.""" """BallisticaCore standard library: games, UI, etc."""
# bs_meta require api 6 # ba_meta require api 6

4
assets/src/ba_data/python/bastd/game/assault.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Defines assault minigame.""" """Defines assault minigame."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -35,7 +35,7 @@ if TYPE_CHECKING:
from typing import Any, Type, List, Dict, Tuple, Sequence, Union from typing import Any, Type, List, Dict, Tuple, Sequence, Union
# bs_meta export game # ba_meta export game
class AssaultGame(ba.TeamGameActivity): class AssaultGame(ba.TeamGameActivity):
"""Game where you score by touching the other team's flag.""" """Game where you score by touching the other team's flag."""

4
assets/src/ba_data/python/bastd/game/capturetheflag.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Defines a capture-the-flag game.""" """Defines a capture-the-flag game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -68,7 +68,7 @@ class CTFFlag(stdflag.Flag):
return self._team return self._team
# bs_meta export game # ba_meta export game
class CaptureTheFlagGame(ba.TeamGameActivity): class CaptureTheFlagGame(ba.TeamGameActivity):
"""Game of stealing other team's flag and returning it to your base.""" """Game of stealing other team's flag and returning it to your base."""

4
assets/src/ba_data/python/bastd/game/chosenone.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Provides the chosen-one mini-game.""" """Provides the chosen-one mini-game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -36,7 +36,7 @@ if TYPE_CHECKING:
Union) Union)
# bs_meta export game # ba_meta export game
class ChosenOneGame(ba.TeamGameActivity): class ChosenOneGame(ba.TeamGameActivity):
""" """
Game involving trying to remain the one 'chosen one' Game involving trying to remain the one 'chosen one'

4
assets/src/ba_data/python/bastd/game/conquest.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Provides the Conquest game.""" """Provides the Conquest game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -56,7 +56,7 @@ class ConquestFlag(Flag):
return self._team return self._team
# bs_meta export game # ba_meta export game
class ConquestGame(ba.TeamGameActivity): class ConquestGame(ba.TeamGameActivity):
"""A game where teams try to claim all flags on the map.""" """A game where teams try to claim all flags on the map."""

4
assets/src/ba_data/python/bastd/game/deathmatch.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""DeathMatch game and support classes.""" """DeathMatch game and support classes."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -34,7 +34,7 @@ if TYPE_CHECKING:
from typing import Any, Type, List, Dict, Tuple, Union, Sequence from typing import Any, Type, List, Dict, Tuple, Union, Sequence
# bs_meta export game # ba_meta export game
class DeathMatchGame(ba.TeamGameActivity): class DeathMatchGame(ba.TeamGameActivity):
"""A game type based on acquiring kills.""" """A game type based on acquiring kills."""

4
assets/src/ba_data/python/bastd/game/easteregghunt.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Provides an easter egg hunt game.""" """Provides an easter egg hunt game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -38,7 +38,7 @@ if TYPE_CHECKING:
from typing import Any, Type, Dict, List, Tuple, Optional from typing import Any, Type, Dict, List, Tuple, Optional
# bs_meta export game # ba_meta export game
class EasterEggHuntGame(ba.TeamGameActivity): class EasterEggHuntGame(ba.TeamGameActivity):
"""A game where score is based on collecting eggs""" """A game where score is based on collecting eggs"""

4
assets/src/ba_data/python/bastd/game/elimination.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Elimination mini-game.""" """Elimination mini-game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -163,7 +163,7 @@ class Icon(ba.Actor):
ba.timer(0.6, self.update_for_lives) ba.timer(0.6, self.update_for_lives)
# bs_meta export game # ba_meta export game
class EliminationGame(ba.TeamGameActivity): class EliminationGame(ba.TeamGameActivity):
"""Game type where last player(s) left alive win.""" """Game type where last player(s) left alive win."""

4
assets/src/ba_data/python/bastd/game/football.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Implements football games (both co-op and teams varieties).""" """Implements football games (both co-op and teams varieties)."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -65,7 +65,7 @@ class FootballFlag(stdflag.Flag):
self.node.connectattr('position', self.light, 'position') self.node.connectattr('position', self.light, 'position')
# bs_meta export game # ba_meta export game
class FootballTeamGame(ba.TeamGameActivity): class FootballTeamGame(ba.TeamGameActivity):
"""Football game for teams mode.""" """Football game for teams mode."""

4
assets/src/ba_data/python/bastd/game/hockey.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Hockey game and support classes.""" """Hockey game and support classes."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -105,7 +105,7 @@ class Puck(ba.Actor):
super().handlemessage(msg) super().handlemessage(msg)
# bs_meta export game # ba_meta export game
class HockeyGame(ba.TeamGameActivity): class HockeyGame(ba.TeamGameActivity):
"""Ice hockey game.""" """Ice hockey game."""

4
assets/src/ba_data/python/bastd/game/keepaway.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Defines a keep-away game type.""" """Defines a keep-away game type."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -36,7 +36,7 @@ if TYPE_CHECKING:
Union) Union)
# bs_meta export game # ba_meta export game
class KeepAwayGame(ba.TeamGameActivity): class KeepAwayGame(ba.TeamGameActivity):
"""Game where you try to keep the flag away from your enemies.""" """Game where you try to keep the flag away from your enemies."""

4
assets/src/ba_data/python/bastd/game/kingofthehill.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Defines the King of the Hill game.""" """Defines the King of the Hill game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -38,7 +38,7 @@ if TYPE_CHECKING:
Union) Union)
# bs_meta export game # ba_meta export game
class KingOfTheHillGame(ba.TeamGameActivity): class KingOfTheHillGame(ba.TeamGameActivity):
"""Game where a team wins by holding a 'hill' for a set amount of time.""" """Game where a team wins by holding a 'hill' for a set amount of time."""

4
assets/src/ba_data/python/bastd/game/meteorshower.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Defines a bomb-dodging mini-game.""" """Defines a bomb-dodging mini-game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -37,7 +37,7 @@ if TYPE_CHECKING:
from bastd.actor.onscreentimer import OnScreenTimer from bastd.actor.onscreentimer import OnScreenTimer
# bs_meta export game # ba_meta export game
class MeteorShowerGame(ba.TeamGameActivity): class MeteorShowerGame(ba.TeamGameActivity):
"""Minigame involving dodging falling bombs.""" """Minigame involving dodging falling bombs."""

4
assets/src/ba_data/python/bastd/game/ninjafight.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Provides Ninja Fight mini-game.""" """Provides Ninja Fight mini-game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -37,7 +37,7 @@ if TYPE_CHECKING:
from typing import Any, Type, Dict, List, Optional from typing import Any, Type, Dict, List, Optional
# bs_meta export game # ba_meta export game
class NinjaFightGame(ba.TeamGameActivity): class NinjaFightGame(ba.TeamGameActivity):
""" """
A co-op game where you try to defeat a group A co-op game where you try to defeat a group

4
assets/src/ba_data/python/bastd/game/race.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Defines Race mini-game.""" """Defines Race mini-game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -58,7 +58,7 @@ class RaceRegion(ba.Actor):
}) })
# bs_meta export game # ba_meta export game
class RaceGame(ba.TeamGameActivity): class RaceGame(ba.TeamGameActivity):
"""Game of racing around a track.""" """Game of racing around a track."""

4
assets/src/ba_data/python/bastd/game/targetpractice.py
View File

@ -20,7 +20,7 @@
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
"""Implements Target Practice game.""" """Implements Target Practice game."""
# bs_meta require api 6 # ba_meta require api 6
# (see bombsquadgame.com/apichanges) # (see bombsquadgame.com/apichanges)
from __future__ import annotations from __future__ import annotations
@ -37,7 +37,7 @@ if TYPE_CHECKING:
from bastd.actor.bomb import Bomb, Blast from bastd.actor.bomb import Bomb, Blast
# bs_meta export game # ba_meta export game
class TargetPracticeGame(ba.TeamGameActivity): class TargetPracticeGame(ba.TeamGameActivity):
"""Game where players try to hit targets with bombs.""" """Game where players try to hit targets with bombs."""

4
docs/ba_module.md
View File

@ -1,6 +1,6 @@
<!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND --> <!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
<!--DOCSHASH=266725d2f42aff8a96924a30416d8926--> <!--DOCSHASH=c798f5512eafca1a6a4e19f5fe5ae860-->
<h4><em>last updated on 2020-03-12 for Ballistica version 1.5.0 build 20001</em></h4> <h4><em>last updated on 2020-03-20 for Ballistica version 1.5.0 build 20001</em></h4>
<p>This page documents the Python classes and functions in the 'ba' module, <p>This page documents the Python classes and functions in the 'ba' module,
which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p> which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p>
<hr> <hr>

18
tools/efrotools/pybuild.py
View File

@ -223,19 +223,11 @@ def build_android(rootdir: str, arch: str, debug: bool = False) -> None:
os.environ['PATH'] += (':' + appathout) os.environ['PATH'] += (':' + appathout)
print(f'ADDED "{appathout}" TO SYS PATH...') print(f'ADDED "{appathout}" TO SYS PATH...')
# Commit from Dec 6th, 2018. Looks like right after this one the repo # Commit from Jan 8, 2020. Right after this, the build system was switched
# switched to ndk r19 beta 2 and now seems to require r19, so we can # a a completely new minimal one which will take some work to update here.
# try switching back to master one r19 comes down the pipe. # Punting on that for now...
# noinspection PyUnreachableCode if True: # pylint: disable=using-constant-test
if False: # pylint: disable=using-constant-test efrotools.run('git checkout 9adbcfaca37f40b7a86381f83f0f6af4187233ae')
efrotools.run('git checkout eb587c52db349fecfc4666c6bf7e077352513035')
# Commit from ~March 14 2019. Looks like right after this the project
# switched to compiling python as a shared library which would be a pretty
# big change.
# noinspection PyUnreachableCode
if False: # pylint: disable=using-constant-test
efrotools.run('git checkout b3024bf350fd5134542ee974a9a28921a687a8a0')
ftxt = efrotools.readfile('pybuild/env.py') ftxt = efrotools.readfile('pybuild/env.py')
# Set the packages we build. # Set the packages we build.