about to add SDL and probably break everything

This commit is contained in:
2023-01-16 10:01:06 -08:00
parent 18d3b074f9
commit 7585891276
53 changed files with 891 additions and 132 deletions

View File

@ -18,7 +18,7 @@ UICanvas * UICanvas::create(Scene *scene) {
UICanvas::UICanvas(SceneItem *item) : SceneItemComponent(item) {
}
void UICanvas::onRenderTargetResize(RenderTarget *target, float_t w, float_t h){
void UICanvas::onRenderTargetResize(float_t w, float_t h){
auto it = this->children.begin();
while(it != this->children.end()) {
(*it)->updatePositions();
@ -30,7 +30,7 @@ void UICanvas::setCamera(Camera *camera) {
assertTrue(camera != this->camera);
if(this->camera != nullptr) {
this->camera->getRenderTarget()->eventRenderTargetResized.removeListener(
this->camera->eventRenderTargetResized.removeListener(
this, &UICanvas::onRenderTargetResize
);
}
@ -38,7 +38,7 @@ void UICanvas::setCamera(Camera *camera) {
this->camera = camera;
if(this->camera != nullptr) {
this->camera->getRenderTarget()->eventRenderTargetResized.addListener(
this->camera->eventRenderTargetResized.addListener(
this, &UICanvas::onRenderTargetResize
);
}
@ -65,16 +65,16 @@ void UICanvas::onStart() {
}
}
UICanvas::~UICanvas() {
void UICanvas::onDispose() {
if(this->camera != nullptr) {
this->camera->eventRenderTargetResized.removeListener(
this, &UICanvas::onRenderTargetResize
);
}
auto it = this->children.begin();
while(it != this->children.end()) {
delete *it;
++it;
}
if(this->camera != nullptr) {
this->camera->getRenderTarget()->eventRenderTargetResized.removeListener(
this, &UICanvas::onRenderTargetResize
);
}
}

View File

@ -21,7 +21,7 @@ namespace Dawn {
protected:
Camera *camera = nullptr;
void onRenderTargetResize(RenderTarget *target, float_t w, float_t h);
void onRenderTargetResize(float_t w, float_t h);
public:
/**
@ -91,7 +91,6 @@ namespace Dawn {
float_t getHeight();
void onStart() override;
~UICanvas();
void onDispose() override;
};
}