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

rl-api: use TileObjects' z for hulls/clickboxes/outlines

Browse Source
This commit is contained in:
Max Weber
2022-03-07 12:35:18 -07:00
parent 4f8991dc7e
commit 52c2061ccd
4 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
runelite-client/src/main/java/net/runelite/client/ui/overlay/outline/ModelOutlineRenderer.java
View File

@@ -1016,15 +1016,13 @@ public class ModelOutlineRenderer
private void drawOutline(GameObject gameObject, int outlineWidth, Color color, int feather)
{
LocalPoint lp = gameObject.getLocalLocation();
Renderable renderable = gameObject.getRenderable();
if (renderable != null)
{
Model model = renderable instanceof Model ? (Model) renderable : renderable.getModel();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, gameObject.getPlane()),
drawModelOutline(model, gameObject.getX(), gameObject.getY(), gameObject.getZ(),
gameObject.getModelOrientation(), outlineWidth, color, feather);
}
}
@@ -1032,15 +1030,13 @@ public class ModelOutlineRenderer
private void drawOutline(GroundObject groundObject, int outlineWidth, Color color, int feather)
{
LocalPoint lp = groundObject.getLocalLocation();
Renderable renderable = groundObject.getRenderable();
if (renderable != null)
{
Model model = renderable instanceof Model ? (Model) renderable : renderable.getModel();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, client.getPlane()),
drawModelOutline(model, groundObject.getX(), groundObject.getY(), groundObject.getZ(),
0, outlineWidth, color, feather);
}
}
@@ -1048,16 +1044,13 @@ public class ModelOutlineRenderer
private void drawOutline(ItemLayer itemLayer, int outlineWidth, Color color, int feather)
{
LocalPoint lp = itemLayer.getLocalLocation();
Renderable bottomRenderable = itemLayer.getBottom();
if (bottomRenderable != null)
{
Model model = bottomRenderable instanceof Model ? (Model) bottomRenderable : bottomRenderable.getModel();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, itemLayer.getPlane()) - itemLayer.getHeight(),
drawModelOutline(model, itemLayer.getX(), itemLayer.getY(), itemLayer.getZ() - itemLayer.getHeight(),
0, outlineWidth, color, feather);
}
}
@@ -1068,8 +1061,7 @@ public class ModelOutlineRenderer
Model model = middleRenderable instanceof Model ? (Model) middleRenderable : middleRenderable.getModel();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, itemLayer.getPlane()) - itemLayer.getHeight(),
drawModelOutline(model, itemLayer.getX(), itemLayer.getY(), itemLayer.getZ() - itemLayer.getHeight(),
0, outlineWidth, color, feather);
}
}
@@ -1080,8 +1072,7 @@ public class ModelOutlineRenderer
Model model = topRenderable instanceof Model ? (Model) topRenderable : topRenderable.getModel();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, itemLayer.getPlane()) - itemLayer.getHeight(),
drawModelOutline(model, itemLayer.getX(), itemLayer.getY(), itemLayer.getZ() - itemLayer.getHeight(),
0, outlineWidth, color, feather);
}
}
@@ -1089,8 +1080,6 @@ public class ModelOutlineRenderer
private void drawOutline(DecorativeObject decorativeObject, int outlineWidth, Color color, int feather)
{
LocalPoint lp = decorativeObject.getLocalLocation();
Renderable renderable1 = decorativeObject.getRenderable();
if (renderable1 != null)
{
@@ -1098,9 +1087,9 @@ public class ModelOutlineRenderer
if (model != null)
{
drawModelOutline(model,
lp.getX() + decorativeObject.getXOffset(),
lp.getY() + decorativeObject.getYOffset(),
Perspective.getTileHeight(client, lp, decorativeObject.getPlane()),
decorativeObject.getX() + decorativeObject.getXOffset(),
decorativeObject.getY() + decorativeObject.getYOffset(),
decorativeObject.getZ(),
0, outlineWidth, color, feather);
}
}
@@ -1112,8 +1101,7 @@ public class ModelOutlineRenderer
if (model != null)
{
// Offset is not used for the second model
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, decorativeObject.getPlane()),
drawModelOutline(model, decorativeObject.getX(), decorativeObject.getY(), decorativeObject.getZ(),
0, outlineWidth, color, feather);
}
}
@@ -1121,16 +1109,13 @@ public class ModelOutlineRenderer
private void drawOutline(WallObject wallObject, int outlineWidth, Color color, int feather)
{
LocalPoint lp = wallObject.getLocalLocation();
Renderable renderable1 = wallObject.getRenderable1();
if (renderable1 != null)
{
Model model = renderable1 instanceof Model ? (Model) renderable1 : renderable1.getModel();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, wallObject.getPlane()),
drawModelOutline(model, wallObject.getX(), wallObject.getY(), wallObject.getZ(),
0, outlineWidth, color, feather);
}
}
@@ -1141,8 +1126,7 @@ public class ModelOutlineRenderer
Model model = renderable2 instanceof Model ? (Model) renderable2 : renderable2.getModel();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(),
Perspective.getTileHeight(client, lp, wallObject.getPlane()),
drawModelOutline(model, wallObject.getX(), wallObject.getY(), wallObject.getZ(),
0, outlineWidth, color, feather);
}
}
@@ -1180,7 +1164,7 @@ public class ModelOutlineRenderer
Model model = graphicsObject.getModel();
if (model != null)
{
drawModelOutline(model, lp.getX(), lp.getY(), graphicsObject.getHeight(),
drawModelOutline(model, lp.getX(), lp.getY(), graphicsObject.getZ(),
0, outlineWidth, color, feather);
}
}