dvorakmortonxd/space-sim
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions

just some code optimisations (moved a part of the functions from the paint function to the performaction, 1/2 commits, cuz im aiming for one commit an hour right now and I still didnt move all the needed stuff from the paint function)

Browse source
This commit is contained in:
dvorakmortonxd 2026-10-21 13:25:59 +02:00
commit 1ba67ba2cc
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/main/java/dev/dvorakmortonxd/Game.java
View file

@ -11,8 +11,6 @@ import javax.imageio.ImageIO;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.util.Random; import java.util.Random;
public class Game extends JPanel implements ActionListener, KeyListener { public class Game extends JPanel implements ActionListener, KeyListener {
// defines the window dimensions // defines the window dimensions
private final int windowWidth = 900; private final int windowWidth = 900;
@ -71,8 +69,8 @@ public class Game extends JPanel implements ActionListener, KeyListener {
private int planetSize = 128*3; private int planetSize = 128*3;
private Rectangle planetCollision = new Rectangle(planetX, planetY, planetSize, planetSize); private Rectangle planetCollision = new Rectangle(planetX, planetY, planetSize, planetSize);
private boolean hoveringOverPlanet = false; private boolean hoveringOverPlanet = false;
int hoverModifier;
double opacityModifier;
private int playButtonX = 70; private int playButtonX = 70;
private int quitButtonX = 70; private int quitButtonX = 70;
private int playButtonY = 210; private int playButtonY = 210;
@ -130,8 +128,12 @@ public class Game extends JPanel implements ActionListener, KeyListener {
playerBackward0 = ImageIO.read(new File("assets/player/playerSpriteBackward.png")); playerBackward0 = ImageIO.read(new File("assets/player/playerSpriteBackward.png"));
playerBackward1 = ImageIO.read(new File("assets/player/playerSpriteBackwardWalk0.png")); playerBackward1 = ImageIO.read(new File("assets/player/playerSpriteBackwardWalk0.png"));
playerBackward2 = ImageIO.read(new File("assets/player/playerSpriteBackwardWalk1.png")); playerBackward2 = ImageIO.read(new File("assets/player/playerSpriteBackwardWalk1.png"));
playerLeft0 = ImageIO.read(new File("assets/player/playerSpriteLeft.png"));
// player0 = ImageIO.read(new File("assets/player/playerSprite.png")); playerLeft1 = ImageIO.read(new File("assets/player/playerSpriteLeftWalk0.png"));
playerLeft2 = ImageIO.read(new File("assets/player/playerSpriteLeftWalk1.png"));
playerRight0 = ImageIO.read(new File("assets/player/playerSpriteRight.png"));
playerRight1 = ImageIO.read(new File("assets/player/playerSpriteRightWalk0.png"));
playerRight2 = ImageIO.read(new File("assets/player/playerSpriteRightWalk1.png"));
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -144,8 +146,6 @@ public class Game extends JPanel implements ActionListener, KeyListener {
timer.start(); timer.start();
} }
@Override @Override
public void actionPerformed(ActionEvent e) { // update step public void actionPerformed(ActionEvent e) { // update step
Random rand = new Random(); Random rand = new Random();
@ -155,19 +155,23 @@ public class Game extends JPanel implements ActionListener, KeyListener {
hoveringOverPlayButton = playButtonCollision.contains(mouseX, mouseY); hoveringOverPlayButton = playButtonCollision.contains(mouseX, mouseY);
hoveringOverQuitButton = quitButtonCollision.contains(mouseX, mouseY); hoveringOverQuitButton = quitButtonCollision.contains(mouseX, mouseY);
if (hoverDirection == "up") { if (hoverDirection == "up") {
hoverYOffset++; hoverModifier = 1;
if (opacityAnimation < 1.00f) { opacityAnimation += 0.01f; } opacityModifier = 0.01f;
if (hoverYOffset > 90) { if (hoverYOffset > 90) { hoverDirection = "down"; }
hoverDirection = "down";
}
} else { } else {
hoverYOffset--; hoverModifier = -1;
if (opacityAnimation > 0.01f) { opacityAnimation -= 0.01f; } opacityModifier = -0.01f;
if (hoverYOffset <= 0) { if (hoverYOffset <= 0) { hoverDirection = "up"; }
hoverDirection = "up";
} }
hoverYOffset += hoverModifier;
if (opacityAnimation < 1.00f && opacityAnimation > 0.01f) { opacityAnimation += opacityModifier; }
if (level == 1) {
planetY = planetYPre + hoverYOffset / 6;
if (levelProgress) {
fadeAnimation += 20;
}
if (windowWidth - fadeAnimation <= 0) { level = 2; }
} }
if (level == 1) { planetY = planetYPre + hoverYOffset / 6; }
if (level == 2) { rocketY = rocketYPre + hoverYOffset / 3; rocketExhaustY = rocketYPre + 150 + hoverYOffset / 2; detachTimer++;} if (level == 2) { rocketY = rocketYPre + hoverYOffset / 3; rocketExhaustY = rocketYPre + 150 + hoverYOffset / 2; detachTimer++;}
repaint(); // triggers render repaint(); // triggers render
} }
@ -217,13 +221,10 @@ public class Game extends JPanel implements ActionListener, KeyListener {
g.drawString("Quit (pretty lame)", quitButtonX +24, quitButtonY+67); g.drawString("Quit (pretty lame)", quitButtonX +24, quitButtonY+67);
} }
} }
if (levelProgress) {
if (levelProgress && (windowWidth-fadeAnimation)>0) {
g.setColor(Color.BLACK); g.setColor(Color.BLACK);
g.fillRect(windowWidth-fadeAnimation, 0, windowWidth, windowHeight); g.fillRect(windowWidth - fadeAnimation, 0, windowWidth, windowHeight);
fadeAnimation += 20;
} }
else if (levelProgress && (windowWidth-fadeAnimation)<=0) { level = 2; }
} }
else if (level == 2) { else if (level == 2) {
if (detachTimer < 260) { if (detachTimer < 260) {