Konflikt lösen
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2
Happy_Bird/.idea/Happy_Bird.iml
generated
Normal file
2
Happy_Bird/.idea/Happy_Bird.iml
generated
Normal file
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="JAVA_MODULE" version="4" />
|
2
Happy_Bird/.idea/misc.xml
generated
2
Happy_Bird/.idea/misc.xml
generated
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="true" project-jdk-name="15" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="false" project-jdk-name="15" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,80 @@
|
||||
package com.example.happy_bird;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.Image;
|
||||
import java.awt.image.ImageObserver;
|
||||
|
||||
public abstract class SpielObjekt {
|
||||
private int xWert;
|
||||
private int yWert;
|
||||
private int fxWert;
|
||||
private int fyWert;
|
||||
private int breite;
|
||||
private int hoehe;
|
||||
private Image bild;
|
||||
|
||||
public SpielObjekt(int xWert, int yWert) {
|
||||
this.xWert = xWert;
|
||||
this.yWert = yWert;
|
||||
}
|
||||
|
||||
public int getyWert() {
|
||||
return yWert;
|
||||
}
|
||||
|
||||
public void setyWert(int yWert) {
|
||||
this.yWert = yWert;
|
||||
}
|
||||
|
||||
public int getxWert() {
|
||||
return xWert;
|
||||
}
|
||||
|
||||
public void setxWert(int xWert) {
|
||||
this.xWert = xWert;
|
||||
}
|
||||
|
||||
public int getFxWert() {
|
||||
return fxWert;
|
||||
}
|
||||
|
||||
public void setFxWert(int fxWert) {
|
||||
this.fxWert = fxWert;
|
||||
}
|
||||
|
||||
public int getFyWert() {
|
||||
return fyWert;
|
||||
}
|
||||
|
||||
public void setFyWert(int fyWert) {
|
||||
this.fyWert = fyWert;
|
||||
}
|
||||
|
||||
public int getBreite() {
|
||||
return breite;
|
||||
}
|
||||
|
||||
public void setBreite(int breite) {
|
||||
this.breite = breite;
|
||||
}
|
||||
|
||||
public int getHoehe() {
|
||||
return hoehe;
|
||||
}
|
||||
|
||||
public void setHoehe(int hoehe) {
|
||||
this.hoehe = hoehe;
|
||||
}
|
||||
|
||||
public Image getBild() {
|
||||
return bild;
|
||||
}
|
||||
|
||||
public void setBild(Image bild) {
|
||||
this.bild = bild;
|
||||
}
|
||||
|
||||
|
||||
public abstract void tick();
|
||||
|
||||
public abstract void render(Graphics2D g, ImageObserver obs);
|
||||
}
|
@@ -1,6 +1,7 @@
|
||||
module com.example.happy_bird {
|
||||
requires javafx.controls;
|
||||
requires javafx.fxml;
|
||||
requires java.desktop;
|
||||
|
||||
|
||||
opens com.example.happy_bird to javafx.fxml;
|
||||
|
Reference in New Issue
Block a user