memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'SQC19_Booster' into online_boosts

Browse Source
This commit is contained in:
MarcEricMartel
2023-12-18 11:19:52 -05:00
parent cf831e339f f2c5f8b636
commit 68d03c1eac
15 changed files with 216 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
SQCSim2021/engine.h
View File

@@ -14,6 +14,7 @@
#include "../SQCSim-common/world.h"
#include "../SQCSim-common/transformation.h"
#include "../SQCSim-common/player.h"
#include "../SQCSim-common/booster.h"
#include "define.h"
#include "openglcontext.h"
#include "texture.h"
@@ -24,13 +25,15 @@
#include "connector.h"
#include "renderer.h"
#include "remoteplayer.h"
#include "booster.h"
#include "settings.h"
class Engine : public OpenglContext {
public:
Engine();
virtual ~Engine();
virtual void Init();
virtual void DeInit();
virtual void LoadResource();
@@ -39,8 +42,8 @@ public:
virtual void KeyPressEvent(unsigned char key);
virtual void KeyReleaseEvent(unsigned char key);
virtual void MouseMoveEvent(int x, int y);
virtual void MousePressEvent(const MOUSE_BUTTON &button, int x, int y);
virtual void MouseReleaseEvent(const MOUSE_BUTTON &button, int x, int y);
virtual void MousePressEvent(const MOUSE_BUTTON& button, int x, int y);
virtual void MouseReleaseEvent(const MOUSE_BUTTON& button, int x, int y);
private:
int GetFps(float elapsedTime) const;
@@ -56,6 +59,7 @@ private:
void KillNotification(Player killer, Player killed);
void DisplayNotification(std::string message);
void DisplayCrosshair();
void DisplayPovGun();
void DisplayCurrentItem();
@@ -103,10 +107,9 @@ private:
Renderer m_renderer = Renderer();
Booster m_booster = Booster();
Booster booster_table[NB_BOOST];
BlockInfo* m_blockinfo[BTYPE_LAST];
BoostInfo* m_boostinfo[BTYPE_BOOST_LAST];
GameState m_gamestate = GameState::SPLASH;
Shader m_shader01;
@@ -169,9 +172,12 @@ private:
float m_splashTime = 2.0f;
float m_scale;
float m_time = 0;
float m_titleX = 0;
float m_titleY = 0;
int m_renderCount = 0;
int m_countdown = COUNTDOWN;
int m_nbReductionChunk = 4;
@@ -186,7 +192,7 @@ private:
bool m_selectedOptAudioMainBar = false;
bool m_selectedOptAudioMusicBar = false;
bool m_selectedOptAudioSfxBar = false;
bool m_selectedOptAudioSfxBar = false;
bool m_selectedGameplaySensitivityBar = false;
bool m_damage = false;
@@ -220,9 +226,10 @@ private:
bool m_singleReady = false;
bool m_multiReady = false;
bool m_key1 = false;
bool m_key2 = false;
bool m_keyK = false;
bool m_keyL = false;
bool m_keyW = false;
@@ -244,7 +251,7 @@ private:
float m_mousemy = 0;
bool m_networkgame = false;
Connector m_conn;
std::deque<netprot::ChunkMod*> m_chunkmod_manifest;
std::chrono::high_resolution_clock::time_point m_startTime;
@@ -258,4 +265,4 @@ private:
std::string m_messageNotification = "";
};
#endif // ENGINE_H__
#endif // ENGINE_H__