began on camera z movement difference

Author: spynetS

libs/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: com.javagamemaker.javagameengine.spel2.Main
+

src/com/javagamemaker/javagameengine/JavaGameEngine.java

@@ -108,7 +108,7 @@ private static void update() {
         counter++;
 
         // delta time is the time from previous frame (tick speed)
-        deltaTime = (now - prevTime) / 10;
+        deltaTime = (now - prevTime)/10;
         prevTime = now;
 
        // try {
@@ -119,7 +119,7 @@ private static void update() {
 
         Debug.startCount();
         selectedScene.update();
-        Debug.endCountMillSeconds();
+        //Debug.endCountMillSeconds();
         //gameWindow.repaint();
         //For linux
         Toolkit.getDefaultToolkit().sync();

src/com/javagamemaker/javagameengine/Scene.java

@@ -262,13 +262,13 @@ protected void paintComponent(Graphics g) {
 
         graphics2D.scale(scale.getX(),scale.getY());
 
-        float width = graphics2D.getClip().getBounds().width/2;
+        float width = graphics2D.getClip().getBounds().width >> 1;
         float percentW = 1-scale.getX();
-        float height = graphics2D.getClip().getBounds().height/2;
+        float height = graphics2D.getClip().getBounds().height >> 1;
         float percentH = 1-scale.getY();
 
         graphics2D.translate(width*percentW,height*percentH);
-        graphics2D.translate(camera.getPosition().getX(),camera.getPosition().getY());
+        //graphics2D.translate(camera.getPosition().getX(),camera.getPosition().getY());
 
         if(!screen.equals(graphics2D.getClip().getBounds())){
             screen = new Rectangle(graphics2D.getClip().getBounds().x-200,graphics2D.getClip().getBounds().y-200,graphics2D.getClip().getBounds().width+500,graphics2D.getClip().getBounds().height+500);
@@ -284,11 +284,14 @@ public int compare(Component o1, Component o2){
            }
         });
 
+        g.setColor(Color.WHITE);
+        g.drawOval((int) (Input.getMousePosition().getX()-20), (int) (Input.getMousePosition().getY()-20),50,50);
         try{
             int lsize = components.size();
             for(int i = 0; i < lsize;i++){
                 Component c = renderList.get(i);
-                if(inside(c)) {
+                if(inside(c) || true) {
+                    int layer = c.getLayer()==0?1:c.getLayer();
                     (c).render(graphics2D);
                     //if(!c.isVisible()){
                     //    c.setVisible(true);
@@ -308,7 +311,7 @@ public int compare(Component o1, Component o2){
                 LightManager.render(graphics2D);
                 graphics2D.translate(camera.getPosition().getX(),camera.getPosition().getY());
             }
-
+            //graphics2D.dispose();
         }catch (Exception e){}
     }
 }

src/com/javagamemaker/javagameengine/components/CameraMovement.java

@@ -9,7 +9,7 @@ public class CameraMovement extends Component{
     @Override
     public void update() {
         super.update();
-        if(Input.getMouseEvent() != null && Input.getMouseEvent().isControlDown()){
+        if(Input.getMouseEvent() != null && Input.isKeyDown(Keys.CTRL)){
             Component camera = getParent();
             camera.setScale(camera.getScale().subtract(camera.getScale().divide(10).multiply(Input.getScrollValue())));
             if(Input.isKeyDown(Keys.W)){

src/com/javagamemaker/javagameengine/components/Component.java

@@ -22,7 +22,7 @@
  */
 public class Component {
 
-    protected int layer = 10;
+    protected int layer = 100;
     protected String tag = "";
     protected float angle = 0;
     protected boolean visible = true;
@@ -622,15 +622,21 @@ public void destroy(){
             getParent().children.remove(this);
         }
     }
+    public void renderChildren(Graphics2D g){
+        for (Component child : getChildren()){
+            child.render(g);
+        }
+    }
     /**
      * Renders the component
      * @param g what graphics to render to
      */
     public void render(Graphics2D g){
-
-        for (Component child : getChildren()){
-            child.render(g);
-        }
+        Camera camera = JavaGameEngine.getSelectedScene().getCamera();
+        g.translate(camera.getPosition().getX()*layer/100,camera.getPosition().getY()*layer/100);
+        renderChildren(g);
+        g.translate(-camera.getPosition().getX()*layer/100,-camera.getPosition().getY()*layer/100);
+        //g.dispose();
     }
 
     /**

src/com/javagamemaker/javagameengine/components/GameObject.java

@@ -1,5 +1,6 @@
 package com.javagamemaker.javagameengine.components;
 
+import com.javagamemaker.javagameengine.JavaGameEngine;
 import com.javagamemaker.javagameengine.msc.Vector2;
 
 import java.awt.*;
@@ -36,13 +37,16 @@ public void setColor(Color color) {
     @Override
     public void render(Graphics2D g) {
         if(visible){
+            Camera camera = JavaGameEngine.getSelectedScene().getCamera();
+            g.translate(camera.getPosition().getX()*layer/100,camera.getPosition().getY()*layer/100);
             Color prev = g.getColor();
             if(getChild(new Sprite())==null){
                 g.setColor(color);
                 g.fill(getShape());
                 g.setColor(prev);
             }
-            super.render(g);
+            renderChildren(g);
+            g.translate(-camera.getPosition().getX()*layer/100,-camera.getPosition().getY()*layer/100);
         }
     }
 }