diff --git a/Bomberman/doc/allclasses-frame.html b/Bomberman/doc/allclasses-frame.html index 3c0699a..08d23a5 100644 --- a/Bomberman/doc/allclasses-frame.html +++ b/Bomberman/doc/allclasses-frame.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -93,6 +93,7 @@

All Classes

  • Stairs
  • StatesMachine
  • StatesMachine.STATE
  • +
  • SuperBomberman3D
  • Visual
  • VolumeSlider
  • diff --git a/Bomberman/doc/allclasses-noframe.html b/Bomberman/doc/allclasses-noframe.html index 0d2203e..20a9cc2 100644 --- a/Bomberman/doc/allclasses-noframe.html +++ b/Bomberman/doc/allclasses-noframe.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -93,6 +93,7 @@

    All Classes

  • Stairs
  • StatesMachine
  • StatesMachine.STATE
  • +
  • SuperBomberman3D
  • Visual
  • VolumeSlider
  • diff --git a/Bomberman/doc/constant-values.html b/Bomberman/doc/constant-values.html index 26d8886..3b5ed56 100644 --- a/Bomberman/doc/constant-values.html +++ b/Bomberman/doc/constant-values.html @@ -2,9 +2,9 @@ - + Constant Field Values - + @@ -372,7 +372,7 @@

    logic.*

    -public static final String +public static final java.lang.String SAVE "savefile.sav" @@ -391,14 +391,14 @@

    logic.*

    -private static final String +private static final java.lang.String KEYMAPPER_FILE "keymap.ini" -private static final String +private static final java.lang.String KM_SECTION "default" @@ -589,7 +589,7 @@

    logic.misc.*

    -private static final int +public static final int fixpos 5 @@ -727,7 +727,7 @@

    main.*

    -public static final String +public static final java.lang.String TITLE "Super Bomberman" @@ -767,7 +767,7 @@

    main.*

    -public static final String +public static final java.lang.String MAP_FILE "iniFiles/maps.ini" @@ -802,14 +802,14 @@

    main.*

    -public static final String +public static final java.lang.String MENU_FILE "iniFiles/menus.ini" -public static final String +public static final java.lang.String SPRITE_FILE "iniFiles/sprites.ini" @@ -848,105 +848,105 @@

    sound.*

    -private static final String +private static final java.lang.String AUDIO "audio/" -public static final String +public static final java.lang.String BATTLE_MUSIC "audio/music/battle.ogg" -public static final String +public static final java.lang.String CREDITS_MUSIC "audio/music/credits.ogg" -public static final String +public static final java.lang.String DEFEAT_MUSIC "audio/music/defeat.ogg" -public static final String +public static final java.lang.String EXPLOSION_SND "audio/sound/explosion.ogg" -public static final String +public static final java.lang.String GAMEOVER_MUSIC "audio/music/gameOver.ogg" -public static final String +public static final java.lang.String INTRO_MUSIC "audio/music/introStage.ogg" -public static final String +public static final java.lang.String MENU_MUSIC "audio/music/menus.ogg" -private static final String +private static final java.lang.String MUSIC "audio/music/" -public static final String +public static final java.lang.String PAUSE_MUSIC "audio/music/pause.ogg" -public static final String +public static final java.lang.String POWERUP_SND "audio/sound/powerup.ogg" -public static final String +public static final java.lang.String PUTBOMB_SND "audio/sound/putBomb2.ogg" -public static final String +public static final java.lang.String SELECT_SND "audio/sound/select.ogg" -private static final String +private static final java.lang.String SOUND "audio/sound/" -public static final String +public static final java.lang.String VICTORY_MUSIC "audio/music/victoryStage.ogg" @@ -971,21 +971,21 @@

    utils.*

    -private static final String +private static final java.lang.String FILE "file" -private static final String +private static final java.lang.String JAR "jar" -private static final String +private static final java.lang.String RSRC "rsrc" diff --git a/Bomberman/doc/deprecated-list.html b/Bomberman/doc/deprecated-list.html index 7c4033f..8740522 100644 --- a/Bomberman/doc/deprecated-list.html +++ b/Bomberman/doc/deprecated-list.html @@ -2,9 +2,9 @@ - + Deprecated List - + diff --git a/Bomberman/doc/graphics/d3/SuperBomberman3D.html b/Bomberman/doc/graphics/d3/SuperBomberman3D.html new file mode 100644 index 0000000..31b76d6 --- /dev/null +++ b/Bomberman/doc/graphics/d3/SuperBomberman3D.html @@ -0,0 +1,822 @@ + + + + + +SuperBomberman3D + + + + + + + + +
    + + +
    Skip navigation links
    + + + + +
    + + + +
    +
    graphics.d3
    +

    Class SuperBomberman3D

    +
    +
    + +
    + +
    +
    + +
    +
    + +
    +
    + + +
    + + +
    Skip navigation links
    + + + + +
    + + + + diff --git a/Bomberman/doc/graphics/d3/class-use/SuperBomberman3D.html b/Bomberman/doc/graphics/d3/class-use/SuperBomberman3D.html new file mode 100644 index 0000000..f187a27 --- /dev/null +++ b/Bomberman/doc/graphics/d3/class-use/SuperBomberman3D.html @@ -0,0 +1,164 @@ + + + + + +Uses of Class graphics.d3.SuperBomberman3D + + + + + + + + +
    + + +
    Skip navigation links
    + + + + +
    + + +
    +

    Uses of Class
    graphics.d3.SuperBomberman3D

    +
    +
    + +
    + +
    + + +
    Skip navigation links
    + + + + +
    + + + + diff --git a/Bomberman/doc/graphics/d3/package-frame.html b/Bomberman/doc/graphics/d3/package-frame.html new file mode 100644 index 0000000..da53a5f --- /dev/null +++ b/Bomberman/doc/graphics/d3/package-frame.html @@ -0,0 +1,20 @@ + + + + + +graphics.d3 + + + + + +

    graphics.d3

    +
    +

    Classes

    + +
    + + diff --git a/Bomberman/doc/graphics/d3/package-summary.html b/Bomberman/doc/graphics/d3/package-summary.html new file mode 100644 index 0000000..fd05f4c --- /dev/null +++ b/Bomberman/doc/graphics/d3/package-summary.html @@ -0,0 +1,142 @@ + + + + + +graphics.d3 + + + + + + + + +
    + + +
    Skip navigation links
    + + + + +
    + + +
    +

    Package graphics.d3

    +
    +
    + +
    + +
    + + +
    Skip navigation links
    + + + + +
    + + + + diff --git a/Bomberman/doc/graphics/d3/package-tree.html b/Bomberman/doc/graphics/d3/package-tree.html new file mode 100644 index 0000000..e717a82 --- /dev/null +++ b/Bomberman/doc/graphics/d3/package-tree.html @@ -0,0 +1,141 @@ + + + + + +graphics.d3 Class Hierarchy + + + + + + + + +
    + + +
    Skip navigation links
    + + + + +
    + + +
    +

    Hierarchy For Package graphics.d3

    +Package Hierarchies: + +
    +
    +

    Class Hierarchy

    + +
    + +
    + + +
    Skip navigation links
    + + + + +
    + + + + diff --git a/Bomberman/doc/graphics/d3/package-use.html b/Bomberman/doc/graphics/d3/package-use.html new file mode 100644 index 0000000..9cca62d --- /dev/null +++ b/Bomberman/doc/graphics/d3/package-use.html @@ -0,0 +1,157 @@ + + + + + +Uses of Package graphics.d3 + + + + + + + + +
    + + +
    Skip navigation links
    + + + + +
    + + +
    +

    Uses of Package
    graphics.d3

    +
    +
    + +
    + +
    + + +
    Skip navigation links
    + + + + +
    + + + + diff --git a/Bomberman/doc/graphics/effects/Button.html b/Bomberman/doc/graphics/effects/Button.html index 98201be..b8e8bcc 100644 --- a/Bomberman/doc/graphics/effects/Button.html +++ b/Bomberman/doc/graphics/effects/Button.html @@ -2,9 +2,9 @@ - + Button - + @@ -97,7 +97,7 @@

    Class Button

    @@ -264,7 +264,7 @@

    selected

    @@ -285,7 +285,7 @@

    Button

    int y, Room r, Sprite sprite, - Runnable run) + java.lang.Runnable run)
    Parameters:
    x - x coordinate
    diff --git a/Bomberman/doc/graphics/effects/ControlButton.html b/Bomberman/doc/graphics/effects/ControlButton.html index 7b46bbb..501ead5 100644 --- a/Bomberman/doc/graphics/effects/ControlButton.html +++ b/Bomberman/doc/graphics/effects/ControlButton.html @@ -2,9 +2,9 @@ - + ControlButton - + @@ -97,7 +97,7 @@

    Class ControlButton

    @@ -344,7 +344,7 @@

    Method Detail

    diff --git a/Bomberman/doc/graphics/effects/PintableButton.html b/Bomberman/doc/graphics/effects/PintableButton.html index 009ad52..22a95a9 100644 --- a/Bomberman/doc/graphics/effects/PintableButton.html +++ b/Bomberman/doc/graphics/effects/PintableButton.html @@ -2,9 +2,9 @@ - + PintableButton - + @@ -97,7 +97,7 @@

    Class PintableButton

    @@ -237,7 +237,7 @@

    Field Detail

    @@ -257,7 +257,7 @@

    PintableButton

    public PintableButton(int x,
                           int y,
                           Room r,
    -                      String key)
    + java.lang.String key)
    Parameters:
    x - x coordinate
    @@ -281,7 +281,7 @@

    Method Detail

    diff --git a/Bomberman/doc/graphics/effects/class-use/Button.html b/Bomberman/doc/graphics/effects/class-use/Button.html index 7bacc41..fec9cf0 100644 --- a/Bomberman/doc/graphics/effects/class-use/Button.html +++ b/Bomberman/doc/graphics/effects/class-use/Button.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.effects.Button - + diff --git a/Bomberman/doc/graphics/effects/class-use/ControlButton.html b/Bomberman/doc/graphics/effects/class-use/ControlButton.html index dcec46d..f06328d 100644 --- a/Bomberman/doc/graphics/effects/class-use/ControlButton.html +++ b/Bomberman/doc/graphics/effects/class-use/ControlButton.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.effects.ControlButton - + diff --git a/Bomberman/doc/graphics/effects/class-use/Fade.html b/Bomberman/doc/graphics/effects/class-use/Fade.html index 2428553..673e76e 100644 --- a/Bomberman/doc/graphics/effects/class-use/Fade.html +++ b/Bomberman/doc/graphics/effects/class-use/Fade.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.effects.Fade - + diff --git a/Bomberman/doc/graphics/effects/class-use/IntroTemporizer.html b/Bomberman/doc/graphics/effects/class-use/IntroTemporizer.html index 538194a..55bcc23 100644 --- a/Bomberman/doc/graphics/effects/class-use/IntroTemporizer.html +++ b/Bomberman/doc/graphics/effects/class-use/IntroTemporizer.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.effects.IntroTemporizer - + diff --git a/Bomberman/doc/graphics/effects/class-use/PintableButton.html b/Bomberman/doc/graphics/effects/class-use/PintableButton.html index f7bdb85..7e64695 100644 --- a/Bomberman/doc/graphics/effects/class-use/PintableButton.html +++ b/Bomberman/doc/graphics/effects/class-use/PintableButton.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.effects.PintableButton - + diff --git a/Bomberman/doc/graphics/effects/class-use/Visual.html b/Bomberman/doc/graphics/effects/class-use/Visual.html index fca583e..091c98c 100644 --- a/Bomberman/doc/graphics/effects/class-use/Visual.html +++ b/Bomberman/doc/graphics/effects/class-use/Visual.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.effects.Visual - + diff --git a/Bomberman/doc/graphics/effects/package-frame.html b/Bomberman/doc/graphics/effects/package-frame.html index 6d8223e..8322ce7 100644 --- a/Bomberman/doc/graphics/effects/package-frame.html +++ b/Bomberman/doc/graphics/effects/package-frame.html @@ -2,9 +2,9 @@ - + graphics.effects - + diff --git a/Bomberman/doc/graphics/effects/package-summary.html b/Bomberman/doc/graphics/effects/package-summary.html index 5cf8bb9..8b8fa31 100644 --- a/Bomberman/doc/graphics/effects/package-summary.html +++ b/Bomberman/doc/graphics/effects/package-summary.html @@ -2,9 +2,9 @@ - + graphics.effects - + @@ -43,7 +43,7 @@
    diff --git a/Bomberman/doc/graphics/rooms/Room.html b/Bomberman/doc/graphics/rooms/Room.html index 54ea78e..dc3595f 100644 --- a/Bomberman/doc/graphics/rooms/Room.html +++ b/Bomberman/doc/graphics/rooms/Room.html @@ -2,9 +2,9 @@ - + Room - + @@ -97,7 +97,7 @@

    Class Room

    @@ -342,7 +342,7 @@

    height

    @@ -351,7 +351,7 @@

    name

    @@ -387,7 +387,7 @@

    background

    @@ -405,7 +405,7 @@

    seconds

    @@ -424,7 +424,7 @@

    Constructor Detail

    Room

    public Room(int w,
                 int h,
    -            String n)
    + java.lang.String n)
    Parameters:
    w - width
    @@ -532,7 +532,7 @@

    loadComplete

    @@ -414,7 +414,7 @@

    Constructor Detail

    Controls

    public Controls(int w,
                     int h,
    -                String n)
    + java.lang.String n)
    Parameters:
    w - width
    @@ -469,7 +469,7 @@

    createOneButton

    int x2, int i2, int j2, - String text) + java.lang.String text)
    Parameters:
    x - x coordinate
    @@ -545,7 +545,7 @@

    confirm

    • drawBackground

      -
      public void drawBackground(Graphics g)
      +
      public void drawBackground(java.awt.Graphics g)
      Specified by:
      drawBackground in class Room
      @@ -577,7 +577,7 @@

      step

      • getKeyText

        -
        private String getKeyText(Input.KEY key)
        +
        private java.lang.String getKeyText(Input.KEY key)
        Get text from a key
        Parameters:
        diff --git a/Bomberman/doc/graphics/rooms/controlsMenu/ControlsRepository.html b/Bomberman/doc/graphics/rooms/controlsMenu/ControlsRepository.html index fbc1377..8f17b47 100644 --- a/Bomberman/doc/graphics/rooms/controlsMenu/ControlsRepository.html +++ b/Bomberman/doc/graphics/rooms/controlsMenu/ControlsRepository.html @@ -2,9 +2,9 @@ - + ControlsRepository - + @@ -97,7 +97,7 @@

        Class ControlsRepository

    diff --git a/Bomberman/doc/graphics/rooms/controlsMenu/class-use/Controls.html b/Bomberman/doc/graphics/rooms/controlsMenu/class-use/Controls.html index 2f68da0..48c7360 100644 --- a/Bomberman/doc/graphics/rooms/controlsMenu/class-use/Controls.html +++ b/Bomberman/doc/graphics/rooms/controlsMenu/class-use/Controls.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.controlsMenu.Controls - + diff --git a/Bomberman/doc/graphics/rooms/controlsMenu/class-use/ControlsRepository.html b/Bomberman/doc/graphics/rooms/controlsMenu/class-use/ControlsRepository.html index 0bdcf70..c042cf0 100644 --- a/Bomberman/doc/graphics/rooms/controlsMenu/class-use/ControlsRepository.html +++ b/Bomberman/doc/graphics/rooms/controlsMenu/class-use/ControlsRepository.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.controlsMenu.ControlsRepository - + diff --git a/Bomberman/doc/graphics/rooms/controlsMenu/package-frame.html b/Bomberman/doc/graphics/rooms/controlsMenu/package-frame.html index c621b73..fa58cf2 100644 --- a/Bomberman/doc/graphics/rooms/controlsMenu/package-frame.html +++ b/Bomberman/doc/graphics/rooms/controlsMenu/package-frame.html @@ -2,9 +2,9 @@ - + graphics.rooms.controlsMenu - + diff --git a/Bomberman/doc/graphics/rooms/controlsMenu/package-summary.html b/Bomberman/doc/graphics/rooms/controlsMenu/package-summary.html index db2998a..b2f1fb8 100644 --- a/Bomberman/doc/graphics/rooms/controlsMenu/package-summary.html +++ b/Bomberman/doc/graphics/rooms/controlsMenu/package-summary.html @@ -2,9 +2,9 @@ - + graphics.rooms.controlsMenu - + diff --git a/Bomberman/doc/graphics/rooms/controlsMenu/package-tree.html b/Bomberman/doc/graphics/rooms/controlsMenu/package-tree.html index 5d3c42f..15a6feb 100644 --- a/Bomberman/doc/graphics/rooms/controlsMenu/package-tree.html +++ b/Bomberman/doc/graphics/rooms/controlsMenu/package-tree.html @@ -2,9 +2,9 @@ - + graphics.rooms.controlsMenu Class Hierarchy - + @@ -79,7 +79,7 @@

    Hierarchy For Package graphics.rooms.controlsMenu

    Class Hierarchy

    @@ -262,7 +262,7 @@

    Constructor Detail

    Credits

    public Credits(int w,
                    int h,
    -               String n)
    + java.lang.String n)
    Parameters:
    w - width
    @@ -298,7 +298,7 @@

    load

    • drawBackground

      -
      public void drawBackground(Graphics g)
      +
      public void drawBackground(java.awt.Graphics g)
      Specified by:
      drawBackground in class Room
      diff --git a/Bomberman/doc/graphics/rooms/credits/CreditsRepository.html b/Bomberman/doc/graphics/rooms/credits/CreditsRepository.html index bfb3b48..e8021d4 100644 --- a/Bomberman/doc/graphics/rooms/credits/CreditsRepository.html +++ b/Bomberman/doc/graphics/rooms/credits/CreditsRepository.html @@ -2,9 +2,9 @@ - + CreditsRepository - + @@ -97,7 +97,7 @@

      Class CreditsRepository

    diff --git a/Bomberman/doc/graphics/rooms/credits/class-use/Credits.html b/Bomberman/doc/graphics/rooms/credits/class-use/Credits.html index f26f245..ec9124b 100644 --- a/Bomberman/doc/graphics/rooms/credits/class-use/Credits.html +++ b/Bomberman/doc/graphics/rooms/credits/class-use/Credits.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.credits.Credits - + diff --git a/Bomberman/doc/graphics/rooms/credits/class-use/CreditsRepository.html b/Bomberman/doc/graphics/rooms/credits/class-use/CreditsRepository.html index f6453c3..acdcd52 100644 --- a/Bomberman/doc/graphics/rooms/credits/class-use/CreditsRepository.html +++ b/Bomberman/doc/graphics/rooms/credits/class-use/CreditsRepository.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.credits.CreditsRepository - + diff --git a/Bomberman/doc/graphics/rooms/credits/package-frame.html b/Bomberman/doc/graphics/rooms/credits/package-frame.html index 44cd6e0..9efd158 100644 --- a/Bomberman/doc/graphics/rooms/credits/package-frame.html +++ b/Bomberman/doc/graphics/rooms/credits/package-frame.html @@ -2,9 +2,9 @@ - + graphics.rooms.credits - + diff --git a/Bomberman/doc/graphics/rooms/credits/package-summary.html b/Bomberman/doc/graphics/rooms/credits/package-summary.html index e3cc69f..5838b94 100644 --- a/Bomberman/doc/graphics/rooms/credits/package-summary.html +++ b/Bomberman/doc/graphics/rooms/credits/package-summary.html @@ -2,9 +2,9 @@ - + graphics.rooms.credits - + diff --git a/Bomberman/doc/graphics/rooms/credits/package-tree.html b/Bomberman/doc/graphics/rooms/credits/package-tree.html index 530439e..9c2eacc 100644 --- a/Bomberman/doc/graphics/rooms/credits/package-tree.html +++ b/Bomberman/doc/graphics/rooms/credits/package-tree.html @@ -2,9 +2,9 @@ - + graphics.rooms.credits Class Hierarchy - + @@ -79,7 +79,7 @@

    Hierarchy For Package graphics.rooms.credits

    Class Hierarchy

      -
    • java.lang.Object +
    • java.lang.Object
      • graphics.rooms.credits.CreditsRepository
      • graphics.rooms.Room diff --git a/Bomberman/doc/graphics/rooms/credits/package-use.html b/Bomberman/doc/graphics/rooms/credits/package-use.html index ba95232..e5aec84 100644 --- a/Bomberman/doc/graphics/rooms/credits/package-use.html +++ b/Bomberman/doc/graphics/rooms/credits/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package graphics.rooms.credits - + diff --git a/Bomberman/doc/graphics/rooms/game/Game.STATE.html b/Bomberman/doc/graphics/rooms/game/Game.STATE.html index 007f6ea..faf7c3e 100644 --- a/Bomberman/doc/graphics/rooms/game/Game.STATE.html +++ b/Bomberman/doc/graphics/rooms/game/Game.STATE.html @@ -2,9 +2,9 @@ - + Game.STATE - + @@ -97,10 +97,10 @@

        Enum Game.STATE

    @@ -170,7 +170,7 @@

    Method Summary

    static Game.STATE -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -186,15 +186,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -280,7 +280,7 @@

    values

    diff --git a/Bomberman/doc/graphics/rooms/game/Game.html b/Bomberman/doc/graphics/rooms/game/Game.html index 9e8fd1d..5e35a24 100644 --- a/Bomberman/doc/graphics/rooms/game/Game.html +++ b/Bomberman/doc/graphics/rooms/game/Game.html @@ -2,9 +2,9 @@ - + Game - + @@ -97,7 +97,7 @@

    Class Game

    @@ -427,7 +431,7 @@

    tiles

    @@ -454,7 +458,7 @@

    secondsVictory

    @@ -463,7 +467,7 @@

    state

    @@ -472,7 +476,7 @@

    timer

    @@ -563,12 +567,21 @@

    startedLevel

    - @@ -585,7 +598,7 @@

    Constructor Detail

    Game

    public Game(int w,
                 int h,
    -            String n)
    + java.lang.String n)
    Parameters:
    w - width
    @@ -621,7 +634,7 @@

    load

    • drawBackground

      -
      public void drawBackground(Graphics g)
      +
      public void drawBackground(java.awt.Graphics g)
      Specified by:
      drawBackground in class Room
      @@ -634,7 +647,7 @@

      drawBackground

      • render

        -
        public void render(Graphics g)
        +
        public void render(java.awt.Graphics g)
        Description copied from class: Room
        Method to paint the screen
        @@ -651,7 +664,7 @@

        render

        • drawHUD

          -
          private void drawHUD(Graphics g)
          +
          private void drawHUD(java.awt.Graphics g)
          Draws the HUD, including the timer
          Parameters:
          diff --git a/Bomberman/doc/graphics/rooms/game/GameRepository.html b/Bomberman/doc/graphics/rooms/game/GameRepository.html index b52ad1a..ed31b96 100644 --- a/Bomberman/doc/graphics/rooms/game/GameRepository.html +++ b/Bomberman/doc/graphics/rooms/game/GameRepository.html @@ -2,9 +2,9 @@ - + GameRepository - + @@ -97,7 +97,7 @@

          Class GameRepository

    @@ -434,7 +434,7 @@

    destroyableBlock2

    @@ -443,7 +443,7 @@

    player

    diff --git a/Bomberman/doc/graphics/rooms/game/class-use/Game.STATE.html b/Bomberman/doc/graphics/rooms/game/class-use/Game.STATE.html index 2b45d1f..66b83ee 100644 --- a/Bomberman/doc/graphics/rooms/game/class-use/Game.STATE.html +++ b/Bomberman/doc/graphics/rooms/game/class-use/Game.STATE.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.game.Game.STATE - + @@ -103,7 +103,7 @@

    Uses of -private Game.STATE +Game.STATE Game.state  @@ -117,7 +117,7 @@

    Uses of static Game.STATE -Game.STATE.valueOf(String name) +Game.STATE.valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    diff --git a/Bomberman/doc/graphics/rooms/game/class-use/Game.html b/Bomberman/doc/graphics/rooms/game/class-use/Game.html index 54bb926..f9577ea 100644 --- a/Bomberman/doc/graphics/rooms/game/class-use/Game.html +++ b/Bomberman/doc/graphics/rooms/game/class-use/Game.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.game.Game - + @@ -83,6 +83,10 @@

    Uses of Class +graphics.d3 +  + + logic   @@ -91,6 +95,48 @@

    Uses of Class
    • +
    • + + +

      Uses of Game in graphics.d3

      + + + + + + + + + + + + +
      Fields in graphics.d3 declared as Game 
      Modifier and TypeField and Description
      GameSuperBomberman3D.room 
      + + + + + + + + + + + + +
      Methods in graphics.d3 with parameters of type Game 
      Modifier and TypeMethod and Description
      static com.badlogic.gdx.backends.lwjgl.LwjglApplicationSuperBomberman3D.main(Game game) 
      + + + + + + + + + + +
      Constructors in graphics.d3 with parameters of type Game 
      Constructor and Description
      SuperBomberman3D(Game game) 
      +
    • diff --git a/Bomberman/doc/graphics/rooms/game/class-use/GameRepository.html b/Bomberman/doc/graphics/rooms/game/class-use/GameRepository.html index 4309c76..076ac12 100644 --- a/Bomberman/doc/graphics/rooms/game/class-use/GameRepository.html +++ b/Bomberman/doc/graphics/rooms/game/class-use/GameRepository.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.game.GameRepository - + diff --git a/Bomberman/doc/graphics/rooms/game/package-frame.html b/Bomberman/doc/graphics/rooms/game/package-frame.html index 65ee744..b770a44 100644 --- a/Bomberman/doc/graphics/rooms/game/package-frame.html +++ b/Bomberman/doc/graphics/rooms/game/package-frame.html @@ -2,9 +2,9 @@ - + graphics.rooms.game - + diff --git a/Bomberman/doc/graphics/rooms/game/package-summary.html b/Bomberman/doc/graphics/rooms/game/package-summary.html index 9ab5eea..9ecf9c3 100644 --- a/Bomberman/doc/graphics/rooms/game/package-summary.html +++ b/Bomberman/doc/graphics/rooms/game/package-summary.html @@ -2,9 +2,9 @@ - + graphics.rooms.game - + diff --git a/Bomberman/doc/graphics/rooms/game/package-tree.html b/Bomberman/doc/graphics/rooms/game/package-tree.html index f9784d1..4c7cda3 100644 --- a/Bomberman/doc/graphics/rooms/game/package-tree.html +++ b/Bomberman/doc/graphics/rooms/game/package-tree.html @@ -2,9 +2,9 @@ - + graphics.rooms.game Class Hierarchy - + @@ -79,7 +79,7 @@

      Hierarchy For Package graphics.rooms.game

      Class Hierarchy

        -
      • java.lang.Object +
      • java.lang.Object
        • graphics.rooms.game.GameRepository
        • graphics.rooms.Room @@ -92,9 +92,9 @@

          Class Hierarchy

        Enum Hierarchy

          -
        • java.lang.Object +
        • java.lang.Object
            -
          • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) +
          • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) diff --git a/Bomberman/doc/graphics/rooms/game/package-use.html b/Bomberman/doc/graphics/rooms/game/package-use.html index 59d3c33..aea75e5 100644 --- a/Bomberman/doc/graphics/rooms/game/package-use.html +++ b/Bomberman/doc/graphics/rooms/game/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package graphics.rooms.game - + @@ -83,16 +83,35 @@

            Uses of Package
            -graphics.rooms.game +graphics.d3   +graphics.rooms.game +  + + logic  

          • +
          • + + + + + + + + + + + + +
            Classes in graphics.rooms.game used by graphics.d3 
            Class and Description
            Game 
            +
          • diff --git a/Bomberman/doc/graphics/rooms/intro/Intro.html b/Bomberman/doc/graphics/rooms/intro/Intro.html index 2cf5372..7efbd5b 100644 --- a/Bomberman/doc/graphics/rooms/intro/Intro.html +++ b/Bomberman/doc/graphics/rooms/intro/Intro.html @@ -2,9 +2,9 @@ - + Intro - + @@ -97,7 +97,7 @@

            Class Intro

      @@ -291,7 +291,7 @@

      Constructor Detail

      Intro

      public Intro(int w,
                    int h,
      -             String n)
      + java.lang.String n)
      Parameters:
      w - width
      @@ -346,7 +346,7 @@

      step

      • drawBackground

        -
        public void drawBackground(Graphics g)
        +
        public void drawBackground(java.awt.Graphics g)
        Specified by:
        drawBackground in class Room
        diff --git a/Bomberman/doc/graphics/rooms/intro/IntroRepository.html b/Bomberman/doc/graphics/rooms/intro/IntroRepository.html index 4054659..a60c6a6 100644 --- a/Bomberman/doc/graphics/rooms/intro/IntroRepository.html +++ b/Bomberman/doc/graphics/rooms/intro/IntroRepository.html @@ -2,9 +2,9 @@ - + IntroRepository - + @@ -97,7 +97,7 @@

        Class IntroRepository

        -
      • java.lang.Object
      • +
      • java.lang.Object
        • graphics.rooms.intro.IntroRepository
        • @@ -110,7 +110,7 @@

          Class IntroRepository



          public class IntroRepository
          -extends Object
          +extends java.lang.Object
          Author:
          Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
          @@ -186,8 +186,8 @@

          Method Summary

        • -

          Methods inherited from class java.lang.Object

          -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
        • +

          Methods inherited from class java.lang.Object

          +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      diff --git a/Bomberman/doc/graphics/rooms/intro/class-use/Intro.html b/Bomberman/doc/graphics/rooms/intro/class-use/Intro.html index c862f0a..d1eca71 100644 --- a/Bomberman/doc/graphics/rooms/intro/class-use/Intro.html +++ b/Bomberman/doc/graphics/rooms/intro/class-use/Intro.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.intro.Intro - + diff --git a/Bomberman/doc/graphics/rooms/intro/class-use/IntroRepository.html b/Bomberman/doc/graphics/rooms/intro/class-use/IntroRepository.html index 3577002..f8e8388 100644 --- a/Bomberman/doc/graphics/rooms/intro/class-use/IntroRepository.html +++ b/Bomberman/doc/graphics/rooms/intro/class-use/IntroRepository.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.intro.IntroRepository - + diff --git a/Bomberman/doc/graphics/rooms/intro/package-frame.html b/Bomberman/doc/graphics/rooms/intro/package-frame.html index f469c0c..1a9b643 100644 --- a/Bomberman/doc/graphics/rooms/intro/package-frame.html +++ b/Bomberman/doc/graphics/rooms/intro/package-frame.html @@ -2,9 +2,9 @@ - + graphics.rooms.intro - + diff --git a/Bomberman/doc/graphics/rooms/intro/package-summary.html b/Bomberman/doc/graphics/rooms/intro/package-summary.html index c0f5b96..7ec8b1a 100644 --- a/Bomberman/doc/graphics/rooms/intro/package-summary.html +++ b/Bomberman/doc/graphics/rooms/intro/package-summary.html @@ -2,9 +2,9 @@ - + graphics.rooms.intro - + diff --git a/Bomberman/doc/graphics/rooms/intro/package-tree.html b/Bomberman/doc/graphics/rooms/intro/package-tree.html index 609e401..a9b33fc 100644 --- a/Bomberman/doc/graphics/rooms/intro/package-tree.html +++ b/Bomberman/doc/graphics/rooms/intro/package-tree.html @@ -2,9 +2,9 @@ - + graphics.rooms.intro Class Hierarchy - + @@ -79,7 +79,7 @@

      Hierarchy For Package graphics.rooms.intro

      Class Hierarchy

        -
      • java.lang.Object +
      • java.lang.Object
        • graphics.rooms.intro.IntroRepository
        • graphics.rooms.Room diff --git a/Bomberman/doc/graphics/rooms/intro/package-use.html b/Bomberman/doc/graphics/rooms/intro/package-use.html index b7a7303..9ee9925 100644 --- a/Bomberman/doc/graphics/rooms/intro/package-use.html +++ b/Bomberman/doc/graphics/rooms/intro/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package graphics.rooms.intro - + diff --git a/Bomberman/doc/graphics/rooms/mainMenu/MainMenu.html b/Bomberman/doc/graphics/rooms/mainMenu/MainMenu.html index 180144d..e7882f4 100644 --- a/Bomberman/doc/graphics/rooms/mainMenu/MainMenu.html +++ b/Bomberman/doc/graphics/rooms/mainMenu/MainMenu.html @@ -2,9 +2,9 @@ - + MainMenu - + @@ -97,7 +97,7 @@

          Class MainMenu

      @@ -411,7 +411,7 @@

      Constructor Detail

      MainMenu

      public MainMenu(int w,
                       int h,
      -                String n)
      + java.lang.String n)
      Parameters:
      w - width
      @@ -531,7 +531,7 @@

      confirm

      • drawBackground

        -
        public void drawBackground(Graphics g)
        +
        public void drawBackground(java.awt.Graphics g)
        Specified by:
        drawBackground in class Room
        diff --git a/Bomberman/doc/graphics/rooms/mainMenu/MainMenuRepository.html b/Bomberman/doc/graphics/rooms/mainMenu/MainMenuRepository.html index 9e01576..63aa8de 100644 --- a/Bomberman/doc/graphics/rooms/mainMenu/MainMenuRepository.html +++ b/Bomberman/doc/graphics/rooms/mainMenu/MainMenuRepository.html @@ -2,9 +2,9 @@ - + MainMenuRepository - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -97,7 +97,7 @@

        Class MainMenuRepository

      @@ -300,6 +310,15 @@

      gameButton

      static Sprite gameButton
    + + + +
      +
    • +

      d3gameButton

      +
      static Sprite d3gameButton
      +
    • +
    @@ -410,6 +429,16 @@

    loadGameButton

    Load game button
  • + + + +
      +
    • +

      loadD3GameButton

      +
      private static void loadD3GameButton()
      +
      Load 3D game button
      +
    • +
    diff --git a/Bomberman/doc/graphics/rooms/mainMenu/class-use/MainMenu.html b/Bomberman/doc/graphics/rooms/mainMenu/class-use/MainMenu.html index e1bb082..913b67a 100644 --- a/Bomberman/doc/graphics/rooms/mainMenu/class-use/MainMenu.html +++ b/Bomberman/doc/graphics/rooms/mainMenu/class-use/MainMenu.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.mainMenu.MainMenu - + diff --git a/Bomberman/doc/graphics/rooms/mainMenu/class-use/MainMenuRepository.html b/Bomberman/doc/graphics/rooms/mainMenu/class-use/MainMenuRepository.html index a301ddf..0faaed8 100644 --- a/Bomberman/doc/graphics/rooms/mainMenu/class-use/MainMenuRepository.html +++ b/Bomberman/doc/graphics/rooms/mainMenu/class-use/MainMenuRepository.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.mainMenu.MainMenuRepository - + diff --git a/Bomberman/doc/graphics/rooms/mainMenu/package-frame.html b/Bomberman/doc/graphics/rooms/mainMenu/package-frame.html index febd7ed..45eed0c 100644 --- a/Bomberman/doc/graphics/rooms/mainMenu/package-frame.html +++ b/Bomberman/doc/graphics/rooms/mainMenu/package-frame.html @@ -2,9 +2,9 @@ - + graphics.rooms.mainMenu - + diff --git a/Bomberman/doc/graphics/rooms/mainMenu/package-summary.html b/Bomberman/doc/graphics/rooms/mainMenu/package-summary.html index 8c47f35..63c5712 100644 --- a/Bomberman/doc/graphics/rooms/mainMenu/package-summary.html +++ b/Bomberman/doc/graphics/rooms/mainMenu/package-summary.html @@ -2,9 +2,9 @@ - + graphics.rooms.mainMenu - + diff --git a/Bomberman/doc/graphics/rooms/mainMenu/package-tree.html b/Bomberman/doc/graphics/rooms/mainMenu/package-tree.html index 6a001ad..228a32d 100644 --- a/Bomberman/doc/graphics/rooms/mainMenu/package-tree.html +++ b/Bomberman/doc/graphics/rooms/mainMenu/package-tree.html @@ -2,9 +2,9 @@ - + graphics.rooms.mainMenu Class Hierarchy - + @@ -79,7 +79,7 @@

    Hierarchy For Package graphics.rooms.mainMenu

    Class Hierarchy

      -
    • java.lang.Object +
    • java.lang.Object
      • graphics.rooms.mainMenu.MainMenuRepository
      • graphics.rooms.Room diff --git a/Bomberman/doc/graphics/rooms/mainMenu/package-use.html b/Bomberman/doc/graphics/rooms/mainMenu/package-use.html index 4838c42..fc70c30 100644 --- a/Bomberman/doc/graphics/rooms/mainMenu/package-use.html +++ b/Bomberman/doc/graphics/rooms/mainMenu/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package graphics.rooms.mainMenu - + diff --git a/Bomberman/doc/graphics/rooms/optionsMenu/OptionsMenu.html b/Bomberman/doc/graphics/rooms/optionsMenu/OptionsMenu.html index 080d6c6..a8f2961 100644 --- a/Bomberman/doc/graphics/rooms/optionsMenu/OptionsMenu.html +++ b/Bomberman/doc/graphics/rooms/optionsMenu/OptionsMenu.html @@ -2,9 +2,9 @@ - + OptionsMenu - + @@ -97,7 +97,7 @@

        Class OptionsMenu

    @@ -266,7 +266,7 @@

    Constructor Detail

    OptionsMenu

    public OptionsMenu(int w,
                        int h,
    -                   String n)
    + java.lang.String n)
    Parameters:
    w - width
    @@ -315,7 +315,7 @@

    getImageIndex

    • drawBackground

      -
      public void drawBackground(Graphics g)
      +
      public void drawBackground(java.awt.Graphics g)
      Specified by:
      drawBackground in class Room
      diff --git a/Bomberman/doc/graphics/rooms/optionsMenu/OptionsMenuRepository.html b/Bomberman/doc/graphics/rooms/optionsMenu/OptionsMenuRepository.html index 800caaa..4058eb2 100644 --- a/Bomberman/doc/graphics/rooms/optionsMenu/OptionsMenuRepository.html +++ b/Bomberman/doc/graphics/rooms/optionsMenu/OptionsMenuRepository.html @@ -2,9 +2,9 @@ - + OptionsMenuRepository - + @@ -97,7 +97,7 @@

      Class OptionsMenuRepositor

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • graphics.rooms.optionsMenu.OptionsMenuRepository
      • @@ -110,7 +110,7 @@

        Class OptionsMenuRepositor

        public class OptionsMenuRepository
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -216,8 +216,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

    diff --git a/Bomberman/doc/graphics/rooms/optionsMenu/class-use/OptionsMenu.html b/Bomberman/doc/graphics/rooms/optionsMenu/class-use/OptionsMenu.html index 5da4e1e..956a8d3 100644 --- a/Bomberman/doc/graphics/rooms/optionsMenu/class-use/OptionsMenu.html +++ b/Bomberman/doc/graphics/rooms/optionsMenu/class-use/OptionsMenu.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.optionsMenu.OptionsMenu - + diff --git a/Bomberman/doc/graphics/rooms/optionsMenu/class-use/OptionsMenuRepository.html b/Bomberman/doc/graphics/rooms/optionsMenu/class-use/OptionsMenuRepository.html index 5936948..6aa6b3e 100644 --- a/Bomberman/doc/graphics/rooms/optionsMenu/class-use/OptionsMenuRepository.html +++ b/Bomberman/doc/graphics/rooms/optionsMenu/class-use/OptionsMenuRepository.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.optionsMenu.OptionsMenuRepository - + diff --git a/Bomberman/doc/graphics/rooms/optionsMenu/package-frame.html b/Bomberman/doc/graphics/rooms/optionsMenu/package-frame.html index 0578420..9f63afb 100644 --- a/Bomberman/doc/graphics/rooms/optionsMenu/package-frame.html +++ b/Bomberman/doc/graphics/rooms/optionsMenu/package-frame.html @@ -2,9 +2,9 @@ - + graphics.rooms.optionsMenu - + diff --git a/Bomberman/doc/graphics/rooms/optionsMenu/package-summary.html b/Bomberman/doc/graphics/rooms/optionsMenu/package-summary.html index 99c980e..9a213eb 100644 --- a/Bomberman/doc/graphics/rooms/optionsMenu/package-summary.html +++ b/Bomberman/doc/graphics/rooms/optionsMenu/package-summary.html @@ -2,9 +2,9 @@ - + graphics.rooms.optionsMenu - + diff --git a/Bomberman/doc/graphics/rooms/optionsMenu/package-tree.html b/Bomberman/doc/graphics/rooms/optionsMenu/package-tree.html index ce5b234..1ab3f04 100644 --- a/Bomberman/doc/graphics/rooms/optionsMenu/package-tree.html +++ b/Bomberman/doc/graphics/rooms/optionsMenu/package-tree.html @@ -2,9 +2,9 @@ - + graphics.rooms.optionsMenu Class Hierarchy - + @@ -79,7 +79,7 @@

    Hierarchy For Package graphics.rooms.optionsMenu

    Class Hierarchy

      -
    • java.lang.Object +
    • java.lang.Object
      • graphics.rooms.optionsMenu.OptionsMenuRepository
      • graphics.rooms.Room diff --git a/Bomberman/doc/graphics/rooms/optionsMenu/package-use.html b/Bomberman/doc/graphics/rooms/optionsMenu/package-use.html index 8a515c5..9f7ccd8 100644 --- a/Bomberman/doc/graphics/rooms/optionsMenu/package-use.html +++ b/Bomberman/doc/graphics/rooms/optionsMenu/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package graphics.rooms.optionsMenu - + diff --git a/Bomberman/doc/graphics/rooms/package-frame.html b/Bomberman/doc/graphics/rooms/package-frame.html index bc2cd33..c26aeec 100644 --- a/Bomberman/doc/graphics/rooms/package-frame.html +++ b/Bomberman/doc/graphics/rooms/package-frame.html @@ -2,9 +2,9 @@ - + graphics.rooms - + diff --git a/Bomberman/doc/graphics/rooms/package-summary.html b/Bomberman/doc/graphics/rooms/package-summary.html index af24936..8c66347 100644 --- a/Bomberman/doc/graphics/rooms/package-summary.html +++ b/Bomberman/doc/graphics/rooms/package-summary.html @@ -2,9 +2,9 @@ - + graphics.rooms - + diff --git a/Bomberman/doc/graphics/rooms/package-tree.html b/Bomberman/doc/graphics/rooms/package-tree.html index 1d48437..e2c6dc9 100644 --- a/Bomberman/doc/graphics/rooms/package-tree.html +++ b/Bomberman/doc/graphics/rooms/package-tree.html @@ -2,9 +2,9 @@ - + graphics.rooms Class Hierarchy - + @@ -79,9 +79,9 @@

        Hierarchy For Package graphics.rooms

        Class Hierarchy

          -
        • java.lang.Object +
        • java.lang.Object diff --git a/Bomberman/doc/graphics/rooms/package-use.html b/Bomberman/doc/graphics/rooms/package-use.html index 239999a..55713cf 100644 --- a/Bomberman/doc/graphics/rooms/package-use.html +++ b/Bomberman/doc/graphics/rooms/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package graphics.rooms - + diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenu.html b/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenu.html index 01a0ffd..1bb5fb9 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenu.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenu.html @@ -2,9 +2,9 @@ - + PauseMenu - + @@ -97,7 +97,7 @@

          Class PauseMenu

        @@ -365,7 +365,7 @@

        Constructor Detail

        PauseMenu

        public PauseMenu(int w,
                          int h,
        -                 String n)
        + java.lang.String n)
        Parameters:
        w - width
        @@ -411,7 +411,7 @@

        createButtons

        • drawBackground

          -
          public void drawBackground(Graphics g)
          +
          public void drawBackground(java.awt.Graphics g)
          Specified by:
          drawBackground in class Room
          diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenu.selection.html b/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenu.selection.html index 892ba54..a08827c 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenu.selection.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenu.selection.html @@ -2,9 +2,9 @@ - + PauseMenu.selection - + @@ -97,10 +97,10 @@

          Enum PauseMenu.selection

        @@ -164,7 +164,7 @@

        Method Summary

        static PauseMenu.selection -valueOf(String name) +valueOf(java.lang.String name)
        Returns the enum constant of this type with the specified name.
        @@ -180,15 +180,15 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Enum

        -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
      • +

        Methods inherited from class java.lang.Enum

        +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
    @@ -256,7 +256,7 @@

    values

    • valueOf

      -
      public static PauseMenu.selection valueOf(String name)
      +
      public static PauseMenu.selection valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -267,8 +267,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenuRepository.html b/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenuRepository.html index bfe062e..c986d01 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenuRepository.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/PauseMenuRepository.html @@ -2,9 +2,9 @@ - + PauseMenuRepository - + @@ -97,7 +97,7 @@

    Class PauseMenuRepository
      -
    • java.lang.Object
    • +
    • java.lang.Object
      • graphics.rooms.pauseMenu.PauseMenuRepository
      • @@ -110,7 +110,7 @@

        Class PauseMenuRepository
        public class PauseMenuRepository
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -216,8 +216,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

    diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenu.html b/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenu.html index 14e2467..68b7bc6 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenu.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenu.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.pauseMenu.PauseMenu - + diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenu.selection.html b/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenu.selection.html index 72cc264..115b1d1 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenu.selection.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenu.selection.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.pauseMenu.PauseMenu.selection - + @@ -104,7 +104,7 @@

    Uses of static PauseMenu.selection -PauseMenu.selection.valueOf(String name) +PauseMenu.selection.valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenuRepository.html b/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenuRepository.html index 2c86fdd..7fe8fb1 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenuRepository.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/class-use/PauseMenuRepository.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.pauseMenu.PauseMenuRepository - + diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/package-frame.html b/Bomberman/doc/graphics/rooms/pauseMenu/package-frame.html index 907b3dc..b06eb59 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/package-frame.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/package-frame.html @@ -2,9 +2,9 @@ - + graphics.rooms.pauseMenu - + diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/package-summary.html b/Bomberman/doc/graphics/rooms/pauseMenu/package-summary.html index c002590..43193b3 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/package-summary.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/package-summary.html @@ -2,9 +2,9 @@ - + graphics.rooms.pauseMenu - + diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/package-tree.html b/Bomberman/doc/graphics/rooms/pauseMenu/package-tree.html index 50a5b08..4a961f7 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/package-tree.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/package-tree.html @@ -2,9 +2,9 @@ - + graphics.rooms.pauseMenu Class Hierarchy - + @@ -79,7 +79,7 @@

    Hierarchy For Package graphics.rooms.pauseMenu

    Class Hierarchy

      -
    • java.lang.Object +
    • java.lang.Object

      Enum Hierarchy

        -
      • java.lang.Object +
      • java.lang.Object
          -
        • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) +
        • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) diff --git a/Bomberman/doc/graphics/rooms/pauseMenu/package-use.html b/Bomberman/doc/graphics/rooms/pauseMenu/package-use.html index a8ab0bc..86d7ee8 100644 --- a/Bomberman/doc/graphics/rooms/pauseMenu/package-use.html +++ b/Bomberman/doc/graphics/rooms/pauseMenu/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package graphics.rooms.pauseMenu - + diff --git a/Bomberman/doc/graphics/rooms/rankMenu/RankMenu.html b/Bomberman/doc/graphics/rooms/rankMenu/RankMenu.html index a788ba1..e46d15e 100644 --- a/Bomberman/doc/graphics/rooms/rankMenu/RankMenu.html +++ b/Bomberman/doc/graphics/rooms/rankMenu/RankMenu.html @@ -2,9 +2,9 @@ - + RankMenu - + @@ -97,7 +97,7 @@

          Class RankMenu

    @@ -342,7 +342,7 @@

    Constructor Detail

    RankMenu

    public RankMenu(int w,
                     int h,
    -                String n,
    +                java.lang.String n,
                     Record record)
    Parameters:
    @@ -380,7 +380,7 @@

    load

    • render

      -
      public void render(Graphics g)
      +
      public void render(java.awt.Graphics g)
      Description copied from class: Room
      Method to paint the screen
      @@ -397,7 +397,7 @@

      render

      • drawBackground

        -
        public void drawBackground(Graphics g)
        +
        public void drawBackground(java.awt.Graphics g)
        Specified by:
        drawBackground in class Room
        diff --git a/Bomberman/doc/graphics/rooms/rankMenu/RankMenuRepository.html b/Bomberman/doc/graphics/rooms/rankMenu/RankMenuRepository.html index e197c27..806377c 100644 --- a/Bomberman/doc/graphics/rooms/rankMenu/RankMenuRepository.html +++ b/Bomberman/doc/graphics/rooms/rankMenu/RankMenuRepository.html @@ -2,9 +2,9 @@ - + RankMenuRepository - + @@ -97,7 +97,7 @@

        Class RankMenuRepository

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • graphics.rooms.rankMenu.RankMenuRepository
      • @@ -110,7 +110,7 @@

        Class RankMenuRepository



        public class RankMenuRepository
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -234,8 +234,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    diff --git a/Bomberman/doc/graphics/rooms/rankMenu/class-use/RankMenu.html b/Bomberman/doc/graphics/rooms/rankMenu/class-use/RankMenu.html index 4b2a334..855533f 100644 --- a/Bomberman/doc/graphics/rooms/rankMenu/class-use/RankMenu.html +++ b/Bomberman/doc/graphics/rooms/rankMenu/class-use/RankMenu.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.rankMenu.RankMenu - + diff --git a/Bomberman/doc/graphics/rooms/rankMenu/class-use/RankMenuRepository.html b/Bomberman/doc/graphics/rooms/rankMenu/class-use/RankMenuRepository.html index 1239e66..7f11893 100644 --- a/Bomberman/doc/graphics/rooms/rankMenu/class-use/RankMenuRepository.html +++ b/Bomberman/doc/graphics/rooms/rankMenu/class-use/RankMenuRepository.html @@ -2,9 +2,9 @@ - + Uses of Class graphics.rooms.rankMenu.RankMenuRepository - + diff --git a/Bomberman/doc/graphics/rooms/rankMenu/package-frame.html b/Bomberman/doc/graphics/rooms/rankMenu/package-frame.html index 94d1187..4b6b000 100644 --- a/Bomberman/doc/graphics/rooms/rankMenu/package-frame.html +++ b/Bomberman/doc/graphics/rooms/rankMenu/package-frame.html @@ -2,9 +2,9 @@ - + graphics.rooms.rankMenu - + diff --git a/Bomberman/doc/graphics/rooms/rankMenu/package-summary.html b/Bomberman/doc/graphics/rooms/rankMenu/package-summary.html index c6f790c..9cfc122 100644 --- a/Bomberman/doc/graphics/rooms/rankMenu/package-summary.html +++ b/Bomberman/doc/graphics/rooms/rankMenu/package-summary.html @@ -2,9 +2,9 @@ - + graphics.rooms.rankMenu - + diff --git a/Bomberman/doc/graphics/rooms/rankMenu/package-tree.html b/Bomberman/doc/graphics/rooms/rankMenu/package-tree.html index 0daf32d..d214c6e 100644 --- a/Bomberman/doc/graphics/rooms/rankMenu/package-tree.html +++ b/Bomberman/doc/graphics/rooms/rankMenu/package-tree.html @@ -2,9 +2,9 @@ - + graphics.rooms.rankMenu Class Hierarchy - + @@ -79,7 +79,7 @@

    Hierarchy For Package graphics.rooms.rankMenu

    Class Hierarchy

      -
    • java.lang.Object +
    • java.lang.Object
      • graphics.rooms.rankMenu.RankMenuRepository
      • graphics.rooms.Room diff --git a/Bomberman/doc/graphics/rooms/rankMenu/package-use.html b/Bomberman/doc/graphics/rooms/rankMenu/package-use.html index 9c8718a..6a835d8 100644 --- a/Bomberman/doc/graphics/rooms/rankMenu/package-use.html +++ b/Bomberman/doc/graphics/rooms/rankMenu/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package graphics.rooms.rankMenu - + diff --git a/Bomberman/doc/help-doc.html b/Bomberman/doc/help-doc.html index 755edf5..ace9ebb 100644 --- a/Bomberman/doc/help-doc.html +++ b/Bomberman/doc/help-doc.html @@ -2,9 +2,9 @@ - + API Help - + diff --git a/Bomberman/doc/index-files/index-1.html b/Bomberman/doc/index-files/index-1.html index b16c18a..70e7df2 100644 --- a/Bomberman/doc/index-files/index-1.html +++ b/Bomberman/doc/index-files/index-1.html @@ -2,9 +2,9 @@ - + A-Index - + @@ -124,6 +124,8 @@

        A

         
        ALPHANUM_WIDTH - Static variable in class main.Initialization
         
        +
        animate() - Method in class logic.Objeto
        +
         
        Animation - Class in utils
         
        Animation() - Constructor for class utils.Animation
        diff --git a/Bomberman/doc/index-files/index-10.html b/Bomberman/doc/index-files/index-10.html index c585cb8..995d470 100644 --- a/Bomberman/doc/index-files/index-10.html +++ b/Bomberman/doc/index-files/index-10.html @@ -2,9 +2,9 @@ - + J-Index - + diff --git a/Bomberman/doc/index-files/index-11.html b/Bomberman/doc/index-files/index-11.html index 9828b32..ddf905c 100644 --- a/Bomberman/doc/index-files/index-11.html +++ b/Bomberman/doc/index-files/index-11.html @@ -2,9 +2,9 @@ - + K-Index - + diff --git a/Bomberman/doc/index-files/index-12.html b/Bomberman/doc/index-files/index-12.html index 7859e5e..8ce5538 100644 --- a/Bomberman/doc/index-files/index-12.html +++ b/Bomberman/doc/index-files/index-12.html @@ -2,9 +2,9 @@ - + L-Index - + @@ -258,6 +258,10 @@

        L

        Load the credits music
        +
        loadD3GameButton() - Static method in class graphics.rooms.mainMenu.MainMenuRepository
        +
        +
        Load 3D game button
        +
        loadDefeatMusic() - Static method in class sound.MusicRepository
        Load the defeat music
        diff --git a/Bomberman/doc/index-files/index-13.html b/Bomberman/doc/index-files/index-13.html index 500fdfc..80f7f17 100644 --- a/Bomberman/doc/index-files/index-13.html +++ b/Bomberman/doc/index-files/index-13.html @@ -2,9 +2,9 @@ - + M-Index - + @@ -76,6 +76,8 @@

        M

        main - package main
         
        +
        main(Game) - Static method in class graphics.d3.SuperBomberman3D
        +
         
        main(String[]) - Static method in class main.Game
        Main method to start, initialize and load up the game
        @@ -148,6 +150,12 @@

        M

         
        MOD - Variable in class graphics.effects.Fade
         
        +
        modelBatch - Variable in class graphics.d3.SuperBomberman3D
        +
         
        +
        models() - Method in class graphics.d3.SuperBomberman3D
        +
        +
        Initializes the 3D models and instances them
        +
        modSwitch - Variable in class logic.characters.Player
         
        modX - Variable in class logic.characters.Enemy
        diff --git a/Bomberman/doc/index-files/index-14.html b/Bomberman/doc/index-files/index-14.html index f20536c..c781c3e 100644 --- a/Bomberman/doc/index-files/index-14.html +++ b/Bomberman/doc/index-files/index-14.html @@ -2,9 +2,9 @@ - + N-Index - + @@ -76,6 +76,8 @@

        N

        name - Variable in class graphics.rooms.Room
         
        +
        near - Variable in class graphics.d3.SuperBomberman3D
        +
         
        newRecord - Variable in class graphics.rooms.rankMenu.RankMenu
         
        newRecord - Static variable in class graphics.rooms.rankMenu.RankMenuRepository
        diff --git a/Bomberman/doc/index-files/index-15.html b/Bomberman/doc/index-files/index-15.html index 15afc3f..a0486f7 100644 --- a/Bomberman/doc/index-files/index-15.html +++ b/Bomberman/doc/index-files/index-15.html @@ -2,9 +2,9 @@ - + O-Index - + @@ -74,6 +74,8 @@

        O

        +
        obj - Variable in class logic.characters.Player
        +
         
        objective - Variable in class graphics.rooms.game.Game
         
        objective - Variable in class logic.misc.LevelFile
        @@ -90,6 +92,8 @@

        O

         
        ObjetoComparator() - Constructor for class logic.misc.ObjetoComparator
         
        +
        objetos - Variable in class graphics.d3.SuperBomberman3D
        +
         
        objetos - Variable in class graphics.rooms.Room
         
        options_menu(Input.KEY, Input.KEY) - Static method in class logic.StatesMachine
        @@ -108,6 +112,8 @@

        O

         
        OptionsMenuRepository() - Constructor for class graphics.rooms.optionsMenu.OptionsMenuRepository
         
        +
        origin - Variable in class graphics.d3.SuperBomberman3D
        +
         
        originalText - Variable in class graphics.effects.ControlButton
         
        other - Variable in class logic.Input
        diff --git a/Bomberman/doc/index-files/index-16.html b/Bomberman/doc/index-files/index-16.html index 275d2b9..f5ff4da 100644 --- a/Bomberman/doc/index-files/index-16.html +++ b/Bomberman/doc/index-files/index-16.html @@ -2,9 +2,9 @@ - + P-Index - + @@ -179,6 +179,10 @@

        P

         
        PintableButton(int, int, Room, String) - Constructor for class graphics.effects.PintableButton
         
        +
        plane - Variable in class graphics.d3.SuperBomberman3D
        +
         
        +
        planeModel - Variable in class graphics.d3.SuperBomberman3D
        +
         
        player - Static variable in class graphics.rooms.game.GameRepository
         
        player - Variable in class logic.characters.Bomb
        diff --git a/Bomberman/doc/index-files/index-17.html b/Bomberman/doc/index-files/index-17.html index 5b1fccc..3716106 100644 --- a/Bomberman/doc/index-files/index-17.html +++ b/Bomberman/doc/index-files/index-17.html @@ -2,9 +2,9 @@ - + Q-Index - + diff --git a/Bomberman/doc/index-files/index-18.html b/Bomberman/doc/index-files/index-18.html index 7ea6ccc..bee9512 100644 --- a/Bomberman/doc/index-files/index-18.html +++ b/Bomberman/doc/index-files/index-18.html @@ -2,9 +2,9 @@ - + R-Index - + @@ -135,6 +135,10 @@

        R

        Reloads the key mapper
        reloadMapping() - Method in class main.Game
        +
        +
        Reloads the key mapping
        +
        +
        render() - Method in class graphics.d3.SuperBomberman3D
         
        render(Graphics) - Method in class graphics.effects.Fade
         
        @@ -185,6 +189,8 @@

        R

         
        right - Variable in class logic.Input
         
        +
        room - Variable in class graphics.d3.SuperBomberman3D
        +
         
        room - Variable in class graphics.rooms.Loader
         
        Room - Class in graphics.rooms
        diff --git a/Bomberman/doc/index-files/index-19.html b/Bomberman/doc/index-files/index-19.html index c90e56d..82cc797 100644 --- a/Bomberman/doc/index-files/index-19.html +++ b/Bomberman/doc/index-files/index-19.html @@ -2,9 +2,9 @@ - + S-Index - + @@ -90,6 +90,8 @@

        S

         
        SaveSystemService() - Constructor for class utils.SaveSystemService
         
        +
        sb - Variable in class graphics.rooms.game.Game
        +
         
        score - Variable in class logic.misc.Record
         
        score - Variable in class logic.misc.ScoreManager
        @@ -262,6 +264,11 @@

        S

         
        StatesMachine.STATE - Enum in logic
         
        +
        step() - Method in class graphics.d3.SuperBomberman3D
        +
        +
        Updates objects' positions, destroy the objects that needs to be + destroyed and creates the new ones
        +
        step(Input.KEY, Input.KEY) - Method in class graphics.rooms.controlsMenu.Controls
         
        step(Input.KEY, Input.KEY) - Method in class graphics.rooms.credits.Credits
        @@ -304,6 +311,10 @@

        S

         
        sum - Variable in class graphics.effects.Fade
         
        +
        SuperBomberman3D - Class in graphics.d3
        +
         
        +
        SuperBomberman3D(Game) - Constructor for class graphics.d3.SuperBomberman3D
        +
         
        A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
    diff --git a/Bomberman/doc/index-files/index-2.html b/Bomberman/doc/index-files/index-2.html index ec2397b..cd8d17c 100644 --- a/Bomberman/doc/index-files/index-2.html +++ b/Bomberman/doc/index-files/index-2.html @@ -2,9 +2,9 @@ - + B-Index - + @@ -132,6 +132,10 @@

    B

     
    BOMBERMAN_SPRS - Static variable in class main.Initialization
     
    +
    bombermanModel - Variable in class graphics.d3.SuperBomberman3D
    +
     
    +
    bombModel - Variable in class graphics.d3.SuperBomberman3D
    +
     
    bombRadius - Variable in class logic.characters.Player
     
    bombs - Variable in class logic.characters.Player
    @@ -144,6 +148,8 @@

    B

     
    boundingBox - Variable in class logic.Objeto
     
    +
    boxModel - Variable in class graphics.d3.SuperBomberman3D
    +
     
    Button - Class in graphics.effects
     
    Button(int, int, Room, Sprite, Runnable) - Constructor for class graphics.effects.Button
    diff --git a/Bomberman/doc/index-files/index-20.html b/Bomberman/doc/index-files/index-20.html index 1545213..516fc7a 100644 --- a/Bomberman/doc/index-files/index-20.html +++ b/Bomberman/doc/index-files/index-20.html @@ -2,9 +2,9 @@ - + T-Index - + diff --git a/Bomberman/doc/index-files/index-21.html b/Bomberman/doc/index-files/index-21.html index 6c20337..bdcfea3 100644 --- a/Bomberman/doc/index-files/index-21.html +++ b/Bomberman/doc/index-files/index-21.html @@ -2,9 +2,9 @@ - + U-Index - + diff --git a/Bomberman/doc/index-files/index-22.html b/Bomberman/doc/index-files/index-22.html index 6d0e85b..90f7d30 100644 --- a/Bomberman/doc/index-files/index-22.html +++ b/Bomberman/doc/index-files/index-22.html @@ -2,9 +2,9 @@ - + V-Index - + diff --git a/Bomberman/doc/index-files/index-23.html b/Bomberman/doc/index-files/index-23.html index 1533d53..5a5a641 100644 --- a/Bomberman/doc/index-files/index-23.html +++ b/Bomberman/doc/index-files/index-23.html @@ -2,9 +2,9 @@ - + W-Index - + @@ -74,6 +74,8 @@

    W

    +
    width - Variable in class graphics.d3.SuperBomberman3D
    +
     
    width - Variable in class graphics.rooms.Room
     
    width - Variable in class logic.Sprite
    diff --git a/Bomberman/doc/index-files/index-24.html b/Bomberman/doc/index-files/index-24.html index a5543e8..f0e8396 100644 --- a/Bomberman/doc/index-files/index-24.html +++ b/Bomberman/doc/index-files/index-24.html @@ -2,9 +2,9 @@ - + X-Index - + @@ -80,6 +80,10 @@

    X

     
    x - Variable in class logic.Objeto
     
    +
    xEndPlane - Variable in class graphics.d3.SuperBomberman3D
    +
     
    +
    xInitPlane - Variable in class graphics.d3.SuperBomberman3D
    +
     
    A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
    diff --git a/Bomberman/doc/index-files/index-25.html b/Bomberman/doc/index-files/index-25.html index 77b8f56..346276b 100644 --- a/Bomberman/doc/index-files/index-25.html +++ b/Bomberman/doc/index-files/index-25.html @@ -2,9 +2,9 @@ - + Y-Index - + diff --git a/Bomberman/doc/index-files/index-26.html b/Bomberman/doc/index-files/index-26.html index d71299a..cfe7069 100644 --- a/Bomberman/doc/index-files/index-26.html +++ b/Bomberman/doc/index-files/index-26.html @@ -2,9 +2,9 @@ - + Z-Index - + @@ -76,6 +76,10 @@

    Z

    z - Variable in class logic.Objeto
     
    +
    zEndPlane - Variable in class graphics.d3.SuperBomberman3D
    +
     
    +
    zInitPlane - Variable in class graphics.d3.SuperBomberman3D
    +
     
    A B C D E F G H I J K L M N O P Q R S T U V W X Y Z 
    diff --git a/Bomberman/doc/index-files/index-3.html b/Bomberman/doc/index-files/index-3.html index 195443c..91638f4 100644 --- a/Bomberman/doc/index-files/index-3.html +++ b/Bomberman/doc/index-files/index-3.html @@ -2,9 +2,9 @@ - + C-Index - + @@ -74,6 +74,8 @@

    C

    +
    calcs - Variable in class graphics.d3.SuperBomberman3D
    +
     
    calculateXPosition(int) - Method in class logic.characters.ExplosionManager
     
    calculateYPosition(int) - Method in class logic.characters.ExplosionManager
    @@ -106,6 +108,14 @@

    C

    Calls for victory
    +
    cam - Variable in class graphics.d3.SuperBomberman3D
    +
     
    +
    camController - Variable in class graphics.d3.SuperBomberman3D
    +
     
    +
    camera() - Method in class graphics.d3.SuperBomberman3D
    +
    +
    Initializes the camera
    +
    cancelTimer() - Method in class graphics.rooms.game.Game
    Cancels the timer
    @@ -204,6 +214,8 @@

    C

     
    continueButton - Static variable in class graphics.rooms.rankMenu.RankMenuRepository
     
    +
    continueLevel() - Method in class logic.misc.LevelManager
    +
     
    ControlButton - Class in graphics.effects
     
    ControlButton(int, int, Room, Sprite, Input.KEY, Runnable) - Constructor for class graphics.effects.ControlButton
    @@ -232,6 +244,8 @@

    C

     
    coreExplosion - Static variable in class graphics.rooms.game.GameRepository
     
    +
    create() - Method in class graphics.d3.SuperBomberman3D
    +
     
    create() - Method in class graphics.effects.IntroTemporizer
     
    create() - Method in class logic.characters.Bomb
    diff --git a/Bomberman/doc/index-files/index-4.html b/Bomberman/doc/index-files/index-4.html index 413feed..cff5836 100644 --- a/Bomberman/doc/index-files/index-4.html +++ b/Bomberman/doc/index-files/index-4.html @@ -2,9 +2,9 @@ - + D-Index - + @@ -74,6 +74,8 @@

    D

    +
    d3gameButton - Static variable in class graphics.rooms.mainMenu.MainMenuRepository
    +
     
    DEBUG - Static variable in class logic.Global
     
    decreaseProb(double) - Static method in class logic.misc.Map
    @@ -128,6 +130,8 @@

    D

     
    destroyableBlock2 - Static variable in class graphics.rooms.game.GameRepository
     
    +
    destroyableModel - Variable in class graphics.d3.SuperBomberman3D
    +
     
    destroyBomb() - Method in class logic.characters.Bomb
    Begins the explosion of the bomb
    @@ -152,6 +156,8 @@

    D

     
    DIRECTIONS - Variable in class logic.characters.ExplosionManager
     
    +
    dispose() - Method in class graphics.d3.SuperBomberman3D
    +
     
    down - Static variable in class graphics.rooms.controlsMenu.ControlsRepository
     
    DOWN - Variable in class logic.characters.ExplosionManager
    diff --git a/Bomberman/doc/index-files/index-5.html b/Bomberman/doc/index-files/index-5.html index a8a5c40..fda88fa 100644 --- a/Bomberman/doc/index-files/index-5.html +++ b/Bomberman/doc/index-files/index-5.html @@ -2,9 +2,9 @@ - + E-Index - + @@ -98,6 +98,14 @@

    E

    ENEMY - Static variable in class logic.misc.Map
     
    +
    enemyModel - Variable in class graphics.d3.SuperBomberman3D
    +
     
    +
    env - Variable in class graphics.d3.SuperBomberman3D
    +
     
    +
    environment() - Method in class graphics.d3.SuperBomberman3D
    +
    +
    Initializes the environment
    +
    explosion - Static variable in class sound.MusicRepository
     
    EXPLOSION_SND - Static variable in class sound.SoundTrack
    @@ -106,6 +114,8 @@

    E

     
    ExplosionManager(int, int, int, Room, int) - Constructor for class logic.characters.ExplosionManager
     
    +
    explosionModel - Variable in class graphics.d3.SuperBomberman3D
    +
     
    ExplosionPart - Class in logic.characters
     
    ExplosionPart(int, int, int, Room, ExplosionPart.KIND, ExplosionPart.SIDE) - Constructor for class logic.characters.ExplosionPart
    diff --git a/Bomberman/doc/index-files/index-6.html b/Bomberman/doc/index-files/index-6.html index 6722705..55a4feb 100644 --- a/Bomberman/doc/index-files/index-6.html +++ b/Bomberman/doc/index-files/index-6.html @@ -2,9 +2,9 @@ - + F-Index - + @@ -80,6 +80,10 @@

    F

     
    fadeOutCreated - Variable in class graphics.rooms.intro.Intro
     
    +
    far - Variable in class graphics.d3.SuperBomberman3D
    +
     
    +
    FIELD_OF_VIEW - Variable in class graphics.d3.SuperBomberman3D
    +
     
    FILE - Static variable in class utils.RunFromJar
     
    files - Variable in class logic.misc.LevelManager
    diff --git a/Bomberman/doc/index-files/index-7.html b/Bomberman/doc/index-files/index-7.html index 6fa82e8..fdeab17 100644 --- a/Bomberman/doc/index-files/index-7.html +++ b/Bomberman/doc/index-files/index-7.html @@ -2,9 +2,9 @@ - + G-Index - + @@ -92,6 +92,12 @@

    G

     
    Game.STATE - Enum in graphics.rooms.game
     
    +
    game3D - Static variable in class logic.StatesMachine
    +
     
    +
    game3d(Input.KEY, Input.KEY) - Static method in class logic.StatesMachine
    +
    +
    3D Game mode
    +
    gameButton - Static variable in class graphics.rooms.mainMenu.MainMenuRepository
     
    gameOver(Room) - Method in class logic.misc.objectives.Objective
    @@ -268,6 +274,8 @@

    G

    Changes room
    +
    graphics.d3 - package graphics.d3
    +
     
    graphics.effects - package graphics.effects
     
    graphics.effects.slider - package graphics.effects.slider
    diff --git a/Bomberman/doc/index-files/index-8.html b/Bomberman/doc/index-files/index-8.html index 0a758bd..e9b7889 100644 --- a/Bomberman/doc/index-files/index-8.html +++ b/Bomberman/doc/index-files/index-8.html @@ -2,9 +2,9 @@ - + H-Index - + @@ -76,6 +76,8 @@

    H

    hasBeenPickedUp() - Method in class logic.characters.Item
     
    +
    height - Variable in class graphics.d3.SuperBomberman3D
    +
     
    height - Variable in class graphics.rooms.Room
     
    height - Variable in class logic.Sprite
    diff --git a/Bomberman/doc/index-files/index-9.html b/Bomberman/doc/index-files/index-9.html index 9b9144f..e463600 100644 --- a/Bomberman/doc/index-files/index-9.html +++ b/Bomberman/doc/index-files/index-9.html @@ -2,9 +2,9 @@ - + I-Index - + @@ -84,6 +84,10 @@

    I

    Increases probability
    +
    init() - Method in class graphics.d3.SuperBomberman3D
    +
    +
    Initializes some variables
    +
    init() - Method in class main.Game
    Initializes the game
    @@ -110,6 +114,8 @@

    I

    Initializes to depth of some objects
    +
    initialPosition - Variable in class graphics.d3.SuperBomberman3D
    +
     
    initStatesMachine(Input) - Static method in class logic.StatesMachine
    Creation of the states machine.
    @@ -182,6 +188,8 @@

    I

     
    itemBomb - Static variable in class graphics.rooms.game.GameRepository
     
    +
    itemModel - Variable in class graphics.d3.SuperBomberman3D
    +
     
    itemPower - Static variable in class graphics.rooms.game.GameRepository
     
    itemSpeed - Static variable in class graphics.rooms.game.GameRepository
    diff --git a/Bomberman/doc/index.html b/Bomberman/doc/index.html index c162e34..0943bfd 100644 --- a/Bomberman/doc/index.html +++ b/Bomberman/doc/index.html @@ -2,7 +2,7 @@ - + Generated Documentation (Untitled) @@ -97,7 +97,7 @@

    Class Global

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.Global
      • @@ -110,7 +110,7 @@

        Class Global



        public class Global
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -154,7 +154,7 @@

        Field Summary

        ranking  -static String +static java.lang.String SAVE  @@ -222,8 +222,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    @@ -267,7 +267,7 @@

    DEBUG

    • SAVE

      -
      public static final String SAVE
      +
      public static final java.lang.String SAVE
      See Also:
      Constant Field Values
      diff --git a/Bomberman/doc/logic/Input.KEY.html b/Bomberman/doc/logic/Input.KEY.html index 4e3749b..31c3926 100644 --- a/Bomberman/doc/logic/Input.KEY.html +++ b/Bomberman/doc/logic/Input.KEY.html @@ -2,9 +2,9 @@ - + Input.KEY - + @@ -97,10 +97,10 @@

      Enum Input.KEY

    @@ -185,7 +185,7 @@

    Method Summary

    static Input.KEY -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -201,15 +201,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -340,7 +340,7 @@

    values

    • valueOf

      -
      public static Input.KEY valueOf(String name)
      +
      public static Input.KEY valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -351,8 +351,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/logic/Input.html b/Bomberman/doc/logic/Input.html index 26f30cc..bb71e9c 100644 --- a/Bomberman/doc/logic/Input.html +++ b/Bomberman/doc/logic/Input.html @@ -2,9 +2,9 @@ - + Input - + @@ -97,10 +97,10 @@

    Class Input

      -
    • java.lang.Object
    • +
    • java.lang.Object
    • @@ -446,12 +446,12 @@

      Method Detail

      • keyPressed

        -
        public void keyPressed(KeyEvent e)
        +
        public void keyPressed(java.awt.event.KeyEvent e)
        Specified by:
        -
        keyPressed in interface KeyListener
        +
        keyPressed in interface java.awt.event.KeyListener
        Overrides:
        -
        keyPressed in class KeyAdapter
        +
        keyPressed in class java.awt.event.KeyAdapter
      @@ -461,12 +461,12 @@

      keyPressed

      • keyReleased

        -
        public void keyReleased(KeyEvent e)
        +
        public void keyReleased(java.awt.event.KeyEvent e)
        Specified by:
        -
        keyReleased in interface KeyListener
        +
        keyReleased in interface java.awt.event.KeyListener
        Overrides:
        -
        keyReleased in class KeyAdapter
        +
        keyReleased in class java.awt.event.KeyAdapter
      diff --git a/Bomberman/doc/logic/KeyMapper.html b/Bomberman/doc/logic/KeyMapper.html index ba38fa2..8ebebea 100644 --- a/Bomberman/doc/logic/KeyMapper.html +++ b/Bomberman/doc/logic/KeyMapper.html @@ -2,9 +2,9 @@ - + KeyMapper - + @@ -97,7 +97,7 @@

      Class KeyMapper

    @@ -232,7 +232,7 @@

    Field Detail

    • KEYMAPPER_FILE

      -
      private static final String KEYMAPPER_FILE
      +
      private static final java.lang.String KEYMAPPER_FILE
      See Also:
      Constant Field Values
      @@ -245,7 +245,7 @@

      KEYMAPPER_FILE

      • KM_SECTION

        -
        private static final String KM_SECTION
        +
        private static final java.lang.String KM_SECTION
        See Also:
        Constant Field Values
        @@ -258,7 +258,7 @@

        KM_SECTION

      • diff --git a/Bomberman/doc/logic/Objeto.html b/Bomberman/doc/logic/Objeto.html index 47c6c94..74d29e9 100644 --- a/Bomberman/doc/logic/Objeto.html +++ b/Bomberman/doc/logic/Objeto.html @@ -2,9 +2,9 @@ - + Objeto - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -97,7 +97,7 @@

        Class Objeto

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.Objeto
      • @@ -114,7 +114,7 @@

        Class Objeto



        public abstract class Objeto
        -extends Object
        +extends java.lang.Object
    @@ -138,7 +138,7 @@

    Field Summary

    alarm  -private List<Integer> +private java.util.List<java.lang.Integer> alarmsOff  @@ -245,87 +245,91 @@

    Method Summary

    +int +animate()  + + void checkAnimationEnd()
    Check the animation end
    - -List<Objeto> + +java.util.List<Objeto> collision()
    Collision event
    - + void create()
    Create event
    - + void customCollision(Objeto colision)  - + void customDestroy()
    Custom destroy event
    - + void customStep(Input.KEY key, Input.KEY direction)
    Custom step event
    - + void destroy()
    Destroy event
    - + boolean isAlarmSet(int alarmNo)  - + void processKey(Input.KEY key, Input.KEY direction)  - + void -render(Graphics g) +render(java.awt.Graphics g)
    Render the animated sprite of the object
    - + void resetAnimationEnd()
    Resets the animation end
    - + void setAlarm(int alarmNo, int steps)
    Sets an alarm
    - + void step(Input.KEY key, Input.KEY direction)
    Step event
    - + boolean tryToMove(int modX, int modY)  - + void unsetAlarm(int alarmNo)
    Unsets the alarm
    @@ -336,8 +340,8 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
  • +

    Methods inherited from class java.lang.Object

    +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait @@ -476,7 +480,7 @@

    alarmsSet

    • alarmsOff

      -
      private List<Integer> alarmsOff
      +
      private java.util.List<java.lang.Integer> alarmsOff
    @@ -606,7 +610,7 @@

    processKey

    + + + +
      +
    • +

      animate

      +
      public int animate()
      +
      +
      Returns:
      +
      previous animation index
      +
      +
    • +
    @@ -728,7 +745,7 @@

    tryToMove

    • collision

      -
      public List<Objeto> collision()
      +
      public java.util.List<Objeto> collision()
      Collision event
      Returns:
      diff --git a/Bomberman/doc/logic/Sprite.html b/Bomberman/doc/logic/Sprite.html index 27bb613..ce57f13 100644 --- a/Bomberman/doc/logic/Sprite.html +++ b/Bomberman/doc/logic/Sprite.html @@ -2,9 +2,9 @@ - + Sprite - + @@ -97,7 +97,7 @@

      Class Sprite

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.Sprite
      • @@ -110,7 +110,7 @@

        Class Sprite



        public class Sprite
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -150,7 +150,7 @@

        Field Summary

        subimages  -private BufferedImage[] +private java.awt.image.BufferedImage[] subsprites  @@ -172,13 +172,13 @@

        Constructor Summary

        Constructor and Description -Sprite(BufferedImage[] sheet, +Sprite(java.awt.image.BufferedImage[] sheet, int subImages, int width, int height)  -Sprite(File sheet, +Sprite(java.io.File sheet, int sI, int cX, int cY, @@ -186,7 +186,7 @@

        Constructor Summary

        int h)
          -Sprite(File sheet, +Sprite(java.io.File sheet, int sI, int cX, int cY, @@ -226,7 +226,7 @@

        Method Summary

        getSubimages()  -BufferedImage[] +java.awt.image.BufferedImage[] getSubsprites()  @@ -251,7 +251,7 @@

        Method Summary

        void -setSubsprites(BufferedImage[] subsprites)  +setSubsprites(java.awt.image.BufferedImage[] subsprites)  void @@ -262,8 +262,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    @@ -285,7 +285,7 @@

    Field Detail

    • subsprites

      -
      private BufferedImage[] subsprites
      +
      private java.awt.image.BufferedImage[] subsprites
    @@ -347,7 +347,7 @@

    Constructor Detail

    • Sprite

      -
      public Sprite(File sheet,
      +
      public Sprite(java.io.File sheet,
                     int sI,
                     int cX,
                     int cY,
      @@ -370,7 +370,7 @@ 

      Sprite

      • Sprite

        -
        public Sprite(File sheet,
        +
        public Sprite(java.io.File sheet,
                       int sI,
                       int cX,
                       int cY,
        @@ -395,7 +395,7 @@ 

        Sprite

        • Sprite

          -
          public Sprite(BufferedImage[] sheet,
          +
          public Sprite(java.awt.image.BufferedImage[] sheet,
                         int subImages,
                         int width,
                         int height)
          @@ -422,7 +422,7 @@

          Method Detail

          • getSubsprites

            -
            public BufferedImage[] getSubsprites()
            +
            public java.awt.image.BufferedImage[] getSubsprites()
            Returns:
            subimages
            @@ -435,7 +435,7 @@

            getSubsprites

            • setSubsprites

              -
              public void setSubsprites(BufferedImage[] subsprites)
              +
              public void setSubsprites(java.awt.image.BufferedImage[] subsprites)
              Parameters:
              subsprites - subimages
              diff --git a/Bomberman/doc/logic/StatesMachine.STATE.html b/Bomberman/doc/logic/StatesMachine.STATE.html index de373de..17a185d 100644 --- a/Bomberman/doc/logic/StatesMachine.STATE.html +++ b/Bomberman/doc/logic/StatesMachine.STATE.html @@ -2,9 +2,9 @@ - + StatesMachine.STATE - + @@ -97,10 +97,10 @@

              Enum StatesMachine.STATE

    @@ -151,21 +151,24 @@

    Enum Constant Summary

    GAME  -INTRO  +GAME3D  -MAIN_MENU  +INTRO  -OPTIONS_MENU  +MAIN_MENU  -PAUSE  +OPTIONS_MENU  -RANKS  +PAUSE  +RANKS  + + TOP10  @@ -185,7 +188,7 @@

    Method Summary

    static StatesMachine.STATE -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -201,15 +204,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -261,6 +264,15 @@

    GAME

    public static final StatesMachine.STATE GAME
    + + + + @@ -340,7 +352,7 @@

    values

    • valueOf

      -
      public static StatesMachine.STATE valueOf(String name)
      +
      public static StatesMachine.STATE valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -351,8 +363,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/logic/StatesMachine.html b/Bomberman/doc/logic/StatesMachine.html index 7b5a955..8314c94 100644 --- a/Bomberman/doc/logic/StatesMachine.html +++ b/Bomberman/doc/logic/StatesMachine.html @@ -2,9 +2,9 @@ - + StatesMachine - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9,"i9":9,"i10":9,"i11":9,"i12":9,"i13":9,"i14":9,"i15":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -97,7 +97,7 @@

    Class StatesMachine

    @@ -352,7 +363,7 @@

    Field Detail

    @@ -430,12 +441,21 @@

    credits

    -
      +
      • controls

        private static Controls controls
      + + + +
        +
      • +

        game3D

        +
        public static com.badlogic.gdx.backends.lwjgl.LwjglApplication game3D
        +
      • +
    @@ -492,7 +512,7 @@

    stateMachine

    • render

      -
      public static void render(Graphics g)
      +
      public static void render(java.awt.Graphics g)
      Render a frame
      Parameters:
      @@ -604,6 +624,22 @@

      game

    + + + +
      +
    • +

      game3d

      +
      private static void game3d(Input.KEY key,
      +                           Input.KEY direction)
      +
      3D Game mode
      +
      +
      Parameters:
      +
      key - key
      +
      direction - direction
      +
      +
    • +
    diff --git a/Bomberman/doc/logic/characters/Block.html b/Bomberman/doc/logic/characters/Block.html index 0881827..a6ef090 100644 --- a/Bomberman/doc/logic/characters/Block.html +++ b/Bomberman/doc/logic/characters/Block.html @@ -2,9 +2,9 @@ - + Block - + @@ -91,7 +91,7 @@

    Class Block

    diff --git a/Bomberman/doc/logic/characters/Bomb.html b/Bomberman/doc/logic/characters/Bomb.html index 91653fb..c6be60a 100644 --- a/Bomberman/doc/logic/characters/Bomb.html +++ b/Bomberman/doc/logic/characters/Bomb.html @@ -2,9 +2,9 @@ - + Bomb - + @@ -97,7 +97,7 @@

    Class Bomb

    diff --git a/Bomberman/doc/logic/characters/DestroyableBlock.html b/Bomberman/doc/logic/characters/DestroyableBlock.html index 0fcdb21..9457110 100644 --- a/Bomberman/doc/logic/characters/DestroyableBlock.html +++ b/Bomberman/doc/logic/characters/DestroyableBlock.html @@ -2,9 +2,9 @@ - + DestroyableBlock - + @@ -97,7 +97,7 @@

    Class DestroyableBlock

    diff --git a/Bomberman/doc/logic/characters/Enemy.html b/Bomberman/doc/logic/characters/Enemy.html index 4192742..d625a79 100644 --- a/Bomberman/doc/logic/characters/Enemy.html +++ b/Bomberman/doc/logic/characters/Enemy.html @@ -2,9 +2,9 @@ - + Enemy - + @@ -97,7 +97,7 @@

    Class Enemy

    @@ -301,7 +301,7 @@

    movActual

    • randomizer

      -
      private Random randomizer
      +
      private java.util.Random randomizer
    @@ -319,7 +319,7 @@

    destruction

    diff --git a/Bomberman/doc/logic/characters/ExplosionManager.html b/Bomberman/doc/logic/characters/ExplosionManager.html index 755b9a0..221e876 100644 --- a/Bomberman/doc/logic/characters/ExplosionManager.html +++ b/Bomberman/doc/logic/characters/ExplosionManager.html @@ -2,9 +2,9 @@ - + ExplosionManager - + @@ -97,7 +97,7 @@

    Class ExplosionManager

    diff --git a/Bomberman/doc/logic/characters/ExplosionPart.KIND.html b/Bomberman/doc/logic/characters/ExplosionPart.KIND.html index 0d13aea..7dcc462 100644 --- a/Bomberman/doc/logic/characters/ExplosionPart.KIND.html +++ b/Bomberman/doc/logic/characters/ExplosionPart.KIND.html @@ -2,9 +2,9 @@ - + ExplosionPart.KIND - + @@ -97,10 +97,10 @@

    Enum ExplosionPart.KIND

    @@ -167,7 +167,7 @@

    Method Summary

    static ExplosionPart.KIND -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -183,15 +183,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -268,7 +268,7 @@

    values

    • valueOf

      -
      public static ExplosionPart.KIND valueOf(String name)
      +
      public static ExplosionPart.KIND valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -279,8 +279,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/logic/characters/ExplosionPart.SIDE.html b/Bomberman/doc/logic/characters/ExplosionPart.SIDE.html index 7a6fb1b..c75bd4a 100644 --- a/Bomberman/doc/logic/characters/ExplosionPart.SIDE.html +++ b/Bomberman/doc/logic/characters/ExplosionPart.SIDE.html @@ -2,9 +2,9 @@ - + ExplosionPart.SIDE - + @@ -97,10 +97,10 @@

    Enum ExplosionPart.SIDE

    @@ -170,7 +170,7 @@

    Method Summary

    static ExplosionPart.SIDE -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -186,15 +186,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -280,7 +280,7 @@

    values

    • valueOf

      -
      public static ExplosionPart.SIDE valueOf(String name)
      +
      public static ExplosionPart.SIDE valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -291,8 +291,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/logic/characters/ExplosionPart.html b/Bomberman/doc/logic/characters/ExplosionPart.html index e3a054a..3fd5511 100644 --- a/Bomberman/doc/logic/characters/ExplosionPart.html +++ b/Bomberman/doc/logic/characters/ExplosionPart.html @@ -2,9 +2,9 @@ - + ExplosionPart - + @@ -97,7 +97,7 @@

    Class ExplosionPart

    diff --git a/Bomberman/doc/logic/characters/Item.TYPE.html b/Bomberman/doc/logic/characters/Item.TYPE.html index 93df486..ff0301d 100644 --- a/Bomberman/doc/logic/characters/Item.TYPE.html +++ b/Bomberman/doc/logic/characters/Item.TYPE.html @@ -2,9 +2,9 @@ - + Item.TYPE - + @@ -97,10 +97,10 @@

    Enum Item.TYPE

    @@ -167,7 +167,7 @@

    Method Summary

    static Item.TYPE -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -183,15 +183,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -268,7 +268,7 @@

    values

    • valueOf

      -
      public static Item.TYPE valueOf(String name)
      +
      public static Item.TYPE valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -279,8 +279,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/logic/characters/Item.html b/Bomberman/doc/logic/characters/Item.html index 9850cc6..d11ad92 100644 --- a/Bomberman/doc/logic/characters/Item.html +++ b/Bomberman/doc/logic/characters/Item.html @@ -2,9 +2,9 @@ - + Item - + @@ -97,7 +97,7 @@

    Class Item

    diff --git a/Bomberman/doc/logic/characters/Player.html b/Bomberman/doc/logic/characters/Player.html index f28776e..9085ee0 100644 --- a/Bomberman/doc/logic/characters/Player.html +++ b/Bomberman/doc/logic/characters/Player.html @@ -2,9 +2,9 @@ - + Player - + @@ -97,7 +97,7 @@

    Class Player

    @@ -314,7 +318,7 @@

    Field Detail

    @@ -409,10 +413,19 @@

    bombsLimit

    -
      + + + + +
        +
      • +

        obj

        +
        public com.badlogic.gdx.graphics.g3d.ModelInstance obj
      @@ -578,8 +591,8 @@

      tryToMove

      • checkPlayerCollisions

        -
        public int checkPlayerCollisions(List<Objeto> toCheck,
        -                                 List<Objeto> finalCollision)
        +
        public int checkPlayerCollisions(java.util.List<Objeto> toCheck,
        +                                 java.util.List<Objeto> finalCollision)
        Parameters:
        toCheck - objects to check collision with
        diff --git a/Bomberman/doc/logic/characters/Stairs.html b/Bomberman/doc/logic/characters/Stairs.html index 7913c3a..c89e502 100644 --- a/Bomberman/doc/logic/characters/Stairs.html +++ b/Bomberman/doc/logic/characters/Stairs.html @@ -2,9 +2,9 @@ - + Stairs - + @@ -91,7 +91,7 @@

        Class Stairs

    diff --git a/Bomberman/doc/logic/characters/class-use/Block.html b/Bomberman/doc/logic/characters/class-use/Block.html index c42d434..c5fd3e5 100644 --- a/Bomberman/doc/logic/characters/class-use/Block.html +++ b/Bomberman/doc/logic/characters/class-use/Block.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.Block - + diff --git a/Bomberman/doc/logic/characters/class-use/Bomb.html b/Bomberman/doc/logic/characters/class-use/Bomb.html index 9db7e3c..b2d3fd1 100644 --- a/Bomberman/doc/logic/characters/class-use/Bomb.html +++ b/Bomberman/doc/logic/characters/class-use/Bomb.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.Bomb - + diff --git a/Bomberman/doc/logic/characters/class-use/DestroyableBlock.html b/Bomberman/doc/logic/characters/class-use/DestroyableBlock.html index c55d1cb..d58bd7b 100644 --- a/Bomberman/doc/logic/characters/class-use/DestroyableBlock.html +++ b/Bomberman/doc/logic/characters/class-use/DestroyableBlock.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.DestroyableBlock - + diff --git a/Bomberman/doc/logic/characters/class-use/Enemy.html b/Bomberman/doc/logic/characters/class-use/Enemy.html index a788da4..788facf 100644 --- a/Bomberman/doc/logic/characters/class-use/Enemy.html +++ b/Bomberman/doc/logic/characters/class-use/Enemy.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.Enemy - + diff --git a/Bomberman/doc/logic/characters/class-use/ExplosionManager.html b/Bomberman/doc/logic/characters/class-use/ExplosionManager.html index 50cab42..93079a5 100644 --- a/Bomberman/doc/logic/characters/class-use/ExplosionManager.html +++ b/Bomberman/doc/logic/characters/class-use/ExplosionManager.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.ExplosionManager - + diff --git a/Bomberman/doc/logic/characters/class-use/ExplosionPart.KIND.html b/Bomberman/doc/logic/characters/class-use/ExplosionPart.KIND.html index 1cdbe19..88b1d17 100644 --- a/Bomberman/doc/logic/characters/class-use/ExplosionPart.KIND.html +++ b/Bomberman/doc/logic/characters/class-use/ExplosionPart.KIND.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.ExplosionPart.KIND - + @@ -117,7 +117,7 @@

    Uses of static ExplosionPart.KIND -ExplosionPart.KIND.valueOf(String name) +ExplosionPart.KIND.valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    diff --git a/Bomberman/doc/logic/characters/class-use/ExplosionPart.SIDE.html b/Bomberman/doc/logic/characters/class-use/ExplosionPart.SIDE.html index 8ca1da5..25cc17c 100644 --- a/Bomberman/doc/logic/characters/class-use/ExplosionPart.SIDE.html +++ b/Bomberman/doc/logic/characters/class-use/ExplosionPart.SIDE.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.ExplosionPart.SIDE - + @@ -117,7 +117,7 @@

    Uses of static ExplosionPart.SIDE -ExplosionPart.SIDE.valueOf(String name) +ExplosionPart.SIDE.valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    diff --git a/Bomberman/doc/logic/characters/class-use/ExplosionPart.html b/Bomberman/doc/logic/characters/class-use/ExplosionPart.html index 0bc44ee..1ac6c55 100644 --- a/Bomberman/doc/logic/characters/class-use/ExplosionPart.html +++ b/Bomberman/doc/logic/characters/class-use/ExplosionPart.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.ExplosionPart - + diff --git a/Bomberman/doc/logic/characters/class-use/Item.TYPE.html b/Bomberman/doc/logic/characters/class-use/Item.TYPE.html index bb64cd3..b8baec7 100644 --- a/Bomberman/doc/logic/characters/class-use/Item.TYPE.html +++ b/Bomberman/doc/logic/characters/class-use/Item.TYPE.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.Item.TYPE - + @@ -125,7 +125,7 @@

    Uses of static Item.TYPE -Item.TYPE.valueOf(String name) +Item.TYPE.valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    diff --git a/Bomberman/doc/logic/characters/class-use/Item.html b/Bomberman/doc/logic/characters/class-use/Item.html index 2a73abe..cb0b791 100644 --- a/Bomberman/doc/logic/characters/class-use/Item.html +++ b/Bomberman/doc/logic/characters/class-use/Item.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.Item - + diff --git a/Bomberman/doc/logic/characters/class-use/Player.html b/Bomberman/doc/logic/characters/class-use/Player.html index cf86ee4..32caaf4 100644 --- a/Bomberman/doc/logic/characters/class-use/Player.html +++ b/Bomberman/doc/logic/characters/class-use/Player.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.Player - + diff --git a/Bomberman/doc/logic/characters/class-use/Stairs.html b/Bomberman/doc/logic/characters/class-use/Stairs.html index 3b25ea4..a8e5751 100644 --- a/Bomberman/doc/logic/characters/class-use/Stairs.html +++ b/Bomberman/doc/logic/characters/class-use/Stairs.html @@ -2,9 +2,9 @@ - + Uses of Class logic.characters.Stairs - + diff --git a/Bomberman/doc/logic/characters/package-frame.html b/Bomberman/doc/logic/characters/package-frame.html index 421125e..7196c63 100644 --- a/Bomberman/doc/logic/characters/package-frame.html +++ b/Bomberman/doc/logic/characters/package-frame.html @@ -2,9 +2,9 @@ - + logic.characters - + diff --git a/Bomberman/doc/logic/characters/package-summary.html b/Bomberman/doc/logic/characters/package-summary.html index 98414d8..5e73a6b 100644 --- a/Bomberman/doc/logic/characters/package-summary.html +++ b/Bomberman/doc/logic/characters/package-summary.html @@ -2,9 +2,9 @@ - + logic.characters - + diff --git a/Bomberman/doc/logic/characters/package-tree.html b/Bomberman/doc/logic/characters/package-tree.html index a8cd529..6740e27 100644 --- a/Bomberman/doc/logic/characters/package-tree.html +++ b/Bomberman/doc/logic/characters/package-tree.html @@ -2,9 +2,9 @@ - + logic.characters Class Hierarchy - + @@ -79,7 +79,7 @@

    Hierarchy For Package logic.characters

    Class Hierarchy

    @@ -338,8 +338,8 @@

    collision

    • collisionRectangle

      -
      public static Rectangle collisionRectangle(BoundingBox bb1,
      -                                           BoundingBox bb2)
      +
      public static java.awt.Rectangle collisionRectangle(BoundingBox bb1,
      +                                                    BoundingBox bb2)
      Parameters:
      bb1 - first bounding box
      @@ -355,7 +355,7 @@

      collisionRectangle

      • getRectangle

        -
        private Rectangle getRectangle()
        +
        private java.awt.Rectangle getRectangle()
        Transforms the bounding box to a rectangle
        Returns:
        @@ -434,10 +434,10 @@

        copy

        • toString

          -
          public String toString()
          +
          public java.lang.String toString()
          Overrides:
          -
          toString in class Object
          +
          toString in class java.lang.Object
        diff --git a/Bomberman/doc/logic/collisions/NoPerspectiveBoundingBox.html b/Bomberman/doc/logic/collisions/NoPerspectiveBoundingBox.html index 027ca2e..7e89b8d 100644 --- a/Bomberman/doc/logic/collisions/NoPerspectiveBoundingBox.html +++ b/Bomberman/doc/logic/collisions/NoPerspectiveBoundingBox.html @@ -2,9 +2,9 @@ - + NoPerspectiveBoundingBox - + @@ -97,7 +97,7 @@

        Class NoPerspectiveBoun

    diff --git a/Bomberman/doc/logic/collisions/PerspectiveBoundingBox.html b/Bomberman/doc/logic/collisions/PerspectiveBoundingBox.html index 7d9d084..310bb91 100644 --- a/Bomberman/doc/logic/collisions/PerspectiveBoundingBox.html +++ b/Bomberman/doc/logic/collisions/PerspectiveBoundingBox.html @@ -2,9 +2,9 @@ - + PerspectiveBoundingBox - + @@ -97,7 +97,7 @@

    Class PerspectiveBounding

    diff --git a/Bomberman/doc/logic/collisions/Point2D.html b/Bomberman/doc/logic/collisions/Point2D.html index 4b78d0a..7804b2b 100644 --- a/Bomberman/doc/logic/collisions/Point2D.html +++ b/Bomberman/doc/logic/collisions/Point2D.html @@ -2,9 +2,9 @@ - + Point2D - + @@ -97,7 +97,7 @@

    Class Point2D

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.collisions.Point2D
      • @@ -110,7 +110,7 @@

        Class Point2D



        public class Point2D
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -190,7 +190,7 @@

        Method Summary

        getY()  -String +java.lang.String toString()  @@ -205,8 +205,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -330,10 +330,10 @@

    getY

    • toString

      -
      public String toString()
      +
      public java.lang.String toString()
      Overrides:
      -
      toString in class Object
      +
      toString in class java.lang.Object
    diff --git a/Bomberman/doc/logic/collisions/class-use/BoundingBox.html b/Bomberman/doc/logic/collisions/class-use/BoundingBox.html index fb1be28..21760d7 100644 --- a/Bomberman/doc/logic/collisions/class-use/BoundingBox.html +++ b/Bomberman/doc/logic/collisions/class-use/BoundingBox.html @@ -2,9 +2,9 @@ - + Uses of Class logic.collisions.BoundingBox - + @@ -162,7 +162,7 @@

    Uses of -static Rectangle +static java.awt.Rectangle BoundingBox.collisionRectangle(BoundingBox bb1, BoundingBox bb2)  diff --git a/Bomberman/doc/logic/collisions/class-use/NoPerspectiveBoundingBox.html b/Bomberman/doc/logic/collisions/class-use/NoPerspectiveBoundingBox.html index f7d3187..cd75c9f 100644 --- a/Bomberman/doc/logic/collisions/class-use/NoPerspectiveBoundingBox.html +++ b/Bomberman/doc/logic/collisions/class-use/NoPerspectiveBoundingBox.html @@ -2,9 +2,9 @@ - + Uses of Class logic.collisions.NoPerspectiveBoundingBox - + diff --git a/Bomberman/doc/logic/collisions/class-use/PerspectiveBoundingBox.html b/Bomberman/doc/logic/collisions/class-use/PerspectiveBoundingBox.html index 6464cc9..939f928 100644 --- a/Bomberman/doc/logic/collisions/class-use/PerspectiveBoundingBox.html +++ b/Bomberman/doc/logic/collisions/class-use/PerspectiveBoundingBox.html @@ -2,9 +2,9 @@ - + Uses of Class logic.collisions.PerspectiveBoundingBox - + diff --git a/Bomberman/doc/logic/collisions/class-use/Point2D.html b/Bomberman/doc/logic/collisions/class-use/Point2D.html index 3931917..49c8846 100644 --- a/Bomberman/doc/logic/collisions/class-use/Point2D.html +++ b/Bomberman/doc/logic/collisions/class-use/Point2D.html @@ -2,9 +2,9 @@ - + Uses of Class logic.collisions.Point2D - + @@ -178,26 +178,26 @@

    Uses of static void -PaintService.paintDigits(String number, +PaintService.paintDigits(java.lang.String number, Point2D initial_position, - Graphics g) + java.awt.Graphics g)
    Method to paint digits, records and ranking
    static void -PaintService.paintDigitsColor(String number, +PaintService.paintDigitsColor(java.lang.String number, Point2D initial_position, - Graphics g, + java.awt.Graphics g, int RGB)
    Method to paint colored digits on screen
    static void -PaintService.paintDigitsColor(String number, +PaintService.paintDigitsColor(java.lang.String number, Point2D initial_position, - Graphics g, + java.awt.Graphics g, int R, int G, int B) @@ -207,17 +207,17 @@

    Uses of static void -PaintService.paintText(String text, +PaintService.paintText(java.lang.String text, Point2D initial_position, - Graphics g) + java.awt.Graphics g)
    Method for painting white text on the screen at initial_position position
    static void -PaintService.paintTextColor(String text, +PaintService.paintTextColor(java.lang.String text, Point2D initial_position, - Graphics g, + java.awt.Graphics g, int RGB)
    Method for painting colored text on the screen at initial_position position
    @@ -225,9 +225,9 @@

    Uses of static void -PaintService.paintTextColor(String text, +PaintService.paintTextColor(java.lang.String text, Point2D initial_position, - Graphics g, + java.awt.Graphics g, int R, int G, int B) diff --git a/Bomberman/doc/logic/collisions/package-frame.html b/Bomberman/doc/logic/collisions/package-frame.html index e5cff30..7b04dfc 100644 --- a/Bomberman/doc/logic/collisions/package-frame.html +++ b/Bomberman/doc/logic/collisions/package-frame.html @@ -2,9 +2,9 @@ - + logic.collisions - + diff --git a/Bomberman/doc/logic/collisions/package-summary.html b/Bomberman/doc/logic/collisions/package-summary.html index 41daae4..e8a1970 100644 --- a/Bomberman/doc/logic/collisions/package-summary.html +++ b/Bomberman/doc/logic/collisions/package-summary.html @@ -2,9 +2,9 @@ - + logic.collisions - + diff --git a/Bomberman/doc/logic/collisions/package-tree.html b/Bomberman/doc/logic/collisions/package-tree.html index 9520f1d..cb4e4d5 100644 --- a/Bomberman/doc/logic/collisions/package-tree.html +++ b/Bomberman/doc/logic/collisions/package-tree.html @@ -2,9 +2,9 @@ - + logic.collisions Class Hierarchy - + @@ -79,7 +79,7 @@

    Hierarchy For Package logic.collisions

    Class Hierarchy

      -
    • java.lang.Object +
    • java.lang.Object
      • logic.collisions.BoundingBox
          diff --git a/Bomberman/doc/logic/collisions/package-use.html b/Bomberman/doc/logic/collisions/package-use.html index 0695bf3..e5ccc91 100644 --- a/Bomberman/doc/logic/collisions/package-use.html +++ b/Bomberman/doc/logic/collisions/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package logic.collisions - + diff --git a/Bomberman/doc/logic/misc/Level.html b/Bomberman/doc/logic/misc/Level.html index 9b8b110..9702ff4 100644 --- a/Bomberman/doc/logic/misc/Level.html +++ b/Bomberman/doc/logic/misc/Level.html @@ -2,9 +2,9 @@ - + Level - + @@ -91,7 +91,7 @@

          Class Level

    diff --git a/Bomberman/doc/logic/misc/LevelFile.html b/Bomberman/doc/logic/misc/LevelFile.html index d99b9b6..47fdd27 100644 --- a/Bomberman/doc/logic/misc/LevelFile.html +++ b/Bomberman/doc/logic/misc/LevelFile.html @@ -2,9 +2,9 @@ - + LevelFile - + @@ -97,7 +97,7 @@

    Class LevelFile

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.misc.LevelFile
      • @@ -110,7 +110,7 @@

        Class LevelFile



        public class LevelFile
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -187,8 +187,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    diff --git a/Bomberman/doc/logic/misc/LevelManager.html b/Bomberman/doc/logic/misc/LevelManager.html index 22ba332..1ebcbfa 100644 --- a/Bomberman/doc/logic/misc/LevelManager.html +++ b/Bomberman/doc/logic/misc/LevelManager.html @@ -2,9 +2,9 @@ - + LevelManager - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -97,7 +97,7 @@

    Class LevelManager

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.misc.LevelManager
      • @@ -110,7 +110,7 @@

        Class LevelManager



        public class LevelManager
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -184,16 +184,20 @@

        Method Summary

        actualLevel()  +boolean +continueLevel()  + + int level()  - + void nextLevel()
        Get to the next level
        - + void resetLevel()
        Resets the level
        @@ -204,8 +208,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    @@ -288,6 +292,15 @@

    nextLevel

    Get to the next level
    + + + +
      +
    • +

      continueLevel

      +
      public boolean continueLevel()
      +
    • +
    diff --git a/Bomberman/doc/logic/misc/Map.html b/Bomberman/doc/logic/misc/Map.html index 8a57d98..3cf76fe 100644 --- a/Bomberman/doc/logic/misc/Map.html +++ b/Bomberman/doc/logic/misc/Map.html @@ -2,9 +2,9 @@ - + Map - + @@ -97,7 +97,7 @@

    Class Map

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.misc.Map
      • @@ -110,7 +110,7 @@

        Class Map



        public class Map
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -162,7 +162,7 @@

        Field Summary

        ENEMY  -private static int +static int fixpos  @@ -241,14 +241,14 @@

        Method Summary

        -private static List<Character> +private static java.util.List<java.lang.Character> generateListOfObjects()
        Generates a list of types of destroyable blocks to use when generating random maps
        -static List<Objeto> +static java.util.List<Objeto> generateMap(Room room)
        Generates a random map from various templates
        @@ -258,7 +258,7 @@

        Method Summary

        generateRandomObject(int row, int col, Room room, - List<Character> list) + java.util.List<java.lang.Character> list)
        Generates a random object
        @@ -267,8 +267,8 @@

        Method Summary

        getCol(int x)  -static List<Objeto> -getMap(String file, +static java.util.List<Objeto> +getMap(java.lang.String file, Room room)
        Creates a map from a file
        @@ -311,8 +311,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    @@ -438,7 +438,7 @@

    NOTHING

    • fixpos

      -
      private static final int fixpos
      +
      public static final int fixpos
      See Also:
      Constant Field Values
      @@ -476,8 +476,8 @@

      Method Detail

      • getMap

        -
        public static List<Objeto> getMap(String file,
        -                                  Room room)
        +
        public static java.util.List<Objeto> getMap(java.lang.String file,
        +                                            Room room)
        Creates a map from a file
        Parameters:
        @@ -494,7 +494,7 @@

        getMap

        • generateMap

          -
          public static List<Objeto> generateMap(Room room)
          +
          public static java.util.List<Objeto> generateMap(Room room)
          Generates a random map from various templates
          Parameters:
          @@ -652,7 +652,7 @@

          getCol

          • generateListOfObjects

            -
            private static List<Character> generateListOfObjects()
            +
            private static java.util.List<java.lang.Character> generateListOfObjects()
            Generates a list of types of destroyable blocks to use when generating random maps
            @@ -670,7 +670,7 @@

            generateRandomObject

            private static Objeto generateRandomObject(int row,
                                                        int col,
                                                        Room room,
            -                                           List<Character> list)
            + java.util.List<java.lang.Character> list)
            Generates a random object
            Parameters:
            diff --git a/Bomberman/doc/logic/misc/ObjetoComparator.html b/Bomberman/doc/logic/misc/ObjetoComparator.html index 2fe8447..4b8c121 100644 --- a/Bomberman/doc/logic/misc/ObjetoComparator.html +++ b/Bomberman/doc/logic/misc/ObjetoComparator.html @@ -2,9 +2,9 @@ - + ObjetoComparator - + @@ -97,7 +97,7 @@

            Class ObjetoComparator

    @@ -216,7 +216,7 @@

    compare

    Objeto arg1)
    Specified by:
    -
    compare in interface Comparator<Objeto>
    +
    compare in interface java.util.Comparator<Objeto>
    diff --git a/Bomberman/doc/logic/misc/Ranking.html b/Bomberman/doc/logic/misc/Ranking.html index cec16d9..cc93818 100644 --- a/Bomberman/doc/logic/misc/Ranking.html +++ b/Bomberman/doc/logic/misc/Ranking.html @@ -2,9 +2,9 @@ - + Ranking - + @@ -97,7 +97,7 @@

    Class Ranking

    @@ -242,7 +242,7 @@

    serialVersionUID

    • records

      -
      private List<Record> records
      +
      private java.util.List<Record> records
    @@ -282,7 +282,7 @@

    Ranking

    • Ranking

      -
      public Ranking(List<Record> records)
      +
      public Ranking(java.util.List<Record> records)
      Creates a ranking from a set of records
      Parameters:
      @@ -304,7 +304,7 @@

      Method Detail

      • getRecords

        -
        public List<Record> getRecords()
        +
        public java.util.List<Record> getRecords()
        Returns:
        the records
        diff --git a/Bomberman/doc/logic/misc/Record.html b/Bomberman/doc/logic/misc/Record.html index 38d9405..07e46b8 100644 --- a/Bomberman/doc/logic/misc/Record.html +++ b/Bomberman/doc/logic/misc/Record.html @@ -2,9 +2,9 @@ - + Record - + @@ -97,7 +97,7 @@

        Class Record

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.misc.Record
      • @@ -109,13 +109,13 @@

        Class Record

      • All Implemented Interfaces:
        -
        Serializable
        +
        java.io.Serializable


        public class Record
        -extends Object
        -implements Serializable
        +extends java.lang.Object +implements java.io.Serializable
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -191,8 +191,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    diff --git a/Bomberman/doc/logic/misc/RecordComparator.html b/Bomberman/doc/logic/misc/RecordComparator.html index 3b567aa..6e06c36 100644 --- a/Bomberman/doc/logic/misc/RecordComparator.html +++ b/Bomberman/doc/logic/misc/RecordComparator.html @@ -2,9 +2,9 @@ - + RecordComparator - + @@ -97,7 +97,7 @@

    Class RecordComparator

    @@ -216,7 +216,7 @@

    compare

    Record arg1)
    Specified by:
    -
    compare in interface Comparator<Record>
    +
    compare in interface java.util.Comparator<Record>
    diff --git a/Bomberman/doc/logic/misc/ScoreManager.html b/Bomberman/doc/logic/misc/ScoreManager.html index c61bc47..fe7f4ae 100644 --- a/Bomberman/doc/logic/misc/ScoreManager.html +++ b/Bomberman/doc/logic/misc/ScoreManager.html @@ -2,9 +2,9 @@ - + ScoreManager - + @@ -97,7 +97,7 @@

    Class ScoreManager

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.misc.ScoreManager
      • @@ -110,7 +110,7 @@

        Class ScoreManager



        public class ScoreManager
        -extends Object
        +extends java.lang.Object
    @@ -213,8 +213,8 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Object

    -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
  • +

    Methods inherited from class java.lang.Object

    +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait diff --git a/Bomberman/doc/logic/misc/class-use/Level.html b/Bomberman/doc/logic/misc/class-use/Level.html index fc92648..273dd35 100644 --- a/Bomberman/doc/logic/misc/class-use/Level.html +++ b/Bomberman/doc/logic/misc/class-use/Level.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.Level - + @@ -103,7 +103,7 @@

    Uses of -protected Level +Level Game.level  diff --git a/Bomberman/doc/logic/misc/class-use/LevelFile.html b/Bomberman/doc/logic/misc/class-use/LevelFile.html index a4142ca..76def4d 100644 --- a/Bomberman/doc/logic/misc/class-use/LevelFile.html +++ b/Bomberman/doc/logic/misc/class-use/LevelFile.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.LevelFile - + diff --git a/Bomberman/doc/logic/misc/class-use/LevelManager.html b/Bomberman/doc/logic/misc/class-use/LevelManager.html index 95357fa..debf5f2 100644 --- a/Bomberman/doc/logic/misc/class-use/LevelManager.html +++ b/Bomberman/doc/logic/misc/class-use/LevelManager.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.LevelManager - + diff --git a/Bomberman/doc/logic/misc/class-use/Map.html b/Bomberman/doc/logic/misc/class-use/Map.html index e66e588..f89da9d 100644 --- a/Bomberman/doc/logic/misc/class-use/Map.html +++ b/Bomberman/doc/logic/misc/class-use/Map.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.Map - + diff --git a/Bomberman/doc/logic/misc/class-use/ObjetoComparator.html b/Bomberman/doc/logic/misc/class-use/ObjetoComparator.html index a67beaa..83c5868 100644 --- a/Bomberman/doc/logic/misc/class-use/ObjetoComparator.html +++ b/Bomberman/doc/logic/misc/class-use/ObjetoComparator.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.ObjetoComparator - + diff --git a/Bomberman/doc/logic/misc/class-use/Ranking.html b/Bomberman/doc/logic/misc/class-use/Ranking.html index b377db1..23e9ce3 100644 --- a/Bomberman/doc/logic/misc/class-use/Ranking.html +++ b/Bomberman/doc/logic/misc/class-use/Ranking.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.Ranking - + @@ -126,7 +126,7 @@

    Uses of static Ranking -SaveSystemService.load(String file) +SaveSystemService.load(java.lang.String file)
    Method to load from file or create a ranking object
    @@ -142,7 +142,7 @@

    Uses of static boolean SaveSystemService.save(Ranking object, - String file) + java.lang.String file)
    Method to save the ranking onto a file
    diff --git a/Bomberman/doc/logic/misc/class-use/Record.html b/Bomberman/doc/logic/misc/class-use/Record.html index 8200636..93592cf 100644 --- a/Bomberman/doc/logic/misc/class-use/Record.html +++ b/Bomberman/doc/logic/misc/class-use/Record.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.Record - + @@ -121,7 +121,7 @@

    Uses of RankMenu(int w, int h, - String n, + java.lang.String n, Record record)  @@ -139,7 +139,7 @@

    Uses of -private List<Record> +private java.util.List<Record> Ranking.records  @@ -165,7 +165,7 @@

    Uses of -List<Record> +java.util.List<Record> Ranking.getRecords()  @@ -197,7 +197,7 @@

    Uses of -Ranking(List<Record> records) +Ranking(java.util.List<Record> records)
    Creates a ranking from a set of records
    diff --git a/Bomberman/doc/logic/misc/class-use/RecordComparator.html b/Bomberman/doc/logic/misc/class-use/RecordComparator.html index aa3dd89..7278abf 100644 --- a/Bomberman/doc/logic/misc/class-use/RecordComparator.html +++ b/Bomberman/doc/logic/misc/class-use/RecordComparator.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.RecordComparator - + diff --git a/Bomberman/doc/logic/misc/class-use/ScoreManager.html b/Bomberman/doc/logic/misc/class-use/ScoreManager.html index 36614c2..1025ddf 100644 --- a/Bomberman/doc/logic/misc/class-use/ScoreManager.html +++ b/Bomberman/doc/logic/misc/class-use/ScoreManager.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.ScoreManager - + diff --git a/Bomberman/doc/logic/misc/objectives/GetToTheStairsObjective.html b/Bomberman/doc/logic/misc/objectives/GetToTheStairsObjective.html index b9fd98e..07eaf08 100644 --- a/Bomberman/doc/logic/misc/objectives/GetToTheStairsObjective.html +++ b/Bomberman/doc/logic/misc/objectives/GetToTheStairsObjective.html @@ -2,9 +2,9 @@ - + GetToTheStairsObjective - + @@ -97,7 +97,7 @@

    Class GetToTheStairsObje

    diff --git a/Bomberman/doc/logic/misc/objectives/KillEnemiesObjective.html b/Bomberman/doc/logic/misc/objectives/KillEnemiesObjective.html index a13a56e..8920115 100644 --- a/Bomberman/doc/logic/misc/objectives/KillEnemiesObjective.html +++ b/Bomberman/doc/logic/misc/objectives/KillEnemiesObjective.html @@ -2,9 +2,9 @@ - + KillEnemiesObjective - + @@ -97,7 +97,7 @@

    Class KillEnemiesObjective<

    diff --git a/Bomberman/doc/logic/misc/objectives/Objective.html b/Bomberman/doc/logic/misc/objectives/Objective.html index e929858..e1fc8b7 100644 --- a/Bomberman/doc/logic/misc/objectives/Objective.html +++ b/Bomberman/doc/logic/misc/objectives/Objective.html @@ -2,9 +2,9 @@ - + Objective - + @@ -97,7 +97,7 @@

    Class Objective

      -
    • java.lang.Object
    • +
    • java.lang.Object
      • logic.misc.objectives.Objective
      • @@ -114,7 +114,7 @@

        Class Objective



        public abstract class Objective
        -extends Object
        +extends java.lang.Object
        Author:
        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
        @@ -169,8 +169,8 @@

        Method Summary

      • -

        Methods inherited from class java.lang.Object

        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +

        Methods inherited from class java.lang.Object

        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    diff --git a/Bomberman/doc/logic/misc/objectives/class-use/GetToTheStairsObjective.html b/Bomberman/doc/logic/misc/objectives/class-use/GetToTheStairsObjective.html index 27365c8..4037851 100644 --- a/Bomberman/doc/logic/misc/objectives/class-use/GetToTheStairsObjective.html +++ b/Bomberman/doc/logic/misc/objectives/class-use/GetToTheStairsObjective.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.objectives.GetToTheStairsObjective - + diff --git a/Bomberman/doc/logic/misc/objectives/class-use/KillEnemiesObjective.html b/Bomberman/doc/logic/misc/objectives/class-use/KillEnemiesObjective.html index e8179c7..ce9bb65 100644 --- a/Bomberman/doc/logic/misc/objectives/class-use/KillEnemiesObjective.html +++ b/Bomberman/doc/logic/misc/objectives/class-use/KillEnemiesObjective.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.objectives.KillEnemiesObjective - + diff --git a/Bomberman/doc/logic/misc/objectives/class-use/Objective.html b/Bomberman/doc/logic/misc/objectives/class-use/Objective.html index f2e52c6..56b9418 100644 --- a/Bomberman/doc/logic/misc/objectives/class-use/Objective.html +++ b/Bomberman/doc/logic/misc/objectives/class-use/Objective.html @@ -2,9 +2,9 @@ - + Uses of Class logic.misc.objectives.Objective - + diff --git a/Bomberman/doc/logic/misc/objectives/package-frame.html b/Bomberman/doc/logic/misc/objectives/package-frame.html index d73de8e..71c8128 100644 --- a/Bomberman/doc/logic/misc/objectives/package-frame.html +++ b/Bomberman/doc/logic/misc/objectives/package-frame.html @@ -2,9 +2,9 @@ - + logic.misc.objectives - + diff --git a/Bomberman/doc/logic/misc/objectives/package-summary.html b/Bomberman/doc/logic/misc/objectives/package-summary.html index ad387ef..e7ec560 100644 --- a/Bomberman/doc/logic/misc/objectives/package-summary.html +++ b/Bomberman/doc/logic/misc/objectives/package-summary.html @@ -2,9 +2,9 @@ - + logic.misc.objectives - + diff --git a/Bomberman/doc/logic/misc/objectives/package-tree.html b/Bomberman/doc/logic/misc/objectives/package-tree.html index 0835d65..08a0a73 100644 --- a/Bomberman/doc/logic/misc/objectives/package-tree.html +++ b/Bomberman/doc/logic/misc/objectives/package-tree.html @@ -2,9 +2,9 @@ - + logic.misc.objectives Class Hierarchy - + @@ -79,7 +79,7 @@

    Hierarchy For Package logic.misc.objectives

    Class Hierarchy

    @@ -316,7 +316,7 @@

    values

    • valueOf

      -
      public static Initialization.CTRLS valueOf(String name)
      +
      public static Initialization.CTRLS valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -327,8 +327,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/main/Initialization.MENUS.html b/Bomberman/doc/main/Initialization.MENUS.html index 486d57a..51f937c 100644 --- a/Bomberman/doc/main/Initialization.MENUS.html +++ b/Bomberman/doc/main/Initialization.MENUS.html @@ -2,9 +2,9 @@ - + Initialization.MENUS - + @@ -97,10 +97,10 @@

    Enum Initialization.MENUS
    @@ -163,36 +163,39 @@

    Enum Constant Summary

    CREDITS_BUTTON  -DIGITS  +D3GAME_BUTTON  -GAME_BUTTON  +DIGITS  -HUD  +GAME_BUTTON  -LOADING  +HUD  -NEW  +LOADING  -OPTIONS_BUTTON  +NEW  -QUIT_BUTTON  +OPTIONS_BUTTON  -RANKING_BUTTON  +QUIT_BUTTON  -SLIDER  +RANKING_BUTTON  -TITLE_BUTTON  +SLIDER  +TITLE_BUTTON  + + VICTORY  @@ -212,7 +215,7 @@

    Method Summary

    static Initialization.MENUS -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -228,15 +231,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -270,6 +273,15 @@

    GAME_BUTTON

    public static final Initialization.MENUS GAME_BUTTON
    + + + + @@ -448,7 +460,7 @@

    values

    • valueOf

      -
      public static Initialization.MENUS valueOf(String name)
      +
      public static Initialization.MENUS valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -459,8 +471,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/main/Initialization.SPRITES.html b/Bomberman/doc/main/Initialization.SPRITES.html index e4ec62a..398965a 100644 --- a/Bomberman/doc/main/Initialization.SPRITES.html +++ b/Bomberman/doc/main/Initialization.SPRITES.html @@ -2,9 +2,9 @@ - + Initialization.SPRITES - + @@ -97,10 +97,10 @@

    Enum Initialization.SPRITE

    @@ -212,7 +212,7 @@

    Method Summary

    static Initialization.SPRITES -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -228,15 +228,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -448,7 +448,7 @@

    values

    • valueOf

      -
      public static Initialization.SPRITES valueOf(String name)
      +
      public static Initialization.SPRITES valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -459,8 +459,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/main/Initialization.STAGE.html b/Bomberman/doc/main/Initialization.STAGE.html index 15a0937..3419aa4 100644 --- a/Bomberman/doc/main/Initialization.STAGE.html +++ b/Bomberman/doc/main/Initialization.STAGE.html @@ -2,9 +2,9 @@ - + Initialization.STAGE - + @@ -97,10 +97,10 @@

    Enum Initialization.STAGE
    @@ -164,7 +164,7 @@

    Method Summary

    static Initialization.STAGE -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -180,15 +180,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -256,7 +256,7 @@

    values

    • valueOf

      -
      public static Initialization.STAGE valueOf(String name)
      +
      public static Initialization.STAGE valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -267,8 +267,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/main/Initialization.TYPE.html b/Bomberman/doc/main/Initialization.TYPE.html index 9f50e42..87ad297 100644 --- a/Bomberman/doc/main/Initialization.TYPE.html +++ b/Bomberman/doc/main/Initialization.TYPE.html @@ -2,9 +2,9 @@ - + Initialization.TYPE - + @@ -97,10 +97,10 @@

    Enum Initialization.TYPE

    @@ -170,7 +170,7 @@

    Method Summary

    static Initialization.TYPE -valueOf(String name) +valueOf(java.lang.String name)
    Returns the enum constant of this type with the specified name.
    @@ -186,15 +186,15 @@

    Method Summary

  • -

    Methods inherited from class java.lang.Enum

    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
  • +

    Methods inherited from class java.lang.Enum

    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf @@ -280,7 +280,7 @@

    values

    • valueOf

      -
      public static Initialization.TYPE valueOf(String name)
      +
      public static Initialization.TYPE valueOf(java.lang.String name)
      Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -291,8 +291,8 @@

      valueOf

      Returns:
      the enum constant with the specified name
      Throws:
      -
      IllegalArgumentException - if this enum type has no constant with the specified name
      -
      NullPointerException - if the argument is null
      +
      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
      +
      java.lang.NullPointerException - if the argument is null
    diff --git a/Bomberman/doc/main/Initialization.html b/Bomberman/doc/main/Initialization.html index dcc8c1c..58f1533 100644 --- a/Bomberman/doc/main/Initialization.html +++ b/Bomberman/doc/main/Initialization.html @@ -2,9 +2,9 @@ - + Initialization - + @@ -97,7 +97,7 @@

    Class Initialization

    @@ -348,7 +348,7 @@

    Field Detail

    • SPRITE_FILE

      -
      public static final String SPRITE_FILE
      +
      public static final java.lang.String SPRITE_FILE
      See Also:
      Constant Field Values
      @@ -361,7 +361,7 @@

      SPRITE_FILE

      • MAP_FILE

        -
        public static final String MAP_FILE
        +
        public static final java.lang.String MAP_FILE
        See Also:
        Constant Field Values
        @@ -374,7 +374,7 @@

        MAP_FILE

        • MENU_FILE

          -
          public static final String MENU_FILE
          +
          public static final java.lang.String MENU_FILE
          See Also:
          Constant Field Values
          @@ -387,7 +387,7 @@

          MENU_FILE

          • BOMBERMAN_SPRS

            -
            public static final String[] BOMBERMAN_SPRS
            +
            public static final java.lang.String[] BOMBERMAN_SPRS
          @@ -396,7 +396,7 @@

          BOMBERMAN_SPRS

          @@ -405,7 +405,7 @@

          ENEMIES_SPRS

          @@ -527,7 +527,7 @@

          initialized

        • @@ -561,8 +561,8 @@

          Method Detail

          • getSpritesFromTableSprites

            -
            public static Map<String,Sprite> getSpritesFromTableSprites(String name,
            -                                                            String[] sprs)
            +
            public static java.util.Map<java.lang.String,Sprite> getSpritesFromTableSprites(java.lang.String name,
            +                                                                                java.lang.String[] sprs)
            Method to get the sprites from the sprite_file ini file
            Parameters:
            @@ -579,7 +579,7 @@

            getSpritesFromTableSprites

            • getSpriteFromMap

              -
              public static Sprite getSpriteFromMap(String name)
              +
              public static Sprite getSpriteFromMap(java.lang.String name)
              Method to get the sprite named name from the map_file ini file
              Parameters:
              @@ -595,7 +595,7 @@

              getSpriteFromMap

              • getSpriteFromSprites

                -
                public static Sprite getSpriteFromSprites(String name)
                +
                public static Sprite getSpriteFromSprites(java.lang.String name)
                Method to get a sprite from the sprite_file ini file
                Parameters:
                @@ -611,7 +611,7 @@

                getSpriteFromSprites

                • getSpriteFromMenu

                  -
                  public static Sprite getSpriteFromMenu(String name)
                  +
                  public static Sprite getSpriteFromMenu(java.lang.String name)
                  Method to get a sprite from the menu_file ini file
                  Parameters:
                  @@ -627,8 +627,8 @@

                  getSpriteFromMenu

                  • getSpriteFromFile

                    -
                    public static Sprite getSpriteFromFile(String name,
                    -                                       String file)
                    +
                    public static Sprite getSpriteFromFile(java.lang.String name,
                    +                                       java.lang.String file)
                    Method to get a sprite from an ini file
                    Parameters:
                    @@ -645,7 +645,7 @@

                    getSpriteFromFile

                    • getDepth

                      -
                      public static int getDepth(String objectName)
                      +
                      public static int getDepth(java.lang.String objectName)
                      Method to get the predefined depth of an object
                      Parameters:
                      @@ -671,7 +671,7 @@

                      initializeDepths

                      • getCenterXFromSpriteName

                        -
                        public static int getCenterXFromSpriteName(String name)
                        +
                        public static int getCenterXFromSpriteName(java.lang.String name)
                        Method to get the center-x from a sprite
                        Parameters:
                        @@ -687,7 +687,7 @@

                        getCenterXFromSpriteName

                        • getCenterYFromSpriteName

                          -
                          public static int getCenterYFromSpriteName(String name)
                          +
                          public static int getCenterYFromSpriteName(java.lang.String name)
                          Method to get the center-y from a sprite
                          Parameters:
                          diff --git a/Bomberman/doc/main/class-use/Game.html b/Bomberman/doc/main/class-use/Game.html index 580ca3a..8118795 100644 --- a/Bomberman/doc/main/class-use/Game.html +++ b/Bomberman/doc/main/class-use/Game.html @@ -2,9 +2,9 @@ - + Uses of Class main.Game - + diff --git a/Bomberman/doc/main/class-use/Initialization.CTRLS.html b/Bomberman/doc/main/class-use/Initialization.CTRLS.html index cc24fc2..b42c563 100644 --- a/Bomberman/doc/main/class-use/Initialization.CTRLS.html +++ b/Bomberman/doc/main/class-use/Initialization.CTRLS.html @@ -2,9 +2,9 @@ - + Uses of Class main.Initialization.CTRLS - + @@ -104,7 +104,7 @@

                          Uses of static Initialization.CTRLS -Initialization.CTRLS.valueOf(String name) +Initialization.CTRLS.valueOf(java.lang.String name)
                          Returns the enum constant of this type with the specified name.
                          diff --git a/Bomberman/doc/main/class-use/Initialization.MENUS.html b/Bomberman/doc/main/class-use/Initialization.MENUS.html index 19569ec..69677d6 100644 --- a/Bomberman/doc/main/class-use/Initialization.MENUS.html +++ b/Bomberman/doc/main/class-use/Initialization.MENUS.html @@ -2,9 +2,9 @@ - + Uses of Class main.Initialization.MENUS - + @@ -104,7 +104,7 @@

                          Uses of static Initialization.MENUS -Initialization.MENUS.valueOf(String name) +Initialization.MENUS.valueOf(java.lang.String name)
                          Returns the enum constant of this type with the specified name.
                          diff --git a/Bomberman/doc/main/class-use/Initialization.SPRITES.html b/Bomberman/doc/main/class-use/Initialization.SPRITES.html index 499858d..b42458e 100644 --- a/Bomberman/doc/main/class-use/Initialization.SPRITES.html +++ b/Bomberman/doc/main/class-use/Initialization.SPRITES.html @@ -2,9 +2,9 @@ - + Uses of Class main.Initialization.SPRITES - + @@ -104,7 +104,7 @@

                          Uses of static Initialization.SPRITES -Initialization.SPRITES.valueOf(String name) +Initialization.SPRITES.valueOf(java.lang.String name)
                          Returns the enum constant of this type with the specified name.
                          diff --git a/Bomberman/doc/main/class-use/Initialization.STAGE.html b/Bomberman/doc/main/class-use/Initialization.STAGE.html index 6611bcb..ab7490d 100644 --- a/Bomberman/doc/main/class-use/Initialization.STAGE.html +++ b/Bomberman/doc/main/class-use/Initialization.STAGE.html @@ -2,9 +2,9 @@ - + Uses of Class main.Initialization.STAGE - + @@ -199,7 +199,7 @@

                          Uses of static Initialization.STAGE -Initialization.STAGE.valueOf(String name) +Initialization.STAGE.valueOf(java.lang.String name)
                          Returns the enum constant of this type with the specified name.
                          diff --git a/Bomberman/doc/main/class-use/Initialization.TYPE.html b/Bomberman/doc/main/class-use/Initialization.TYPE.html index 4bd6545..8fc7e6d 100644 --- a/Bomberman/doc/main/class-use/Initialization.TYPE.html +++ b/Bomberman/doc/main/class-use/Initialization.TYPE.html @@ -2,9 +2,9 @@ - + Uses of Class main.Initialization.TYPE - + @@ -104,7 +104,7 @@

                          Uses of I static Initialization.TYPE -Initialization.TYPE.valueOf(String name) +Initialization.TYPE.valueOf(java.lang.String name)
                          Returns the enum constant of this type with the specified name.
                          diff --git a/Bomberman/doc/main/class-use/Initialization.html b/Bomberman/doc/main/class-use/Initialization.html index ef2fce9..47c499a 100644 --- a/Bomberman/doc/main/class-use/Initialization.html +++ b/Bomberman/doc/main/class-use/Initialization.html @@ -2,9 +2,9 @@ - + Uses of Class main.Initialization - + diff --git a/Bomberman/doc/main/package-frame.html b/Bomberman/doc/main/package-frame.html index dfb60c9..d4a91f3 100644 --- a/Bomberman/doc/main/package-frame.html +++ b/Bomberman/doc/main/package-frame.html @@ -2,9 +2,9 @@ - + main - + diff --git a/Bomberman/doc/main/package-summary.html b/Bomberman/doc/main/package-summary.html index 8182b88..e42b651 100644 --- a/Bomberman/doc/main/package-summary.html +++ b/Bomberman/doc/main/package-summary.html @@ -2,9 +2,9 @@ - + main - + diff --git a/Bomberman/doc/main/package-tree.html b/Bomberman/doc/main/package-tree.html index cafc92f..699c85a 100644 --- a/Bomberman/doc/main/package-tree.html +++ b/Bomberman/doc/main/package-tree.html @@ -2,9 +2,9 @@ - + main Class Hierarchy - + @@ -79,13 +79,13 @@

                          Hierarchy For Package main

                          Class Hierarchy

                            -
                          • java.lang.Object +
                          • java.lang.Object
                              -
                            • java.awt.Component (implements java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable) +
                            • java.awt.Component (implements java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable)
                                -
                              • java.awt.Canvas (implements javax.accessibility.Accessible) +
                              • java.awt.Canvas (implements javax.accessibility.Accessible)
                                  -
                                • main.Game (implements java.lang.Runnable)
                                • +
                                • main.Game (implements java.lang.Runnable)
                              @@ -96,9 +96,9 @@

                              Class Hierarchy

                            Enum Hierarchy

                              -
                            • java.lang.Object +
                            • java.lang.Object
                                -
                              • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) +
                              • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable)
                                • main.Initialization.MENUS
                                • main.Initialization.CTRLS
                                • diff --git a/Bomberman/doc/main/package-use.html b/Bomberman/doc/main/package-use.html index 8afb4d5..56ec264 100644 --- a/Bomberman/doc/main/package-use.html +++ b/Bomberman/doc/main/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package main - + diff --git a/Bomberman/doc/overview-frame.html b/Bomberman/doc/overview-frame.html index 367d440..613820a 100644 --- a/Bomberman/doc/overview-frame.html +++ b/Bomberman/doc/overview-frame.html @@ -2,9 +2,9 @@ - + Overview List - + @@ -13,6 +13,7 @@

                                  Packages

                                    +
                                  • graphics.d3
                                  • graphics.effects
                                  • graphics.effects.slider
                                  • graphics.rooms
                                  • diff --git a/Bomberman/doc/overview-summary.html b/Bomberman/doc/overview-summary.html index cb67b38..6494a2e 100644 --- a/Bomberman/doc/overview-summary.html +++ b/Bomberman/doc/overview-summary.html @@ -2,9 +2,9 @@ - + Overview - + @@ -81,78 +81,82 @@

                                    Super Bomberman Game

                                    -graphics.effects +graphics.d3   -graphics.effects.slider +graphics.effects   -graphics.rooms +graphics.effects.slider   -graphics.rooms.controlsMenu +graphics.rooms   -graphics.rooms.credits +graphics.rooms.controlsMenu   -graphics.rooms.game +graphics.rooms.credits   -graphics.rooms.intro +graphics.rooms.game   -graphics.rooms.mainMenu +graphics.rooms.intro   -graphics.rooms.optionsMenu +graphics.rooms.mainMenu   -graphics.rooms.pauseMenu +graphics.rooms.optionsMenu   -graphics.rooms.rankMenu +graphics.rooms.pauseMenu   -logic +graphics.rooms.rankMenu   -logic.characters +logic   -logic.collisions +logic.characters   -logic.misc +logic.collisions   -logic.misc.objectives +logic.misc   -main +logic.misc.objectives   -sound +main   +sound +  + + utils   diff --git a/Bomberman/doc/overview-tree.html b/Bomberman/doc/overview-tree.html index 3f33989..4b398fb 100644 --- a/Bomberman/doc/overview-tree.html +++ b/Bomberman/doc/overview-tree.html @@ -2,9 +2,9 @@ - + Class Hierarchy - + @@ -73,6 +73,7 @@

                                    Hierarchy For All Packages

                                    Package Hierarchies:
                                      +
                                    • graphics.d3,
                                    • graphics.effects,
                                    • graphics.effects.slider,
                                    • graphics.rooms,
                                    • @@ -97,20 +98,25 @@

                                      Hierarchy For All Packages

                                      Class Hierarchy

                                        -
                                      • java.lang.Object
                                      • +
                                      • java.lang.Object
                                        • sound.MusicRepository
                                        • @@ -110,7 +110,7 @@

                                          Class MusicRepository



                                          public class MusicRepository
                                          -extends Object
                                          +extends java.lang.Object
                                          Author:
                                          Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
                                          @@ -332,8 +332,8 @@

                                          Method Summary

                                        • -

                                          Methods inherited from class java.lang.Object

                                          -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                        • +

                                          Methods inherited from class java.lang.Object

                                          +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                      diff --git a/Bomberman/doc/sound/SoundTrack.html b/Bomberman/doc/sound/SoundTrack.html index 8ee4495..05c07f5 100644 --- a/Bomberman/doc/sound/SoundTrack.html +++ b/Bomberman/doc/sound/SoundTrack.html @@ -2,9 +2,9 @@ - + SoundTrack - + @@ -91,7 +91,7 @@

                                      Class SoundTrack

                                      @@ -240,7 +240,7 @@

                                      Field Detail

                                      • AUDIO

                                        -
                                        private static final String AUDIO
                                        +
                                        private static final java.lang.String AUDIO
                                        See Also:
                                        Constant Field Values
                                        @@ -253,7 +253,7 @@

                                        AUDIO

                                        • MUSIC

                                          -
                                          private static final String MUSIC
                                          +
                                          private static final java.lang.String MUSIC
                                          See Also:
                                          Constant Field Values
                                          @@ -266,7 +266,7 @@

                                          MUSIC

                                          • SOUND

                                            -
                                            private static final String SOUND
                                            +
                                            private static final java.lang.String SOUND
                                            See Also:
                                            Constant Field Values
                                            @@ -279,7 +279,7 @@

                                            SOUND

                                            • BATTLE_MUSIC

                                              -
                                              public static final String BATTLE_MUSIC
                                              +
                                              public static final java.lang.String BATTLE_MUSIC
                                              See Also:
                                              Constant Field Values
                                              @@ -292,7 +292,7 @@

                                              BATTLE_MUSIC

                                              • CREDITS_MUSIC

                                                -
                                                public static final String CREDITS_MUSIC
                                                +
                                                public static final java.lang.String CREDITS_MUSIC
                                                See Also:
                                                Constant Field Values
                                                @@ -305,7 +305,7 @@

                                                CREDITS_MUSIC

                                                • GAMEOVER_MUSIC

                                                  -
                                                  public static final String GAMEOVER_MUSIC
                                                  +
                                                  public static final java.lang.String GAMEOVER_MUSIC
                                                  See Also:
                                                  Constant Field Values
                                                  @@ -318,7 +318,7 @@

                                                  GAMEOVER_MUSIC

                                                  • MENU_MUSIC

                                                    -
                                                    public static final String MENU_MUSIC
                                                    +
                                                    public static final java.lang.String MENU_MUSIC
                                                    See Also:
                                                    Constant Field Values
                                                    @@ -331,7 +331,7 @@

                                                    MENU_MUSIC

                                                    • PAUSE_MUSIC

                                                      -
                                                      public static final String PAUSE_MUSIC
                                                      +
                                                      public static final java.lang.String PAUSE_MUSIC
                                                      See Also:
                                                      Constant Field Values
                                                      @@ -344,7 +344,7 @@

                                                      PAUSE_MUSIC

                                                      • DEFEAT_MUSIC

                                                        -
                                                        public static final String DEFEAT_MUSIC
                                                        +
                                                        public static final java.lang.String DEFEAT_MUSIC
                                                        See Also:
                                                        Constant Field Values
                                                        @@ -357,7 +357,7 @@

                                                        DEFEAT_MUSIC

                                                        • INTRO_MUSIC

                                                          -
                                                          public static final String INTRO_MUSIC
                                                          +
                                                          public static final java.lang.String INTRO_MUSIC
                                                          See Also:
                                                          Constant Field Values
                                                          @@ -370,7 +370,7 @@

                                                          INTRO_MUSIC

                                                          • VICTORY_MUSIC

                                                            -
                                                            public static final String VICTORY_MUSIC
                                                            +
                                                            public static final java.lang.String VICTORY_MUSIC
                                                            See Also:
                                                            Constant Field Values
                                                            @@ -383,7 +383,7 @@

                                                            VICTORY_MUSIC

                                                            • EXPLOSION_SND

                                                              -
                                                              public static final String EXPLOSION_SND
                                                              +
                                                              public static final java.lang.String EXPLOSION_SND
                                                              See Also:
                                                              Constant Field Values
                                                              @@ -396,7 +396,7 @@

                                                              EXPLOSION_SND

                                                              • PUTBOMB_SND

                                                                -
                                                                public static final String PUTBOMB_SND
                                                                +
                                                                public static final java.lang.String PUTBOMB_SND
                                                                See Also:
                                                                Constant Field Values
                                                                @@ -409,7 +409,7 @@

                                                                PUTBOMB_SND

                                                                • SELECT_SND

                                                                  -
                                                                  public static final String SELECT_SND
                                                                  +
                                                                  public static final java.lang.String SELECT_SND
                                                                  See Also:
                                                                  Constant Field Values
                                                                  @@ -422,7 +422,7 @@

                                                                  SELECT_SND

                                                                  • POWERUP_SND

                                                                    -
                                                                    public static final String POWERUP_SND
                                                                    +
                                                                    public static final java.lang.String POWERUP_SND
                                                                    See Also:
                                                                    Constant Field Values
                                                                    diff --git a/Bomberman/doc/sound/class-use/MusicRepository.html b/Bomberman/doc/sound/class-use/MusicRepository.html index 63f1ea0..0f7583d 100644 --- a/Bomberman/doc/sound/class-use/MusicRepository.html +++ b/Bomberman/doc/sound/class-use/MusicRepository.html @@ -2,9 +2,9 @@ - + Uses of Class sound.MusicRepository - + diff --git a/Bomberman/doc/sound/class-use/SoundTrack.html b/Bomberman/doc/sound/class-use/SoundTrack.html index 53fbbe7..126b843 100644 --- a/Bomberman/doc/sound/class-use/SoundTrack.html +++ b/Bomberman/doc/sound/class-use/SoundTrack.html @@ -2,9 +2,9 @@ - + Uses of Class sound.SoundTrack - + diff --git a/Bomberman/doc/sound/package-frame.html b/Bomberman/doc/sound/package-frame.html index 1f4e6c6..45b392a 100644 --- a/Bomberman/doc/sound/package-frame.html +++ b/Bomberman/doc/sound/package-frame.html @@ -2,9 +2,9 @@ - + sound - + diff --git a/Bomberman/doc/sound/package-summary.html b/Bomberman/doc/sound/package-summary.html index 4fa937d..e245ba2 100644 --- a/Bomberman/doc/sound/package-summary.html +++ b/Bomberman/doc/sound/package-summary.html @@ -2,9 +2,9 @@ - + sound - + diff --git a/Bomberman/doc/sound/package-tree.html b/Bomberman/doc/sound/package-tree.html index de7cf2c..1c3e9f9 100644 --- a/Bomberman/doc/sound/package-tree.html +++ b/Bomberman/doc/sound/package-tree.html @@ -2,9 +2,9 @@ - + sound Class Hierarchy - + @@ -79,7 +79,7 @@

                                                                    Hierarchy For Package sound

                                                                    Class Hierarchy

                                                                      -
                                                                    • java.lang.Object +
                                                                    • java.lang.Object
                                                                      • sound.MusicRepository
                                                                      • sound.SoundTrack
                                                                      • diff --git a/Bomberman/doc/sound/package-use.html b/Bomberman/doc/sound/package-use.html index b2a2ee2..19887b3 100644 --- a/Bomberman/doc/sound/package-use.html +++ b/Bomberman/doc/sound/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package sound - + diff --git a/Bomberman/doc/utils/Animation.html b/Bomberman/doc/utils/Animation.html index 0c1be08..d11fc22 100644 --- a/Bomberman/doc/utils/Animation.html +++ b/Bomberman/doc/utils/Animation.html @@ -2,9 +2,9 @@ - + Animation - + @@ -97,7 +97,7 @@

                                                                        Class Animation

                                                                    @@ -215,10 +215,10 @@

                                                                    Method Detail

                                                                    • getSpritesFromImage

                                                                      -
                                                                      public static BufferedImage[] getSpritesFromImage(BufferedImage sheet,
                                                                      -                                                  int frames,
                                                                      -                                                  int width,
                                                                      -                                                  int height)
                                                                      +
                                                                      public static java.awt.image.BufferedImage[] getSpritesFromImage(java.awt.image.BufferedImage sheet,
                                                                      +                                                                 int frames,
                                                                      +                                                                 int width,
                                                                      +                                                                 int height)
                                                                      Method to get the sprites from a spritesheet (only one row allowed)
                                                                      Parameters:
                                                                      @@ -237,11 +237,11 @@

                                                                      getSpritesFromImage

                                                                      • getSpritesFromImage

                                                                        -
                                                                        public static BufferedImage[] getSpritesFromImage(BufferedImage sheet,
                                                                        -                                                  int frames,
                                                                        -                                                  int width,
                                                                        -                                                  int height,
                                                                        -                                                  int transparency)
                                                                        +
                                                                        public static java.awt.image.BufferedImage[] getSpritesFromImage(java.awt.image.BufferedImage sheet,
                                                                        +                                                                 int frames,
                                                                        +                                                                 int width,
                                                                        +                                                                 int height,
                                                                        +                                                                 int transparency)
                                                                        Method to get the sprites from a spritesheet (only one row allowed) adding transparency to pixels with 'transparency' color
                                                                        diff --git a/Bomberman/doc/utils/ConvertTimeService.html b/Bomberman/doc/utils/ConvertTimeService.html index 1816491..c1f3744 100644 --- a/Bomberman/doc/utils/ConvertTimeService.html +++ b/Bomberman/doc/utils/ConvertTimeService.html @@ -2,9 +2,9 @@ - + ConvertTimeService - + @@ -97,7 +97,7 @@

                                                                        Class ConvertTimeService

                                                                      -
                                                                    • java.lang.Object
                                                                    • +
                                                                    • java.lang.Object
                                                                      • utils.ConvertTimeService
                                                                      • @@ -110,7 +110,7 @@

                                                                        Class ConvertTimeService



                                                                        public class ConvertTimeService
                                                                        -extends Object
                                                                        +extends java.lang.Object
                                                                        Author:
                                                                        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
                                                                        @@ -170,7 +170,7 @@

                                                                        Method Summary

                                                                        Method and Description -static String +static java.lang.String timeToString(long seconds)
                                                                        Method to pass from seconds to mm:ss format
                                                                        @@ -180,8 +180,8 @@

                                                                        Method Summary

                                                                      • -

                                                                        Methods inherited from class java.lang.Object

                                                                        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                                                      • +

                                                                        Methods inherited from class java.lang.Object

                                                                        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                                                    @@ -237,7 +237,7 @@

                                                                    Method Detail

                                                                    • timeToString

                                                                      -
                                                                      public static String timeToString(long seconds)
                                                                      +
                                                                      public static java.lang.String timeToString(long seconds)
                                                                      Method to pass from seconds to mm:ss format
                                                                      Parameters:
                                                                      diff --git a/Bomberman/doc/utils/FileUtils.html b/Bomberman/doc/utils/FileUtils.html index c06f886..e553917 100644 --- a/Bomberman/doc/utils/FileUtils.html +++ b/Bomberman/doc/utils/FileUtils.html @@ -2,9 +2,9 @@ - + FileUtils - + @@ -97,7 +97,7 @@

                                                                      Class FileUtils

                                                                      -
                                                                    • java.lang.Object
                                                                    • +
                                                                    • java.lang.Object
                                                                      • utils.FileUtils
                                                                      • @@ -110,7 +110,7 @@

                                                                        Class FileUtils



                                                                        public class FileUtils
                                                                        -extends Object
                                                                        +extends java.lang.Object
                                                                        Author:
                                                                        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
                                                                        @@ -151,17 +151,17 @@

                                                                        Method Summary

                                                                        Method and Description -static File -getFile(String file) +static java.io.File +getFile(java.lang.String file)
                                                                        Gets the file referenced by the path @param file, creating a temp file that will be deleted on exit
                                                                        static int -numberOfFiles(String folder, - String initFile, - String endFile) +numberOfFiles(java.lang.String folder, + java.lang.String initFile, + java.lang.String endFile)
                                                                        Method to get the number of files on a folder with format initFile NUMBER endFile
                                                                        @@ -171,8 +171,8 @@

                                                                        Method Summary

                                                                      • -

                                                                        Methods inherited from class java.lang.Object

                                                                        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                                                      • +

                                                                        Methods inherited from class java.lang.Object

                                                                        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                                                    @@ -211,7 +211,7 @@

                                                                    Method Detail

                                                                    • getFile

                                                                      -
                                                                      public static File getFile(String file)
                                                                      +
                                                                      public static java.io.File getFile(java.lang.String file)
                                                                      Gets the file referenced by the path @param file, creating a temp file that will be deleted on exit
                                                                      @@ -228,9 +228,9 @@

                                                                      getFile

                                                                      • numberOfFiles

                                                                        -
                                                                        public static int numberOfFiles(String folder,
                                                                        -                                String initFile,
                                                                        -                                String endFile)
                                                                        +
                                                                        public static int numberOfFiles(java.lang.String folder,
                                                                        +                                java.lang.String initFile,
                                                                        +                                java.lang.String endFile)
                                                                        Method to get the number of files on a folder with format initFile NUMBER endFile
                                                                        diff --git a/Bomberman/doc/utils/IniUtils.html b/Bomberman/doc/utils/IniUtils.html index d8067ee..fbdb485 100644 --- a/Bomberman/doc/utils/IniUtils.html +++ b/Bomberman/doc/utils/IniUtils.html @@ -2,9 +2,9 @@ - + IniUtils - + @@ -97,7 +97,7 @@

                                                                        Class IniUtils

                                                                      -
                                                                    • java.lang.Object
                                                                    • +
                                                                    • java.lang.Object
                                                                      • utils.IniUtils
                                                                      • @@ -110,7 +110,7 @@

                                                                        Class IniUtils



                                                                        public class IniUtils
                                                                        -extends Object
                                                                        +extends java.lang.Object
                                                                        Author:
                                                                        Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
                                                                        @@ -152,18 +152,18 @@

                                                                        Method Summary

                                                                        static void -addValue(String file, - String section, - String term, - String value) +addValue(java.lang.String file, + java.lang.String section, + java.lang.String term, + java.lang.String value)
                                                                        Method to add a value for a term on a section on the ini file
                                                                        -static String -getValue(String file, - String section, - String term) +static java.lang.String +getValue(java.lang.String file, + java.lang.String section, + java.lang.String term)
                                                                        Method to get the value of a term on a specific section of the ini file
                                                                        @@ -172,8 +172,8 @@

                                                                        Method Summary

                                                                      • -

                                                                        Methods inherited from class java.lang.Object

                                                                        -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                                                      • +

                                                                        Methods inherited from class java.lang.Object

                                                                        +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                                                    @@ -212,9 +212,9 @@

                                                                    Method Detail

                                                                    • getValue

                                                                      -
                                                                      public static String getValue(String file,
                                                                      -                              String section,
                                                                      -                              String term)
                                                                      +
                                                                      public static java.lang.String getValue(java.lang.String file,
                                                                      +                                        java.lang.String section,
                                                                      +                                        java.lang.String term)
                                                                      Method to get the value of a term on a specific section of the ini file
                                                                      Parameters:
                                                                      @@ -232,10 +232,10 @@

                                                                      getValue

                                                                      • addValue

                                                                        -
                                                                        public static void addValue(String file,
                                                                        -                            String section,
                                                                        -                            String term,
                                                                        -                            String value)
                                                                        +
                                                                        public static void addValue(java.lang.String file,
                                                                        +                            java.lang.String section,
                                                                        +                            java.lang.String term,
                                                                        +                            java.lang.String value)
                                                                        Method to add a value for a term on a section on the ini file
                                                                        Parameters:
                                                                        diff --git a/Bomberman/doc/utils/PaintService.TYPE.html b/Bomberman/doc/utils/PaintService.TYPE.html index 57cb78b..eec9c2e 100644 --- a/Bomberman/doc/utils/PaintService.TYPE.html +++ b/Bomberman/doc/utils/PaintService.TYPE.html @@ -2,9 +2,9 @@ - + PaintService.TYPE - + @@ -97,10 +97,10 @@

                                                                        Enum PaintService.TYPE

                                                                    @@ -164,7 +164,7 @@

                                                                    Method Summary

                                                                    static PaintService.TYPE -valueOf(String name) +valueOf(java.lang.String name)
                                                                    Returns the enum constant of this type with the specified name.
                                                                    @@ -180,15 +180,15 @@

                                                                    Method Summary

                                                                  • -

                                                                    Methods inherited from class java.lang.Enum

                                                                    -clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
                                                                  • +

                                                                    Methods inherited from class java.lang.Enum

                                                                    +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
                                                                @@ -256,7 +256,7 @@

                                                                values

                                                                • valueOf

                                                                  -
                                                                  public static PaintService.TYPE valueOf(String name)
                                                                  +
                                                                  public static PaintService.TYPE valueOf(java.lang.String name)
                                                                  Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are @@ -267,8 +267,8 @@

                                                                  valueOf

                                                                  Returns:
                                                                  the enum constant with the specified name
                                                                  Throws:
                                                                  -
                                                                  IllegalArgumentException - if this enum type has no constant with the specified name
                                                                  -
                                                                  NullPointerException - if the argument is null
                                                                  +
                                                                  java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
                                                                  +
                                                                  java.lang.NullPointerException - if the argument is null
                                                              diff --git a/Bomberman/doc/utils/PaintService.html b/Bomberman/doc/utils/PaintService.html index e0df043..a255daa 100644 --- a/Bomberman/doc/utils/PaintService.html +++ b/Bomberman/doc/utils/PaintService.html @@ -2,9 +2,9 @@ - + PaintService - + @@ -97,7 +97,7 @@

                                                              Class PaintService

                                      @@ -307,7 +307,7 @@

                                      Field Detail

                                      • charAlphabet

                                        -
                                        private static String charAlphabet
                                        +
                                        private static java.lang.String charAlphabet
                                      @@ -316,7 +316,7 @@

                                      charAlphabet

                                      @@ -325,7 +325,7 @@

                                      charDigits

                                      @@ -334,7 +334,7 @@

                                      DIGITS_ORANGE

                                      @@ -368,9 +368,9 @@

                                      Method Detail

                                      • paintText

                                        -
                                        public static void paintText(String text,
                                        +
                                        public static void paintText(java.lang.String text,
                                                                      Point2D initial_position,
                                        -                             Graphics g)
                                        + java.awt.Graphics g)
                                        Method for painting white text on the screen at initial_position position
                                        Parameters:
                                        @@ -386,9 +386,9 @@

                                        paintText

                                        • paintTextColor

                                          -
                                          public static void paintTextColor(String text,
                                          +
                                          public static void paintTextColor(java.lang.String text,
                                                                             Point2D initial_position,
                                          -                                  Graphics g,
                                          +                                  java.awt.Graphics g,
                                                                             int RGB)
                                          Method for painting colored text on the screen at initial_position position
                                          @@ -407,9 +407,9 @@

                                          paintTextColor

                                          • paintTextColor

                                            -
                                            public static void paintTextColor(String text,
                                            +
                                            public static void paintTextColor(java.lang.String text,
                                                                               Point2D initial_position,
                                            -                                  Graphics g,
                                            +                                  java.awt.Graphics g,
                                                                               int R,
                                                                               int G,
                                                                               int B)
                                            @@ -432,9 +432,9 @@

                                            paintTextColor

                                            • paintDigits

                                              -
                                              public static void paintDigits(String number,
                                              +
                                              public static void paintDigits(java.lang.String number,
                                                                              Point2D initial_position,
                                              -                               Graphics g)
                                              + java.awt.Graphics g)
                                              Method to paint digits, records and ranking
                                              Parameters:
                                              @@ -450,9 +450,9 @@

                                              paintDigits

                                              • paintDigitsColor

                                                -
                                                public static void paintDigitsColor(String number,
                                                +
                                                public static void paintDigitsColor(java.lang.String number,
                                                                                     Point2D initial_position,
                                                -                                    Graphics g,
                                                +                                    java.awt.Graphics g,
                                                                                     int RGB)
                                                Method to paint colored digits on screen
                                                @@ -470,9 +470,9 @@

                                                paintDigitsColor

                                                • paintDigitsColor

                                                  -
                                                  public static void paintDigitsColor(String number,
                                                  +
                                                  public static void paintDigitsColor(java.lang.String number,
                                                                                       Point2D initial_position,
                                                  -                                    Graphics g,
                                                  +                                    java.awt.Graphics g,
                                                                                       int R,
                                                                                       int G,
                                                                                       int B)
                                                  @@ -511,9 +511,9 @@

                                                  getCharInt

                                                  • changeColor

                                                    -
                                                    private static BufferedImage changeColor(BufferedImage input,
                                                    -                                         int RGB,
                                                    -                                         PaintService.TYPE t)
                                                    +
                                                    private static java.awt.image.BufferedImage changeColor(java.awt.image.BufferedImage input,
                                                    +                                                        int RGB,
                                                    +                                                        PaintService.TYPE t)
                                                    Method to change color of the image
                                                    Parameters:
                                                    diff --git a/Bomberman/doc/utils/RunFromJar.html b/Bomberman/doc/utils/RunFromJar.html index c3eec86..0f1f69e 100644 --- a/Bomberman/doc/utils/RunFromJar.html +++ b/Bomberman/doc/utils/RunFromJar.html @@ -2,9 +2,9 @@ - + RunFromJar - + @@ -97,7 +97,7 @@

                                                    Class RunFromJar

                                        -
                                      • java.lang.Object
                                      • +
                                      • java.lang.Object
                                        • utils.RunFromJar
                                        • @@ -110,7 +110,7 @@

                                          Class RunFromJar



                                          public class RunFromJar
                                          -extends Object
                                          +extends java.lang.Object
                                          Author:
                                          Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
                                          @@ -134,15 +134,15 @@

                                          Field Summary

                                          Field and Description -private static String +private static java.lang.String FILE  -private static String +private static java.lang.String JAR  -private static String +private static java.lang.String RSRC  @@ -188,8 +188,8 @@

                                          Method Summary

                                        • -

                                          Methods inherited from class java.lang.Object

                                          -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                        • +

                                          Methods inherited from class java.lang.Object

                                          +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                      @@ -211,7 +211,7 @@

                                      Field Detail

                                      • JAR

                                        -
                                        private static final String JAR
                                        +
                                        private static final java.lang.String JAR
                                        See Also:
                                        Constant Field Values
                                        @@ -224,7 +224,7 @@

                                        JAR

                                        • RSRC

                                          -
                                          private static final String RSRC
                                          +
                                          private static final java.lang.String RSRC
                                          See Also:
                                          Constant Field Values
                                          @@ -237,7 +237,7 @@

                                          RSRC

                                          • FILE

                                            -
                                            private static final String FILE
                                            +
                                            private static final java.lang.String FILE
                                            See Also:
                                            Constant Field Values
                                            diff --git a/Bomberman/doc/utils/SaveSystemService.html b/Bomberman/doc/utils/SaveSystemService.html index a4a7730..b6e00a8 100644 --- a/Bomberman/doc/utils/SaveSystemService.html +++ b/Bomberman/doc/utils/SaveSystemService.html @@ -2,9 +2,9 @@ - + SaveSystemService - + @@ -97,7 +97,7 @@

                                            Class SaveSystemService

                                        -
                                      • java.lang.Object
                                      • +
                                      • java.lang.Object
                                        • utils.SaveSystemService
                                        • @@ -110,7 +110,7 @@

                                          Class SaveSystemService



                                          public class SaveSystemService
                                          -extends Object
                                          +extends java.lang.Object
                                          Author:
                                          Patricia Lazaro Tello (554309), Jaime Ruiz-Borau Vizarraga (546751)
                                          @@ -134,7 +134,7 @@

                                          Field Summary

                                          Field and Description -static String +static java.lang.String PATH  @@ -171,14 +171,14 @@

                                          Method Summary

                                          static Ranking -load(String file) +load(java.lang.String file)
                                          Method to load from file or create a ranking object
                                          static boolean save(Ranking object, - String file) + java.lang.String file)
                                          Method to save the ranking onto a file
                                          @@ -187,8 +187,8 @@

                                          Method Summary

                                        • -

                                          Methods inherited from class java.lang.Object

                                          -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                        • +

                                          Methods inherited from class java.lang.Object

                                          +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                      @@ -210,7 +210,7 @@

                                      Field Detail

                                      • PATH

                                        -
                                        public static final String PATH
                                        +
                                        public static final java.lang.String PATH
                                      @@ -245,7 +245,7 @@

                                      Method Detail

                                    • save

                                      public static boolean save(Ranking object,
                                      -                           String file)
                                      + java.lang.String file)
                                      Method to save the ranking onto a file
                                      Parameters:
                                      @@ -262,7 +262,7 @@

                                      save

                                      • load

                                        -
                                        public static Ranking load(String file)
                                        +
                                        public static Ranking load(java.lang.String file)
                                        Method to load from file or create a ranking object
                                        Parameters:
                                        diff --git a/Bomberman/doc/utils/class-use/Animation.html b/Bomberman/doc/utils/class-use/Animation.html index 0a5e3fb..c436af5 100644 --- a/Bomberman/doc/utils/class-use/Animation.html +++ b/Bomberman/doc/utils/class-use/Animation.html @@ -2,9 +2,9 @@ - + Uses of Class utils.Animation - + diff --git a/Bomberman/doc/utils/class-use/ConvertTimeService.html b/Bomberman/doc/utils/class-use/ConvertTimeService.html index 8eaad70..8596b5a 100644 --- a/Bomberman/doc/utils/class-use/ConvertTimeService.html +++ b/Bomberman/doc/utils/class-use/ConvertTimeService.html @@ -2,9 +2,9 @@ - + Uses of Class utils.ConvertTimeService - + diff --git a/Bomberman/doc/utils/class-use/FileUtils.html b/Bomberman/doc/utils/class-use/FileUtils.html index 648bd0a..0eb3938 100644 --- a/Bomberman/doc/utils/class-use/FileUtils.html +++ b/Bomberman/doc/utils/class-use/FileUtils.html @@ -2,9 +2,9 @@ - + Uses of Class utils.FileUtils - + diff --git a/Bomberman/doc/utils/class-use/IniUtils.html b/Bomberman/doc/utils/class-use/IniUtils.html index 3f91398..00b0c0e 100644 --- a/Bomberman/doc/utils/class-use/IniUtils.html +++ b/Bomberman/doc/utils/class-use/IniUtils.html @@ -2,9 +2,9 @@ - + Uses of Class utils.IniUtils - + diff --git a/Bomberman/doc/utils/class-use/PaintService.TYPE.html b/Bomberman/doc/utils/class-use/PaintService.TYPE.html index 2929872..c993dd6 100644 --- a/Bomberman/doc/utils/class-use/PaintService.TYPE.html +++ b/Bomberman/doc/utils/class-use/PaintService.TYPE.html @@ -2,9 +2,9 @@ - + Uses of Class utils.PaintService.TYPE - + @@ -104,7 +104,7 @@

                                        Uses of P static PaintService.TYPE -PaintService.TYPE.valueOf(String name) +PaintService.TYPE.valueOf(java.lang.String name)
                                        Returns the enum constant of this type with the specified name.
                                        @@ -125,8 +125,8 @@

                                        Uses of P -private static BufferedImage -PaintService.changeColor(BufferedImage input, +private static java.awt.image.BufferedImage +PaintService.changeColor(java.awt.image.BufferedImage input, int RGB, PaintService.TYPE t)
                                        Method to change color of the image
                                        diff --git a/Bomberman/doc/utils/class-use/PaintService.html b/Bomberman/doc/utils/class-use/PaintService.html index d1640ac..a38ba22 100644 --- a/Bomberman/doc/utils/class-use/PaintService.html +++ b/Bomberman/doc/utils/class-use/PaintService.html @@ -2,9 +2,9 @@ - + Uses of Class utils.PaintService - + diff --git a/Bomberman/doc/utils/class-use/RunFromJar.html b/Bomberman/doc/utils/class-use/RunFromJar.html index 59698c9..896c528 100644 --- a/Bomberman/doc/utils/class-use/RunFromJar.html +++ b/Bomberman/doc/utils/class-use/RunFromJar.html @@ -2,9 +2,9 @@ - + Uses of Class utils.RunFromJar - + diff --git a/Bomberman/doc/utils/class-use/SaveSystemService.html b/Bomberman/doc/utils/class-use/SaveSystemService.html index 4255eab..806a22d 100644 --- a/Bomberman/doc/utils/class-use/SaveSystemService.html +++ b/Bomberman/doc/utils/class-use/SaveSystemService.html @@ -2,9 +2,9 @@ - + Uses of Class utils.SaveSystemService - + diff --git a/Bomberman/doc/utils/package-frame.html b/Bomberman/doc/utils/package-frame.html index cfb662b..a6c580a 100644 --- a/Bomberman/doc/utils/package-frame.html +++ b/Bomberman/doc/utils/package-frame.html @@ -2,9 +2,9 @@ - + utils - + diff --git a/Bomberman/doc/utils/package-summary.html b/Bomberman/doc/utils/package-summary.html index b7bcd71..936674b 100644 --- a/Bomberman/doc/utils/package-summary.html +++ b/Bomberman/doc/utils/package-summary.html @@ -2,9 +2,9 @@ - + utils - + diff --git a/Bomberman/doc/utils/package-tree.html b/Bomberman/doc/utils/package-tree.html index 1dcb25e..298d134 100644 --- a/Bomberman/doc/utils/package-tree.html +++ b/Bomberman/doc/utils/package-tree.html @@ -2,9 +2,9 @@ - + utils Class Hierarchy - + @@ -79,7 +79,7 @@

                                        Hierarchy For Package utils

                                        Class Hierarchy

                                          -
                                        • java.lang.Object +
                                        • java.lang.Object

                                          Enum Hierarchy

                                            -
                                          • java.lang.Object +
                                          • java.lang.Object
                                              -
                                            • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) +
                                            • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) diff --git a/Bomberman/doc/utils/package-use.html b/Bomberman/doc/utils/package-use.html index 7d080c0..f825324 100644 --- a/Bomberman/doc/utils/package-use.html +++ b/Bomberman/doc/utils/package-use.html @@ -2,9 +2,9 @@ - + Uses of Package utils - + diff --git a/Bomberman/src/graphics/d3/SuperBomberman3D.java b/Bomberman/src/graphics/d3/SuperBomberman3D.java index 788cc75..0175af9 100644 --- a/Bomberman/src/graphics/d3/SuperBomberman3D.java +++ b/Bomberman/src/graphics/d3/SuperBomberman3D.java @@ -1,3 +1,7 @@ +/** + * Main class for the 3D Game + */ + package graphics.d3; import java.util.Collection; @@ -44,21 +48,34 @@ import logic.misc.Level; import main.Game; +/** + * @author Patricia Lazaro Tello (554309) + * @author Jaime Ruiz-Borau Vizarraga (546751) + */ public class SuperBomberman3D extends ApplicationAdapter implements ApplicationListener { + /** + * @param game + * 2DGame room + */ public SuperBomberman3D(graphics.rooms.game.Game game) { room = game; } + /** + * @param game + * 2DGame room + * @return a new desktop libgdx application that runs the 3D game + */ public static LwjglApplication main(graphics.rooms.game.Game game) { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); - // config.forceExit = false; config.height = Game.HEIGHT; config.width = Game.WIDTH; config.title = "Super Bomberman 3D"; return new LwjglApplication(new SuperBomberman3D(game), config); } + /* attributes */ public PerspectiveCamera cam; public CameraInputController camController; public Thread calcs; @@ -102,6 +119,9 @@ public void create() { System.out.println("Finished creating things"); } + /** + * Initializes some variables + */ private void init() { Level lvl = room.level; xInitPlane = lvl.mapInitX; @@ -116,6 +136,9 @@ private void init() { initialPosition = new Vector3(xMid, 600, zMid); } + /** + * Initializes the camera + */ private void camera() { cam = new PerspectiveCamera(FIELD_OF_VIEW, Gdx.graphics.getWidth(), Gdx.graphics.getHeight()); cam.position.set(initialPosition); @@ -128,6 +151,9 @@ private void camera() { Gdx.input.setInputProcessor(camController); } + /** + * Initializes the 3D models and instances them + */ private void models() { modelBatch = new ModelBatch(); ModelBuilder mb = new ModelBuilder(); @@ -146,12 +172,20 @@ private void models() { /* box */ boxModel = mb.createBox(width, height, width, new Material(ColorAttribute.createDiffuse(Color.YELLOW)), Usage.Position | Usage.Normal); + + /* destroyable */ destroyableModel = mb.createBox(width, height, width, new Material(ColorAttribute.createDiffuse(Color.GRAY)), Usage.Position | Usage.Normal); + + /* item */ itemModel = mb.createBox(width, height, width, new Material(ColorAttribute.createDiffuse(Color.OLIVE)), Usage.Position | Usage.Normal); + + /* bomb */ bombModel = mb.createBox(width, height, width, new Material(ColorAttribute.createDiffuse(Color.BROWN)), Usage.Position | Usage.Normal); + + /* explosion */ explosionModel = mb.createBox(width, height, width, new Material(ColorAttribute.createDiffuse(Color.CORAL)), Usage.Position | Usage.Normal); @@ -163,6 +197,7 @@ private void models() { VertexAttributes.Usage.Position | VertexAttributes.Usage.TextureCoordinates); plane = new ModelInstance(planeModel); + /* instances the objects of the 2D game room */ objetos = new HashMap<>(); for (Objeto obj : room.objetos) { ModelInstance model = null; @@ -199,6 +234,9 @@ private void models() { } } + /** + * Initializes the environment + */ private void environment() { env = new Environment(); env.set(new ColorAttribute(ColorAttribute.AmbientLight, 0.2f, 0.2f, 0.2f, 1f)); @@ -220,13 +258,18 @@ public void render() { modelBatch.end(); } + /** + * Updates objects' positions, destroy the objects that needs to be + * destroyed and creates the new ones + */ public void step() { - /* move objects */ + /* previous position */ Map lastPos = new HashMap<>(); for (Objeto obj : objetos.keySet()) { lastPos.put(obj, new Point2D(obj.x, obj.y)); } + /* key handling */ KEY dir = KEY.NO_KEY; KEY keyPressed = KEY.NO_KEY; if (Gdx.input.isKeyPressed(Input.Keys.UP)) { @@ -245,8 +288,10 @@ public void step() { keyPressed = KEY.BOMB; } + /* step of the 2D Game */ room.step(keyPressed, dir); + /* objects to be destroyed */ List destroy = new LinkedList(); for (Objeto obj : objetos.keySet()) { if (!room.objetos.contains(obj)) { @@ -257,6 +302,7 @@ public void step() { objetos.remove(obj); } + /* creates new objects */ for (Objeto obj : room.objetos) { obj.render(null); if (objetos.containsKey(obj)) { @@ -283,6 +329,7 @@ public void step() { } } + /* updates objects' positions */ for (Map.Entry entry : objetos.entrySet()) { Objeto key = entry.getKey(); ModelInstance value = entry.getValue(); @@ -292,7 +339,6 @@ public void step() { value.transform.translate(key.x - last.getX(), 0, key.y - last.getY()); } } - /* end move objects */ if (room.state == STATE.DESTRUCTION || room.state == STATE.VICTORY) { Gdx.app.exit(); diff --git a/Bomberman/src/logic/Objeto.java b/Bomberman/src/logic/Objeto.java index e07ecb5..9f0e9cb 100644 --- a/Bomberman/src/logic/Objeto.java +++ b/Bomberman/src/logic/Objeto.java @@ -129,10 +129,10 @@ public void processKey(KEY key, KEY direction) { public void render(Graphics g) { if (sprite_index != null) { int temp_image_index = animate(); - if(g != null){ + if (g != null) { g.drawImage(sprite_index.getSubsprites()[temp_image_index], x - sprite_index.getCenterX(), y - sprite_index.getCenterY(), null); - + if (Global.DEBUG && boundingBox != null) { g.setColor(Color.red); g.drawRect(boundingBox.getX(), boundingBox.getY(), boundingBox.getWidth(), boundingBox.getHeight()); @@ -142,6 +142,9 @@ public void render(Graphics g) { } } + /** + * @return previous animation index + */ public int animate() { if (sprite_index != null) { if (image_speed != 0 && (prev_sprite_index == null @@ -159,8 +162,7 @@ public int animate() { image_index = (image_index + image_speed) % sprite_index.getSubimages(); return temp_image_index; - } - else{ + } else { return -1; } } diff --git a/Bomberman/src/logic/StatesMachine.java b/Bomberman/src/logic/StatesMachine.java index 3fb23b3..5304ef7 100644 --- a/Bomberman/src/logic/StatesMachine.java +++ b/Bomberman/src/logic/StatesMachine.java @@ -122,7 +122,6 @@ public static void render(Graphics g) { gameScreen.render(g); break; case GAME3D: -// game3D.getGraphics().requestRendering(); break; case PAUSE: pauseScreen.render(g); diff --git a/Bomberman/src/main/Game.java b/Bomberman/src/main/Game.java index b4b8be2..566f0b8 100644 --- a/Bomberman/src/main/Game.java +++ b/Bomberman/src/main/Game.java @@ -176,6 +176,9 @@ public static void main(String[] args) { game.start(); } + /** + * Reloads the key mapping + */ public void reloadMapping() { input.reloadMapping(); }