moonpower/P3DS-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shadergen: Fix small register decoding oopsie

Browse Source
This commit is contained in:
wheremyfoodat
2024-07-19 03:01:12 +03:00
parent 25098082c7
commit ac55c3e324
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/PICA/pica_frag_config.hpp
View File

@@ -116,7 +116,7 @@ namespace PICA {
for (int i = 0; i < totalLightCount; i++) { for (int i = 0; i < totalLightCount; i++) {
auto& light = lights[i]; auto& light = lights[i];
const u32 lightConfig = 0x149 + 0x10 * i; const u32 lightConfig = regs[InternalRegs::Light0Config + 0x10 * i];
light.num = (regs[InternalRegs::LightPermutation] >> (i * 4)) & 0x7; light.num = (regs[InternalRegs::LightPermutation] >> (i * 4)) & 0x7;
light.directional = Helpers::getBit<0>(lightConfig); light.directional = Helpers::getBit<0>(lightConfig);

1
include/PICA/regs.hpp
View File

@@ -77,6 +77,7 @@ namespace PICA {
Light0Z = 0x145, Light0Z = 0x145,
Light0SpotlightXY = 0x146, Light0SpotlightXY = 0x146,
Light0SpotlightZ = 0x147, Light0SpotlightZ = 0x147,
Light0Config = 0x149,
Light0AttenuationBias = 0x14A, Light0AttenuationBias = 0x14A,
Light0AttenuationScale = 0x14B, Light0AttenuationScale = 0x14B,

4
src/core/PICA/shader_gen_glsl.cpp
View File

@@ -485,9 +485,9 @@ void FragmentGenerator::compileLights(std::string& shader, const PICA::FragmentC
shader += "light_position = lightSources[" + std::to_string(lightID) + "].position;\n"; shader += "light_position = lightSources[" + std::to_string(lightID) + "].position;\n";
if (lightConfig.directional) { // Directional lighting if (lightConfig.directional) { // Directional lighting
shader += "light_vector = light_position + v_view;\n";
} else { // Positional lighting
shader += "light_vector = light_position;\n"; shader += "light_vector = light_position;\n";
} else { // Positional lighting
shader += "light_vector = light_position + v_view;\n";
} }
shader += R"( shader += R"(