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

api: flatten model uvs

Browse Source 
This drastically reduces the number of allocated float arrays on the heap just by flattening the uvs into a single array per model
This commit is contained in:
Adam
2021-09-03 13:21:32 -04:00
parent a3d33bee0d
commit ef3622c05a
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,8 +72,7 @@ public interface Model extends Renderable
short[] getFaceTextures(); short[] getFaceTextures();
float[][] getFaceTextureUCoordinates(); float[] getFaceTextureUVCoordinates();
float[][] getFaceTextureVCoordinates();
void calculateExtreme(int orientation); void calculateExtreme(int orientation);

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

@@ -389,8 +389,7 @@ class SceneUploader
final short[] faceTextures = model.getFaceTextures(); final short[] faceTextures = model.getFaceTextures();
final byte[] facePriorities = model.getFaceRenderPriorities(); final byte[] facePriorities = model.getFaceRenderPriorities();
float[][] u = model.getFaceTextureUCoordinates(); float[] uv = model.getFaceTextureUVCoordinates();
float[][] v = model.getFaceTextureVCoordinates();
int len = 0; int len = 0;
for (int face = 0; face < triangleCount; ++face) for (int face = 0; face < triangleCount; ++face)
@@ -432,7 +431,7 @@ class SceneUploader
if (faceTextures != null) if (faceTextures != null)
{ {
pushUvForFace(faceTextures, u, v, face, uvBuffer); pushUvForFace(faceTextures, uv, face, uvBuffer);
} }
len += 3; len += 3;
@@ -559,11 +558,9 @@ class SceneUploader
vertexBuffer.put(a, b, c, packedAlphaPriority | color3); vertexBuffer.put(a, b, c, packedAlphaPriority | color3);
float[][] u = model.getFaceTextureUCoordinates();
float[][] v = model.getFaceTextureVCoordinates();
if (padUvs || faceTextures != null) if (padUvs || faceTextures != null)
{ {
pushUvForFace(faceTextures, u, v, face, uvBuffer); pushUvForFace(faceTextures, model.getFaceTextureUVCoordinates(), face, uvBuffer);
} }
return 3; return 3;
@@ -584,15 +581,15 @@ class SceneUploader
return alpha | priority; return alpha | priority;
} }
private static void pushUvForFace(short[] faceTextures, float[][] u, float[][] v, int face, GpuFloatBuffer uvBuffer) private static void pushUvForFace(short[] faceTextures, float[] uv, int face, GpuFloatBuffer uvBuffer)
{ {
float[] uf, vf; if (faceTextures != null && faceTextures[face] != -1 && uv != null)
if (faceTextures != null && u != null && v != null && (uf = u[face]) != null && (vf = v[face]) != null)
{ {
int idx = face * 6;
float texture = faceTextures[face] + 1f; float texture = faceTextures[face] + 1f;
uvBuffer.put(texture, uf[0], vf[0], 0f); uvBuffer.put(texture, uv[idx], uv[idx + 1], 0f);
uvBuffer.put(texture, uf[1], vf[1], 0f); uvBuffer.put(texture, uv[idx + 2], uv[idx + 3], 0f);
uvBuffer.put(texture, uf[2], vf[2], 0f); uvBuffer.put(texture, uv[idx + 4], uv[idx + 5], 0f);
} }
else else
{ {