Skip to content

Commit

Permalink
Remove renderer from scene api
Browse files Browse the repository at this point in the history
  • Loading branch information
NeonSky committed Sep 27, 2020
1 parent 7d126ef commit d561fe3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 12 deletions.
9 changes: 2 additions & 7 deletions src/engine/scene/api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,9 @@
using namespace engine;
using namespace engine::scene;

SceneAPI::SceneAPI(const os::InputManager& input_manager, graphics::Renderer& renderer)
: _input_manager(std::ref(input_manager)),
_renderer(std::ref(renderer)) {}
SceneAPI::SceneAPI(const os::InputManager& input_manager)
: _input_manager(std::ref(input_manager)) {}

auto SceneAPI::input_manager() const -> const os::InputManager& {
return _input_manager;
}

auto SceneAPI::renderer() -> graphics::Renderer& {
return _renderer;
}
5 changes: 1 addition & 4 deletions src/engine/scene/api.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,16 @@ namespace engine::scene {
/// @todo Consider making an interface.
/// @todo Consider moving to another directory and changing the name. ScriptAPI?
/// @todo Figure out a better camera solution.
/// @TODO Remove renderer from the api.
class SceneAPI {
public:
SceneAPI(const os::InputManager& input_manager, graphics::Renderer& renderer);
SceneAPI(const os::InputManager& input_manager);

[[nodiscard]] auto input_manager() const -> const os::InputManager&;
[[nodiscard]] auto renderer() -> graphics::Renderer&;

graphics::Camera* camera = nullptr;

private:
std::reference_wrapper<const os::InputManager> _input_manager;
std::reference_wrapper<graphics::Renderer> _renderer;
};

}
2 changes: 1 addition & 1 deletion src/engine/scene/manager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ using namespace engine::scene;
Manager::Manager(const os::InputManager& input_manager,
graphics::Renderer& renderer,
std::vector<std::unique_ptr<IFactory>> scene_factories)
: _api(input_manager, renderer),
: _api(input_manager),
_renderer(renderer) {

for (auto& scene_factory : scene_factories)
Expand Down

0 comments on commit d561fe3

Please sign in to comment.