Use non-1.0 alpha component for default lighting

AxioDL · Nov 8, 2019 · 55c4a58 · 55c4a58
1 parent 6e3b23e
commit 55c4a58
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/Core/OpenGL/CShaderGenerator.cpp b/src/Core/OpenGL/CShaderGenerator.cpp
@@ -463,12 +463,6 @@ bool CShaderGenerator::CreatePixelShader(const CMaterial& rkMat)
         if (pPass->Texture())
             ShaderCode << "    Tex = texture(Texture" << iPass << ", TevCoord)";
 
-        // A couple pass types require special swizzles to access different texture color channels as alpha
-        if ((PassType == "TRAN") || (PassType == "INCA") || (PassType == "BLOI"))
-            ShaderCode << ".rgbr";
-        else if (PassType == "BLOL")
-            ShaderCode << ".rgbg";
-
         // Apply lightmap multiplier
         bool UseLightmapMultiplier = (PassType == "DIFF") ||
                                      (PassType == "CUST" && (rkMat.Options() & EMaterialOption::Lightmap) && iPass == 0);

diff --git a/src/Core/Render/CGraphics.cpp b/src/Core/Render/CGraphics.cpp
@@ -22,13 +22,13 @@ CGraphics::SLightBlock  CGraphics::sLightBlock;
 
 CGraphics::ELightingMode CGraphics::sLightMode;
 uint32 CGraphics::sNumLights;
-const CColor CGraphics::skDefaultAmbientColor = CColor(0.5f, 0.5f, 0.5f, 1.f);
+const CColor CGraphics::skDefaultAmbientColor = CColor(0.5f, 0.5f, 0.5f, 0.5f);
 CColor CGraphics::sAreaAmbientColor = CColor::skBlack;
 float CGraphics::sWorldLightMultiplier;
 CLight CGraphics::sDefaultDirectionalLights[3] = {
-    CLight::BuildDirectional(CVector3f(0), CVector3f   (0.f, -0.866025f, -0.5f), CColor(0.3f, 0.3f, 0.3f, 1.f)),
-    CLight::BuildDirectional(CVector3f(0), CVector3f(-0.75f,  0.433013f, -0.5f), CColor(0.3f, 0.3f, 0.3f, 1.f)),
-    CLight::BuildDirectional(CVector3f(0), CVector3f( 0.75f,  0.433013f, -0.5f), CColor(0.3f, 0.3f, 0.3f, 1.f))
+    CLight::BuildDirectional(CVector3f(0), CVector3f   (0.f, -0.866025f, -0.5f), CColor(0.3f, 0.3f, 0.3f, 0.3f)),
+    CLight::BuildDirectional(CVector3f(0), CVector3f(-0.75f,  0.433013f, -0.5f), CColor(0.3f, 0.3f, 0.3f, 0.3f)),
+    CLight::BuildDirectional(CVector3f(0), CVector3f( 0.75f,  0.433013f, -0.5f), CColor(0.3f, 0.3f, 0.3f, 0.3f))
 };
 
 // ************ FUNCTIONS ************
@@ -167,9 +167,11 @@ void CGraphics::SetDefaultLighting()
     sDefaultDirectionalLights[0].Load();
     sDefaultDirectionalLights[1].Load();
     sDefaultDirectionalLights[2].Load();
+    sNumLights = 0;
     UpdateLightBlock();
 
     sVertexBlock.COLOR0_Amb = CColor::skGray;
+    sVertexBlock.COLOR0_Amb.A = 0.5f;
     UpdateVertexBlock();
 }
 

diff --git a/src/Core/Resource/Factory/CMaterialLoader.h b/src/Core/Resource/Factory/CMaterialLoader.h
@@ -8,7 +8,8 @@
 #include <Common/FileIO.h>
 #include <assimp/scene.h>
 
-enum class EMP3RenderConfig {
+enum class EMP3RenderConfig
+{
     NoBloomTransparent,
     NoBloomAdditiveIncandecence,
     FullRenderOpaque,
@@ -30,7 +31,8 @@ enum class EMP3RenderConfig {
     XRayOpaque
 };
 
-enum class EPASS {
+enum class EPASS
+{
     DIFF,
     RIML,
     BLOL,
@@ -47,15 +49,17 @@ enum class EPASS {
     TOON
 };
 
-enum class EINT {
+enum class EINT
+{
     OPAC,
     BLOD,
     BLOI,
     BNIF,
     XRBR
 };
 
-enum class ECLR {
+enum class ECLR
+{
     CLR,
     DIFB
 };

diff --git a/src/Core/Scene/CModelNode.cpp b/src/Core/Scene/CModelNode.cpp
@@ -75,7 +75,7 @@ void CModelNode::Draw(FRenderOptions Options, int ComponentIndex, ERenderCommand
         if (IsLightingEnabled)
         {
             CGraphics::sNumLights = 0;
-            CGraphics::sVertexBlock.COLOR0_Amb = CColor::skBlack;
+            CGraphics::sVertexBlock.COLOR0_Amb = CColor::skTransparentBlack;
             CGraphics::sPixelBlock.LightmapMultiplier = 1.f;
             CGraphics::UpdateLightBlock();
         }

diff --git a/src/Core/Scene/CScriptNode.cpp b/src/Core/Scene/CScriptNode.cpp
@@ -180,7 +180,7 @@ void CScriptNode::Draw(FRenderOptions Options, int /*ComponentIndex*/, ERenderCo
         if (CGraphics::sLightMode == CGraphics::ELightingMode::World && LightingOptions == eDisableWorldLighting)
         {
             CGraphics::sNumLights = 0;
-            CGraphics::sVertexBlock.COLOR0_Amb = CColor::skBlack;
+            CGraphics::sVertexBlock.COLOR0_Amb = CColor::skTransparentBlack;
             CGraphics::sPixelBlock.LightmapMultiplier = 1.f;
             CGraphics::UpdateLightBlock();
         }

diff --git a/src/Core/Scene/CStaticNode.cpp b/src/Core/Scene/CStaticNode.cpp
@@ -62,7 +62,7 @@ void CStaticNode::Draw(FRenderOptions Options, int ComponentIndex, ERenderComman
     if (IsLightingEnabled)
     {
         CGraphics::sNumLights = 0;
-        CGraphics::sVertexBlock.COLOR0_Amb = UseWhiteAmbient ? CColor::skWhite : CColor::skBlack;
+        CGraphics::sVertexBlock.COLOR0_Amb = UseWhiteAmbient ? CColor::skWhite : CColor::skTransparentBlack;
         CGraphics::sPixelBlock.LightmapMultiplier = 1.0f;
         CGraphics::UpdateLightBlock();
     }