Skip to content

Allow non 64x64 textures on floor and ceiling in floating point renderer #591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jerethk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow non 64x64 textures on floor and ceiling in floating point renderer #591

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions TheForceEngine/TFE_Jedi/Renderer/RClassic_Float/rflatFloat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,10 @@ namespace RClassic_Float
fixed44_20 V = s_scanlineV0;
fixed44_20 U = s_scanlineU0;

// Note this produces a distorted mapping if the texture is not 64x64.
// This behavior matches the original.
// Supports all texture dimensions. The original fixed point renderer only supported 64x64.
for (s32 i = s_scanlineWidth - 1; i >= 0; i--, U += dUdX, V += dVdX)
{
const u32 texel = ((floor20(U) & 63) * 64 + (floor20(V) & 63)) & s_ftexDataEnd;
const u32 texel = ((floor20(U) & s_ftexWidthMask) * s_ftexHeight + (floor20(V) & s_ftexHeightMask)) & s_ftexDataEnd;
s_scanlineOut[i] = s_scanlineLight[s_ftexImage[texel]];
}
}
Expand All @@ -102,11 +101,10 @@ namespace RClassic_Float
fixed44_20 V = s_scanlineV0;
fixed44_20 U = s_scanlineU0;

// Note this produces a distorted mapping if the texture is not 64x64.
// This behavior matches the original.
// Supports all texture dimensions. The original fixed point renderer only supported 64x64.
for (s32 i = s_scanlineWidth - 1; i >= 0; i--, U += dUdX, V += dVdX)
{
const u32 texel = ((floor20(U) & 63) * 64 + (floor20(V) & 63)) & s_ftexDataEnd;
const u32 texel = ((floor20(U) & s_ftexWidthMask) * s_ftexHeight + (floor20(V) & s_ftexHeightMask)) & s_ftexDataEnd;
s_scanlineOut[i] = s_ftexImage[texel];
}
}
Expand All @@ -118,11 +116,10 @@ namespace RClassic_Float
fixed44_20 V = s_scanlineV0;
fixed44_20 U = s_scanlineU0;

// Note this produces a distorted mapping if the texture is not 64x64.
// This behavior matches the original.
// Supports all texture dimensions. The original fixed point renderer only supported 64x64.
for (s32 i = s_scanlineWidth - 1; i >= 0; i--, U += dUdX, V += dVdX)
{
const u32 texel = ((floor20(U) & 63) * 64 + (floor20(V) & 63)) & s_ftexDataEnd;
const u32 texel = ((floor20(U) & s_ftexWidthMask) * s_ftexHeight + (floor20(V) & s_ftexHeightMask)) & s_ftexDataEnd;
const u8 baseColor = s_ftexImage[texel];

if (baseColor) { s_scanlineOut[i] = s_scanlineLight[baseColor]; }
Expand All @@ -136,11 +133,10 @@ namespace RClassic_Float
fixed44_20 V = s_scanlineV0;
fixed44_20 U = s_scanlineU0;

// Note this produces a distorted mapping if the texture is not 64x64.
// This behavior matches the original.
// Supports all texture dimensions. The original fixed point renderer only supported 64x64.
for (s32 i = s_scanlineWidth - 1; i >= 0; i--, U += dUdX, V += dVdX)
{
const u32 texel = ((floor20(U) & 63) * 64 + (floor20(V) & 63)) & s_ftexDataEnd;
const u32 texel = ((floor20(U) & s_ftexWidthMask) * s_ftexHeight + (floor20(V) & s_ftexHeightMask)) & s_ftexDataEnd;
const u8 baseColor = s_ftexImage[texel];

if (baseColor) { s_scanlineOut[i] = baseColor; }
Expand Down