From aa7ec6afbccb51fb9605a7ced4bbc0edb1ab10d7 Mon Sep 17 00:00:00 2001 From: Noodleeater Date: Sat, 20 Feb 2021 20:39:13 +0000 Subject: [PATCH 1/3] Added api to interact with SequenceDefinition --- .../net/runelite/api/SequenceDefinition.java | 52 +++++++++++++++++++ .../runelite/rs/api/RSSequenceDefinition.java | 6 ++- 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 runelite-api/src/main/java/net/runelite/api/SequenceDefinition.java diff --git a/runelite-api/src/main/java/net/runelite/api/SequenceDefinition.java b/runelite-api/src/main/java/net/runelite/api/SequenceDefinition.java new file mode 100644 index 0000000000..ee6e626721 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/SequenceDefinition.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2021, Noodleeater + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.api; + +/** + * Represents a Sequence of animation frame Ids. + * It stores animation frames Ids and the length of time between each frame. + */ +public interface SequenceDefinition extends DualNode +{ + /** + * Get the number of frames in the animation sequence + */ + int getFrameCount(); + + /** + * Get id of all frames in the animation sequence + */ + int[] getFrameIDs(); + + /** + * Get the length in game ticks, that each animation frame is displayed for. + */ + int[] getFrameLengths(); + + /** + * Get id of all frames in the animation sequence for the chat head's model animation. + */ + int[] getChatFrameIds(); +} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java index 14268ff5ba..09b1c96090 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSSequenceDefinition.java @@ -1,8 +1,9 @@ package net.runelite.rs.api; +import net.runelite.api.SequenceDefinition; import net.runelite.mapping.Import; -public interface RSSequenceDefinition extends RSNode +public interface RSSequenceDefinition extends SequenceDefinition { // @Import("stretches") // boolean getStretches(); @@ -20,11 +21,14 @@ public interface RSSequenceDefinition extends RSNode // int[] getInterleaveLeave(); @Import("frameIds") + @Override int[] getFrameIDs(); @Import("frameLengths") + @Override int[] getFrameLengths(); @Import("chatFrameIds") + @Override int[] getChatFrameIds(); } From 14e83e551ebdda1bffcdfb52a86597d014a0145f Mon Sep 17 00:00:00 2001 From: Noodleeater Date: Sat, 20 Feb 2021 21:02:53 +0000 Subject: [PATCH 2/3] Added tileModel rl api "getIsFlat" --- .../src/main/java/net/runelite/api/SceneTileModel.java | 2 ++ .../src/main/java/net/runelite/rs/api/RSSceneTileModel.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/SceneTileModel.java b/runelite-api/src/main/java/net/runelite/api/SceneTileModel.java index 03899d218d..761128ab2d 100644 --- a/runelite-api/src/main/java/net/runelite/api/SceneTileModel.java +++ b/runelite-api/src/main/java/net/runelite/api/SceneTileModel.java @@ -117,4 +117,6 @@ public interface SceneTileModel int getOverlayNwColor(); void setOverlayNwColor(int color); + + boolean getIsFlat(); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java b/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java index dd4b226f12..c7d61d5f3a 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSSceneTileModel.java @@ -60,4 +60,7 @@ public interface RSSceneTileModel extends SceneTileModel @Import("triangleTextureId") @Override int[] getTriangleTextureId(); + + @Import("isFlat") + boolean getIsFlat(); } From f01512b8cb16f752b491e8d00d6f5e4e624f05ee Mon Sep 17 00:00:00 2001 From: Noodleeater Date: Sat, 20 Feb 2021 22:01:53 +0000 Subject: [PATCH 3/3] Added rl api to get animation information form actor --- .../src/main/java/net/runelite/api/Actor.java | 17 +++++++++++++++++ .../java/net/runelite/api/DynamicObject.java | 10 ++++++++++ 2 files changed, 27 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Actor.java b/runelite-api/src/main/java/net/runelite/api/Actor.java index 4a0a3eade0..e021795768 100644 --- a/runelite-api/src/main/java/net/runelite/api/Actor.java +++ b/runelite-api/src/main/java/net/runelite/api/Actor.java @@ -109,6 +109,16 @@ public interface Actor extends Renderable, Locatable void setPoseAnimation(int animation); + /** + * Get the index of the PoseFrame (the index as it appears in the sequenceDefinition "frames" array). + */ + int getPoseFrame(); + + /** + * Get the number of cycles the pose frame has been displayed for. + */ + int getPoseFrameCycle(); + /** * Gets the orientation of the actor. * @@ -169,8 +179,15 @@ public interface Actor extends Renderable, Locatable void setGraphic(int graphic); + int getSpotAnimationFrame(); + void setSpotAnimFrame(int spotAnimFrame); + /** + * Get the number of cycles the SpotAnimation frame has been displayed for. + */ + int getSpotAnimationFrameCycle(); + /** * Gets the canvas area of the current tile the actor is standing on. * diff --git a/runelite-api/src/main/java/net/runelite/api/DynamicObject.java b/runelite-api/src/main/java/net/runelite/api/DynamicObject.java index a1914605e3..f34c20c8f0 100644 --- a/runelite-api/src/main/java/net/runelite/api/DynamicObject.java +++ b/runelite-api/src/main/java/net/runelite/api/DynamicObject.java @@ -3,4 +3,14 @@ package net.runelite.api; public interface DynamicObject extends Renderable { int getAnimationID(); + + /** + * Get the index of the AnimFrame (the index as it appears in the sequenceDefinition "frames" array). + */ + int getAnimFrame(); + + /** + * Get the number of cycles that have elapsed in the whole animation. + */ + int getAnimCycleCount(); }