eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-07 00:10:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

keep iTransform and color when replacing shader

Browse Source
This commit is contained in:
brunoherbelin
2020-11-30 23:16:58 +01:00
parent cc4d9ede97
commit ca51c5348e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Scene.cpp
View File

@@ -196,9 +196,16 @@ void Primitive::accept(Visitor& v)
void Primitive::replaceShader( Shader *newshader )
{
if (newshader) {
if (shader_)
glm::mat4 iTransform = newshader->iTransform;
glm::vec4 color = newshader->color;
if (shader_) {
iTransform = shader_->iTransform;
color = shader_->color;
delete shader_;
}
shader_ = newshader;
shader_->iTransform = iTransform;
shader_->color = color;
}
}

1
Source.cpp
View File

@@ -299,7 +299,6 @@ void Source::setImageProcessingEnabled (bool on)
// this calls replaceShader() on the Primitive and
// will delete the previously attached shader
texturesurface_->replaceShader(renderingshader_);
}
bool Source::imageProcessingEnabled()