added layers and a button in package ui

Author: spynetS

.attach_pid53052

@@ -3,9 +3,6 @@
 import JavaGameEngine.Backend.Input.Input;
 import JavaGameEngine.Backend.Input.Keys;
 import JavaGameEngine.Components.Component;
-import JavaGameEngine.Components.GameObject;
-import JavaGameEngine.Components.Ui.UiComponent;
-import JavaGameEngine.msc.Debug;
 import JavaGameEngine.msc.Vector2;
 
 import javax.swing.*;
@@ -14,7 +11,9 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.geom.AffineTransform;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
 
 public class GameWorld extends JPanel{
     /*
@@ -90,7 +89,15 @@ private void drawUi(Graphics g){
 
     }
     private void drawComponents(Graphics g){
-        for(Component c : ComponentHandler.getObjects()){
+        List<Component> list = ComponentHandler.getObjects();
+        Collections.sort(list, new Comparator<Component>() {
+            @Override
+            public int compare(Component o1, Component o2) {
+                return o1.getLayer() - o2.getLayer();
+            }
+        });
+
+        for(Component c : list){
             (c).draw(g);
             g.drawString(fps,0,10);
         }

out/artifacts/JavaGameEngine_jar/JavaGameEngine.jar

@@ -27,6 +27,16 @@ public class Component {
     Component parent = null; // if component has parent it should update with some of the parents data
     LinkedList<Component> components = new LinkedList<>(); // children
 
+    int layer = 0;
+
+    public int getLayer() {
+        return layer;
+    }
+
+    public void setLayer(int layer) {
+        this.layer = layer;
+    }
+
     private boolean mouseInside = false;
 
     boolean isEnabled = true;
@@ -132,7 +142,12 @@ public void setRotation(Vector2 rotation) {
     }
 
     public boolean isEnabled() {
-        return isEnabled;
+        if(isParent()){
+            return isEnabled;
+        }
+        else{
+            return getParent().isEnabled();
+        }
     }
     public void setEnabled(boolean enabled) {
         isEnabled = enabled;
@@ -211,18 +226,18 @@ public void destroy(){
      */
     public void update() {
 
-        if(insideComp()&&isEnabled){
+        if(insideComp()&&isEnabled()){
             if(!isMouseInside()){
                 onMouseEntered();
                 setMouseInside(true);
             }
 
         }
-        else if (isMouseInside()&&isEnabled){
+        else if (isMouseInside()&&isEnabled()){
             onMouseExit();
             setMouseInside(false);
         }
-        if(isMouseInside()&&Input.isMousePressed()&&isEnabled){
+        if(isMouseInside()&&Input.isMousePressed()&&isEnabled()){
             onMousePressed();
             if(getParent()!=null) getParent().onMousePressed();
         }

src/JavaGameEngine/Backend/GameWorld.java

@@ -62,17 +62,7 @@ private static void startGame(){
             @Override
             public void run() {
                 calcThread.Update();
-                float current = System.nanoTime();
-                deltaTime = current - previous;
-                previous = current;
-                totalElapsed += deltaTime;
 
-                if((totalElapsed/1000000000)>1){
-                    GameWorld.fps = String.valueOf(fps);
-                    totalElapsed = 0;
-                    fps = 0;
-                }
-                fps++;
             }
         }, DELAY,DELAY);
         Timer timer1 = new Timer();
@@ -83,7 +73,17 @@ public void run() {
                 // Debug.log(totalElapsed);
                 GAMEWORLD.repaint();
                 Toolkit.getDefaultToolkit().sync(); // so it does not lag on linux
+                float current = System.nanoTime();
+                deltaTime = current - previous;
+                previous = current;
+                totalElapsed += deltaTime;
 
+                if((totalElapsed/1000000000)>1){
+                    GameWorld.fps = String.valueOf(fps);
+                    totalElapsed = 0;
+                    fps = 0;
+                }
+                fps++;
             }
         }, DELAY,DELAY);
 

src/JavaGameEngine/Components/Component.java

@@ -0,0 +1,53 @@
+package JavaGameEngine.UI;
+
+import JavaGameEngine.Components.GameObject;
+import JavaGameEngine.msc.Vector2;
+
+import java.awt.*;
+
+public class Button extends GameObject {
+
+    String text = "Press me";
+
+    public Button(String text){
+        this.text = text;
+        init();
+    }
+    public Button(){init();}
+
+    @Override
+    public void onMouseEntered() {
+        super.onMouseEntered();
+        setLocalScale(getLocalScale().multiply(1.1f));
+    }
+    @Override
+    public void onMouseExit() {
+        super.onMouseEntered();
+        setLocalScale(getLocalScale().devide(1.1f));
+    }
+    public void init(){
+        setLocalScale(new Vector2(0,-50));
+    }
+
+    @Override
+    public void onMousePressed() {
+        super.onMousePressed();
+        onPress();
+    }
+
+    public void onPress(){
+
+    }
+
+    @Override
+    public void draw(Graphics g) {
+        super.draw(g);
+        g.setColor(Color.white);
+        Graphics2D g2 = (Graphics2D)g;
+        g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g2.setFont(new Font("minectaft",0,30));
+
+        //g2.drawString("This is gona be awesome",70,20);
+        g2.drawString(this.text, (int) (getPosition().getX()-(g2.getFont().getSize())), (int) getPosition().getY());
+    }
+}

src/JavaGameEngine/JavaGameEngine.java

@@ -25,6 +25,7 @@ public static void main(String[] args){
         g.setPosition(new Vector2(0,500));
         b.setUseGravity(false);
         g.addChild(b);
+        g.setLayer(0);
         ComponentHandler.addObject(g);
         start();
     }
@@ -33,7 +34,7 @@ static class Player extends GameObject{
         public Player(){
 
             setColor(Color.CYAN);
-
+            setLayer(10);
             setTag("player");
             PhysicsBody b = new PhysicsBody();
             setPosition(new Vector2(400,300));