Last commit before the massive state refactor.

src/dawn/state/StateOwner.hpp

@@ -59,7 +59,7 @@ namespace Dawn {
        * @param o The old, previous value of the property.
        */
       template<class V>
-      void onStatePropertyUpdated(StateProperty<V> *prop, V n, V o) {
+      void _statePropertyUpdated(StateProperty<V> *prop, V n, V o) {
         this->onStateUpdate();
 
         auto eff = &this->effects[prop];
@@ -69,5 +69,17 @@ namespace Dawn {
           ++itEff;
         }
       }
+
+      /**
+       * Internal method to listen for when a state property is disposed or
+       * destroyed so that it can be completely removed from this state owner.
+       * 
+       * @tparam V Value type.
+       * @param prop Property that was destroyed.
+       */
+      template<class V>
+      void _statePropertyDestroyed(StateProperty<V> *prop) {
+        this->effects.erase((void*)prop);
+      }
   };
 }

src/dawn/state/StateProperty.hpp

@@ -18,7 +18,7 @@ namespace Dawn {
         assertNotNull(this->owner);
         auto old = this->value;
         this->value = val;
-        this->owner->onStatePropertyUpdated(this, val, old);
+        this->owner->_statePropertyUpdated(this, val, old);
       }
 
     public:
@@ -44,6 +44,10 @@ namespace Dawn {
         return this->value;
       }
 
+      ~StateProperty() {
+        this->owner->_statePropertyDestroyed(this);
+      }
+
       friend class StateOwner;
   };
 }