projects
/
koperkapel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minor clean-ups.
[koperkapel.git]
/
koperkapel
/
scenes
/
base.py
diff --git
a/koperkapel/scenes/base.py
b/koperkapel/scenes/base.py
index fd53f817b9cc6b3fade5a0b617f42a90e1f1e84f..ade4d8bfddede638919ab9eb884423d38a9e55c6 100644
(file)
--- a/
koperkapel/scenes/base.py
+++ b/
koperkapel/scenes/base.py
@@
-44,9
+44,13
@@
class Engine:
self._viewport = (self._viewport[0] + offset[0],
self._viewport[1] + offset[1])
self._viewport = (self._viewport[0] + offset[0],
self._viewport[1] + offset[1])
+ def calc_offset(self, x, y):
+ """Return a position offset by the viewport"""
+ return x - self._viewport[0], y - self._viewport[1]
+
@apply_events
def update(self, dt):
@apply_events
def update(self, dt):
- return self._scene.update(self._world.proxy(), dt)
+ return self._scene.update(self._world.proxy(),
self,
dt)
def draw(self):
self._scene.draw(self._app.screen, self._viewport)
def draw(self):
self._scene.draw(self._app.screen, self._viewport)
@@
-116,10
+120,22
@@
class Layer:
self.name = name
self.actors = []
self.name = name
self.actors = []
+ def __iter__(self):
+ return iter(self.actors)
+
+ def __getitem__(self, i):
+ return self.actors[i]
+
+ def __len__(self):
+ return len(self.actors)
+
def add(self, actor):
self.actors.append(actor)
return actor
def add(self, actor):
self.actors.append(actor)
return actor
+ def clear(self):
+ self.actors.clear()
+
def remove(self, actor):
self.actors.remove(actor)
return actor
def remove(self, actor):
self.actors.remove(actor)
return actor
@@
-154,7
+170,7
@@
class Actors:
def draw(self, screen):
for lvl, name in self._ordered_layers:
def draw(self, screen):
for lvl, name in self._ordered_layers:
- for actor in self._layers[name]
.actors
:
+ for actor in self._layers[name]:
actor.draw() # TODO: allow an option screen to be passed in
actor.draw() # TODO: allow an option screen to be passed in
@@
-170,7
+186,7
@@
class Scene:
def exit(self, world):
pass
def exit(self, world):
pass
- def update(self, world, dt):
+ def update(self, world,
engine,
dt):
pass
def draw(self, screen, viewport):
pass
def draw(self, screen, viewport):