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 d229a073f7..4e5332e2f2 100644 --- a/runelite-api/src/main/java/net/runelite/api/Model.java +++ b/runelite-api/src/main/java/net/runelite/api/Model.java @@ -24,29 +24,11 @@ */ package net.runelite.api; -import java.util.List; -import net.runelite.api.model.Triangle; -import net.runelite.api.model.Vertex; - /** * Represents the model of an object. */ public interface Model extends Renderable { - /** - * Gets a list of all vertices of the model. - * - * @return the vertices - */ - List getVertices(); - - /** - * Gets a list of all triangles of the model. - * - * @return the triangle - */ - List getTriangles(); - int getVerticesCount(); int[] getVerticesX(); diff --git a/runelite-api/src/main/java/net/runelite/api/model/Triangle.java b/runelite-api/src/main/java/net/runelite/api/model/Triangle.java deleted file mode 100644 index daf59c2489..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/model/Triangle.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.model; - -import lombok.Value; - -/** - * Represents 3 vertices as a three-dimensional Triangle. - */ -@Value -public class Triangle -{ - private final Vertex a; - private final Vertex b; - private final Vertex c; - - /** - * Rotates the triangle by the given orientation. - * - * @param orientation passed orientation - * @return new instance - */ - public Triangle rotate(int orientation) - { - return new Triangle( - a.rotate(orientation), - b.rotate(orientation), - c.rotate(orientation) - ); - } - -} diff --git a/runelite-api/src/main/java/net/runelite/api/model/Vertex.java b/runelite-api/src/main/java/net/runelite/api/model/Vertex.java deleted file mode 100644 index b59a7d7891..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/model/Vertex.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2017, Adam - * 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.model; - -import lombok.Value; -import net.runelite.api.Perspective; - -/** - * Represents a point in a three-dimensional space. - */ -@Value -public class Vertex -{ - private final int x; - private final int y; - private final int z; - - /** - * Rotates the triangle by the given orientation. - * - * @param orientation passed orientation - * @return new instance - */ - public Vertex rotate(int orientation) - { - // models are orientated north (1024) and there are 2048 angles total - orientation = (orientation + 1024) % 2048; - - if (orientation == 0) - { - return this; - } - - int sin = Perspective.SINE[orientation]; - int cos = Perspective.COSINE[orientation]; - - return new Vertex( - x * cos + z * sin >> 16, - y, - z * cos - x * sin >> 16 - ); - } -}