Fixed all my pointers
This commit is contained in:
@ -9,7 +9,9 @@
|
||||
namespace Dawn {
|
||||
class DummyComponent : public SceneItemComponent {
|
||||
public:
|
||||
DummyComponent(std::weak_ptr<SceneItem> item) : SceneItemComponent(item) {
|
||||
DummyComponent(SceneItem &item) :
|
||||
SceneItemComponent(item)
|
||||
{
|
||||
std::cout << "Dummy Component Initialized" << std::endl;
|
||||
};
|
||||
|
||||
|
@ -9,7 +9,9 @@
|
||||
|
||||
using namespace Dawn;
|
||||
|
||||
Camera::Camera(std::weak_ptr<SceneItem> item) : SceneItemComponent(item) {
|
||||
Camera::Camera(SceneItem &item) :
|
||||
SceneItemComponent(item)
|
||||
{
|
||||
}
|
||||
|
||||
void Camera::updateProjection() {
|
||||
@ -36,17 +38,16 @@ void Camera::updateProjection() {
|
||||
}
|
||||
}
|
||||
|
||||
std::shared_ptr<RenderTarget> Camera::getRenderTarget() {
|
||||
RenderTarget & Camera::getRenderTarget() {
|
||||
if(this->target == nullptr) {
|
||||
return this->getGame()->renderManager.getBackBuffer();
|
||||
return this->getGame().renderManager.getBackBuffer();
|
||||
}
|
||||
|
||||
return this->target;
|
||||
return *this->target;
|
||||
}
|
||||
|
||||
float_t Camera::getAspect() {
|
||||
auto target = this->getRenderTarget();
|
||||
return target->getWidth() / target->getHeight();
|
||||
RenderTarget &target = this->getRenderTarget();
|
||||
return target.getWidth() / target.getHeight();
|
||||
}
|
||||
|
||||
void Camera::start() {
|
||||
|
@ -37,14 +37,14 @@ namespace Dawn {
|
||||
*
|
||||
* @param item SceneItem that this component belongs to.
|
||||
*/
|
||||
Camera(std::weak_ptr<SceneItem> item);
|
||||
Camera(SceneItem &item);
|
||||
|
||||
/**
|
||||
* Updates the projection matrix.
|
||||
*/
|
||||
void updateProjection();
|
||||
|
||||
std::shared_ptr<RenderTarget> getRenderTarget();
|
||||
RenderTarget & getRenderTarget();
|
||||
|
||||
/**
|
||||
* Returs the aspect ratio of the camera.
|
||||
|
@ -7,7 +7,7 @@
|
||||
|
||||
using namespace Dawn;
|
||||
|
||||
MeshRenderer::MeshRenderer(std::weak_ptr<SceneItem> item) :
|
||||
MeshRenderer::MeshRenderer(SceneItem &item) :
|
||||
SceneItemComponent(item)
|
||||
{
|
||||
|
||||
|
@ -12,7 +12,7 @@ namespace Dawn {
|
||||
public:
|
||||
std::shared_ptr<Mesh> mesh = nullptr;
|
||||
|
||||
MeshRenderer(std::weak_ptr<SceneItem> item);
|
||||
MeshRenderer(SceneItem &item);
|
||||
|
||||
void start() override;
|
||||
};
|
||||
|
Reference in New Issue
Block a user