diff options
author | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-12 23:24:05 +0100 |
---|---|---|
committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-12 23:24:05 +0100 |
commit | c35dfbd0bb8a1abfef876bb6dbe20945867a5270 (patch) | |
tree | 895fbe6a09c24c45f09d33da7bf46a2e19e0155c /engine/flatactor.cpp | |
parent | initialization (diff) | |
download | flatland-c35dfbd0bb8a1abfef876bb6dbe20945867a5270.tar.gz flatland-c35dfbd0bb8a1abfef876bb6dbe20945867a5270.zip |
edas
Diffstat (limited to 'engine/flatactor.cpp')
-rw-r--r-- | engine/flatactor.cpp | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/engine/flatactor.cpp b/engine/flatactor.cpp index 7ab0909..e41d5cf 100644 --- a/engine/flatactor.cpp +++ b/engine/flatactor.cpp @@ -1,44 +1,30 @@ #include "flatactor.h" -#include "flattask.h" #include "flatland.h" -FlatActor::FlatActor(FlatCollector *parent, bool evolving) +FlatActor::FlatActor(FlatCollector *parent, FlatBound *bounds) - : FlatCollector(parent), task(0) + : FlatCollector(parent), bounds(bounds) { - setEvolving(evolving); } FlatActor::~FlatActor() { - if (task) - delete task; + } -void FlatActor::evolve_task(void *data) +void FlatActor::setBounds(FlatBound * bounds) { - evolve(*(float*)data); + this->bounds = bounds; } -void FlatActor::evolve(float) {} - -void FlatActor::setEvolving(bool flag) +FlatBound * FlatActor::getBounds() const { - if (isEvolving() != flag) - { - if (flag) - task = new FlatTask<FlatActor>(this, &FlatActor::evolve_task, (void*)&flatland_dt); - else { - - delete task; - task = 0; - } - } + return bounds; } -bool FlatActor::isEvolving() const +void FlatActor::evolve(float dt) { - return task != 0; + } |