Refactoring of Material parameters in Renderable components.

engine/includes/components/renderable.h

@@ -30,7 +30,7 @@ class ENGINE_EXPORT Renderable : public NativeBehaviour {
     virtual void setMaterial(Material *material);
 
     int32_t materialsCount() const;
-    MaterialInstance *materialInstance(int index) const;
+    virtual MaterialInstance *materialInstance(int index);
 
 protected:
     virtual Mesh *meshToDraw(int instance);

engine/includes/components/spriterender.h

@@ -63,6 +63,8 @@ class ENGINE_EXPORT SpriteRender : public Renderable {
 
     void setMaterial(Material *material) override;
 
+    MaterialInstance *materialInstance(int index) override;
+
 private:
     Mesh *meshToDraw(int instance) override;
 
@@ -94,7 +96,8 @@ class ENGINE_EXPORT SpriteRender : public Renderable {
 
     bool m_useCustom;
 
-    bool m_dirty;
+    bool m_dirtyMesh;
+    bool m_dirtyMaterial;
 
 };
 

engine/includes/components/textrender.h

@@ -21,7 +21,8 @@ class ENGINE_EXPORT TextRender : public Renderable {
         A_PROPERTYEX(Vector4, color, TextRender::color, TextRender::setColor, "editor=Color"),
         A_PROPERTY(bool, wordWrap, TextRender::wordWrap, TextRender::setWordWrap),
         A_PROPERTY(Vector2, size, TextRender::size, TextRender::setSize),
-        A_PROPERTY(bool, kerning, TextRender::kerning, TextRender::setKerning)
+        A_PROPERTY(bool, kerning, TextRender::kerning, TextRender::setKerning),
+        A_PROPERTY(int, layer, TextRender::layer, TextRender::setLayer)
     )
     A_NOMETHODS()
 
@@ -55,7 +56,12 @@ class ENGINE_EXPORT TextRender : public Renderable {
     bool kerning() const;
     void setKerning(const bool kerning);
 
+    int layer() const;
+    void setLayer(int layer);
+
 private:
+    MaterialInstance *materialInstance(int index) override;
+
     Mesh *meshToDraw(int instance) override;
 
     AABBox localBound() const override;
@@ -85,13 +91,17 @@ class ENGINE_EXPORT TextRender : public Renderable {
 
     int m_alignment;
 
+    int m_priority;
+
     float m_fontWeight;
 
     bool m_kerning;
 
     bool m_wrap;
 
-    bool m_dirty;
+    bool m_dirtyMesh;
+
+    bool m_dirtyMaterial;
 
 };
 

engine/includes/resources/material.h

@@ -302,6 +302,8 @@ class ENGINE_EXPORT MaterialInstance {
     void setTransform(Transform *transform);
     void setTransform(const Matrix4 &transform);
 
+    int32_t finalPriority() const;
+
     int32_t priority() const;
     void setPriority(int32_t priority);
 

engine/src/components/renderable.cpp

@@ -36,11 +36,13 @@ Renderable::~Renderable() {
 AABBox Renderable::bound() const {
     AABBox bb = localBound();
     Transform *t = transform();
-    uint32_t hash = t->hash();
-    if(hash != m_transformHash || m_localBox != bb) {
-        m_localBox = bb;
-        m_worldBox = m_localBox * t->worldTransform();
-        m_transformHash = hash;
+    if(t) {
+        uint32_t hash = t->hash();
+        if(hash != m_transformHash || m_localBox != bb) {
+            m_localBox = bb;
+            m_worldBox = m_localBox * t->worldTransform();
+            m_transformHash = hash;
+        }
     }
     return m_worldBox;
 }
@@ -89,7 +91,7 @@ int32_t Renderable::materialsCount() const {
 /*!
     Returns a Material instance with \a index assigned to this Renderable.
 */
-MaterialInstance *Renderable::materialInstance(int index) const {
+MaterialInstance *Renderable::materialInstance(int index) {
     if(m_materials.size() > index) {
         return m_materials[index];
     }

engine/src/components/spriterender.cpp

@@ -1,6 +1,4 @@
 #include "components/spriterender.h"
-#include "components/actor.h"
-#include "components/transform.h"
 
 #include "resources/material.h"
 #include "resources/mesh.h"
@@ -40,9 +38,9 @@ SpriteRender::SpriteRender() :
         m_mesh(PipelineContext::defaultPlane()),
         m_customMesh(Engine::objectCreate<Mesh>()),
         m_drawMode(Simple),
-        m_priority(0),
         m_useCustom(false),
-        m_dirty(true) {
+        m_dirtyMesh(true),
+        m_dirtyMaterial(true) {
 
 }
 
@@ -58,7 +56,7 @@ SpriteRender::~SpriteRender() {
     \internal
 */
 Mesh *SpriteRender::meshToDraw(int instance) {
-    if(m_dirty) {
+    if(m_dirtyMesh) {
         m_useCustom = false;
         if(m_sheet) {
             int hash = Mathf::hashString(m_item);
@@ -80,14 +78,32 @@ Mesh *SpriteRender::meshToDraw(int instance) {
             m_mesh = PipelineContext::defaultPlane();
         }
 
-        m_dirty = false;
+        m_dirtyMesh = false;
     }
 
     return (m_useCustom) ? m_customMesh : m_mesh;
 }
 /*!
     \internal
 */
+MaterialInstance *SpriteRender::materialInstance(int index) {
+    if(m_dirtyMaterial && !m_materials.empty()) {
+        MaterialInstance *inst = m_materials.front();
+        if(inst) {
+            inst->setTexture(gTexture, texture());
+            inst->setVector4(gColor, &m_color);
+            inst->setTransform(transform());
+            inst->setPriority(m_priority);
+
+            m_dirtyMaterial = false;
+        }
+    }
+
+    return Renderable::materialInstance(index);
+}
+/*!
+    \internal
+*/
 AABBox SpriteRender::localBound() const {
     if(m_useCustom) {
         return m_customMesh->bound();
@@ -119,18 +135,15 @@ void SpriteRender::setSprite(Sprite *sheet) {
         if(m_sheet) {
             m_sheet->subscribe(&SpriteRender::spriteUpdated, this);
 
-            m_dirty = true;
-            if(!m_materials.empty() && m_sheet->state() == Resource::Ready) {
-                m_materials[0]->setTexture(gTexture, m_sheet->page());
-            }
+            m_dirtyMesh = m_dirtyMaterial = true;
         }
     }
 }
 /*!
     Returns current assigned texture.
 */
 Texture *SpriteRender::texture() const {
-    if(m_sheet) {
+    if(m_sheet && m_sheet->state() == Resource::Ready) {
         return m_sheet->page();
     }
 
@@ -151,10 +164,7 @@ void SpriteRender::setTexture(Texture *texture) {
             m_texture->incRef();
         }
 
-        m_dirty = true;
-        if(!m_materials.empty()) {
-            m_materials[0]->setTexture(gTexture, m_texture);
-        }
+        m_dirtyMesh = m_dirtyMaterial = true;
     }
 }
 /*!
@@ -169,9 +179,7 @@ Vector4 SpriteRender::color() const {
 void SpriteRender::setColor(const Vector4 &color) {
     m_color = color;
 
-    for(auto it : m_materials) {
-        it->setVector4(gColor, &m_color);
-    }
+    m_dirtyMaterial = true;
 }
 /*!
     Returns the current item name of sprite from the sprite sheet.
@@ -185,7 +193,7 @@ TString SpriteRender::item() const {
 void SpriteRender::setItem(const TString &item) {
     if(m_item != item) {
         m_item = item;
-        m_dirty = true;
+        m_dirtyMesh = true;
     }
 }
 /*!
@@ -214,7 +222,7 @@ int SpriteRender::drawMode() const {
 void SpriteRender::setDrawMode(int mode) {
     if(m_drawMode != mode) {
         m_drawMode = mode;
-        m_dirty = true;
+        m_dirtyMesh = true;
     }
 }
 /*!
@@ -229,33 +237,23 @@ int SpriteRender::layer() const {
 void SpriteRender::setLayer(int layer) {
     m_priority = layer;
 
-    for(auto it : m_materials) {
-        it->setPriority(m_priority);
-    }
+    m_dirtyMaterial = true;
 }
 /*!
     \internal
 */
 void SpriteRender::setMaterial(Material *material) {
     Renderable::setMaterial(material);
 
-    for(auto it : m_materials) {
-        it->setTexture(gTexture, texture());
-        it->setVector4(gColor, &m_color);
-        it->setTransform(transform());
-    }
+    m_dirtyMaterial = true;
 }
 /*!
     \internal
 */
 void SpriteRender::setMaterialsList(const std::list<Material *> &materials) {
     Renderable::setMaterialsList(materials);
 
-    for(auto it : m_materials) {
-        it->setTexture(gTexture, texture());
-        it->setVector4(gColor, &m_color);
-        it->setTransform(transform());
-    }
+    m_dirtyMaterial = true;
 }
 /*!
     \internal
@@ -271,17 +269,11 @@ void SpriteRender::spriteUpdated(int state, void *ptr) {
 
     switch(state) {
     case Resource::Ready: {
-        if(!p->m_materials.empty()) {
-            p->m_materials[0]->setTexture(gTexture, p->m_sheet->page());
-        }
-        p->m_dirty = true;
+        p->m_dirtyMesh = p->m_dirtyMaterial = true;
     } break;
     case Resource::ToBeDeleted: {
         p->m_sheet = nullptr;
-        if(!p->m_materials.empty()) {
-            p->m_materials[0]->setTexture(gTexture, nullptr);
-        }
-        p->m_dirty = true;
+        p->m_dirtyMesh = p->m_dirtyMaterial = true;
     } break;
     default: break;
     }