@mhawryluk/rpg 82 points earned popup #9

mhawryluk · 2022-04-05T13:32:37Z

Description

Create and show a popup when earning points.

Checklist

FXML configuration
Controller class
Popup creator class

kkafar

Looks good to me, good job 🍾 ! After the #6 is merged, we need to adapt these changes to use information provided by configuration files.

kkafar · 2022-04-05T13:39:19Z

src/main/java/io/rpg/HelloApplication.java

+    Image someMap = new Image("file:assets/map.png");
+    Image someMap10x10 = new Image("file:assets/map10x10.png");
+    Image someDude1 = new Image("file:assets/someDude.png");
+    Image someDude2 = new Image("file:assets/someDudeButGreen.png");


These paths should be loaded from configuration. I guess its fine for now and we can do this in separate PR after #6 is merged.

kkafar · 2022-04-05T13:43:19Z

src/main/java/io/rpg/gui/LocationController.java

+    public void onKeyTyped(KeyEvent event) {
+        // TODO: 01.04.2022 Implement key actions
+
+        System.out.println(event);


#6 Introduces log4j, we should switch and use one logger in whole project.

kkafar · 2022-04-05T13:46:48Z

src/main/java/io/rpg/HelloApplication.java

+    new Thread(() -> {
+      try {
+        Thread.sleep(1000);
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+      }
+      Platform.runLater(() ->{
+        displayLayer.showLocation()
+                .setBackgroundImage(someMap10x10)
+                .addMapObject(new GameObjectStandIn(new Pair<>(0,0), someDude1))
+                .addMapObject(new GameObjectStandIn(new Pair<>(0,2), someDude1))
+                .addMapObject(new GameObjectStandIn(new Pair<>(5,9), someDude2));
+      });
+    }).start();


I think we can remove this

kkafar · 2022-04-05T13:47:23Z

src/main/java/io/rpg/gui/DisplayLayer.java

+        locationController = LocationController.load();
+    }
+
+


Suggested change

kkafar · 2022-04-05T13:47:34Z

src/main/java/io/rpg/gui/DisplayLayer.java

+                .clear();
+    }
+
+


Suggested change

kkafar · 2022-04-05T13:51:57Z

src/main/java/io/rpg/gui/popups/PointsEarnedPopup.java

