ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More tweaks to GLES legacy pipeline

Browse Source
This commit is contained in:
Deve 2017-03-02 22:19:10 +01:00
parent 067518df5d
commit 11024569b0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/shaders/irrlicht/COGLES2FixedPipeline.fsh
View File

@ -108,7 +108,7 @@ void main ()
else if(uMaterialType == Solid2Layer) else if(uMaterialType == Solid2Layer)
gl_FragColor = render2LayerSolid(); gl_FragColor = render2LayerSolid();
else if(uMaterialType == LightMap) else if(uMaterialType == LightMap)
gl_FragColor = renderLightMap(); gl_FragColor = renderSolid();
else if(uMaterialType == DetailMap) else if(uMaterialType == DetailMap)
gl_FragColor = renderDetailMap(); gl_FragColor = renderDetailMap();
else if(uMaterialType == SphereMap) else if(uMaterialType == SphereMap)

7
lib/irrlicht/source/Irrlicht/COGLES2FixedPipelineRenderer.cpp
View File

@ -92,6 +92,7 @@ bool COGLES2FixedPipelineRenderer::OnRender(IMaterialRendererServices* service,
Driver->setTextureRenderStates(Driver->getCurrentMaterial(), false); Driver->setTextureRenderStates(Driver->getCurrentMaterial(), false);
s32 materialType = 0; s32 materialType = 0;
bool second_texture = false;
switch(Driver->getCurrentMaterial().MaterialType) switch(Driver->getCurrentMaterial().MaterialType)
{ {
@ -102,10 +103,13 @@ bool COGLES2FixedPipelineRenderer::OnRender(IMaterialRendererServices* service,
case EMT_LIGHTMAP_ADD: case EMT_LIGHTMAP_ADD:
case EMT_LIGHTMAP_M2: case EMT_LIGHTMAP_M2:
case EMT_LIGHTMAP_M4: case EMT_LIGHTMAP_M4:
materialType = 2;
break;
case EMT_LIGHTMAP_LIGHTING: case EMT_LIGHTMAP_LIGHTING:
case EMT_LIGHTMAP_LIGHTING_M2: case EMT_LIGHTMAP_LIGHTING_M2:
case EMT_LIGHTMAP_LIGHTING_M4: case EMT_LIGHTMAP_LIGHTING_M4:
materialType = 2; materialType = 2;
second_texture = true;
break; break;
case EMT_DETAIL_MAP: case EMT_DETAIL_MAP:
materialType = 3; materialType = 3;
@ -161,6 +165,9 @@ bool COGLES2FixedPipelineRenderer::OnRender(IMaterialRendererServices* service,
s32 TextureUnit0 = 0; s32 TextureUnit0 = 0;
//s32 TextureUnit1 = 1; //s32 TextureUnit1 = 1;
if (second_texture)
TextureUnit0 = 1;
IMaterialRendererServices::setPixelShaderConstant("uTextureUnit0", &TextureUnit0, 1); IMaterialRendererServices::setPixelShaderConstant("uTextureUnit0", &TextureUnit0, 1);
//IMaterialRendererServices::setPixelShaderConstant("uTextureUnit1", &TextureUnit1, 1); //IMaterialRendererServices::setPixelShaderConstant("uTextureUnit1", &TextureUnit1, 1);