Bläddra i källkod

removed EasyMesh invalid Uniform setup for emscripten correct operating.

undefined
Benjamin ‘Touky’ Huet Sam Hocevar <sam@hocevar.net> 11 år sedan
förälder
incheckning
7de466cac4
1 ändrade filer med 4 tillägg och 3 borttagningar
  1. +4
    -3
      src/easymesh/easymesh.cpp

+ 4
- 3
src/easymesh/easymesh.cpp Visa fil

@@ -121,7 +121,7 @@ DefaultShaderData::DefaultShaderData(uint16_t vert_decl_flags, Shader* shader, b
void DefaultShaderData::SetupDefaultData(bool with_UV)
{
AddUniform("in_ModelView");
AddUniform("in_Inv_ModelView");
//AddUniform("in_Inv_ModelView");
AddUniform("in_View");
AddUniform("in_Inv_View");
AddUniform("in_Proj");
@@ -150,12 +150,13 @@ void DefaultShaderData::SetupShaderDatas(mat4 const &model)
m_shader->SetUniform(*GetUniform("u_Lights"), light_data);

m_shader->SetUniform(*GetUniform("in_ModelView"), modelview);
m_shader->SetUniform(*GetUniform("in_Inv_ModelView"), inverse(modelview));
//m_shader->SetUniform(*GetUniform("in_Inv_ModelView"), inverse(modelview));
m_shader->SetUniform(*GetUniform("in_View"), view);
m_shader->SetUniform(*GetUniform("in_Inv_View"), inverse(view));
m_shader->SetUniform(*GetUniform("in_Proj"), proj);
m_shader->SetUniform(*GetUniform("in_NormalMat"), normalmat);
m_shader->SetUniform(*GetUniform("in_Damage"), 0);
float f = 0.f;
m_shader->SetUniform(*GetUniform("in_Damage"), f);
}

//-----------------------------------------------------------------------------


Laddar…
Avbryt
Spara