+    private PointsPopupController controller;
+    private final Scene popupScene;
+
+    public PointsEarnedPopup(){


Suggested change

public PointsEarnedPopup(){

public PointsEarnedPopup() {

kkafar · 2022-04-05T13:52:05Z

src/main/java/io/rpg/gui/popups/PointsEarnedPopup.java

+        popupScene = new Scene(root, Color.TRANSPARENT);
+    }
+
+    public Stage getPopup(int pointsCount, Scene scene){


Suggested change

public Stage getPopup(int pointsCount, Scene scene){

public Stage getPopup(int pointsCount, Scene scene) {

kkafar · 2022-04-05T13:52:20Z

src/main/java/io/rpg/gui/popups/PointsPopupController.java

+        label.setText("Earned " + pointsCount + " points!");
+    }
+
+    protected Pair<Double, Double> setBackgroundImage(String url){


Suggested change

protected Pair<Double, Double> setBackgroundImage(String url){

protected Pair<Double, Double> setBackgroundImage(String url) {

kkafar · 2022-04-05T13:52:31Z

src/main/java/io/rpg/gui/popups/PointsPopupController.java

+        background.setBackground(new Background(backgroundImg));
+        return new Pair<>(background.getPrefWidth(), background.getPrefHeight());
+    }
+}


Suggested change

}

}

kkafar · 2022-04-05T13:52:47Z

src/main/java/io/rpg/model/GameObjectStandIn.java

+        return position;
+    }
+
+    public Image getImage(){


Suggested change

public Image getImage(){

public Image getImage() {

…G-IO/rpg-io into @mhawryluk/RPG-82-points-earned-popup

* chore: Init gui * feat: now location is centered * feat: Add popup creation class for point earning * feat: Read popup layout from FXML and set pointCount via controller * refactor: Move popup classes into popups package * chore: Add background image and improve styling of points popup * fix: Add background image to assets * refactor: Add comments to popup class * refactor: Make showPopup method not static * refactor: Change position to be represented as a vector * add game class * moving player * measuring frame time duration * improved player control * modified player class * RPG-79 Model proposal & configuration loading (#6) * chore: Add dependency on Gson This library is required, as our configuration files will be based on json * chore: Add dependency on jetbrains.annotations * fix: Change package name in module-info.java * chore: Push out commit * feat: Extend class schema * refract: Rename DialogicGameObject -> DialogGameObject * feat: Add Position record * feat: Initial GameObject implementation * refract: Make GameWorld class final * feat: Add empty Location class * docs: Add docs dir & empty configuration description * chore: Add ConfigConstants class with static data members * refract: Resign from m prefix in private member var names * chore: Add dependency on log4j * fix: Fix module-info: export io.rpg * feat: Setup logging in application entry point * chore: Package structure * refract: Empty line at the end of build.gradle * feat: Initlial configuration structure * refract: Code cleanup * refract: Change ROOT file name to root.json * refract: Change String paths to java.nio classes * chore: Add logging to ConfigLoader * feat: Handle FNF config dir & root file * chore: Exclude bin directory from repo * feat: Update configuration structure * feat: LocationConfig * feat: GameWorldConfig * fix: Open io.rpg.model module to gson * TO REVERT: modify app entry class due to some issues with sdk * chore: Add mock top level class of application * feat: Initial ConfigLoader impl * feat: toString method for GameWorldConfig * feat: Log GameWorldConfig after deserialization * chore: Add mock game configuration for unit-testing * chore: Expose model classes to Gson * Fix: Adjustments to make Gson work * feat: ConfigLoader#loadLocation * test: Add initial tests for ConfigLoader * test: Add ConfigLoaderTest#LocationConfigIsLoadedProperly test * chore: Update MockTest * chore: Update configuration files * chore: Remove not-up-to-date test * chore: Improve ConfigLoader#load method * chore: Improve model classes * refract: Fix typos Co-authored-by: adam <adam.przywieczerski@gmail.com> * @co012/RPG-93 widac lokacje w okienku (#8) * chore: Init gui * feat: now location is centered * RPG-79 Model proposal & configuration loading (#6) * chore: Add dependency on Gson This library is required, as our configuration files will be based on json * chore: Add dependency on jetbrains.annotations * fix: Change package name in module-info.java * chore: Push out commit * feat: Extend class schema * refract: Rename DialogicGameObject -> DialogGameObject * feat: Add Position record * feat: Initial GameObject implementation * refract: Make GameWorld class final * feat: Add empty Location class * docs: Add docs dir & empty configuration description * chore: Add ConfigConstants class with static data members * refract: Resign from m prefix in private member var names * chore: Add dependency on log4j * fix: Fix module-info: export io.rpg * feat: Setup logging in application entry point * chore: Package structure * refract: Empty line at the end of build.gradle * feat: Initlial configuration structure * refract: Code cleanup * refract: Change ROOT file name to root.json * refract: Change String paths to java.nio classes * chore: Add logging to ConfigLoader * feat: Handle FNF config dir & root file * chore: Exclude bin directory from repo * feat: Update configuration structure * feat: LocationConfig * feat: GameWorldConfig * fix: Open io.rpg.model module to gson * TO REVERT: modify app entry class due to some issues with sdk * chore: Add mock top level class of application * feat: Initial ConfigLoader impl * feat: toString method for GameWorldConfig * feat: Log GameWorldConfig after deserialization * chore: Add mock game configuration for unit-testing * chore: Expose model classes to Gson * Fix: Adjustments to make Gson work * feat: ConfigLoader#loadLocation * test: Add initial tests for ConfigLoader * test: Add ConfigLoaderTest#LocationConfigIsLoadedProperly test * chore: Update MockTest * chore: Update configuration files * chore: Remove not-up-to-date test * chore: Improve ConfigLoader#load method * chore: Improve model classes * refract: Fix typos Co-authored-by: adam <adam.przywieczerski@gmail.com> Co-authored-by: Kacper Kafara <kacperkafara@gmail.com> Co-authored-by: adam <adam.przywieczerski@gmail.com> * @mhawryluk/rpg 82 points earned popup (#9) * chore: Init gui * feat: now location is centered * feat: Add popup creation class for point earning * feat: Read popup layout from FXML and set pointCount via controller * refactor: Move popup classes into popups package * chore: Add background image and improve styling of points popup * fix: Add background image to assets * refactor: Add comments to popup class * refactor: Make showPopup method not static * refactor: Turn showPopup into getPopup, make it return Stage * test: Add test for hiding a popup when no focus * fix: Quick fix * fix: Remove tests for now * fix: module-info Co-authored-by: co012 <co123@interia.eu> Co-authored-by: Kacper Kafara <kacperkafara@gmail.com> Co-authored-by: co012 <co123@interia.eu> Co-authored-by: mhawryluk <marcinhawrylukxx@gmail.com> Co-authored-by: Kacper Kafara <kacperkafara@gmail.com> Co-authored-by: adam <adam.przywieczerski@gmail.com> Co-authored-by: Marcin Hawryluk <70582973+mhawryluk@users.noreply.github.com>

co012 and others added 10 commits April 1, 2022 21:30

chore: Init gui

5931cfb

feat: now location is centered

363fc49

feat: Add popup creation class for point earning

ddb2dde

feat: Read popup layout from FXML and set pointCount via controller

a2c4aac

refactor: Move popup classes into popups package

eeb1ed7

chore: Add background image and improve styling of points popup

901e572

fix: Add background image to assets

4e92d73

refactor: Add comments to popup class

61ca3d6

refactor: Make showPopup method not static

38561c0

refactor: Turn showPopup into getPopup, make it return Stage

75325b6

mhawryluk requested review from Monatyr, co012, kkafar, ksiek127 and zamojtel April 5, 2022 13:32

zamojtel approved these changes Apr 5, 2022

View reviewed changes

kkafar reviewed Apr 5, 2022

View reviewed changes

mhawryluk and others added 6 commits April 6, 2022 23:26

test: Add test for hiding a popup when no focus

1b3bcee

fix: Quick fix

4a764ce

fix: Remove tests for now

713d04e

Merge branch '@mhawryluk/RPG-82-points-earned-popup' of github.com:RP…

93895ac

…G-IO/rpg-io into @mhawryluk/RPG-82-points-earned-popup

Merge branch 'master' into @mhawryluk/RPG-82-points-earned-popup

dc7bbfa

fix: module-info

8f97fe1

kkafar merged commit dbb5dd2 into master Apr 7, 2022

kkafar deleted the @mhawryluk/RPG-82-points-earned-popup branch April 7, 2022 16:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

@mhawryluk/rpg 82 points earned popup #9

@mhawryluk/rpg 82 points earned popup #9

Uh oh!

mhawryluk commented Apr 5, 2022

Uh oh!

kkafar left a comment

Uh oh!

kkafar Apr 5, 2022

Uh oh!

kkafar Apr 5, 2022

Uh oh!

kkafar Apr 5, 2022

Uh oh!

kkafar Apr 5, 2022

Uh oh!

kkafar Apr 5, 2022

Uh oh!

kkafar Apr 5, 2022

Uh oh!

kkafar Apr 5, 2022

Uh oh!

kkafar Apr 5, 2022

Uh oh!

kkafar Apr 5, 2022

Uh oh!

kkafar Apr 5, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	public Stage getPopup(int pointsCount, Scene scene){
	public Stage getPopup(int pointsCount, Scene scene) {

	protected Pair<Double, Double> setBackgroundImage(String url){
	protected Pair<Double, Double> setBackgroundImage(String url) {

@mhawryluk/rpg 82 points earned popup #9

@mhawryluk/rpg 82 points earned popup #9

Uh oh!

Conversation

mhawryluk commented Apr 5, 2022

Description

Checklist

Uh oh!

kkafar left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants