Merge remote-tracking branch 'origin/master'

Author: liqyn

core/src/main/java/com/amhsrobotics/circuitsim/gui/CircuitGUIManager.java

@@ -584,9 +584,9 @@ public void exit(InputEvent event, float x, float y, int pointer, Actor toActor)
         tbStyle.down = Constants.SKIN.getDrawable("button_02");
 
         TextButton dontshow = new TextButton(" Don't Show Again ", tbStyle);
-        welcomeMenu.add(dontshow).colspan(1).padRight(10).align(Align.right);
+//        welcomeMenu.add(dontshow).colspan(1).padRight(10).align(Align.right);
         TextButton close = new TextButton(" Close ", tbStyle);
-        welcomeMenu.add(close).colspan(1).padLeft(10).align(Align.left);
+        welcomeMenu.add(close).colspan(2).align(Align.center);
 
         dontshow.addListener(new ChangeListener() {
             @Override

core/src/main/java/com/amhsrobotics/circuitsim/hardware/Hardware.java

@@ -470,7 +470,13 @@ public void update(SpriteBatch batch, ModifiedShapeRenderer renderer, ClippedCam
                 }
 
                 //SET OWN POSITION
-                setPosition(vec.x + diffX, vec.y + diffY);
+
+                Vector2 isOutOfBounds = Tools.checkOutOfBounds(getSpriteBox(), getPosition());
+                if(isOutOfBounds != null) {
+                    setPosition(isOutOfBounds.x, isOutOfBounds.y);
+                } else {
+                    setPosition(vec.x + diffX, vec.y + diffY);
+                }
             }
 
         }

core/src/main/java/com/amhsrobotics/circuitsim/screens/CircuitScreen.java

@@ -3,6 +3,7 @@
 import com.amhsrobotics.circuitsim.Constants;
 import com.amhsrobotics.circuitsim.files.FileManager;
 import com.amhsrobotics.circuitsim.gui.CircuitGUIManager;
+import com.amhsrobotics.circuitsim.gui.ConfirmDialog;
 import com.amhsrobotics.circuitsim.hardware.Hardware;
 import com.amhsrobotics.circuitsim.hardware.HardwareManager;
 import com.amhsrobotics.circuitsim.hardware.HardwareType;
@@ -107,7 +108,9 @@ public boolean touchDragged(int screenX, int screenY, int pointer) {
                             }
                         }
                         for(Hardware h : selected) {
+//                            if(h.getSpriteBox().x - 10 > Tools.mouseScreenToWorld(camera).x) {
                             h.move(x, -y);
+//                            }
                         }
                         selectMultiple1.add(x, -y);
                         selectMultiple2.add(x, -y);
@@ -133,7 +136,7 @@ public boolean scrolled(float amountX, float amountY) {
 
                         Vector3 worldCoordsBefore = camera.getCamera().unproject(new Vector3(screenCoords));
 
-                        camera.getCamera().zoom += amountY * camera.getCamera().zoom * 0.015f;
+                        camera.getCamera().zoom += amountY * camera.getCamera().zoom * 0.1f;
                         camera.getCamera().update();
 
                         Vector3 worldCoordsAfter = camera.getCamera().unproject(new Vector3(screenCoords));
@@ -163,6 +166,7 @@ public boolean scrolled(float amountX, float amountY) {
 
     @Override
     public void render(float delta) {
+//        Gdx.app.log(Tools.mouseScreenToWorld(camera).toString(), "");
 
         camera.update();
         camera.calculateBounds();
@@ -255,7 +259,16 @@ public void render(float delta) {
 
 
             if (currentPlacingHardware != null && currentPlacingHardware.type == Constants.placing_object) {
-                currentPlacingHardware.setPosition(vec2.x, vec2.y);
+
+                Vector2 isOutOfBounds = Tools.checkOutOfBounds(currentPlacingHardware.getSpriteBox(), currentPlacingHardware.getPosition());
+                if(isOutOfBounds != null) {
+                    currentPlacingHardware.setPosition(isOutOfBounds.x, isOutOfBounds.y);
+                } else {
+                    currentPlacingHardware.setPosition(vec2.x, vec2.y);
+                }
+
+
+
             } else {
                 if (Constants.placing_object == HardwareType.WIRE || Constants.placing_object == HardwareType.ETHERNET || Constants.placing_object == HardwareType.TUBING || Constants.placing_object == HardwareType.CURVEDCABLE) {
                     drawPlacing(vec2.x, vec2.y);
@@ -408,6 +421,15 @@ public void show() { }
     @Override
     public void resize(int width, int height) {
         stage.getViewport().update(width, height, true);
+        // TODO add confirm dialog for resize, tell user to save, go to title screen, come back
+//        ConfirmDialog.createWindow(
+//                new Runnable() {
+//                    @Override
+//                    public void run() {
+//
+//                    }
+//                }
+//        );
     }
     @Override
     public void pause() { }

core/src/main/java/com/amhsrobotics/circuitsim/utility/Tools.java

@@ -1,10 +1,12 @@
 package com.amhsrobotics.circuitsim.utility;
 
+import com.amhsrobotics.circuitsim.Constants;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
 import com.badlogic.gdx.math.Interpolation;
+import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.math.Vector3;
 import com.badlogic.gdx.scenes.scene2d.Actor;
@@ -41,6 +43,23 @@ public static boolean collide(Vector2 r1p1, Vector2 r1p2, Vector2 r2p1, Vector2
                 r1p1.y >= r2p2.y);
     }
 
+    // returns coordinates to reset to if out of bounds
+    public static Vector2 checkOutOfBounds(Rectangle spriteBox, Vector2 originPosition) {
+        if(spriteBox.x <= 0) {
+            return new Vector2(5 + (float)(spriteBox.width / 2), originPosition.y);
+        } else if(spriteBox.x + spriteBox.width >= Constants.WORLD_DIM.x) {
+            return new Vector2(Constants.WORLD_DIM.x - 5 - (float)(spriteBox.width / 2), originPosition.y);
+        }
+
+        if(spriteBox.y <= 0) {
+            return new Vector2(originPosition.x, 5 + (float)(spriteBox.height / 2));
+        } else if(spriteBox.y + spriteBox.height >= Constants.WORLD_DIM.y) {
+            return new Vector2(originPosition.x, Constants.WORLD_DIM.y - 5 - (float)(spriteBox.height / 2));
+        }
+
+        return null;
+    }
+
     public static void slideIn(Actor actor, String location, float duration, Interpolation interp, int offset, Runnable... runnable) {
         Vector2 actorXY = new Vector2(actor.getX(), actor.getY());
 

lwjgl3/src/main/java/com/amhsrobotics/circuitsim/lwjgl3/Lwjgl3Launcher.java

@@ -17,6 +17,7 @@ private static Lwjgl3ApplicationConfiguration getDefaultConfiguration() {
 		Lwjgl3ApplicationConfiguration configuration = new Lwjgl3ApplicationConfiguration();
 		configuration.setTitle("TKO Circuit Simulator");
 		configuration.setWindowedMode(1366, 768);
+		configuration.setResizable(false);
 		configuration.setWindowIcon("logo.png");
 		configuration.setBackBufferConfig(8, 8, 8, 8, 16, 0, 3);
 		return configuration;