Skip to content

Commit 85af07b

Browse files
spynetSspynetS
committed
began
1 parent 76e9df6 commit 85af07b

File tree

10 files changed

+56
-28
lines changed

10 files changed

+56
-28
lines changed

‎src/Testing/Main.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import javagameengine.backend.UpdateThread;
66
import javagameengine.backend.input.Input;
77
import javagameengine.backend.input.Keys;
8+
import javagameengine.components.Camera;
89
import javagameengine.components.Component;
910
import javagameengine.components.colliders.SquareCollider;
1011
import javagameengine.components.GameObject;
@@ -23,7 +24,9 @@ public class Main extends JavaGameEngine{
2324
public static int level = 0;
2425
public static void main(String[] args){
2526
Main m = new Main();
26-
setSelectedScene(new Level4());
27+
Level1 l = new Level1();
28+
setSelectedScene(l);
29+
2730
m.start();
2831
//Debug.showWhere = true;
2932
}

‎src/Testing/PlayerMovement.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ class PlayerMovement : Component() {
1717
super.update()
1818

1919
if(Input.isKeyDown(Keys.DOWNARROW)){
20-
UpdateThread.camera.scale=UpdateThread.camera.scale.add(0.01F);
20+
Main.getScene().camera.scale= Main.getScene().camera.scale?.add(0.01F);
2121
}
2222
if(Input.isKeyDown(Keys.UPARROW)){
23-
UpdateThread.camera.scale=UpdateThread.camera.scale.subtract(Vector2(0.01f,0.01f));
23+
Main.getScene().camera.scale=Main.getScene().camera.scale?.subtract(Vector2(0.01f,0.01f));
2424
}
2525

2626
try {
@@ -41,7 +41,7 @@ class PlayerMovement : Component() {
4141
if (Input.isKeyPressed(Keys.SPACE)) {
4242
physicsBody.addForce(Vector2.up, 120f*UpdateThread.deltatime)
4343
}
44-
UpdateThread.camera.position = parent.position.subtract(Main.getWindowSize().devide(2f))
44+
Main.getScene().camera.position = Main.getScene().camera.position.add(parent.position.subtract(Main.getWindowSize().devide(2)))
4545
}
4646
catch (e: Exception){
4747
e.printStackTrace()

‎src/javagameengine/backend/Scene.java‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package javagameengine.backend;
22

3+
import Testing.Main;
34
import javagameengine.JavaGameEngine;
45
import javagameengine.backend.input.Input;
6+
import javagameengine.components.Camera;
57
import javagameengine.components.Component;
68
import javagameengine.msc.Debug;
79
import javagameengine.msc.Vector2;
@@ -34,6 +36,7 @@ public class Scene extends JPanel{
3436
public static String fps = "0";
3537

3638
public int id=120313;
39+
private Camera camera = new Camera();
3740

3841
private boolean active = false;
3942

@@ -56,7 +59,7 @@ public void start(){
5659

5760
setActive(true);
5861
setBackground(new Color(44, 157, 228));
59-
UpdateThread.camera.setPosition(new Vector2(0,0));
62+
getCamera().setPosition(new Vector2(0,0));
6063

6164
}
6265
public void starts(){
@@ -82,6 +85,13 @@ public void update(){
8285
JavaGameEngine.origin = JavaGameEngine.getWindowSize().devide(2);
8386
}
8487

88+
public void setCamera(Camera c){
89+
this.camera = c;
90+
}
91+
public Camera getCamera(){
92+
return camera;
93+
}
94+
8595
/**
8696
* Here is the main drawing function
8797
* */
@@ -96,7 +106,7 @@ private void drawComponents(Graphics g){
96106
//g.drawString(Input.getMouseWorldPosition().toString(), (int) Input.getMousePosition().getX(), (int) Input.getMousePosition().getY());
97107

98108
Graphics2D g1 = (Graphics2D) g;
99-
Vector2 scale = UpdateThread.camera.getScale();
109+
Vector2 scale = getCamera().getScale();
100110
//scale = scale.devide(JavaGameEngine.getWindowSize());
101111
g1.scale(scale.getX(),scale.getY());
102112

‎src/javagameengine/backend/UpdateThread.java‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,6 @@ public UpdateThread(LinkedList<Component> o,Scene gameWorld) {
3030
this.gameWorld = gameWorld;
3131
}
3232

33-
/**
34-
* This is the camera every component is going to be renderd offset to the cameras position
35-
*/
36-
public static Component camera = new Component(new Vector2(0,0),new Vector2(1,1)){
37-
38-
@Override
39-
public void setPosition(Vector2 position) {
40-
this.position = position;
41-
}
42-
43-
@Override
44-
public Vector2 getScale() {
45-
return this.scale;
46-
}
47-
};
48-
4933
//updates all the components
5034
private LinkedList<Component> UpdateObjects()
5135
{
@@ -97,7 +81,7 @@ public void run() {
9781
} catch (InterruptedException e) {
9882
e.printStackTrace();
9983
}
100-
camera.update();
84+
JavaGameEngine.getScene().getCamera().update();
10185
//Updates all the objects
10286
Update();
10387
JavaGameEngine.mainClass.update();

‎src/javagameengine/backend/input/Input.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package javagameengine.backend.input;
22

3+
import Testing.Main;
34
import javagameengine.JavaGameEngine;
45
import javagameengine.backend.UpdateThread;
56
import javagameengine.msc.Vector2;
@@ -20,7 +21,7 @@ public static Vector2 getMousePosition() {
2021
return mousePosition;
2122
}
2223
public static Vector2 getMouseWorldPosition(){
23-
return Input.getMousePosition().add(UpdateThread.camera.getPosition().add(0).subtract(JavaGameEngine.getWindowSize().devide(2)));
24+
return Input.getMousePosition().add(Main.getScene().getCamera().getPosition().add(0).subtract(JavaGameEngine.getWindowSize().devide(2)));
2425
}
2526
public static void setScrollValue(float scrollValue1){
2627
scrollValue = scrollValue1;

‎src/javagameengine/components/Camera.kt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
package javagameengine.components
2+
3+
import javagameengine.msc.Vector2
4+
5+
class Camera : Component() {
6+
7+
init {
8+
tag = "Camera"
9+
scale = Vector2(1f,1f);
10+
position = Vector2(0f,0f);
11+
}
12+
13+
override fun setPosition(position: Vector2?) {
14+
this.position = position
15+
}
16+
17+
override fun getScale(): Vector2? {
18+
return scale
19+
}
20+
21+
}

‎src/javagameengine/components/Component.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package javagameengine.components;
22

3+
import Testing.Main;
34
import javagameengine.backend.input.Input;
45
import javagameengine.backend.UpdateThread;
56
import javagameengine.JavaGameEngine;
@@ -135,8 +136,8 @@ public void setPosition(Vector2 position) {
135136
*
136137
*/
137138
public Vector2 getSpritePosition(){
138-
float x = (getPosition().subtract(UpdateThread.camera.getPosition()).getX()-((getScale().getX()/2)));
139-
float y = (getPosition().subtract(UpdateThread.camera.getPosition()).getY()-((getScale().getY()/2)));
139+
float x = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getX()-((getScale().getX()/2)));
140+
float y = (getPosition().subtract(Main.getScene().getCamera().getPosition()).getY()-((getScale().getY()/2)));
140141

141142
return new Vector2(x,y);
142143
}

‎src/javagameengine/components/GameObject.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package javagameengine.components;
2+
import Testing.Main;
23
import javagameengine.backend.UpdateThread;
34
import javagameengine.components.colliders.Collider;
45
import javagameengine.components.colliders.SquareCollider;
@@ -70,7 +71,7 @@ public Color getColor() {
7071
*/
7172
@Override
7273
public void draw(Graphics g){
73-
if(getPosition().getDistance(UpdateThread.camera.getPosition())<5000){
74+
if(getPosition().getDistance(Main.getScene().getCamera().getPosition())<5000){
7475
//g.drawString(getPosition().toString(), (int) getSpritePosition().getX(), (int) (getSpritePosition().getY()-50));
7576
// g.drawString(getSpritePosition().toString(), (int) getSpritePosition().getX(), (int) (getSpritePosition().getY()-20));
7677
g.setColor(this.color);

‎src/javagameengine/mapeditor/DrawingBoard.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class DrawingBoard : Scene(){
2929

3030
init {
3131
components.add(GameObject())
32-
UpdateThread.camera.addChild(CameraMovement(4f))
32+
//UpdateThread.camera.addChild(CameraMovement(4f))
3333
}
3434

3535
override fun paintComponents(g: Graphics?) {

‎src/javagameengine/msc/Vector2.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package javagameengine.msc;
22

3+
import org.jetbrains.annotations.NotNull;
4+
35
import java.util.Objects;
46

57
public class Vector2 {
@@ -123,4 +125,9 @@ public Vector2 removeY(){
123125
public Vector2 removeX(){
124126
return new Vector2(0,y);
125127
}
128+
129+
@NotNull
130+
public Vector2 devide(int i) {
131+
return this.devide(new Vector2(i,i));
132+
}
126133
}

0 commit comments

Comments
 (0)