Merge branch 'main' of github.com:Java-Game-Maker/JavaGameEngine

Author: spynetS

out/artifacts/JavaGameEngine_jar/JavaGameEngine.jar

@@ -216,17 +216,17 @@ public void update() {
             updateChildren(); // updates all the children
         }
         //mouse enter and exit
-        if(insideComp()){
+        if(insideComp()&&isEnabled){
             if(!isMouseInside()){
                 onMouseEntered();
                 setMouseInside(true);
             }
         }
-        else if (isMouseInside()){
+        else if (isMouseInside()&&isEnabled){
             onMouseExit();
             setMouseInside(false);
         }
-        if(isMouseInside()&&Input.isMousePressed()){
+        if(isMouseInside()&&Input.isMousePressed()&&isEnabled){
             onMousePressed();
             if(getParent()!=null) getParent().onMousePressed();
         }

src/JavaGameEngine/Components/Component.java

@@ -62,18 +62,9 @@ private static void startGame(){
             @Override
             public void run() {
                 calcThread.Update();
-            }
-        }, DELAY,DELAY);
-        Timer timer1 = new Timer();
-        timer1.schedule(new TimerTask() {
-            @Override
-            public void run() {
                 float current = System.nanoTime();
                 deltaTime = current - previous;
                 previous = current;
-                // Debug.log(totalElapsed);
-                GAMEWORLD.repaint();
-                Toolkit.getDefaultToolkit().sync(); // so it does not lag on linux
                 totalElapsed += deltaTime;
 
                 if((totalElapsed/1000000000)>1){
@@ -84,6 +75,17 @@ public void run() {
                 fps++;
             }
         }, DELAY,DELAY);
+        Timer timer1 = new Timer();
+        timer1.schedule(new TimerTask() {
+            @Override
+            public void run() {
+
+                // Debug.log(totalElapsed);
+                GAMEWORLD.repaint();
+                Toolkit.getDefaultToolkit().sync(); // so it does not lag on linux
+
+            }
+        }, DELAY,DELAY);
 
     }
 

src/JavaGameEngine/JavaGameEngine.java

@@ -22,7 +22,7 @@ public Coin() {
         sprite.loadAnimation(paths);
         sprite.setTimer(20);
 
-        setScale(new Vector2(16,16));
+        setScale(new Vector2(5,5));
         addChild(sprite);
         SquareCollider b = new SquareCollider();
         b.setTrigger(true);

src/Testing/Coin.java

@@ -26,6 +26,7 @@ public Ground() {
         }
 */
         SquareCollider s = new SquareCollider();
+        s.setVisible(true);
         s.setLocalPosition(new Vector2(0,0));
         //s.setLocalScale(new Vector2(600,0));
         addChild(s);

src/Testing/Ground.java

@@ -42,7 +42,7 @@ public void onTrigger(Component c) {
 
         if(c.getTag().equals("Coin")){
             c.destroy();
-            instantiate(new Bullet(getPosition().add(new Vector2(20,0)),Vector2.right));
+          //  instantiate(new Bullet(getPosition().add(new Vector2(20,0)),Vector2.right));
 
         }
     }