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

client: Add Widget Animation Smoothing

Browse Source
This commit is contained in:
Owain van Brakel
2019-07-10 23:32:24 +02:00
parent e7b15d9cfd
commit e85fc0e7d0
14 changed files with 325 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runescape-client/src/main/java/NPCDefinition.java
View File

@@ -424,11 +424,11 @@ public class NPCDefinition extends DualNode {
Model var10;
if (var1 != null && var3 != null) {
var10 = var1.animateSequence2(var5, var2, var3, var4);
var10 = var1.applyTransformations(var5, var2, var3, var4);
} else if (var1 != null) {
var10 = var1.animateSequence(var5, var2);
var10 = var1.transformActorModel(var5, var2);
} else if (var3 != null) {
var10 = var3.animateSequence(var5, var4);
var10 = var3.transformActorModel(var5, var4);
} else {
var10 = var5.toSharedSequenceModel(true);
}

2
runescape-client/src/main/java/ObjectDefinition.java
View File

@@ -662,7 +662,7 @@ public class ObjectDefinition extends DualNode {
return var11;
} else {
if (var7 != null) {
var11 = var7.animateObject(var11, var8, var2);
var11 = var7.transformObjectModel(var11, var8, var2);
} else {
var11 = var11.toSharedSequenceModel(true);
}

6
runescape-client/src/main/java/PlayerAppearance.java
View File

@@ -321,11 +321,11 @@ public class PlayerAppearance {
} else {
Model var16;
if (var1 != null && var3 != null) {
var16 = var1.animateSequence2(var15, var2, var3, var4);
var16 = var1.applyTransformations(var15, var2, var3, var4);
} else if (var1 != null) {
var16 = var1.animateSequence(var15, var2);
var16 = var1.transformActorModel(var15, var2);
} else {
var16 = var3.animateSequence(var15, var4);
var16 = var3.transformActorModel(var15, var4);
}
return var16;

36
runescape-client/src/main/java/SequenceDefinition.java
View File

@@ -38,8 +38,8 @@ public class SequenceDefinition extends DualNode {
@Export("frameIds")
public int[] frameIds;
@ObfuscatedName("g")
@Export("frameIds2")
int[] frameIds2;
@Export("chatFrameIds")
int[] chatFrameIds;
@ObfuscatedName("l")
@Export("frameLengths")
public int[] frameLengths;
@@ -179,14 +179,14 @@ public class SequenceDefinition extends DualNode {
this.field783 = var1.readUnsignedByte();
} else if (var2 == 12) {
var4 = var1.readUnsignedByte();
this.frameIds2 = new int[var4];
this.chatFrameIds = new int[var4];
for (var5 = 0; var5 < var4; ++var5) {
this.frameIds2[var5] = var1.readUnsignedShort();
this.chatFrameIds[var5] = var1.readUnsignedShort();
}
for (var5 = 0; var5 < var4; ++var5) {
var3 = this.frameIds2;
var3 = this.chatFrameIds;
var3[var5] += var1.readUnsignedShort() << 16;
}
} else if (var2 == 13) {
@@ -230,8 +230,8 @@ public class SequenceDefinition extends DualNode {
signature = "(Ldu;II)Ldu;",
garbageValue = "128527714"
)
@Export("animateSequence")
public Model animateSequence(Model model, int frame) {
@Export("transformActorModel")
public Model transformActorModel(Model model, int frame) {
frame = this.frameIds[frame];
Frames var3 = ItemContainer.getFrames(frame >> 16);
frame &= 65535;
@@ -249,8 +249,8 @@ public class SequenceDefinition extends DualNode {
signature = "(Ldu;IIB)Ldu;",
garbageValue = "-65"
)
@Export("animateObject")
Model animateObject(Model model, int frame, int orientation) {
@Export("transformObjectModel")
Model transformObjectModel(Model model, int frame, int orientation) {
frame = this.frameIds[frame];
Frames var4 = ItemContainer.getFrames(frame >> 16);
frame &= 65535;
@@ -285,8 +285,8 @@ public class SequenceDefinition extends DualNode {
signature = "(Ldu;II)Ldu;",
garbageValue = "-1692496767"
)
@Export("animateSpotAnimation")
Model animateSpotAnimation(Model model, int frame) {
@Export("transformSpotAnimationModel")
Model transformSpotAnimationModel(Model model, int frame) {
frame = this.frameIds[frame];
Frames var3 = ItemContainer.getFrames(frame >> 16);
frame &= 65535;
@@ -304,13 +304,13 @@ public class SequenceDefinition extends DualNode {
signature = "(Ldu;ILjh;II)Ldu;",
garbageValue = "-386360993"
)
@Export("animateSequence2")
public Model animateSequence2(Model model, int frame, SequenceDefinition sequence, int sequenceFrame) {
@Export("applyTransformations")
public Model applyTransformations(Model model, int frame, SequenceDefinition sequence, int sequenceFrame) {
frame = this.frameIds[frame];
Frames var5 = ItemContainer.getFrames(frame >> 16);
frame &= 65535;
if (var5 == null) {
return sequence.animateSequence(model, sequenceFrame);
return sequence.transformActorModel(model, sequenceFrame);
} else {
sequenceFrame = sequence.frameIds[sequenceFrame];
Frames var6 = ItemContainer.getFrames(sequenceFrame >> 16);
@@ -333,8 +333,8 @@ public class SequenceDefinition extends DualNode {
signature = "(Ldu;II)Ldu;",
garbageValue = "-15433768"
)
@Export("animateWidget")
public Model animateWidget(Model model, int frame) {
@Export("transformWidgetModel")
public Model transformWidgetModel(Model model, int frame) {
int var3 = this.frameIds[frame];
Frames var4 = ItemContainer.getFrames(var3 >> 16);
var3 &= 65535;
@@ -343,8 +343,8 @@ public class SequenceDefinition extends DualNode {
} else {
Frames var5 = null;
int var6 = 0;
if (this.frameIds2 != null && frame < this.frameIds2.length) {
var6 = this.frameIds2[frame];
if (this.chatFrameIds != null && frame < this.chatFrameIds.length) {
var6 = this.chatFrameIds[frame];
var5 = ItemContainer.getFrames(var6 >> 16);
var6 &= 65535;
}

2
runescape-client/src/main/java/SpotAnimationDefinition.java
View File

@@ -196,7 +196,7 @@ public class SpotAnimationDefinition extends DualNode {
Model var5;
if (this.sequence != -1 && var1 != -1) {
var5 = WorldMapAreaData.getSequenceDefinition(this.sequence).animateSpotAnimation(var2, var1);
var5 = WorldMapAreaData.getSequenceDefinition(this.sequence).transformSpotAnimationModel(var2, var1);
} else {
var5 = var2.toSharedSpotAnimationModel(true);
}

6
runescape-client/src/main/java/Widget.java
View File

@@ -1376,11 +1376,11 @@ public class Widget extends Node {
garbageValue = "1082545676"
)
@Export("getModel")
public Model getModel(SequenceDefinition sequence, int frame, boolean var3, PlayerAppearance appearance) {
public Model getModel(SequenceDefinition sequence, int frame, boolean alternate, PlayerAppearance appearance) {
field957 = false;
int var5;
int var6;
if (var3) {
if (alternate) {
var5 = this.modelType2;
var6 = this.modelId2;
} else {
@@ -1445,7 +1445,7 @@ public class Widget extends Node {
}
if (sequence != null) {
var7 = sequence.animateWidget(var7, frame);
var7 = sequence.transformWidgetModel(var7, frame);
}
return var7;