Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Use named indices for per pixel light vertex program

Browse source
This commit is contained in:
kaetemi 2013-09-13 21:47:42 +02:00
parent edec14807f
commit 7176cbc0af
1 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
code/nel/src/3d/meshvp_per_pixel_light.cpp
View file

@ -357,9 +357,12 @@ static const char* PPLightingVPCodeTest =
class CVertexProgramPerPixelLight : public CVertexProgramLighted class CVertexProgramPerPixelLight : public CVertexProgramLighted
{ {
public: public:
class CIdx struct CIdx
{ {
/// Position or direction of strongest light
uint StrongestLight;
/// Viewer position
uint ViewerPos;
}; };
CVertexProgramPerPixelLight(uint vp); CVertexProgramPerPixelLight(uint vp);
virtual ~CVertexProgramPerPixelLight() { }; virtual ~CVertexProgramPerPixelLight() { };
@ -436,6 +439,7 @@ CVertexProgramPerPixelLight::CVertexProgramPerPixelLight(uint vp)
source->DisplayName = NLMISC::toString("nelvp/MeshVPPerPixel/%i", vp); source->DisplayName = NLMISC::toString("nelvp/MeshVPPerPixel/%i", vp);
source->Profile = CVertexProgram::nelvp; source->Profile = CVertexProgram::nelvp;
source->setSource(vpCode); source->setSource(vpCode);
source->ParamIndices["modelViewProjection"] = 0;
addSource(source); addSource(source);
} }
@ -448,6 +452,27 @@ CVertexProgramPerPixelLight::CVertexProgramPerPixelLight(uint vp)
void CVertexProgramPerPixelLight::buildInfo() void CVertexProgramPerPixelLight::buildInfo()
{ {
CVertexProgramLighted::buildInfo(); CVertexProgramLighted::buildInfo();
if (profile() == nelvp)
{
m_Idx.StrongestLight = 4;
if (m_FeaturesLighted.SupportSpecular)
{
m_Idx.ViewerPos = 5;
}
else
{
m_Idx.ViewerPos = ~0;
}
}
else
{
// TODO_VP_GLSL
}
nlassert(m_Idx.StrongestLight != ~0);
if (m_FeaturesLighted.SupportSpecular)
{
nlassert(m_Idx.ViewerPos != ~0);
}
} }
@ -485,10 +510,12 @@ bool CMeshVPPerPixelLight::begin(IDriver *drv,
} }
// //
enable(true, drv); // must enable the vertex program before the vb is activated enable(true, drv); // must enable the vertex program before the vb is activated
CVertexProgramPerPixelLight *program = _ActiveVertexProgram;
nlassert(program);
// //
CRenderTrav *renderTrav= &scene->getRenderTrav(); CRenderTrav *renderTrav= &scene->getRenderTrav();
/// Setup for gouraud lighting /// Setup for gouraud lighting
renderTrav->beginVPLightSetup(_ActiveVertexProgram, invertedModelMat); renderTrav->beginVPLightSetup(program, invertedModelMat);
// //
sint strongestLightIndex = renderTrav->getStrongestLightIndex(); sint strongestLightIndex = renderTrav->getStrongestLightIndex();
if (strongestLightIndex == -1) return false; // if no strongest light, disable this vertex program if (strongestLightIndex == -1) return false; // if no strongest light, disable this vertex program
@ -502,7 +529,7 @@ bool CMeshVPPerPixelLight::begin(IDriver *drv,
{ {
// put light direction in object space // put light direction in object space
NLMISC::CVector lPos = invertedModelMat.mulVector(strongestLight.getDirection()); NLMISC::CVector lPos = invertedModelMat.mulVector(strongestLight.getDirection());
drv->setConstant(4, lPos); drv->setUniform3f(IDriver::VertexProgram, program->idx().StrongestLight, lPos);
_IsPointLight = false; _IsPointLight = false;
} }
break; break;
@ -510,7 +537,7 @@ bool CMeshVPPerPixelLight::begin(IDriver *drv,
{ {
// put light in object space // put light in object space
NLMISC::CVector lPos = invertedModelMat * strongestLight.getPosition(); NLMISC::CVector lPos = invertedModelMat * strongestLight.getPosition();
drv->setConstant(4, lPos); drv->setUniform3f(IDriver::VertexProgram, program->idx().StrongestLight, lPos);
_IsPointLight = true; _IsPointLight = true;
} }
break; break;
@ -524,11 +551,11 @@ bool CMeshVPPerPixelLight::begin(IDriver *drv,
{ {
// viewer pos in object space // viewer pos in object space
NLMISC::CVector vPos = invertedModelMat * viewerPos; NLMISC::CVector vPos = invertedModelMat * viewerPos;
drv->setConstant(5, vPos); drv->setUniform3f(IDriver::VertexProgram, program->idx().ViewerPos, vPos);
} }
// c[0..3] take the ModelViewProjection Matrix. After setupModelMatrix(); // c[0..3] take the ModelViewProjection Matrix. After setupModelMatrix();
drv->setConstantMatrix(0, IDriver::ModelViewProjection, IDriver::Identity); drv->setUniformMatrix(IDriver::VertexProgram, program->getUniformIndex(CGPUProgramIndex::ModelViewProjection), IDriver::ModelViewProjection, IDriver::Identity);
return true; return true;
} }