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

SQC-15_online #1

Merged
memartel_loc merged 349 commits from SQC-15_online into master 2023-12-10 17:41:26 -05:00
Conversation 0 Commits 349 Files Changed 181 +8 -3
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8970bc33a1 - Show all commits

2
SQCSim-common/player.h
View File

@ -28,6 +28,8 @@ public:
float GetHP() const;
void Teleport(int& x, int& z);
uint64_t getId() const;
protected:
Vector3f m_position;
Vector3f m_velocity;

4
SQCSim2021/engine.cpp
View File

@ -772,9 +772,9 @@ void Engine::Render(float elapsedTime) {
}
}
m_wrenderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
m_renderer.RenderWorld(&m_world, m_renderCount, m_player.GetPosition(), m_player.GetDirection(), all, m_shader01, m_textureAtlas);
m_world.Update(m_bullets, m_player.GetPosition(), m_blockinfo);
m_wrenderer.UpdateWorld(&m_world, m_player.GetPosition(), m_blockinfo);
m_renderer.UpdateMesh(&m_world, m_player.GetPosition(), m_blockinfo);
if (m_isSkybox) m_skybox.Render(skybox);

5
SQCSim2021/engine.h
View File

@ -19,6 +19,7 @@
#include "textureatlas.h"
#include "connector.h"
#include "renderer.h"
#include "remoteplayer.h"
class Engine : public OpenglContext {
public:
@ -79,8 +80,10 @@ private:
Bullet* m_bullets[MAX_BULLETS];
std::map<uint64_t, RemotePlayer*> m_players;
//Menu
enum class GameState { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
enum class GameState: uint8_t { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY };
GameState m_gamestate = GameState::MAIN_MENU;
Texture MenuTitleTexture,
MenuBGTexture,