update

Author: spynetS

src/javagameengine/input/Input.java

@@ -69,10 +69,11 @@ public static boolean isMouseDown() {
         return mouseButtonDowns.size() > 0;
     }
 
-    public static boolean isMousePressed(){
-        boolean temp = mouseIsPressed;
-        mouseIsPressed = false;
-        return temp;
+    public static boolean isMousePressed(int keyCode){
+        boolean pressed =  isMouseDown(keyCode);
+        if(pressed)
+            mouseButtonDowns.remove(new Integer(keyCode));
+        return pressed;
     }
     /**
      * @param keyCode the key to check

src/javagameengine/ui/Button.java

@@ -4,6 +4,7 @@
 import javagameengine.msc.Debug;
 import javagameengine.msc.Padding;
 import javagameengine.msc.Vector2;
+import testing.Main;
 
 import java.awt.*;
 
@@ -21,13 +22,22 @@ public Button(String text){
     @Override
     public void mouseEntered() {
         super.mouseEntered();
-        Debug.log("asdsad");
+        setScale(getScale().add(10));
     }
 
     @Override
     public void mouseLeft() {
         super.mouseLeft();
-        setPadding(new Padding(0));
+        setScale(getScale().subtract(10));
+    }
+
+    @Override
+    public void update() {
+        super.update();
+        try{
+          //  Debug.log(Main.getSelectedScene().hasA.toString());
+        }catch (Exception e){}
+
     }
 
     @Override

src/javagameengine/ui/Panel.java

@@ -1,8 +1,11 @@
-package javagameengine.ui.layout;
+package javagameengine.ui;
 
+import javagameengine.msc.Debug;
 import javagameengine.msc.Vector2;
-import javagameengine.ui.Row;
 import javagameengine.ui.UiFillElement;
+import javagameengine.ui.layout.Layout;
+import javagameengine.ui.layout.Row;
+import testing.Main;
 
 import java.awt.*;
 
@@ -17,7 +20,7 @@ public Panel(Layout layout){
         setColor(new Color(126, 126, 126));
         setScale(new Vector2(100,100));
         this.layout = layout;
-        layout.parent = this;
+        layout.setParent(this);
     }
 
     public Layout getLayout() {
@@ -32,5 +35,6 @@ public void setLayout(Layout layout) {
     public void update() {
         layout.orient(getChildren());
         super.update();
+        Debug.log((Main.getSelectedScene().hasA!=null?Main.getSelectedScene().hasA.toString():""));
     }
 }

src/javagameengine/ui/Text.java

@@ -1,5 +1,7 @@
 package javagameengine.ui;
 
+import javagameengine.msc.Debug;
+
 import java.awt.*;
 
 public class Text extends UiElement{
@@ -9,8 +11,9 @@ public class Text extends UiElement{
     public Text(String text){
         this.text = text;
         setColor(Color.WHITE);
+        setLayer(0);
     }
-    
+
     public float getLength(){
         return text.length()*font.getSize();
     }

src/javagameengine/ui/UiElement.java

@@ -5,6 +5,7 @@
 import javagameengine.components.shapes.Circle;
 import javagameengine.components.shapes.Rect;
 import javagameengine.input.Input;
+import javagameengine.input.Keys;
 import javagameengine.msc.Debug;
 import javagameengine.msc.Padding;
 
@@ -31,7 +32,7 @@ public void onClick(){
     @Override
     public void update() {
         super.update();
-        if(Input.isMousePressed()){
+        if(Input.isMouseDown(Keys.LEFTCLICK) && mouseInside){
             onClick();
         }
     }

src/javagameengine/ui/layout/Layout.java

@@ -18,6 +18,14 @@ public Layout(UiElement parent) {
         this.parent = parent;
     }
 
+    public UiElement getParent() {
+        return parent;
+    }
+
+    public void setParent(UiElement parent) {
+        this.parent = parent;
+    }
+
     public void orient(LinkedList<Component> elements) {
 
     }

src/javagameengine/ui/layout/Row.java

@@ -1,7 +1,8 @@
-package javagameengine.ui;
+package javagameengine.ui.layout;
 
 import javagameengine.components.Component;
 import javagameengine.msc.Vector2;
+import javagameengine.ui.UiElement;
 import javagameengine.ui.layout.Layout;
 
 import java.util.LinkedList;

src/testing/Main.java

@@ -2,56 +2,34 @@
 
 import javagameengine.JavaGameEngine;
 import javagameengine.Scene;
-import javagameengine.components.*;
+import javagameengine.msc.Debug;
+import javagameengine.msc.Padding;
 import javagameengine.msc.Vector2;
-
-import java.awt.*;
+import javagameengine.ui.Button;
+import javagameengine.ui.Panel;
 
 public class Main extends JavaGameEngine {
 
     public static void main(String[] args){
 
-        Scene scene1 = new Scene(){
-            @Override
-            protected void paintComponent(Graphics g) {
-                super.paintComponent(g);
-                g.drawString(((hasA!=null)?hasA.toString():""),-100,-100);
-            }
-        };
-
-
-        GameObject gameObject = new GameObject();
-        gameObject.setPosition(new Vector2(100,100));
-        gameObject.setColor(Color.GREEN);
-        gameObject.add(new GameObject(){
-            @Override
-            public void start() {
-                super.start();
-                setColor(Color.red);
-                setLayer(30);
-                setScale(new Vector2(60,60));
-                setParentOffset(new Vector2(80,80));
-            }
-        });
+        Scene scene1 = new Scene();
 
-        scene1.add(gameObject);
-        scene1.add(new GameObject(){
+        Button b = new Button("Text"){
             @Override
-            public void start() {
-                super.start();
-                setLayer(20);
+            public void onClick() {
+                super.onClick();
+                Debug.log("asdasd");
             }
-        });
+        };
+        b.setLayer(10);
 
+        scene1.add(b);
 
         setSelectedScene(scene1);
 
         JavaGameEngine.size = new Vector2(1920/2,1080/2);
 
         start();
 
-
     }
-
-
-}
+}