Skip to content

Commit

Permalink
Add new top down screen implementation.
Browse files Browse the repository at this point in the history
  • Loading branch information
daid committed Jun 14, 2015
1 parent eb41847 commit 25cc56a
Show file tree
Hide file tree
Showing 7 changed files with 90 additions and 89 deletions.
4 changes: 2 additions & 2 deletions EmptyEpsilon.cbp
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,6 @@
<Unit filename="src/gui/gui2_textentry.h" />
<Unit filename="src/gui/gui2_togglebutton.cpp" />
<Unit filename="src/gui/gui2_togglebutton.h" />
<Unit filename="src/gui/mainScreen.cpp" />
<Unit filename="src/gui/mainScreen.h" />
<Unit filename="src/gui/mainUIBase.cpp" />
<Unit filename="src/gui/mainUIBase.h" />
<Unit filename="src/gui/mouseRenderer.cpp" />
Expand Down Expand Up @@ -566,6 +564,8 @@
<Unit filename="src/screenComponents/viewport3d.h" />
<Unit filename="src/screens/mainScreen.cpp" />
<Unit filename="src/screens/mainScreen.h" />
<Unit filename="src/screens/topDownScreen.cpp" />
<Unit filename="src/screens/topDownScreen.h" />
<Unit filename="src/screens/windowScreen.cpp" />
<Unit filename="src/screens/windowScreen.h" />
<Unit filename="src/script.cpp" />
Expand Down
59 changes: 0 additions & 59 deletions src/gui/mainScreen.cpp

This file was deleted.

26 changes: 0 additions & 26 deletions src/gui/mainScreen.h

This file was deleted.

6 changes: 4 additions & 2 deletions src/menus/shipSelectionScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "playerInfo.h"
#include "gameGlobalInfo.h"
#include "screens/windowScreen.h"
#include "gui/mainScreen.h"
#include "screens/topDownScreen.h"
#include "gui/gameMasterUI.h"

ShipSelectionScreen::ShipSelectionScreen()
Expand Down Expand Up @@ -221,8 +221,10 @@ void ShipSelectionScreen::onReadyClick()
new WindowScreen(window_angle->getSelectionValue().toInt());
}else if(topdown_button->getValue())
{
my_spaceship = NULL;
my_player_info->setShipId(-1);
destroy();
new TopDownUI();
new TopDownScreen();
}else{
destroy();
my_player_info->spawnUI();
Expand Down
1 change: 1 addition & 0 deletions src/screens/mainScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ ScreenMainScreen::ScreenMainScreen()
void ScreenMainScreen::update(float delta)
{
/*
TODO
if (game_client && !game_client->isConnected())
{
destroy();
Expand Down
61 changes: 61 additions & 0 deletions src/screens/topDownScreen.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
#include "playerInfo.h"
#include "gameGlobalInfo.h"
#include "topDownScreen.h"
#include "main.h"
#include "menus/shipSelectionScreen.h"

#include "screenComponents/indicatorOverlays.h"

TopDownScreen::TopDownScreen()
{
viewport = new GuiViewport3D(this, "VIEWPORT");
viewport->showCallsigns();
viewport->setPosition(0, 0, ATopLeft)->setSize(GuiElement::GuiSizeMax, GuiElement::GuiSizeMax);

new GuiIndicatorOverlays(this);
}

void TopDownScreen::update(float delta)
{
camera_yaw = -90.0f;
camera_pitch = 90.0f;

camera_position.z = 7000.0;

if (!target)
{
for(int n=0; n<GameGlobalInfo::max_player_ships; n++)
{
target = gameGlobalInfo->getPlayerShip(n);
if (target)
break;
}
}

if (target)
{
sf::Vector2f position = target->getPosition();

camera_position.x = position.x;
camera_position.y = position.y;
}
}

void TopDownScreen::onKey(sf::Keyboard::Key key, int unicode)
{
switch(key)
{
//TODO: This is more generic code and is duplicated.
case sf::Keyboard::Escape:
case sf::Keyboard::Home:
destroy();
new ShipSelectionScreen();
break;
case sf::Keyboard::P:
if (game_server)
engine->setGameSpeed(0.0);
break;
default:
break;
}
}
22 changes: 22 additions & 0 deletions src/screens/topDownScreen.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#ifndef TOP_DOWN_SCREEN_H
#define TOP_DOWN_SCREEN_H

#include "engine.h"
#include "gui/gui2.h"
#include "screenComponents/viewport3d.h"
#include "screenComponents/radarView.h"

class TopDownScreen : public GuiCanvas, public Updatable
{
private:
GuiViewport3D* viewport;
P<SpaceObject> target;
public:
TopDownScreen();

virtual void update(float delta);

virtual void onKey(sf::Keyboard::Key key, int unicode);
};

#endif//TOP_DOWN_SCREEN_H

0 comments on commit 25cc56a

Please sign in to comment.