Some cleanup
| package graphics.guiSkeleton.guiPanel; | ||
| import core.gamestate.*; | ||
| import core.relayer.Relayer; | ||
| import core.zone.Circle; | ||
| import core.zone.Point; | ||
| import core.zone.Rectangle; | ||
| import core.zone.Zone; | ||
| import gameloop.DummyLocalGameLoop; | ||
| import gameloop.GameStarter; | ||
| import graphics.graphical_abstraction.panel.GamePanelAbstraction; | ||
| import graphics.graphical_abstraction.panel.GamePanelAbstractionController; | ||
| import graphics.graphical_utility.GraphicalBridgeConfiguration; | ||
| import graphics.graphical_utility.coreProcesses.GameContentMapChangeListener; | ||
| import graphics.guiSkeleton.*; | ||
| import graphics.guiSkeleton.entityDisplayer.HealthBarDisplayer; | ||
| import graphics.guiSkeleton.mapManagement.*; | ||
| import graphics.ingame_input_listener.Input; | ||
| import logging.Logging; | ||
| import map_generation.map.Map; | ||
| import javax.swing.*; | ||
| import java.awt.*; | ||
| import java.util.logging.Logger; | ||
| /** | ||
| * Created by dupriez on 10/11/15. | ||
| * | ||
| * This class is the panel that displays the game window (what the player sees when he's playing) | ||
| */ | ||
| //TODO: Replace DummyEntitybis by Entity (or Entity id) (or whatever) | ||
| public class GamePanel2 extends GUIPanel implements GameContentMapChangeListener, GamePanelAbstraction { | ||
| private GamePanelAbstractionController controller = new GamePanelAbstractionController(this); | ||
| private static final long serialVersionUID = -4309173330106121587L; | ||
| private boolean initialised = false; | ||
| private JLabel topLeftLabel; | ||
| private boolean debugMapPoint = false; | ||
| //If set to true, this class will print information in the console | ||
| private boolean debug = false; | ||
| //The relayer of the entity that the player plays | ||
| private Relayer followedRelayer; | ||
| //The place where are stored the information the game panel has to display (entities + map) | ||
| private GameContent gameContent; | ||
| //Defines the portion of the map this panel must display | ||
| private VisionBox visionBox; | ||
| //React to the key typed | ||
| //private InputInterpreter MyInputInterpreter; | ||
| //Spells of the character | ||
| private SpellDisplayer MySpellDisplayer; | ||
| //Avatar of the character | ||
| private AvatarDisplayer MyAvatarDisplayer; | ||
| private Logger LOGGER = Logging.getInstance().getLogger(); | ||
| //private boolean spellReleased=true; | ||
| //private boolean attackReleased=true; | ||
| public GamePanel2(GraphicsMaster graphicsMaster) { | ||
| super(graphicsMaster); | ||
| } | ||
| /** | ||
| * | ||
| */ | ||
| @Override | ||
| public void keyTypedHandler(Input e) { | ||
| } | ||
| /** | ||
| * Function to be called when the gui goes into the state GAME_PANEL, to prepare the Game Panel | ||
| */ | ||
| @Override | ||
| public void initialise(){ | ||
| RepaintTimer.getInstance().enterPlayingFramerateMode(); | ||
| controller.initialise(); | ||
| followedRelayer = DummyLocalGameLoop.getInstance().getFollowedRelayer(); | ||
| //MyInputInterpreter = new InputInterpreter(followedRelayer); | ||
| gameContent = DummyLocalGameLoop.getInstance().getContent(); | ||
| //subscribe to the map changes of gameContent | ||
| //gameContent.addMapChangeListener(this); | ||
| //Getting the map, creating a bufferedImage out of it and storing it | ||
| GraphicsMap graphicsMap = MapDrawer.drawMap(gameContent.getMap()); | ||
| GraphicsMapPoint initialTopLeftGraphicsMapPoint = GraphicalBridgeConfiguration.makeMapPointFromCoreCoordinates(followedRelayer.getCharacter().getX(), followedRelayer.getCharacter().getY()); | ||
| visionBox = new VisionBox(initialTopLeftGraphicsMapPoint, getSize().width, getSize().height, graphicsMap); | ||
| topLeftLabel = new JLabel("Press ESC to go back to main menu"); | ||
| topLeftLabel.setFont(new Font("Inconsolata", Font.BOLD, 26)); | ||
| topLeftLabel.setForeground(new Color(255, 185, 15)); | ||
| topLeftLabel.setHorizontalAlignment(SwingConstants.LEFT); | ||
| topLeftLabel.setOpaque(true); | ||
| topLeftLabel.setBackground(new Color(0, 0, 0)); | ||
| this.add(topLeftLabel, BorderLayout.NORTH); | ||
| initialised = true; | ||
| } | ||
| /** | ||
| * Function to be called when the gui leave the state GAME_PANEL, to clean up the GamePanel | ||
| */ | ||
| @Override | ||
| public void finalise() { | ||
| </ |