Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

GL3: Cleanup

Browse Source 
--HG--
branch : opengl3
hg/feature/opengl3
kaetemi 11 years ago
parent b25747b2ef
commit 424aa079a2
3 changed files with 2 additions and 342 deletions
Show Stats Download Patch File Download Diff File

313
code/nel/src/3d/driver/opengl3/driver_glsl_shader_generator.cpp
Unescape Escape View File

@ -141,81 +141,6 @@ namespace NL3D
ss.clear();
}
void CGLSLShaderGenerator::generateVS(std::string &vs)
{
ss.str("");
ss.clear();
ss << "// " << shaderNames[ material->getShader() ] << " Vertex Shader" << std::endl;
ss << std::endl;
ss << "#version 330" << std::endl;
ss << "#extension GL_ARB_separate_shader_objects : enable" << std::endl;
ss << "out gl_PerVertex" << std::endl;
ss << "{" << std::endl;
ss << "vec4 gl_Position;" << std::endl;
ss << "};" << std::endl;
ss << std::endl;
ss << "uniform mat4 modelViewProjection;" << std::endl;
ss << std::endl;
for (int i = Position; i < NumOffsets; i++)
{
if (hasFlag(vbFormat, vertexFlags[ i ]))
{
ss << "layout (location = ";
ss << i;
ss << ") ";
ss << "in vec4 ";
ss << "v" << attribNames[ i ];
ss << ";";
ss << std::endl;
}
}
ss << std::endl;
for (int i = Weight; i < NumOffsets; i++)
{
if (hasFlag(vbFormat, vertexFlags[ i ]))
{
ss << "smooth out vec4 ";
ss << attribNames[ i ] << ";" << std::endl;
}
}
ss << std::endl;
if (!desc->useTextures())
{
addAmbient();
addDiffuse();
addSpecular();
}
switch(material->getShader())
{
case CMaterial::Normal:
case CMaterial::UserColor:
case CMaterial::LightMap:
case CMaterial::Cloud:
generateNormalVS();
break;
case CMaterial::Specular:
generateSpecularVS();
break;
case CMaterial::PerPixelLighting:
case CMaterial::PerPixelLightingNoSpec:
generatePPLVS();
break;
case CMaterial::Water:
generateWaterVS();
break;
}
vs.assign(ss.str());
}
void CGLSLShaderGenerator::generatePS(std::string &ps)
{
ss.str("");
@ -365,38 +290,6 @@ namespace NL3D
/////////////////////////////////////////////////////////// Lights ////////////////////////////////////////////////////////////////////
void CGLSLShaderGenerator::addLightUniformsVS()
{
for (int i = 0; i < SHADER_MAX_LIGHTS; i++)
{
switch(desc->getLight(i))
{
case CShaderDesc::Nolight:
continue;
break;
case CShaderDesc::Directional:
ss << "uniform vec3 light" << i << "DirOrPos;" << std::endl;
ss << "uniform vec4 light" << i << "ColDiff;" << std::endl;
ss << "uniform vec4 light" << i << "ColAmb;" << std::endl;
ss << "uniform vec4 light" << i << "ColSpec;" << std::endl;
ss << "uniform float light" << i << "Shininess;" << std::endl;
break;
case CShaderDesc::Point:
ss << "uniform vec3 light" << i << "DirOrPos;" << std::endl;
ss << "uniform vec4 light" << i << "ColDiff;" << std::endl;
ss << "uniform vec4 light" << i << "ColAmb;" << std::endl;
ss << "uniform vec4 light" << i << "ColSpec;" << std::endl;
ss << "uniform float light" << i << "Shininess;" << std::endl;
ss << "uniform float light" << i << "ConstAttn;" << std::endl;
ss << "uniform float light" << i << "LinAttn;" << std::endl;
ss << "uniform float light" << i << "QuadAttn;" << std::endl;
break;
}
}
}
void CGLSLShaderGenerator::addLightUniformsFS()
{
for (int i = 0; i < SHADER_MAX_LIGHTS; i++)
@ -414,142 +307,11 @@ namespace NL3D
}
void CGLSLShaderGenerator::addLightOutsVS()
{
ss << "smooth out vec4 lightColor;" << std::endl;
}
void CGLSLShaderGenerator::addLightInsFS()
{
ss << "smooth in vec4 lightColor;" << std::endl;
}
void CGLSLShaderGenerator::addDirectionalFunctionVS(int num)
{
ss << "float getIntensity" << num << "(vec3 normal3, vec3 lightDir)" << std::endl;
ss << "{" << std::endl;
ss << "float angle = dot(lightDir, normal3);" << std::endl;
ss << "angle = max(0.0, angle);" << std::endl;
ss << "return angle;" << std::endl;
ss << "}" << std::endl;
ss << std::endl;
ss << "float getSpecIntensity" << num << "(vec3 normal3, vec3 lightDir)" << std::endl;
ss << "{" << std::endl;
ss << "vec3 halfVector = normalize(lightDir + normal3);" << std::endl;
ss << "float angle = dot(normal3, halfVector);" << std::endl;
ss << "angle = max(0.0, angle);" << std::endl;
ss << "float si = pow(angle, light" << num << "Shininess);" << std::endl;
ss << "return si;" << std::endl;
ss << "}" << std::endl;
ss << std::endl;
ss << "vec4 getLight" << num << "Color()" << std::endl;
ss << "{" << std::endl;
ss << "vec4 lightDir4 = viewMatrix * vec4(light" << num << "DirOrPos, 1.0);" << std::endl;
ss << "vec3 lightDir = lightDir4.xyz / lightDir4.w;" << std::endl;
ss << "lightDir = normalize(lightDir);" << std::endl;
ss << "vec3 normal3 = vnormal.xyz / vnormal.w;" << std::endl;
ss << "normal3 = normalMatrix * normal3;" << std::endl;
ss << "normal3 = normalize(normal3);" << std::endl;
if (desc->useTextures() || (material->getShader() == CMaterial::LightMap))
{
ss << "vec4 lc = getIntensity" << num << "(normal3, lightDir) * light" << num << "ColDiff + ";
ss << "getSpecIntensity" << num << "(normal3, lightDir) * light" << num << "ColSpec + ";
ss << "light" << num << "ColAmb;" << std::endl;
}
else
{
ss << "vec4 lc = getIntensity" << num << "(normal3, lightDir) * light" << num << "ColDiff * diffuseColor + ";
ss << "getSpecIntensity" << num << "(normal3, lightDir) * light" << num << "ColSpec * specularColor + ";
ss << "light" << num << "ColAmb * ambientColor;" << std::endl;
}
ss << "return lc;" << std::endl;
ss << "}" << std::endl;
ss << std::endl;
}
void CGLSLShaderGenerator::addPointLightFunctionVS(int num)
{
ss << "float getIntensity" << num << "(vec3 normal3, vec3 direction3)" << std::endl;
ss << "{" << std::endl;
ss << "float angle = dot(direction3, normal3);" << std::endl;
ss << "angle = max(0.0, angle);" << std::endl;
ss << "return angle;" << std::endl;
ss << "}" << std::endl;
ss << std::endl;
ss << "float getSpecIntensity" << num << "(vec3 normal3, vec3 direction3)" << std::endl;
ss << "{" << std::endl;
ss << "vec3 halfVector = normalize(direction3 + normal3);" << std::endl;
ss << "float angle = dot(normal3, halfVector);" << std::endl;
ss << "angle = max(0.0, angle);" << std::endl;
ss << "float si = pow(angle, light" << num << "Shininess);" << std::endl;
ss << "return si;" << std::endl;
ss << "}" << std::endl;
ss << std::endl;
ss << "vec4 getLight" << num << "Color()" << std::endl;
ss << "{" << std::endl;
ss << "vec3 ecPos3 = ecPos4.xyz / ecPos4.w;" << std::endl;
ss << "vec4 lightPos4 = viewMatrix * vec4(light" << num << "DirOrPos, 1.0);" << std::endl;
ss << "vec3 lightPos = lightPos4.xyz / lightPos4.w;" << std::endl;
ss << "vec3 lightDirection = lightPos - ecPos3;" << std::endl;
ss << "float lightDistance = length(lightDirection);" << std::endl;
ss << "lightDirection = normalize(lightDirection);" << std::endl;
ss << "float attenuation = light" << num << "ConstAttn + ";
ss << "light" << num << "LinAttn * lightDistance +";
ss << "light" << num << "QuadAttn * lightDistance * lightDistance;" << std::endl;
ss << "vec3 normal3 = vnormal.xyz / vnormal.w;" << std::endl;
ss << "normal3 = normalMatrix * normal3;" << std::endl;
ss << "normal3 = normalize(normal3);" << std::endl;
if (desc->useTextures() || (material->getShader() == CMaterial::LightMap))
{
ss << "vec4 lc = getIntensity" << num << "(normal3, lightDirection) * light" << num << "ColDiff + ";
ss << "getSpecIntensity" << num << "(normal3, lightDirection) * light" << num << "ColSpec + ";
ss << "light" << num << "ColAmb;" << std::endl;
}
else
{
ss << "vec4 lc = getIntensity" << num << "(normal3, lightDirection) * light" << num << "ColDiff * diffuseColor+ ";
ss << "getSpecIntensity" << num << "(normal3, lightDirection) * light" << num << "ColSpec * specularColor + ";
ss << "light" << num << "ColAmb * ambientColor;" << std::endl;
}
ss << "lc = lc / attenuation;" << std::endl;
ss << "return lc;" << std::endl;
ss << "}" << std::endl;
ss << std::endl;
}
void CGLSLShaderGenerator::addLightsFunctionVS()
{
for (int i = 0; i < SHADER_MAX_LIGHTS; i++)
{
switch(desc->getLight(i))
{
case CShaderDesc::Nolight:
continue;
break;
case CShaderDesc::Directional:
addDirectionalFunctionVS(i);
break;
case CShaderDesc::Point:
addPointLightFunctionVS(i);
break;
}
}
}
void CGLSLShaderGenerator::addLightsFunctionFS()
{
ss << "vec4 applyLights(vec4 col)" << std::endl;
@ -558,19 +320,6 @@ namespace NL3D
ss << "}" << std::endl;
}
void CGLSLShaderGenerator::addLightsVS()
{
ss << "lightColor = vec4(0.0, 0.0, 0.0, 1.0);" << std::endl;
for (int i = 0; i < SHADER_MAX_LIGHTS; i++)
{
if (desc->getLight(i) == CShaderDesc::Nolight)
continue;
ss << "lightColor = lightColor + getLight" << i << "Color();" << std::endl;
}
}
void CGLSLShaderGenerator::addLightsFS()
{
ss << "fragColor = applyLights(fragColor);" << std::endl;
@ -578,65 +327,7 @@ namespace NL3D
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CGLSLShaderGenerator::generateNormalVS()
{
if (desc->fogEnabled() || desc->hasPointLight())
{
ss << "uniform mat4 modelView;" << std::endl;
}
if (desc->lightingEnabled())
{
addViewMatrix();
}
if (desc->fogEnabled() || desc->hasPointLight())
{
ss << "vec4 ecPos4;" << std::endl;
}
if (desc->fogEnabled())
ss << "smooth out vec4 ecPos;" << std::endl;
ss << std::endl;
if (desc->lightingEnabled())
{
addNormalMatrix();
addLightUniformsVS();
addLightOutsVS();
ss << std::endl;
addLightsFunctionVS();
ss << std::endl;
}
ss << "void main(void)" << std::endl;
ss << "{" << std::endl;
ss << "gl_Position = modelViewProjection * " << "v" << attribNames[ 0 ] << ";" << std::endl;
if (desc->fogEnabled() || desc->hasPointLight())
ss << "ecPos4 = modelView * v" << attribNames[ 0 ] << ";" << std::endl;
if (desc->fogEnabled())
ss << "ecPos = ecPos4;" << std::endl;
if (desc->lightingEnabled())
addLightsVS();
for (int i = Weight; i < NumOffsets; i++)
{
if (hasFlag(vbFormat, vertexFlags[ i ]))
{
ss << attribNames[ i ];
ss << " = ";
ss << "v" << attribNames[ i ] << ";" << std::endl;
}
}
ss << "}" << std::endl;
}
void CGLSLShaderGenerator::generateSpecularVS()
/*void CGLSLShaderGenerator::generateSpecularVS()
{
ss << "uniform mat4 modelView;" << std::endl;
@ -821,7 +512,7 @@ namespace NL3D
}
ss << "}" << std::endl;
}
}*/
void CGLSLShaderGenerator::generateNormalPS()
{

19
code/nel/src/3d/driver/opengl3/driver_glsl_shader_generator.h
Unescape Escape View File

@ -36,9 +36,6 @@ namespace NL3D
/// Resets the generator to 0.
void reset();
/// Generate Vertex Shader based on the data provided in material, descriptor and vertexbuffer flags
void generateVS(std::string &vs);
/// Generate Pixel Shader based on the data provided in material, descriptor and vertexbuffer flags
void generatePS(std::string &ps);
@ -98,27 +95,12 @@ namespace NL3D
/// Adds the Pixel Shader light uniforms to the program
void addLightUniformsFS();
/// Adds the Vertex Shader light output variables to the program
void addLightOutsVS();
/// Adds the Pixel Shader light output variables to the program
void addLightInsFS();
/// Adds the directional light Vertex Shader function, num is the light number
void addDirectionalFunctionVS(int num);
/// Adds the point-light Vertex Shader function, num is the light number
void addPointLightFunctionVS(int num);
/// Adds the appropriate light functions to the Vertex Shader
void addLightsFunctionVS();
/// Adds the appropriate light functions to the Pixel Shader
void addLightsFunctionFS();
/// Adds the lights to the Vertex Shader (calls the appropriate functions)
void addLightsVS();
/// Adds the lights to the Fragment Shader (calls the appropriate functions)
void addLightsFS();
@ -129,7 +111,6 @@ namespace NL3D
//////////////////////////////////////// Vertex Shader generation ////////////////////////////////////
void generateNormalVS();
void generateSpecularVS();
/// Per-Pixel Lighting

12
code/nel/src/3d/driver/opengl3/driver_opengl.cpp
Unescape Escape View File

@ -373,18 +373,6 @@ bool CDriverGL3::setupDisplay()
throw EBadDisplay("Missing required GL extension: GL_ARB_separate_shader_objects. Update your driver");
}
// ARBMultiTexture is a OpenGL 1.2 required extension.
/*if (!_Extensions.ARBMultiTexture)
{
nlwarning("Missing Required GL extension: GL_ARB_multitexture. Update your driver");
throw EBadDisplay("Missing Required GL extension: GL_ARB_multitexture. Update your driver");
}
if (!_Extensions.EXTTextureEnvCombine)
{
nlwarning("Missing Important GL extension: GL_EXT_texture_env_combine => All envcombine are setup to GL_MODULATE!!!");
}*/
// All User Light are disabled by Default
for (uint i = 0; i < MaxLight; ++i)
{

Write Preview
Loading…
Cancel
Save