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

Operational implementation of UV texture coordinates changes in

Browse Source 
Appearance View.
This commit is contained in:
brunoherbelin
2020-11-16 21:43:39 +01:00
parent 8c9b753544
commit 1ab2ae0df0
19 changed files with 214 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Shader.cpp
View File

@@ -186,6 +186,7 @@ void Shader::operator = (const Shader &S )
{
color = S.color;
blending = S.blending;
uv = S.uv;
}
void Shader::accept(Visitor& v) {
@@ -205,6 +206,7 @@ void Shader::use()
program_->setUniform("projection", projection);
program_->setUniform("modelview", modelview);
program_->setUniform("color", color);
program_->setUniform("uv", uv);
iResolution = glm::vec3( Rendering::manager().currentAttrib().viewport, 0.f);
program_->setUniform("iResolution", iResolution);
@@ -237,6 +239,7 @@ void Shader::reset()
modelview = glm::identity<glm::mat4>();
iResolution = glm::vec3(1280.f, 720.f, 0.f);
color = glm::vec4(1.f, 1.f, 1.f, 1.f);
uv = glm::vec4(0.0, 0.0, 1.0, 1.0);
}