diff --git a/runelite-api/src/main/java/net/runelite/api/Sequence.java b/runelite-api/src/main/java/net/runelite/api/Animation.java similarity index 98% rename from runelite-api/src/main/java/net/runelite/api/Sequence.java rename to runelite-api/src/main/java/net/runelite/api/Animation.java index e7e1c8fcb9..77c8a8af2e 100644 --- a/runelite-api/src/main/java/net/runelite/api/Sequence.java +++ b/runelite-api/src/main/java/net/runelite/api/Animation.java @@ -27,6 +27,6 @@ package net.runelite.api; /** * Represents an animation of a renderable */ -public interface Sequence +public interface Animation { } diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 91cf6a842c..1699b5637d 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -1089,7 +1089,7 @@ public interface Client extends GameEngine * @param id the ID of the animation. Any int is allowed, but implementations in the client * should be defined in {@link AnimationID} */ - Sequence loadAnimation(int id); + Animation loadAnimation(int id); /** * Gets the music volume diff --git a/runelite-api/src/main/java/net/runelite/api/Model.java b/runelite-api/src/main/java/net/runelite/api/Model.java index e923cbd3d4..d3756ea727 100644 --- a/runelite-api/src/main/java/net/runelite/api/Model.java +++ b/runelite-api/src/main/java/net/runelite/api/Model.java @@ -37,13 +37,13 @@ public interface Model extends Renderable int[] getVerticesZ(); - int getTrianglesCount(); + int getFaceCount(); - int[] getTrianglesX(); + int[] getFaceIndices1(); - int[] getTrianglesY(); + int[] getFaceIndices2(); - int[] getTrianglesZ(); + int[] getFaceIndices3(); int[] getFaceColors1(); @@ -51,7 +51,7 @@ public interface Model extends Renderable int[] getFaceColors3(); - byte[] getTriangleTransparencies(); + byte[] getFaceTransparencies(); int getSceneId(); void setSceneId(int sceneId); diff --git a/runelite-api/src/main/java/net/runelite/api/Perspective.java b/runelite-api/src/main/java/net/runelite/api/Perspective.java index 75963a2486..e5f2262965 100644 --- a/runelite-api/src/main/java/net/runelite/api/Perspective.java +++ b/runelite-api/src/main/java/net/runelite/api/Perspective.java @@ -781,9 +781,9 @@ public class Perspective final int radius = 5; int[][] tris = new int[][]{ - m.getTrianglesX(), - m.getTrianglesY(), - m.getTrianglesZ() + m.getFaceIndices1(), + m.getFaceIndices2(), + m.getFaceIndices3() }; int vpX1 = client.getViewportXOffset(); @@ -791,10 +791,10 @@ public class Perspective int vpX2 = vpX1 + client.getViewportWidth(); int vpY2 = vpY1 + client.getViewportHeight(); - List rects = new ArrayList<>(m.getTrianglesCount()); + List rects = new ArrayList<>(m.getFaceCount()); nextTri: - for (int tri = 0; tri < m.getTrianglesCount(); tri++) + for (int tri = 0; tri < m.getFaceCount(); tri++) { if (faceColors3[tri] == -2) { diff --git a/runelite-api/src/main/java/net/runelite/api/RuneLiteObject.java b/runelite-api/src/main/java/net/runelite/api/RuneLiteObject.java index 20f2fb001e..5fcd50c3e3 100644 --- a/runelite-api/src/main/java/net/runelite/api/RuneLiteObject.java +++ b/runelite-api/src/main/java/net/runelite/api/RuneLiteObject.java @@ -41,7 +41,7 @@ public interface RuneLiteObject extends GraphicsObject * Sets the animation of the RuneLiteObject * If animation is null model will be static */ - void setAnimation(Sequence animation); + void setAnimation(Animation animation); /** * Sets whether the animation of the RuneLiteObject should loop when the animation ends. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java index b275fd7d4e..062c810ffa 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/GpuPlugin.java @@ -1608,7 +1608,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks modelY = y + client.getCameraY2(); modelZ = z + client.getCameraZ2(); modelOrientation = orientation; - int triangleCount = model.getTrianglesCount(); + int triangleCount = model.getFaceCount(); vertexBuffer.ensureCapacity(12 * triangleCount); uvBuffer.ensureCapacity(12 * triangleCount); @@ -1632,7 +1632,7 @@ public class GpuPlugin extends Plugin implements DrawCallbacks model.calculateExtreme(orientation); client.checkClickbox(model, orientation, pitchSin, pitchCos, yawSin, yawCos, x, y, z, hash); - int tc = Math.min(MAX_TRIANGLE, model.getTrianglesCount()); + int tc = Math.min(MAX_TRIANGLE, model.getFaceCount()); int uvOffset = model.getUvBufferOffset(); GpuIntBuffer b = bufferForTriangles(tc); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java index 910f8b3147..1bf9dcce63 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/gpu/SceneUploader.java @@ -379,7 +379,7 @@ class SceneUploader public int pushModel(Model model, GpuIntBuffer vertexBuffer, GpuFloatBuffer uvBuffer) { - final int triangleCount = Math.min(model.getTrianglesCount(), GpuPlugin.MAX_TRIANGLE); + final int triangleCount = Math.min(model.getFaceCount(), GpuPlugin.MAX_TRIANGLE); vertexBuffer.ensureCapacity(triangleCount * 12); uvBuffer.ensureCapacity(triangleCount * 12); @@ -388,15 +388,15 @@ class SceneUploader final int[] vertexY = model.getVerticesY(); final int[] vertexZ = model.getVerticesZ(); - final int[] trianglesX = model.getTrianglesX(); - final int[] trianglesY = model.getTrianglesY(); - final int[] trianglesZ = model.getTrianglesZ(); + final int[] indices1 = model.getFaceIndices1(); + final int[] indices2 = model.getFaceIndices2(); + final int[] indices3 = model.getFaceIndices3(); final int[] color1s = model.getFaceColors1(); final int[] color2s = model.getFaceColors2(); final int[] color3s = model.getFaceColors3(); - final byte[] transparencies = model.getTriangleTransparencies(); + final byte[] transparencies = model.getFaceTransparencies(); final short[] faceTextures = model.getFaceTextures(); final byte[] facePriorities = model.getFaceRenderPriorities(); @@ -432,9 +432,9 @@ class SceneUploader int packAlphaPriority = packAlphaPriority(faceTextures, transparencies, facePriorities, face); - int triangleA = trianglesX[face]; - int triangleB = trianglesY[face]; - int triangleC = trianglesZ[face]; + int triangleA = indices1[face]; + int triangleB = indices2[face]; + int triangleC = indices3[face]; vertexBuffer.put(vertexX[triangleA], vertexY[triangleA], vertexZ[triangleA], packAlphaPriority | color1); vertexBuffer.put(vertexX[triangleB], vertexY[triangleB], vertexZ[triangleB], packAlphaPriority | color2); @@ -458,21 +458,21 @@ class SceneUploader final int[] vertexY = model.getVerticesY(); final int[] vertexZ = model.getVerticesZ(); - final int[] trianglesX = model.getTrianglesX(); - final int[] trianglesY = model.getTrianglesY(); - final int[] trianglesZ = model.getTrianglesZ(); + final int[] indices1 = model.getFaceIndices1(); + final int[] indices2 = model.getFaceIndices2(); + final int[] indices3 = model.getFaceIndices3(); final int[] color1s = model.getFaceColors1(); final int[] color2s = model.getFaceColors2(); final int[] color3s = model.getFaceColors3(); - final byte[] transparencies = model.getTriangleTransparencies(); + final byte[] transparencies = model.getFaceTransparencies(); final short[] faceTextures = model.getFaceTextures(); final byte[] facePriorities = model.getFaceRenderPriorities(); - int triangleA = trianglesX[face]; - int triangleB = trianglesY[face]; - int triangleC = trianglesZ[face]; + int triangleA = indices1[face]; + int triangleB = indices2[face]; + int triangleC = indices3[face]; int color1 = color1s[face]; int color2 = color2s[face]; diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/outline/ModelOutlineRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/outline/ModelOutlineRenderer.java index e3528433cb..3047086dda 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/outline/ModelOutlineRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/outline/ModelOutlineRenderer.java @@ -564,11 +564,11 @@ public class ModelOutlineRenderer */ private void simulateModelRasterizationForOutline(Model model) { - final int triangleCount = model.getTrianglesCount(); - final int[] indices1 = model.getTrianglesX(); - final int[] indices2 = model.getTrianglesY(); - final int[] indices3 = model.getTrianglesZ(); - final byte[] triangleTransparencies = model.getTriangleTransparencies(); + final int triangleCount = model.getFaceCount(); + final int[] indices1 = model.getFaceIndices1(); + final int[] indices2 = model.getFaceIndices2(); + final int[] indices3 = model.getFaceIndices3(); + final byte[] triangleTransparencies = model.getFaceTransparencies(); for (int i = 0; i < triangleCount; i++) {