@co012/RPG-93 widac lokacje w okienku #8
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhawryluk
reviewed
Apr 5, 2022
| stage.setTitle("Hello!"); | ||
| stage.setScene(scene); | ||
| stage.show(); | ||
| Image someMap = new Image("C:\\Dev\\rpg-io\\assets\\map.png"); |
Collaborator
There was a problem hiding this comment.
Zmień na ścieżki względne
| import java.net.URL; | ||
| import java.util.ResourceBundle; | ||
|
|
||
| public class DisplayLayer { |
Collaborator
There was a problem hiding this comment.
pomyślałbym o innej nazwie dla tej klasy, bo nie wiadomo co robi
| return loader.getController(); | ||
| } | ||
|
|
||
| public LocationController() { |
| public LocationModel addMapObject(GameObjectStandIn gameObject){ | ||
| ImageView imageView = new ImageView(gameObject.getImage()); | ||
| Pair<Integer,Integer> mapPosition = getMapPosition(gameObject.getPosition()); | ||
| imageView.setX(mapPosition.getKey()); |
Collaborator
There was a problem hiding this comment.
dziwne, że X i Y to Key i Value. lepiej żeby position nie było Pair
|
|
||
| // TODO: 01.04.2022 Replace with Position | ||
| private Pair<Integer, Integer> getMapPosition(Pair<Integer, Integer> position){ | ||
| int scale = 32; |
Collaborator
There was a problem hiding this comment.
dodać komentarz albo zmienić nazwę zmiennej - czym jest scale
* 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>
kkafar
changed the title
…G-IO/rpg-io into @co012/RPG-93-widac-lokacje-w-okienku
kkafar
added a commit
that referenced
this pull request
Apr 7, 2022
* 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Checklist