Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions engine/src/components/meshrender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ Mesh *MeshRender::meshToDraw(int instance) {
\internal
*/
MaterialInstance *MeshRender::materialInstance(int index) {
if(m_dirtyMaterial && !m_materials.empty()) {
MaterialInstance *inst = m_materials.front();
if(inst) {
inst->setTransform(transform());

m_dirtyMaterial = false;
if(m_dirtyMaterial) {
for(auto it : m_materials) {
if(it) {
it->setTransform(transform());
}
}
m_dirtyMaterial = false;
}

return Renderable::materialInstance(index);
Expand Down
18 changes: 9 additions & 9 deletions engine/src/components/spriterender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ Mesh *SpriteRender::meshToDraw(int instance) {
\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;
if(m_dirtyMaterial) {
for(auto it : m_materials) {
if(it) {
it->setTexture(gTexture, texture());
it->setVector4(gColor, &m_color);
it->setTransform(transform());
it->setPriority(m_priority);
}
}
m_dirtyMaterial = false;
}

return Renderable::materialInstance(index);
Expand Down
20 changes: 11 additions & 9 deletions engine/src/components/textrender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -211,17 +211,19 @@ void TextRender::setLayer(int layer) {
\internal
*/
MaterialInstance *TextRender::materialInstance(int index) {
if(m_dirtyMaterial && !m_materials.empty()) {
MaterialInstance *inst = m_materials.front();
if(inst) {
if(m_font) {
inst->setTexture(gTexture, m_font->page());
if(m_dirtyMaterial) {
for(auto it : m_materials) {
if(it) {
if(m_font) {
it->setTexture(gTexture, m_font->page());
}
it->setVector4(gColor, &m_color);
it->setFloat(gWeight, &m_fontWeight);
it->setTransform(transform());
it->setPriority(m_priority);
}
inst->setVector4(gColor, &m_color);
inst->setFloat(gWeight, &m_fontWeight);
inst->setTransform(transform());
inst->setPriority(m_priority);
}
m_dirtyMaterial = false;
}
return Renderable::materialInstance(index);
}
Expand Down
Loading