Merge branch 'master' of https://git.bib.de/PBS2H20AAL/HappyBird
This commit is contained in:
commit
da0e493461
@ -5,14 +5,19 @@
|
|||||||
<?import javafx.scene.image.*?>
|
<?import javafx.scene.image.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<VBox prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird">
|
<VBox prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird">
|
||||||
<Button>
|
<Button>
|
||||||
Start
|
Start
|
||||||
</Button>
|
</Button>
|
||||||
|
=======
|
||||||
|
<StackPane prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird" back >
|
||||||
|
|
||||||
|
>>>>>>> c070a72d9131552445c751d71391bab4f0059fd4
|
||||||
<ImageView>
|
<ImageView>
|
||||||
<image>
|
<image>
|
||||||
<Image url="@pics/Background.png"></Image>
|
<Image url="@pics/Background.png"></Image>
|
||||||
</image>
|
</image>
|
||||||
</ImageView>
|
</ImageView>
|
||||||
|
|
||||||
</VBox>
|
</StackPane>
|
||||||
|
@ -19,10 +19,29 @@ public class HappyBirdMain extends Application {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void start(Stage stage) throws IOException {
|
public void start(Stage stage) throws IOException {
|
||||||
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("happyBird.fxml"));
|
/*FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("happyBird.fxml"));
|
||||||
Scene scene = new Scene(fxmlLoader.load(), 800, 700);
|
Scene scene = new Scene(fxmlLoader.load(), 800, 700);
|
||||||
stage.setTitle("HappyBird");
|
stage.setTitle("HappyBird");
|
||||||
stage.setScene(scene);
|
stage.setScene(scene);
|
||||||
|
stage.show();*/
|
||||||
|
|
||||||
|
StackPane stackPane = new StackPane();
|
||||||
|
|
||||||
|
Scene scene = new Scene(stackPane, 800, 700);
|
||||||
|
stage.setTitle("Happy Bird");
|
||||||
|
stage.setScene(scene);
|
||||||
|
Image image = new Image("file:src/main/resources/com/example/happy_bird/pics/Background.png");
|
||||||
|
BackgroundImage backgroundImageImg = new BackgroundImage(
|
||||||
|
image,
|
||||||
|
BackgroundRepeat.NO_REPEAT,
|
||||||
|
BackgroundRepeat.NO_REPEAT,
|
||||||
|
BackgroundPosition.DEFAULT,
|
||||||
|
BackgroundSize.DEFAULT
|
||||||
|
);
|
||||||
|
|
||||||
|
Background background = new Background(backgroundImageImg);
|
||||||
|
stackPane.setBackground(background);
|
||||||
|
|
||||||
stage.show();
|
stage.show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,14 +5,19 @@
|
|||||||
<?import javafx.scene.image.*?>
|
<?import javafx.scene.image.*?>
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
<VBox prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird">
|
<VBox prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird">
|
||||||
<Button>
|
<Button>
|
||||||
Start
|
Start
|
||||||
</Button>
|
</Button>
|
||||||
|
=======
|
||||||
|
<StackPane prefHeight="800.0" prefWidth="700.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.example.happy_bird.HappyBird" back >
|
||||||
|
|
||||||
|
>>>>>>> c070a72d9131552445c751d71391bab4f0059fd4
|
||||||
<ImageView>
|
<ImageView>
|
||||||
<image>
|
<image>
|
||||||
<Image url="@pics/Background.png"></Image>
|
<Image url="@pics/Background.png"></Image>
|
||||||
</image>
|
</image>
|
||||||
</ImageView>
|
</ImageView>
|
||||||
|
|
||||||
</VBox>
|
</StackPane>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user