Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-07-17 00:02:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some work on the OpenGL 3 renderer.

Browse Source
This commit is contained in:
spartanj
2011-01-22 14:41:26 -03:00
parent 2cc55ea68a
commit 02e00d7315
26 changed files with 688 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/graphics/cshaderprogram.cpp
View File

@@ -71,7 +71,7 @@ cShaderProgram::cShaderProgram( cPack * Pack, const std::string& VertexShaderPat
}
}
cShaderProgram::cShaderProgram( const Uint8 * VertexShaderData, const Uint32& VertexShaderDataSize, const Uint8 * FragmentShaderData, const Uint32& FragmentShaderDataSize, const std::string& name ) :
cShaderProgram::cShaderProgram( const char * VertexShaderData, const Uint32& VertexShaderDataSize, const char * FragmentShaderData, const Uint32& FragmentShaderDataSize, const std::string& name ) :
mHandler(0),
mId(0)
{
@@ -93,6 +93,28 @@ cShaderProgram::cShaderProgram( const Uint8 * VertexShaderData, const Uint32& Ve
Link();
}
cShaderProgram::cShaderProgram( const char ** VertexShaderData, const Uint32& NumLinesVS, const char ** FragmentShaderData, const Uint32& NumLinesFS, const std::string& name ) :
mHandler(0),
mId(0)
{
AddToManager( name );
Init();
cVertexShader * vs = eeNew( cVertexShader, ( VertexShaderData, NumLinesVS ) );
cFragmentShader * fs = eeNew( cFragmentShader, ( FragmentShaderData, NumLinesFS ) );
if ( !vs->IsValid() || !fs->IsValid() ) {
eeSAFE_DELETE( vs );
eeSAFE_DELETE( fs );
return;
}
AddShader( vs );
AddShader( fs );
Link();
}
cShaderProgram::~cShaderProgram() {
if ( Handler() > 0 )
glDeleteProgram( Handler() );
@@ -183,12 +205,14 @@ bool cShaderProgram::Link() {
void cShaderProgram::Bind() const {
cGlobalBatchRenderer::instance()->Draw();
glUseProgram( Handler() );
GLi->SetShader( const_cast<cShaderProgram*>( this ) );
}
void cShaderProgram::Unbind() const {
cGlobalBatchRenderer::instance()->Draw();
glUseProgram( 0 );
GLi->SetShader( NULL );
}
Int32 cShaderProgram::UniformLocation( const std::string& Name ) {
@@ -256,13 +280,13 @@ bool cShaderProgram::SetUniform( const std::string& Name, Int32 Value ) {
return ( Location >= 0 );
}
bool SetUniformMatrix( const Int32& Id, const eeFloat * Value ) {
bool cShaderProgram::SetUniformMatrix( const Int32& Id, const float * Value ) {
glUniformMatrix4fv( Id, 1, false, Value );
return true;
}
bool cShaderProgram::SetUniformMatrix( const std::string Name, const eeFloat * Value ) {
bool cShaderProgram::SetUniformMatrix( const std::string Name, const float * Value ) {
Int32 Location = UniformLocation( Name );
if ( Location >= 0 )