Ignore:
Timestamp:
Jan 9, 2013, 4:17:54 PM (7 years ago)
Author:
Jnat
Message:

Update EasyMesh.Convert() method.
Now takes an optional shader

Location:
trunk/src/easymesh
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/easymesh/easymesh.cpp

    r2183 r2209  
    6363}
    6464
    65 void EasyMesh::MeshConvert()
    66 {
    67     m_gpu.shader = Shader::Create(lolfx_shiny);
     65void EasyMesh::MeshConvert(Shader* ProvidedShader)
     66{
     67    if(ProvidedShader == NULL)
     68    {
     69        m_gpu.shader = Shader::Create(lolfx_shiny);
     70    }else{
     71        m_gpu.shader = ProvidedShader;
     72    }
    6873
    6974    m_gpu.modelview = m_gpu.shader->GetUniformLocation("in_ModelView");
  • trunk/src/easymesh/easymesh.h

    r2183 r2209  
    3030
    3131    bool Compile(char const *command);
    32     void MeshConvert();
     32    void MeshConvert(Shader* ProvidedShader = NULL);
    3333    void Render(mat4 const &model, float damage = 0.f);
    3434
Note: See TracChangeset for help on using the changeset viewer.