adecentat el codi. lo proxim fa falta mirar i pollar events
This commit is contained in:
1 parent
ffc2dee311
commit
1837844b03
7 files changed
+50
-16
No files matched your search
@@ -2,6 +2,8 @@
|
||||
|
||||
#include "director.hpp"
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include "core/rendering/video.hpp"
|
||||
#include "defaults.hpp"
|
||||
#include "game/scenes/scenes.hpp"
|
||||
@@ -18,6 +20,7 @@ Director::Director() {
|
||||
Defaults::Video::ZOOM,
|
||||
Defaults::Video::WIDTH,
|
||||
Defaults::Video::HEIGHT});
|
||||
timer_ = std::make_unique<Timer>();
|
||||
|
||||
// Inicializa el contexto
|
||||
context_.video = video_.get();
|
||||
@@ -35,8 +38,8 @@ Director::~Director() {
|
||||
auto Director::iterate() -> int {
|
||||
while (scene_) {
|
||||
scene_->render();
|
||||
switch (scene_->update()) {
|
||||
case Scenes::CONTINUE:
|
||||
switch (scene_->update(timer_->getDelta())) {
|
||||
case Scenes::ACTION_CONTINUE:
|
||||
break;
|
||||
case Scenes::LOGO:
|
||||
break;
|
||||
@@ -47,7 +50,7 @@ auto Director::iterate() -> int {
|
||||
case Scenes::TEST:
|
||||
scene_ = std::make_unique<Test>(context_);
|
||||
break;
|
||||
case Scenes::QUIT:
|
||||
case Scenes::ACTION_QUIT:
|
||||
scene_.reset();
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <memory>
|
||||
|
||||
#include "core/rendering/video.hpp"
|
||||
#include "core/timer/timer.hpp"
|
||||
#include "game/scenes/scene.hpp"
|
||||
#include "gamecontext.hpp"
|
||||
|
||||
@@ -20,6 +21,7 @@ class Director {
|
||||
|
||||
// Core
|
||||
std::unique_ptr<Video> video_;
|
||||
std::unique_ptr<Timer> timer_;
|
||||
|
||||
// Game
|
||||
std::unique_ptr<Scene> scene_;
|
||||
|
||||
@@ -8,6 +8,6 @@ class Scene {
|
||||
public:
|
||||
virtual ~Scene() = default;
|
||||
|
||||
virtual auto update() -> Scenes = 0;
|
||||
virtual auto update(int delta_ms) -> Scenes = 0;
|
||||
virtual void render() = 0;
|
||||
};
|
||||
@@ -7,6 +7,6 @@ enum class Scenes {
|
||||
LOGO,
|
||||
GAME,
|
||||
TEST,
|
||||
CONTINUE,
|
||||
QUIT
|
||||
ACTION_CONTINUE,
|
||||
ACTION_QUIT
|
||||
};
|
||||
@@ -1,22 +1,22 @@
|
||||
// test.cpp
|
||||
|
||||
#include "test.hpp"
|
||||
#include "core/rendering/video.hpp"
|
||||
#include "game/gamecontext.hpp"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include "core/rendering/video.hpp"
|
||||
#include "game/gamecontext.hpp"
|
||||
|
||||
Test::Test(GameContext& context)
|
||||
: context_(context) {}
|
||||
|
||||
auto Test::update() -> Scenes {
|
||||
static int count = 0;
|
||||
std::cout << count++ << "\n";
|
||||
if (count == 500) { return Scenes::QUIT; }
|
||||
return Scenes::CONTINUE;
|
||||
auto Test::update(int delta_ms) -> Scenes {
|
||||
time_elapsed_ += delta_ms;
|
||||
if (time_elapsed_ >= 5000) { return Scenes::ACTION_QUIT; }
|
||||
return Scenes::ACTION_CONTINUE;
|
||||
}
|
||||
|
||||
void Test::render() {
|
||||
context_.video->clean(0xAA0000);
|
||||
context_.video->clean(time_elapsed_ / 10);
|
||||
context_.video->present();
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,8 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <SDL3/SDL.h>
|
||||
|
||||
#include "scene.hpp"
|
||||
|
||||
struct GameContext;
|
||||
@@ -9,9 +11,11 @@ struct GameContext;
|
||||
class Test final : public Scene {
|
||||
public:
|
||||
explicit Test(GameContext& context);
|
||||
auto update() -> Scenes override;
|
||||
auto update(int delta_ms) -> Scenes override;
|
||||
void render() override;
|
||||
|
||||
private:
|
||||
GameContext& context_;
|
||||
int color_{0};
|
||||
Uint64 time_elapsed_{0};
|
||||
};
|
||||
Reference in new issue
Block a user