From 489416a5eb974c09423d87f8908a2e58b7616f7d Mon Sep 17 00:00:00 2001
From: Dominic Masters <dominic@domsplace.com>
Date: Sat, 12 Nov 2022 01:38:52 -0800
Subject: [PATCH] Couple of assertions

---
 src/dawn/scene/Scene.cpp              | 1 +
 src/dawn/scene/SceneItem.hpp          | 1 +
 src/dawn/scene/SceneItemComponent.cpp | 1 +
 src/dawn/ui/UIComponent.cpp           | 3 ++-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/dawn/scene/Scene.cpp b/src/dawn/scene/Scene.cpp
index 0d39082e..cce1fd30 100644
--- a/src/dawn/scene/Scene.cpp
+++ b/src/dawn/scene/Scene.cpp
@@ -35,6 +35,7 @@ void Scene::update() {
 SceneItem * Scene::createSceneItem() {
   sceneitemid_t id = this->nextId++;
   auto item = new SceneItem(this, id);
+  assertNotNull(item);
   this->itemsNotInitialized[id] = item;
   return item;
 }
diff --git a/src/dawn/scene/SceneItem.hpp b/src/dawn/scene/SceneItem.hpp
index 11c7e631..3d817f23 100644
--- a/src/dawn/scene/SceneItem.hpp
+++ b/src/dawn/scene/SceneItem.hpp
@@ -50,6 +50,7 @@ namespace Dawn {
       template<class T>
       T * addComponent() {
         auto component = new T(this);
+        assertNotNull(component);
         this->components.push_back(component);
         return component;
       }
diff --git a/src/dawn/scene/SceneItemComponent.cpp b/src/dawn/scene/SceneItemComponent.cpp
index eda2f7d7..48af765b 100644
--- a/src/dawn/scene/SceneItemComponent.cpp
+++ b/src/dawn/scene/SceneItemComponent.cpp
@@ -11,6 +11,7 @@
 using namespace Dawn;
 
 SceneItemComponent::SceneItemComponent(SceneItem *item) {
+  assertNotNull(item);
   this->item = item;
   this->transform = &item->transform;
 }
diff --git a/src/dawn/ui/UIComponent.cpp b/src/dawn/ui/UIComponent.cpp
index 444ba90b..4ef1583d 100644
--- a/src/dawn/ui/UIComponent.cpp
+++ b/src/dawn/ui/UIComponent.cpp
@@ -8,6 +8,7 @@
 using namespace Dawn;
 
 UIComponent::UIComponent(UICanvas *canvas) {
+  assertNotNull(canvas);
   this->canvas = canvas;
 }
 
@@ -141,7 +142,7 @@ void UIComponent::addChild(UIComponent *child) {
 }
 
 void UIComponent::removeChild(UIComponent *child) {
-  if(child->parent != this) throw "Invalid child";
+  assertTrue(child->parent != this);
   auto it = this->children.begin();
   while(it != this->children.end()) {
     if(*it == child) {