ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

gpu: add model hsl override support

Browse Source
This commit is contained in:
Adam
2021-12-12 11:00:45 -05:00
parent 02235d1584
commit a3ed6c089f
2 changed files with 62 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runelite-api/src/main/java/net/runelite/api/Model.java
View File

@@ -89,4 +89,9 @@ public interface Model extends Renderable
int[] getVertexNormalsX(); int[] getVertexNormalsX();
int[] getVertexNormalsY(); int[] getVertexNormalsY();
int[] getVertexNormalsZ(); int[] getVertexNormalsZ();
byte getOverrideAmount();
byte getOverrideHue();
byte getOverrideSaturation();
byte getOverrideLuminance();
} }

60
runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java
View File

@@ -402,6 +402,11 @@ class SceneUploader
float[] uv = model.getFaceTextureUVCoordinates(); float[] uv = model.getFaceTextureUVCoordinates();
final byte overrideAmount = model.getOverrideAmount();
final byte overrideHue = model.getOverrideHue();
final byte overrideSat = model.getOverrideSaturation();
final byte overrideLum = model.getOverrideLuminance();
int len = 0; int len = 0;
for (int face = 0; face < triangleCount; ++face) for (int face = 0; face < triangleCount; ++face)
{ {
@@ -429,6 +434,16 @@ class SceneUploader
len += 3; len += 3;
continue; continue;
} }
// HSL override is not applied to flat shade faces or to textured faces
else if (faceTextures == null || faceTextures[face] == -1)
{
if (overrideAmount > 0)
{
color1 = interpolateHSL(color1, overrideHue, overrideSat, overrideLum, overrideAmount);
color2 = interpolateHSL(color2, overrideHue, overrideSat, overrideLum, overrideAmount);
color3 = interpolateHSL(color3, overrideHue, overrideSat, overrideLum, overrideAmount);
}
}
int packAlphaPriority = packAlphaPriority(faceTextures, transparencies, facePriorities, face); int packAlphaPriority = packAlphaPriority(faceTextures, transparencies, facePriorities, face);
@@ -470,14 +485,19 @@ class SceneUploader
final short[] faceTextures = model.getFaceTextures(); final short[] faceTextures = model.getFaceTextures();
final byte[] facePriorities = model.getFaceRenderPriorities(); final byte[] facePriorities = model.getFaceRenderPriorities();
int triangleA = indices1[face]; final int triangleA = indices1[face];
int triangleB = indices2[face]; final int triangleB = indices2[face];
int triangleC = indices3[face]; final int triangleC = indices3[face];
int color1 = color1s[face]; int color1 = color1s[face];
int color2 = color2s[face]; int color2 = color2s[face];
int color3 = color3s[face]; int color3 = color3s[face];
final byte overrideAmount = model.getOverrideAmount();
final byte overrideHue = model.getOverrideHue();
final byte overrideSat = model.getOverrideSaturation();
final byte overrideLum = model.getOverrideLuminance();
int packedAlphaPriority = packAlphaPriority(faceTextures, transparencies, facePriorities, face); int packedAlphaPriority = packAlphaPriority(faceTextures, transparencies, facePriorities, face);
int sin = 0, cos = 0; int sin = 0, cos = 0;
@@ -505,6 +525,16 @@ class SceneUploader
} }
return 3; return 3;
} }
// HSL override is not applied to flat shade faces or to textured faces
else if (faceTextures == null || faceTextures[face] == -1)
{
if (overrideAmount > 0)
{
color1 = interpolateHSL(color1, overrideHue, overrideSat, overrideLum, overrideAmount);
color2 = interpolateHSL(color2, overrideHue, overrideSat, overrideLum, overrideAmount);
color3 = interpolateHSL(color3, overrideHue, overrideSat, overrideLum, overrideAmount);
}
}
int a, b, c; int a, b, c;
@@ -605,4 +635,28 @@ class SceneUploader
uvBuffer.put(0, 0, 0, 0); uvBuffer.put(0, 0, 0, 0);
} }
} }
private static int interpolateHSL(int hsl, byte hue2, byte sat2, byte lum2, byte lerp)
{
int hue = hsl >> 10 & 63;
int sat = hsl >> 7 & 7;
int lum = hsl & 127;
int var9 = lerp & 255;
if (hue2 != -1)
{
hue += var9 * (hue2 - hue) >> 7;
}
if (sat2 != -1)
{
sat += var9 * (sat2 - sat) >> 7;
}
if (lum2 != -1)
{
lum += var9 * (lum2 - lum) >> 7;
}
return (hue << 10 | sat << 7 | lum) & 65535;
}
} }