Shaders improved

src/dawn/display/shader/ShaderManager.cpp

@@ -13,9 +13,4 @@ ShaderManager::ShaderManager() {
 }
 
 ShaderManager::~ShaderManager() {
-  auto it = this->shaders.begin();
-  while(it != this->shaders.end()) {
-    delete it->second;
-    ++it;
-  }
 }

src/dawn/display/shader/ShaderManager.hpp

@@ -14,7 +14,7 @@ namespace Dawn {
     private:
       int32_t nextId;
       shaderlock_t nextLock;
-      std::map<shaderid_t, Shader*> shaders;
+      std::map<shaderid_t, std::shared_ptr<Shader>> shaders;
       std::map<shaderlock_t, shaderid_t> shaderLocks;
       std::map<shaderid_t, std::vector<shaderlock_t>> shaderLocksByShader;
 
@@ -28,7 +28,7 @@ namespace Dawn {
       shaderid_t getShaderId() {
         auto it = shaders.begin();
         while(it != shaders.end()) {
-          auto asT = dynamic_cast<T*>(it->second);
+          auto asT = std::dynamic_pointer_cast<T>(it->second);
           if(asT != nullptr) return asT->shaderId;
           ++it;
         }
@@ -52,7 +52,7 @@ namespace Dawn {
       shaderlock_t lockShader() {
         auto shaderId = this->getShaderId<T>();
         if(shaderId == -1) {
-          T* shader = new T();
+          auto shader = std::make_shared<T>();
           shader->compile();
           shader->shaderId = this->nextId++;
           this->shaders[shader->shaderId] = shader;
@@ -72,9 +72,9 @@ namespace Dawn {
        * @return The shader for the given lock.
        */
       template<class T>
-      T * getShader(shaderlock_t lock) {
+      std::shared_ptr<T> getShader(shaderlock_t lock) {
         auto shaderId = this->shaderLocks[lock];
-        return (T*)this->shaders[shaderId];
+        return std::static_pointer_cast<T>(this->shaders[shaderId]);
       }
 
       /**
@@ -94,8 +94,6 @@ namespace Dawn {
 
         if(locks.size() == 0) {
           this->shaderLocksByShader.erase(shaderId);
-          auto shader = (T*)this->shaders[shaderId];
-          delete shader;
           this->shaders.erase(shaderId);
         }
       }

src/dawn/display/shader/ShaderPass.hpp

@@ -11,7 +11,7 @@ namespace Dawn {
   struct ShaderPassItem;
 
   struct ShaderPassItem {
-    Shader *shader = nullptr;
+    std::shared_ptr<Shader> shader;
     int32_t priority = 0;
     std::vector<struct ShaderPassItem>::iterator index;