added mouse keys and onmouse events update

Author: spynetS

.attach_pid38976

@@ -22,6 +22,19 @@ public static LinkedList<Component> getObjects() {
         return objects;
     }
 
+    public static LinkedList<Component> getAllObjects() {
+
+        return getAllObjects_(objects);
+    }
+
+    private static LinkedList<Component> getAllObjects_(LinkedList<Component> parent) {
+        for(Component component : parent){
+            parent.addAll(component.getChildren());
+            return parent;
+        }
+        return parent;
+    }
+
     public static void removeObject(Component object)
     {
         ComponentHandler.objects.remove((object));

out/artifacts/JavaGameEngine_jar/JavaGameEngine.jar

@@ -46,12 +46,6 @@ public void keyReleased(KeyEvent e) {
             @Override
             public void mousePressed(MouseEvent e) {
                 super.mousePressed(e);
-                for(Component comp : ComponentHandler.getObjects()){
-
-                    if(insideComp(comp)){
-                        comp.onMousePressed();
-                    }
-                }
                 Input.addMouseButton(e);
             }
             @Override
@@ -68,18 +62,6 @@ public void mouseDragged(MouseEvent e) {
             @Override
             public void mouseMoved(MouseEvent e) {
                 super.mouseMoved(e);
-                for(Component comp : ComponentHandler.getObjects()){
-                    if(insideComp(comp)){
-                        if(!comp.isMouseInside()){
-                            comp.onMouseEntered();
-                            comp.setMouseInside(true);
-                        }
-                    }
-                    else if (comp.isMouseInside()){
-                        comp.onMouseExit();
-                        comp.setMouseInside(false);
-                    }
-                }
                 Input.setMousePosition(new Vector2((float) e.getPoint().getX(), (float) e.getPoint().getY()));
             }
         };

src/JavaGameEngine/Backend/ComponentHandler.java

@@ -9,6 +9,7 @@
 public class Input {
     private static LinkedList<Integer> keyDowns = new LinkedList<>();
     private static boolean isPressed = false;
+    private static boolean mouseIsPressed = false;
     private static Vector2 mousePosition=new Vector2(0,0);
 
 
@@ -24,22 +25,39 @@ public static void setMousePosition(Vector2 mousePosition) {
     public static void addMouseButton(MouseEvent e) {
         if(!isMouseDown(e.getButton()))
             mouseButtonDowns.add(new Integer(e.getButton()));
+
+        if(!mouseIsPressed)
+        {
+            mouseIsPressed = true;
+        }
     }
     public static void removeMouseButton(MouseEvent e) {
+
         if(isMouseDown(e.getButton()))
             mouseButtonDowns.remove(new Integer(e.getButton()));
     }
     public static boolean isMouseDown(int mouseButtonDown)
     {
         return(mouseButtonDowns.contains(mouseButtonDown));
     }
+
+    public static boolean isMouseDown() {
+        return mouseButtonDowns.size() > 0;
+    }
+
+    public static boolean isMousePressed(){
+        boolean temp = mouseIsPressed;
+        mouseIsPressed = false;
+        return temp;
+    }
     /**
      * @param keyCode the key to check
      * @return true if the keyCode is held down
      */
     public static boolean isKeyDown(int keyCode) {
         return(keyDowns.contains(keyCode));
     }
+
     public static void addKey(KeyEvent e){
         if(!isKeyDown(e.getKeyCode()))
             keyDowns.add(new Integer(e.getKeyCode()));

src/JavaGameEngine/Backend/GameWorld.java

@@ -10,5 +10,8 @@ public class Keys {
     public static final int LEFTARROW = 37;
     public static final int RIGHTARROW = 40;
     public static final int SPACE = 32;
+    public static final int RIGHTCLICK = 1;
+    public static final int LEFTCLICK = 3;
+    public static final int MIDDLECLICK = 2;
 
 }

src/JavaGameEngine/Backend/Input/Input.java

@@ -1,6 +1,7 @@
 package JavaGameEngine.Components;
 
 import JavaGameEngine.Backend.ComponentHandler;
+import JavaGameEngine.Backend.Input.Input;
 import JavaGameEngine.Backend.UpdateThread;
 import JavaGameEngine.Components.Collider.Collider;
 import JavaGameEngine.Components.Collider.SquareCollider;
@@ -178,7 +179,7 @@ public void removeChild(Component child){
      * @param c the object to instantiate
      */
     public void instantiate(Component c){
-        //UpdateThread.newObjects.add(c);
+        UpdateThread.newObjects.add(c);
     }
     /**
      * This method will destroy this object it will remove it from the component handler
@@ -205,15 +206,48 @@ public void update() {
             float y = (parent.getPosition().getY()-((getScale().getY()/2)));
 
             setPosition(new Vector2(x,y).add(getLocalPosition())); // we get the parents position and we add our localPosition
+            /* update this in the setScale and setRotation instead
+                setRotation(parent.getRotation().add(getLocalRotation()));
+                setScale(parent.getScale().add(getLocalScale()));
+            */
 
-            setRotation(parent.getRotation().add(getLocalRotation()));
-            setScale(parent.getScale().add(getLocalScale()));
         }
         if(components.size()>0){
             updateChildren(); // updates all the children
         }
+        //mouse enter and exit
+        if(insideComp()){
+            if(!isMouseInside()){
+                onMouseEntered();
+                setMouseInside(true);
+            }
+        }
+        else if (isMouseInside()){
+            onMouseExit();
+            setMouseInside(false);
+        }
+        if(isMouseInside()&&Input.isMousePressed()){
+            onMousePressed();
+        }
     }
+    private boolean insideComp(){
+        float width = getScale().getX()/2;
+        float height = getScale().getY()/2;
+
+        float xMin = getPosition().getX()-width;
+        float xMax = getPosition().getX()+width;
 
+        float yMin = getPosition().getY()-height;
+        float yMax = getPosition().getY()+height;
+
+        float mx = Input.getMousePosition().getX();
+        float my = Input.getMousePosition().getY();
+
+        if(mx>xMin&&mx<xMax&&my>yMin&&my<yMax){
+            return true;
+        }
+        return false;
+    }
     public void updateChildren(){
         LinkedList<Component> s =  getChildren();
         for (Component component :s) {