Updated UI
This commit is contained in:
1 parent
46d7a2a25d
commit
1265d87bc5
10 files changed
+526
-332
No files matched your search
+7
-12
@@ -14,19 +14,13 @@
|
||||
#include <string>
|
||||
#include <memory>
|
||||
#include <render/TextRenderer.h>
|
||||
#include "MenuManager.h"
|
||||
#include "Space.h"
|
||||
|
||||
#include <unordered_set>
|
||||
|
||||
namespace ZL {
|
||||
|
||||
|
||||
struct BoxCoords
|
||||
{
|
||||
Vector3f pos;
|
||||
Matrix3f m;
|
||||
};
|
||||
|
||||
|
||||
class Game {
|
||||
public:
|
||||
Game();
|
||||
@@ -43,6 +37,8 @@ namespace ZL {
|
||||
MainThreadHandler mainThreadHandler;
|
||||
|
||||
std::unique_ptr<INetworkClient> networkClient;
|
||||
|
||||
|
||||
private:
|
||||
int64_t getSyncTimeMs();
|
||||
void processTickCount();
|
||||
@@ -100,7 +96,8 @@ namespace ZL {
|
||||
SparkEmitter projectileEmitter;
|
||||
SparkEmitter explosionEmitter;
|
||||
PlanetObject planetObject;
|
||||
UiManager uiManager;
|
||||
|
||||
MenuManager menuManager;
|
||||
|
||||
std::vector<std::unique_ptr<Projectile>> projectiles;
|
||||
std::shared_ptr<Texture> projectileTexture;
|
||||
@@ -115,12 +112,10 @@ namespace ZL {
|
||||
std::vector<bool> boxAlive;
|
||||
float shipCollisionRadius = 15.0f;
|
||||
float boxCollisionRadius = 2.0f;
|
||||
bool uiGameOverShown = false;
|
||||
//bool uiGameOverShown = false;
|
||||
bool showExplosion = false;
|
||||
uint64_t lastExplosionTime = 0;
|
||||
const uint64_t explosionDurationMs = 500;
|
||||
bool firePressed = false;
|
||||
|
||||
|
||||
bool serverBoxesApplied = false;
|
||||
|
||||
|
||||
Reference in new issue
Block a user