Add graphics timeline manager and handle game pause
This commit is contained in:
parent
55b8349e60
commit
cf33d7c172
|
@ -187,4 +187,5 @@ void EditorState::leave()
|
||||||
{
|
{
|
||||||
_group.reset();
|
_group.reset();
|
||||||
_bpm_calculator.reset();
|
_bpm_calculator.reset();
|
||||||
|
_music.reset();
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,7 +9,6 @@ GameState::GameState(const std::shared_ptr<kku::CoreFactory>& core_factory, cons
|
||||||
_game(game),
|
_game(game),
|
||||||
_onLeaveGameCallback(callbacks.onLeaveGame)
|
_onLeaveGameCallback(callbacks.onLeaveGame)
|
||||||
{
|
{
|
||||||
_music = _core_factory->getMusic();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GameState::input(const kku::SystemEvent& event)
|
void GameState::input(const kku::SystemEvent& event)
|
||||||
|
@ -24,10 +23,14 @@ void GameState::input(const kku::SystemEvent& event)
|
||||||
if (view == kku::SystemEvent::Key::Code::Space)
|
if (view == kku::SystemEvent::Key::Code::Space)
|
||||||
_music->isPlaying() ? _music->pause() : _music->play();
|
_music->isPlaying() ? _music->pause() : _music->play();
|
||||||
if (view == kku::SystemEvent::Key::Code::Escape)
|
if (view == kku::SystemEvent::Key::Code::Escape)
|
||||||
|
{
|
||||||
_onLeaveGameCallback();
|
_onLeaveGameCallback();
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_game->input(kku::GameEvent{_music->fetchOffset(), event});
|
if (_music->isPlaying())
|
||||||
|
_game->input(kku::GameEvent{_music->fetchOffset(), event});
|
||||||
}
|
}
|
||||||
|
|
||||||
void GameState::update(const kku::microsec& dt)
|
void GameState::update(const kku::microsec& dt)
|
||||||
|
@ -44,6 +47,7 @@ void GameState::enter()
|
||||||
{
|
{
|
||||||
_game->run();
|
_game->run();
|
||||||
|
|
||||||
|
_music = _core_factory->getMusic();
|
||||||
_music->open("resources/METEOR.flac");
|
_music->open("resources/METEOR.flac");
|
||||||
_music->setVolume(10);
|
_music->setVolume(10);
|
||||||
_music->play();
|
_music->play();
|
||||||
|
@ -51,5 +55,5 @@ void GameState::enter()
|
||||||
|
|
||||||
void GameState::leave()
|
void GameState::leave()
|
||||||
{
|
{
|
||||||
_music->stop();
|
_music.reset();
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
#include "classicmode/classicfactory.h"
|
#include "classicmode/classicfactory.h"
|
||||||
|
|
||||||
#include "graphics/classicscenegraphicsmanager.h"
|
#include "graphics/classicscenegraphicsmanager.h"
|
||||||
|
#include "graphics/classictimelinegraphicsmanager.h"
|
||||||
#include "graphics/classicgraphicsfactory.h"
|
#include "graphics/classicgraphicsfactory.h"
|
||||||
|
|
||||||
#include "core/timeline.h"
|
#include "core/timeline.h"
|
||||||
|
@ -37,6 +38,7 @@ std::unique_ptr<kku::Editor> classic::getEditor(const std::shared_ptr<kku::CoreF
|
||||||
const auto selection_manager = std::make_shared<SelectionManager<ClassicNote>>();
|
const auto selection_manager = std::make_shared<SelectionManager<ClassicNote>>();
|
||||||
std::vector<std::shared_ptr<ClassicGraphicsManager>> graphics_managers;
|
std::vector<std::shared_ptr<ClassicGraphicsManager>> graphics_managers;
|
||||||
graphics_managers.emplace_back(std::make_shared<ClassicSceneGraphicsManager>(timeline, factory, visibility_offset));
|
graphics_managers.emplace_back(std::make_shared<ClassicSceneGraphicsManager>(timeline, factory, visibility_offset));
|
||||||
|
graphics_managers.emplace_back(std::make_shared<ClassicTimelineGraphicsManager>(timeline, factory, visibility_offset * 2));
|
||||||
|
|
||||||
const auto context = std::make_shared<EditorContext>(selection_manager, std::move(graphics_managers));
|
const auto context = std::make_shared<EditorContext>(selection_manager, std::move(graphics_managers));
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ void ClassicFlyingAnimationScenario::launch(const std::shared_ptr<ClassicNoteGra
|
||||||
|
|
||||||
_percentage = ((_time_end - _time_begin) * 0.01);
|
_percentage = ((_time_end - _time_begin) * 0.01);
|
||||||
|
|
||||||
refillColor();
|
_sprite->setTrailColor(_sprite->getColor());
|
||||||
}
|
}
|
||||||
|
|
||||||
float ClassicFlyingAnimationScenario::getPoint(const kku::Point& point, float perc) const
|
float ClassicFlyingAnimationScenario::getPoint(const kku::Point& point, float perc) const
|
||||||
|
@ -35,8 +35,3 @@ bool ClassicFlyingAnimationScenario::isDone() const
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ClassicFlyingAnimationScenario::refillColor() const
|
|
||||||
{
|
|
||||||
_sprite->setTrailColor(_sprite->getColor());
|
|
||||||
}
|
|
||||||
|
|
|
@ -12,7 +12,5 @@ public:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
float getPoint(const kku::Point& position, float perc) const;
|
float getPoint(const kku::Point& position, float perc) const;
|
||||||
void refillColor() const;
|
|
||||||
|
|
||||||
float _percentage;
|
float _percentage;
|
||||||
};
|
};
|
||||||
|
|
|
@ -0,0 +1,165 @@
|
||||||
|
#include "classictimelinegraphicsmanager.h"
|
||||||
|
#include "game/classicarrownote.h"
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
|
ClassicTimelineGraphicsManager::ClassicTimelineGraphicsManager(const std::shared_ptr<kku::Timeline<ClassicNote>>& timeline,
|
||||||
|
const std::shared_ptr<ClassicGraphicsFactory>& factory,
|
||||||
|
const kku::microsec& visibility_offset) :
|
||||||
|
ClassicGraphicsManager(visibility_offset),
|
||||||
|
_sprite_container({Type::UP, Type::DOWN,
|
||||||
|
Type::LEFT, Type::RIGHT},
|
||||||
|
factory),
|
||||||
|
_factory(factory),
|
||||||
|
_timeline(timeline)
|
||||||
|
{
|
||||||
|
_timeline->expire(_first);
|
||||||
|
_timeline->expire(_last);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClassicTimelineGraphicsManager::input(kku::GameEvent&& input)
|
||||||
|
{
|
||||||
|
if (nothingToDraw())
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (auto it = _first; it != _last; ++it)
|
||||||
|
{
|
||||||
|
(*it)->input(std::move(input));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClassicTimelineGraphicsManager::display() const
|
||||||
|
{
|
||||||
|
if (nothingToDraw())
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (auto it = _first; it != _last; ++it)
|
||||||
|
{
|
||||||
|
const auto note = *it;
|
||||||
|
if (note->getState() != ClassicNote::State::DEAD)
|
||||||
|
note->draw(shared_from_this());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClassicTimelineGraphicsManager::update(const kku::microsec &offset)
|
||||||
|
{
|
||||||
|
fetchLastNote(offset);
|
||||||
|
fetchFirstNote(offset);
|
||||||
|
|
||||||
|
updateVisibleNotes(offset);
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClassicTimelineGraphicsManager::update(const kku::microsec& offset, ClassicArrowNote* note)
|
||||||
|
{
|
||||||
|
bool hasGraphics = (note->getElements()[0].sprite != nullptr);
|
||||||
|
|
||||||
|
if (isVisiblyClose(note, offset) && !hasGraphics)
|
||||||
|
{
|
||||||
|
std::cout << note->getId() << ": set graphics!\n" << std::flush;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
std::cout << note->getId() << ": remove graphics!\n" << std::flush;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClassicTimelineGraphicsManager::draw(const std::vector<ArrowElement>& elements) const
|
||||||
|
{
|
||||||
|
for (std::size_t i = 0; i < elements.size(); ++i)
|
||||||
|
{
|
||||||
|
const auto& sprite = elements[i].sprite;
|
||||||
|
|
||||||
|
if (i >= 1)
|
||||||
|
{
|
||||||
|
//const auto& neighbor_sprite = elements[i - 1].sprite;
|
||||||
|
//const auto c1 = neighbor_sprite->trailPosition();
|
||||||
|
//const auto c2 = sprite->trailPosition();
|
||||||
|
//_render_target->draw(makeLine(c1, c2));
|
||||||
|
}
|
||||||
|
|
||||||
|
sprite->display();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ClassicTimelineGraphicsManager::nothingToDraw() const noexcept
|
||||||
|
{
|
||||||
|
return _timeline->isExpired(_first)
|
||||||
|
|| _timeline->isExpired(_last);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool ClassicTimelineGraphicsManager::isVisiblyClose(const ClassicNote * const note, const kku::microsec& music_offset) const noexcept
|
||||||
|
{
|
||||||
|
return (note->getPerfectOffset() - _visibility_offset) <= music_offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClassicTimelineGraphicsManager::fetchFirstNote(const kku::microsec& offset)
|
||||||
|
{
|
||||||
|
if (nothingToDraw())
|
||||||
|
return;
|
||||||
|
|
||||||
|
if (offset < (*_first)->getPerfectOffset())
|
||||||
|
{
|
||||||
|
Iterator note_iterator = _first;
|
||||||
|
while (note_iterator != _timeline->begin() && isVisiblyClose(*note_iterator, offset))
|
||||||
|
{
|
||||||
|
--note_iterator;
|
||||||
|
}
|
||||||
|
|
||||||
|
_first = note_iterator;
|
||||||
|
|
||||||
|
auto note = *_first;
|
||||||
|
const auto state = note->getState();
|
||||||
|
if (state != ClassicNote::State::FLYING
|
||||||
|
&& state != ClassicNote::State::DYING
|
||||||
|
&& state != ClassicNote::State::INITIAL
|
||||||
|
&& offset <= note->getPerfectOffset())
|
||||||
|
{
|
||||||
|
note->setState(ClassicNote::State::INITIAL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Iterator note_iterator = _first;
|
||||||
|
while (note_iterator != _last)
|
||||||
|
{
|
||||||
|
auto note = *note_iterator;
|
||||||
|
if (note->getState() == ClassicNote::State::DEAD)
|
||||||
|
{
|
||||||
|
// note->removeGraphics(this);
|
||||||
|
++_first;
|
||||||
|
}
|
||||||
|
|
||||||
|
++note_iterator;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClassicTimelineGraphicsManager::fetchLastNote(const kku::microsec& offset)
|
||||||
|
{
|
||||||
|
Iterator note_iterator = _timeline->getTopNote();
|
||||||
|
while (!_timeline->isExpired(note_iterator) && isVisiblyClose(*note_iterator, offset))
|
||||||
|
{
|
||||||
|
if (nothingToDraw())
|
||||||
|
_first = note_iterator;
|
||||||
|
|
||||||
|
auto note = *note_iterator;
|
||||||
|
const auto state = note->getState();
|
||||||
|
if (state != ClassicNote::State::FLYING
|
||||||
|
&& state != ClassicNote::State::DYING
|
||||||
|
&& state != ClassicNote::State::INITIAL
|
||||||
|
&& offset <= note->getPerfectOffset())
|
||||||
|
{
|
||||||
|
note->setState(ClassicNote::State::INITIAL);
|
||||||
|
}
|
||||||
|
|
||||||
|
++note_iterator;
|
||||||
|
}
|
||||||
|
|
||||||
|
_last = note_iterator;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ClassicTimelineGraphicsManager::updateVisibleNotes(const kku::microsec& offset)
|
||||||
|
{
|
||||||
|
for (auto it = _first; it != _last; ++it)
|
||||||
|
(*it)->update(offset);
|
||||||
|
}
|
|
@ -0,0 +1,44 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "classicmode/classicnote.h"
|
||||||
|
#include "graphics/classicgraphicsmanager.h"
|
||||||
|
#include "graphics/classicgraphicsfactory.h"
|
||||||
|
#include "core/timeline.h"
|
||||||
|
#include "core/spritecontainer.h"
|
||||||
|
|
||||||
|
#include "game/arrowelement.h"
|
||||||
|
|
||||||
|
#include "graphics/animations/classicflyinganimationscenario.h"
|
||||||
|
#include "graphics/animations/classicdyinganimationscenario.h"
|
||||||
|
|
||||||
|
class ClassicTimelineGraphicsManager : public ClassicGraphicsManager
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
explicit ClassicTimelineGraphicsManager(const std::shared_ptr<kku::Timeline<ClassicNote>>& timeline,
|
||||||
|
const std::shared_ptr<ClassicGraphicsFactory>& factory,
|
||||||
|
const kku::microsec& visibility_offset);
|
||||||
|
|
||||||
|
virtual void input(kku::GameEvent&& input) override;
|
||||||
|
virtual void display() const override;
|
||||||
|
virtual void update(const kku::microsec& offset) override;
|
||||||
|
|
||||||
|
virtual void update(const kku::microsec& offset, ClassicArrowNote* note) override;
|
||||||
|
virtual void draw(const std::vector<ArrowElement>& elements) const override;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
kku::SpriteContainer<Type, ClassicGraphicsFactory, ClassicNoteGraphics> _sprite_container;
|
||||||
|
const std::shared_ptr<const ClassicGraphicsFactory> _factory;
|
||||||
|
|
||||||
|
typedef typename std::set<ClassicNote*>::const_iterator Iterator;
|
||||||
|
|
||||||
|
Iterator _first;
|
||||||
|
Iterator _last;
|
||||||
|
|
||||||
|
const std::shared_ptr<kku::Timeline<ClassicNote>> _timeline;
|
||||||
|
|
||||||
|
inline bool nothingToDraw() const noexcept;
|
||||||
|
inline bool isVisiblyClose(const ClassicNote * const note, const kku::microsec& music_offset) const noexcept;
|
||||||
|
void fetchFirstNote(const kku::microsec& offset);
|
||||||
|
void fetchLastNote(const kku::microsec& offset);
|
||||||
|
void updateVisibleNotes(const kku::microsec& offset);
|
||||||
|
};
|
Loading…
Reference in New Issue