mirror of
https://github.com/zoriya/Bomberman.git
synced 2026-06-06 19:22:20 +00:00
merging from develpo
This commit is contained in:
@@ -6,8 +6,9 @@
|
||||
|
||||
namespace BBM
|
||||
{
|
||||
CameraComponent::CameraComponent(WAL::Entity &entity)
|
||||
: Component(entity)
|
||||
CameraComponent::CameraComponent(WAL::Entity &entity, Vector3f target)
|
||||
: Component(entity),
|
||||
target(target)
|
||||
{}
|
||||
|
||||
WAL::Component *BBM::CameraComponent::clone(WAL::Entity &entity) const
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <Component/Component.hpp>
|
||||
#include <Models/Vector3.hpp>
|
||||
|
||||
namespace BBM
|
||||
{
|
||||
@@ -13,11 +14,14 @@ namespace BBM
|
||||
class CameraComponent : public WAL::Component
|
||||
{
|
||||
public:
|
||||
//! @brief The camera's target, the cam will look at this position.
|
||||
Vector3f target;
|
||||
|
||||
//! @inherit
|
||||
Component *clone(WAL::Entity &entity) const override;
|
||||
|
||||
//! @brief Ctor
|
||||
explicit CameraComponent(WAL::Entity &);
|
||||
explicit CameraComponent(WAL::Entity &, Vector3f target = Vector3f());
|
||||
//! @brief A camera component is copy constructable.
|
||||
CameraComponent(const CameraComponent &) = default;
|
||||
//! @brief Default destructor.
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include <Models/TypeHolder.hpp>
|
||||
#include "Component/Component.hpp"
|
||||
#include "Drawables/ADrawable3D.hpp"
|
||||
#include "Drawables/ADrawable2D.hpp"
|
||||
#include "Model/Model.hpp"
|
||||
|
||||
namespace BBM
|
||||
|
||||
Reference in New Issue
Block a user