From 4d9c58750a0a1d9041069d804f97ce81b007fc5c Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 10 May 2018 08:45:45 -0400 Subject: [PATCH] Remove bounding boxes --- .../main/java/net/runelite/api/Client.java | 45 ----------- .../plugins/devtools/DevToolsPanel.java | 73 ------------------ .../plugins/devtools/2D_bounding_box.png | Bin 233 -> 0 bytes .../plugins/devtools/2D_clickbox_geometry.png | Bin 285 -> 0 bytes .../plugins/devtools/3D_bounding_box.png | Bin 430 -> 0 bytes .../devtools/mouseover_3D_bounding_box.png | Bin 312 -> 0 bytes .../net/runelite/mixins/RSClientMixin.java | 21 ----- .../rs/api/RSBoundingBox3DDrawMode.java | 30 ------- .../java/net/runelite/rs/api/RSClient.java | 36 --------- 9 files changed, 205 deletions(-) delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/devtools/2D_bounding_box.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/devtools/2D_clickbox_geometry.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/devtools/3D_bounding_box.png delete mode 100644 runelite-client/src/main/resources/net/runelite/client/plugins/devtools/mouseover_3D_bounding_box.png delete mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSBoundingBox3DDrawMode.java 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 2fba549c1b..e0955084b7 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -262,51 +262,6 @@ public interface Client extends GameEngine */ void playSoundEffect(int id, int x, int y, int range); - boolean getDrawBoundingBoxes2D(); - - /** - * When {@code shouldDraw} is true, a 2D bounding box will be drawn for - * all on-screen objects - * - * @param shouldDraw whether or not to draw 2D bounding boxes - */ - void setDrawBoundingBoxes2D(boolean shouldDraw); - - boolean getDrawBoundingBoxes3D(); - - /** - * When {@code shouldDraw} is true, 3D bounding boxes will be drawn - * either for the object under the cursor, or every object on screen - * according to - * {@link #setBoundingBoxAlwaysOnMode(boolean) BoundingBoxAlwaysOnMode} - * - * @param shouldDraw whether or not to draw 3D bounding boxes - */ - void setDrawBoundingBoxes3D(boolean shouldDraw); - - boolean getdrawObjectGeometry2D(); - - /** - * When {@code shouldDraw} is true, the clickbox geometry for the object - * under the cursor will be displayed - * - * @param shouldDraw whether or not to draw the clickbox geometry - */ - void setdrawObjectGeometry2D(boolean shouldDraw); - - boolean getBoundingBoxAlwaysOnMode(); - - /** - * Changes how {@link #getDrawBoundingBoxes3D()} behaves when active. - * When {@code alwaysDrawBoxes} is true, 3D bounding boxes will be - * drawn. When false, a 3D bounding box will only be drawn for the - * object under the cursor - * - * @param alwaysDrawBoxes whether or not to draw every 3D bounding box, - * when 3D bounding boxes are enabled - */ - void setBoundingBoxAlwaysOnMode(boolean alwaysDrawBoxes); - BufferProvider getBufferProvider(); int getMouseIdleTicks(); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java index e5f7c12705..bbd126e943 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java @@ -27,10 +27,7 @@ package net.runelite.client.plugins.devtools; import java.awt.Color; import java.awt.GridLayout; -import java.io.IOException; -import javax.imageio.ImageIO; import javax.inject.Inject; -import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JPanel; import lombok.extern.slf4j.Slf4j; @@ -136,9 +133,6 @@ public class DevToolsPanel extends PluginPanel }); container.add(renderProjectilesBtn); - final JPanel boundsDebugPanel = createBoundsDebugMultiButton(); - container.add(boundsDebugPanel); - final JButton varSnapshotBtn = new JButton("Snapshot Vars"); varSnapshotBtn.addActionListener(varTracker::snapshot); container.add(varSnapshotBtn); @@ -207,73 +201,6 @@ public class DevToolsPanel extends PluginPanel return container; } - private JPanel createBoundsDebugMultiButton() - { - ImageIcon bBox2DIcon; - ImageIcon bBox3DIcon; - ImageIcon clickBoxIcon; - ImageIcon bBox3DMousoverIcon; - - try - { - synchronized (ImageIO.class) - { - bBox2DIcon = new ImageIcon(ImageIO.read(DevToolsPlugin.class.getResourceAsStream("2D_bounding_box.png"))); - bBox3DIcon = new ImageIcon(ImageIO.read(DevToolsPlugin.class.getResourceAsStream("3D_bounding_box.png"))); - clickBoxIcon = new ImageIcon(ImageIO.read(DevToolsPlugin.class.getResourceAsStream("2D_clickbox_geometry.png"))); - bBox3DMousoverIcon = new ImageIcon(ImageIO.read(DevToolsPlugin.class.getResourceAsStream("mouseover_3D_bounding_box.png"))); - } - } - catch (IOException ex) - { - log.warn("unable to load bounding box images", ex); - return new JPanel(); - } - - JPanel buttonPanel = new JPanel(); - buttonPanel.setLayout(new GridLayout(1, 4)); - JButton bBox2DButton = new JButton(bBox2DIcon); - bBox2DButton.addActionListener(e -> - { - client.setDrawBoundingBoxes2D(!client.getDrawBoundingBoxes2D()); - highlightButton(bBox2DButton); - }); - buttonPanel.add(bBox2DButton); - - JButton bBox3DButton = new JButton(bBox3DIcon); - bBox3DButton.addActionListener(e -> - { - client.setDrawBoundingBoxes3D(!client.getDrawBoundingBoxes3D()); - highlightButton(bBox3DButton); - }); - buttonPanel.add(bBox3DButton); - - JButton clickBoxButton = new JButton(clickBoxIcon); - clickBoxButton.addActionListener(e -> - { - client.setdrawObjectGeometry2D(!client.getdrawObjectGeometry2D()); - highlightButton(clickBoxButton); - }); - buttonPanel.add(clickBoxButton); - - JButton mouseoverModeButton = new JButton(client.getBoundingBoxAlwaysOnMode() ? bBox3DIcon : bBox3DMousoverIcon); - mouseoverModeButton.addActionListener(e -> - { - client.setBoundingBoxAlwaysOnMode(!client.getBoundingBoxAlwaysOnMode()); - if (client.getBoundingBoxAlwaysOnMode()) - { - mouseoverModeButton.setIcon(bBox3DIcon); - } - else - { - mouseoverModeButton.setIcon(bBox3DMousoverIcon); - } - }); - buttonPanel.add(mouseoverModeButton); - - return buttonPanel; - } - private void highlightButton(JButton button) { if (button.getBackground().equals(Color.GREEN)) diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/devtools/2D_bounding_box.png b/runelite-client/src/main/resources/net/runelite/client/plugins/devtools/2D_bounding_box.png deleted file mode 100644 index d4449a42d3efc4a20c5407c0aae09aa26e6f4222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPdqo^p0=)J}F9DqWynIRD+&iT2ysd*(pE(3#eQEFmI zYKlU6W=V#EyQgnJie4%^P~6wk#WBR77|LvJo8#)`E4lpJE`E`z`oJ;z7yjxD! z#+8YROD1H9D=;U;GzhX8`0g-y9OPW6&?nW9!l2XjVJTxy7Mq=-Azwuv3qzo)4(FVX Qv;dHep00i_>zopr0I2apBLDyZ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/devtools/2D_clickbox_geometry.png b/runelite-client/src/main/resources/net/runelite/client/plugins/devtools/2D_clickbox_geometry.png deleted file mode 100644 index bf6a1930b60b9ddf121ebf8fb513941b01e936c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEUnfx)>bHL)Z$ zMWH;iBtya7(>EYRFO?lA-stJ#7-DgH>EzQwhZT63Rr&w_KYiPKj)4eAUTyM$*X=D| zSbixcS$q~}&~UCveZa18JGyJVjc3+o_J*AMtZkAv-!8E6d!y&C@Gz<)^mS!_#3(At&#PxW|1MBSHZvrm#5q4VH#M&W$Yo$~E=o-- zNlj5G&n(GMaQE~LNYP7WXJB9y@^o--2bs|C(LyE&4S1iw_5)e z2rppaeZ4DV+bjjmIkP&xe0^B5{z#0cT=}BCzo+ewd=q+i#%XVh=06M;pZ@#(VQlm} UI>nEN+XNJBp00i_>zopr06ej-9RL6T diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/devtools/mouseover_3D_bounding_box.png b/runelite-client/src/main/resources/net/runelite/client/plugins/devtools/mouseover_3D_bounding_box.png deleted file mode 100644 index 6af91bffa8a6dd51c5f349157d13df29e0dd2f0e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEYGO%h zib8p2Nrr;Er*A-tUMf3Ke2%A!V~EA+sgo`W9yZ``o?j!Ue7JH8-*nq6{nspO6csNn z7c^oznecX5leyxBottjA`5c`1x!&TVRD;9P6Rhj+iq_WD=w8~K^d(C=bE{ls()OES z#|-|xnDOAcilNZtx$PX2HR`TZH0G$UXEB;6_kPcsmD`dV=Bb_e@zU>>Z-?B?m6IYC y-EV!tWf-ycRMj<;^9FO~7|u>uR?v0B&LjTy`=|tVXR{L^4|uxzxvX