Compare commits
5 Commits
thehell_af
...
linux
Author | SHA1 | Date | |
---|---|---|---|
|
93062e49e2 | ||
|
cddc59d6cf | ||
|
965e78309e | ||
|
0452920697 | ||
|
8be8852596 |
5
.gitignore
vendored
5
.gitignore
vendored
@@ -373,3 +373,8 @@ FodyWeavers.xsd
|
|||||||
/x64/Release/SQCSim2023.exe
|
/x64/Release/SQCSim2023.exe
|
||||||
/x64/Debug/SQCSim2023.exe
|
/x64/Debug/SQCSim2023.exe
|
||||||
/x64/Debug/SQCSim2021.pdb
|
/x64/Debug/SQCSim2021.pdb
|
||||||
|
/SQCSim-srv/cmake/*
|
||||||
|
!/SQCSim-srv/cmake/CMakeLists.txt
|
||||||
|
/SQCSim2021/cmake/*
|
||||||
|
!/SQCSim2021/cmake/CMakeLists.txt
|
||||||
|
/SQCSim2021/SQCSim-client
|
||||||
|
BIN
Debug/glew32.dll
BIN
Debug/glew32.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -22,7 +22,7 @@
|
|||||||
#define FRAMES_DELETE_CHUNKS 1
|
#define FRAMES_DELETE_CHUNKS 1
|
||||||
|
|
||||||
#define THREADS_GENERATE_CHUNKS 8
|
#define THREADS_GENERATE_CHUNKS 8
|
||||||
#define THREADS_UPDATE_CHUNKS 6
|
#define THREADS_UPDATE_CHUNKS 3
|
||||||
#define THREADS_DELETE_CHUNKS 3
|
#define THREADS_DELETE_CHUNKS 3
|
||||||
|
|
||||||
#define VIEW_DISTANCE 512 // Si les chunks arr<72>tent de s'afficher pendant une game et qu'il y a un access violation quand tu quitte, il faut augmenter ce chiffre.
|
#define VIEW_DISTANCE 512 // Si les chunks arr<72>tent de s'afficher pendant une game et qu'il y a un access violation quand tu quitte, il faut augmenter ce chiffre.
|
||||||
@@ -53,6 +53,7 @@ typedef uint64_t Timestamp;
|
|||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
#define SOCKET int
|
#define SOCKET int
|
||||||
#define INVALID_SOCKET -1
|
#define INVALID_SOCKET -1
|
||||||
|
@@ -5,7 +5,7 @@ Player::Player(const Vector3f& position, float rotX, float rotY) : m_position(po
|
|||||||
m_velocity = Vector3f(0, 0, 0);
|
m_velocity = Vector3f(0, 0, 0);
|
||||||
m_airborne = true;
|
m_airborne = true;
|
||||||
m_hp = 0.75f; //TODO: Remettre <20> 1.0f
|
m_hp = 0.75f; //TODO: Remettre <20> 1.0f
|
||||||
m_username = "Zelda Bee-Bop56";
|
m_username = "Zelda Bee-Bop";
|
||||||
}
|
}
|
||||||
|
|
||||||
void Player::TurnLeftRight(float value) {
|
void Player::TurnLeftRight(float value) {
|
||||||
|
@@ -130,7 +130,7 @@ void World::GetScope(unsigned int& x, unsigned int& y) {
|
|||||||
y = m_center[1];
|
y = m_center[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
void World::Update(Bullet* bullets[MAX_BULLETS], Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]) {
|
void World::Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]) {
|
||||||
UpdateWorld(player_pos, blockinfo);
|
UpdateWorld(player_pos, blockinfo);
|
||||||
//TransposeWorld(player_pos, bullets);
|
//TransposeWorld(player_pos, bullets);
|
||||||
}
|
}
|
||||||
@@ -407,4 +407,4 @@ void World::UpdateWorld(const Vector3f& player, BlockInfo* blockinfo[BTYPE_LAST]
|
|||||||
}*/
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
int World::GettbDeleted() const { return m_tbDeleted.size(); }
|
int World::GettbDeleted() const { return m_tbDeleted.size(); }
|
||||||
|
@@ -30,7 +30,7 @@ public:
|
|||||||
BlockType BlockAt(float x, float y, float z, BlockType defaultBlockType = BTYPE_AIR) const;
|
BlockType BlockAt(float x, float y, float z, BlockType defaultBlockType = BTYPE_AIR) const;
|
||||||
BlockType BlockAt(const Vector3f& pos, BlockType defaultBlockType = BTYPE_AIR) const;
|
BlockType BlockAt(const Vector3f& pos, BlockType defaultBlockType = BTYPE_AIR) const;
|
||||||
|
|
||||||
void Update(Bullet* bullets[MAX_BULLETS], Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]);
|
void Update(Bullet* bullets[MAX_BULLETS], const Vector3f& player_pos, BlockInfo* blockinfo[BTYPE_LAST]);
|
||||||
|
|
||||||
void GetScope(unsigned int& x, unsigned int& y);
|
void GetScope(unsigned int& x, unsigned int& y);
|
||||||
|
|
||||||
|
30
SQCSim-srv/cmake/CMakeLists.txt
Normal file
30
SQCSim-srv/cmake/CMakeLists.txt
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.18.4)
|
||||||
|
|
||||||
|
project(SQCSim-Server VERSION 0.1)
|
||||||
|
|
||||||
|
add_compile_options("-Wno-narrowing")
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_STANDARD_REQUIRED True)
|
||||||
|
|
||||||
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../out")
|
||||||
|
|
||||||
|
set(SQCSIM_COMMON_DIR "../../SQCSim-common/")
|
||||||
|
|
||||||
|
add_library(SQCSim-common
|
||||||
|
"${SQCSIM_COMMON_DIR}blockinfo.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}bullet.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}chunk.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}netprotocol.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}opensimplex.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}player.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}transformation.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}world.cpp"
|
||||||
|
)
|
||||||
|
|
||||||
|
add_executable(SQCSim-server
|
||||||
|
"../connection.cpp"
|
||||||
|
"../server.cpp"
|
||||||
|
"../main.cpp"
|
||||||
|
)
|
||||||
|
|
||||||
|
target_link_libraries(SQCSim-server PUBLIC SQCSim-common)
|
@@ -14,4 +14,4 @@
|
|||||||
typedef unsigned char LogDest;
|
typedef unsigned char LogDest;
|
||||||
enum LOG_DEST { CONSOLE, LOGFILE, LOG_LAST };
|
enum LOG_DEST { CONSOLE, LOGFILE, LOG_LAST };
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
@@ -85,7 +85,7 @@ int Server::Ready() {
|
|||||||
|
|
||||||
while (!readystart) {
|
while (!readystart) {
|
||||||
sockaddr_in sockad;
|
sockaddr_in sockad;
|
||||||
int addrlen = sizeof(sockad);
|
unsigned int addrlen = sizeof(sockad);
|
||||||
SOCKET sock = accept(m_sock_tcp, (sockaddr*)&sockad, &addrlen);
|
SOCKET sock = accept(m_sock_tcp, (sockaddr*)&sockad, &addrlen);
|
||||||
|
|
||||||
if (sock < 0)
|
if (sock < 0)
|
||||||
@@ -140,7 +140,7 @@ void Server::Run() {
|
|||||||
Log("Partie en cours...", false, false);
|
Log("Partie en cours...", false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
inline std::string Server::Timestamp() {
|
inline std::string Server::LogTimestamp() {
|
||||||
time_t rawtime;
|
time_t rawtime;
|
||||||
struct tm timeinfo;
|
struct tm timeinfo;
|
||||||
char buffer[80];
|
char buffer[80];
|
||||||
@@ -162,11 +162,11 @@ inline std::string Server::Timestamp() {
|
|||||||
void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) {
|
void Server::Log(std::string str, bool is_error = false, bool is_fatal = false) {
|
||||||
switch (m_log) {
|
switch (m_log) {
|
||||||
case LOG_DEST::LOGFILE:
|
case LOG_DEST::LOGFILE:
|
||||||
m_logfile << Timestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
|
m_logfile << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
|
||||||
break;
|
break;
|
||||||
case LOG_DEST::CONSOLE:
|
case LOG_DEST::CONSOLE:
|
||||||
default:
|
default:
|
||||||
std::cout << Timestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
|
std::cout << LogTimestamp() << (is_fatal ? "FATAL " : "") << (is_error ? "ERROR " : "") << str << std::endl;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -35,7 +35,7 @@ private:
|
|||||||
|
|
||||||
World* m_world = nullptr;
|
World* m_world = nullptr;
|
||||||
|
|
||||||
std::string Timestamp();
|
std::string LogTimestamp();
|
||||||
void Log(std::string str, bool is_error, bool is_fatal);
|
void Log(std::string str, bool is_error, bool is_fatal);
|
||||||
void buildIdList(size_t size);
|
void buildIdList(size_t size);
|
||||||
|
|
||||||
|
@@ -105,8 +105,8 @@
|
|||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<LinkIncremental>true</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
<IncludePath>external\irrKlang-1.6.0\include;external\glew210\include;external\devil180\include;external\sfml251-32\include;$(IncludePath)</IncludePath>
|
<IncludePath>external\irrKlang-1.6.0\include;external\glew210\include;external\devil178\include;external\sfml251\include;$(IncludePath)</IncludePath>
|
||||||
<LibraryPath>external\glew210\lib\Release\Win32;external\sfml251-32\lib;external\devil180\lib\x86\Release;external\irrKlang-1.6.0\lib\Win32-visualStudio;$(LibraryPath)</LibraryPath>
|
<LibraryPath>external\glew210\lib;external\sfml251\lib;external\devil178\lib;external\irrKlang-1.6.0\lib\Win32-visualStudio;$(LibraryPath)</LibraryPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
<LinkIncremental>true</LinkIncremental>
|
<LinkIncremental>true</LinkIncremental>
|
||||||
@@ -115,8 +115,8 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>false</LinkIncremental>
|
||||||
<IncludePath>external\devil180\include;external\irrKlang-1.6.0\include;external\sfml251-32\include;external\glew210\include;$(IncludePath)</IncludePath>
|
<IncludePath>external\devil180\include;external\irrKlang-1.6.0\include;external\sfml251\include;external\glew210\include;$(IncludePath)</IncludePath>
|
||||||
<LibraryPath>external\sfml251-32\lib;external\devil180\lib\x86\Release;external\glew210\lib\Release\Win32;$(LibraryPath);external\irrKlang-1.6.0\lib\Win32-visualStudio</LibraryPath>
|
<LibraryPath>external\sfml251\lib;external\devil180\lib\x86\Release;external\glew210\lib\Release\Win32;$(LibraryPath);external\irrKlang-1.6.0\lib\Win32-visualStudio</LibraryPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
<LinkIncremental>false</LinkIncremental>
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
@@ -1,8 +1,14 @@
|
|||||||
#ifndef AUDIO_H__
|
#ifndef AUDIO_H__
|
||||||
#define AUDIO_H__
|
#define AUDIO_H__
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
#include <irrKlang.h>
|
#include <irrKlang.h>
|
||||||
#include <ik_ISoundSource.h>
|
#include <ik_ISoundSource.h>
|
||||||
|
#else
|
||||||
|
#include "./external/irrKlang-64bit-1.6.0/include/irrKlang.h"
|
||||||
|
#include "./external/irrKlang-64bit-1.6.0/include/ik_ISoundSource.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "../SQCSim-common/vector3.h"
|
#include "../SQCSim-common/vector3.h"
|
||||||
#include "define.h"
|
#include "define.h"
|
||||||
|
|
||||||
@@ -29,4 +35,4 @@ public:
|
|||||||
void PauseEngine();
|
void PauseEngine();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // AUDIO_H__
|
#endif // AUDIO_H__
|
||||||
|
68
SQCSim2021/cmake/CMakeLists.txt
Normal file
68
SQCSim2021/cmake/CMakeLists.txt
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.18.4)
|
||||||
|
|
||||||
|
project(SQCSim-Client VERSION 0.8)
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_STANDARD_REQUIRED True)
|
||||||
|
|
||||||
|
set(CMAKE_BUILD_DIRECTORY "./build")
|
||||||
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../")
|
||||||
|
|
||||||
|
set(SQCSIM_COMMON_DIR "../../SQCSim-common/")
|
||||||
|
set(SQCSIM_EXTERN_DIR "../external/")
|
||||||
|
|
||||||
|
find_package(SFML COMPONENTS system window graphics REQUIRED)
|
||||||
|
find_package(DevIL REQUIRED)
|
||||||
|
find_package(OpenGL REQUIRED)
|
||||||
|
find_package(GLEW REQUIRED)
|
||||||
|
|
||||||
|
find_library(IRRKLANG_LIBRARY
|
||||||
|
NAMES libIrrKlang.so
|
||||||
|
PATHS "${SQCSIM_EXTERN_DIR}/irrKlang-64bit-1.6.0/lib/linux-gcc-64/")
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
${SQCSIM_EXTERN_DIR}/irrKlang-64bit-1.6.0/include/
|
||||||
|
${SFML_INCLUDE_DIRS}
|
||||||
|
${IL_INCLUDE_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
add_library(SQCSim-common
|
||||||
|
"${SQCSIM_COMMON_DIR}blockinfo.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}bullet.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}chunk.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}netprotocol.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}opensimplex.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}player.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}transformation.cpp"
|
||||||
|
"${SQCSIM_COMMON_DIR}world.cpp"
|
||||||
|
)
|
||||||
|
|
||||||
|
add_executable(SQCSim-client
|
||||||
|
"../audio.cpp"
|
||||||
|
"../connector.cpp"
|
||||||
|
"../engine.cpp"
|
||||||
|
"../mesh.cpp"
|
||||||
|
"../openglcontext.cpp"
|
||||||
|
"../shader.cpp"
|
||||||
|
"../skybox.cpp"
|
||||||
|
"../texture.cpp"
|
||||||
|
"../textureatlas.cpp"
|
||||||
|
"../tool.cpp"
|
||||||
|
"../vertexbuffer.cpp"
|
||||||
|
"../worldrenderer.cpp"
|
||||||
|
"../main.cpp"
|
||||||
|
)
|
||||||
|
|
||||||
|
target_link_libraries(SQCSim-client PUBLIC SQCSim-common
|
||||||
|
${IRRKLANG_LIBRARY}
|
||||||
|
sfml-system
|
||||||
|
sfml-window
|
||||||
|
sfml-graphics
|
||||||
|
GL
|
||||||
|
GLU
|
||||||
|
GLEW
|
||||||
|
${IL_LIBRARIES}
|
||||||
|
${ILU_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
@@ -1,27 +1,29 @@
|
|||||||
#ifndef CLI_DEFINE_H__
|
#ifndef CLI_DEFINE_H__
|
||||||
#define CLI_DEFINE_H__
|
#define CLI_DEFINE_H__
|
||||||
|
|
||||||
//#define SFML_STATIC true
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <iomanip>
|
#include <iomanip>
|
||||||
|
#include <GL/glew.h>
|
||||||
#include <SFML/Window.hpp>
|
#include <SFML/Window.hpp>
|
||||||
#include <SFML/Graphics.hpp>
|
#include <SFML/Graphics.hpp>
|
||||||
#include "../SQCSim-common/define.h"
|
#include "../SQCSim-common/define.h"
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include <GL/glew.h>
|
|
||||||
#include <gl/GL.h>
|
#include <gl/GL.h>
|
||||||
#include <gl/GLU.h>
|
#include <gl/GLU.h>
|
||||||
|
#else
|
||||||
|
#include <GL/gl.h>
|
||||||
|
#include <GL/glu.h>
|
||||||
|
#include <climits>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define NETWORK_TEST false
|
#define NETWORK_TEST false
|
||||||
#define SRV_ADDR "127.0.0.1"
|
#define SRV_ADDR "127.0.0.1"
|
||||||
#define COUNTDOWN 300
|
#define COUNTDOWN 300
|
||||||
|
|
||||||
#define BASE_WIDTH 1920
|
#define BASE_WIDTH 640
|
||||||
#define BASE_HEIGHT 1080
|
#define BASE_HEIGHT 480
|
||||||
|
|
||||||
#define TEXTURE_PATH "./media/textures/"
|
#define TEXTURE_PATH "./media/textures/"
|
||||||
#define SHADER_PATH "./media/shaders/"
|
#define SHADER_PATH "./media/shaders/"
|
||||||
|
0
SQCSim2021/docs/analyse_preliminaire.md
Normal file
0
SQCSim2021/docs/analyse_preliminaire.md
Normal file
1
SQCSim2021/docs/analyse_serveur.md
Normal file
1
SQCSim2021/docs/analyse_serveur.md
Normal file
@@ -0,0 +1 @@
|
|||||||
|
|
@@ -1,23 +1,5 @@
|
|||||||
#include "engine.h"
|
#include "engine.h"
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
#include <chrono>
|
|
||||||
#include <thread>
|
|
||||||
#include <queue>
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Define a structure to represent notifications
|
|
||||||
struct Notification {
|
|
||||||
std::string message;
|
|
||||||
float displayStartTime = 0.0f;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Use a queue to manage notifications
|
|
||||||
//std::queue<Notification> notificationQueue;
|
|
||||||
// Use a vector to manage notifications
|
|
||||||
std::vector<Notification> notifications;
|
|
||||||
|
|
||||||
Engine::Engine() {}
|
Engine::Engine() {}
|
||||||
|
|
||||||
Engine::~Engine() {
|
Engine::~Engine() {
|
||||||
@@ -131,91 +113,6 @@ void Engine::LoadResource() {
|
|||||||
|
|
||||||
void Engine::UnloadResource() {}
|
void Engine::UnloadResource() {}
|
||||||
|
|
||||||
void Engine::SystemNotification(std::string systemLog) {
|
|
||||||
std::string message = "";
|
|
||||||
|
|
||||||
message = systemLog;
|
|
||||||
|
|
||||||
DisplayNotification(message);
|
|
||||||
}
|
|
||||||
void Engine::KillNotification(Player killer, Player killed) {
|
|
||||||
std::string message = "";
|
|
||||||
|
|
||||||
message = killed.GetUsername() + " killed by -> " + killer.GetUsername();
|
|
||||||
|
|
||||||
DisplayNotification(message);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void Engine::DisplayNotification(std::string message) {
|
|
||||||
|
|
||||||
if (message.length() > 45) {
|
|
||||||
message = message.substr(0, 45);
|
|
||||||
}
|
|
||||||
// Create a new notification and add it to the queue
|
|
||||||
Notification newNotification;
|
|
||||||
newNotification.message = message;
|
|
||||||
newNotification.displayStartTime = m_time;
|
|
||||||
|
|
||||||
notifications.push_back(newNotification);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add a method to process the notification queue
|
|
||||||
void Engine::ProcessNotificationQueue() {
|
|
||||||
m_textureFont.Bind();
|
|
||||||
float scale = GetScale();
|
|
||||||
unsigned int xOffset = Width() - Width() * 0.26;
|
|
||||||
unsigned int yOffset = Height() - (Height() / 2.2);
|
|
||||||
|
|
||||||
// Iterate through the notifications and display them
|
|
||||||
for (auto it = notifications.begin(); it != notifications.end(); ) {
|
|
||||||
float timeSinceDisplay = m_time - it->displayStartTime;
|
|
||||||
|
|
||||||
// Display the notification message with vertical offset
|
|
||||||
unsigned int y = yOffset - (static_cast<unsigned int>(scale * 20) * (it - notifications.begin()));
|
|
||||||
glDisable(GL_STENCIL_TEST);
|
|
||||||
glDisable(GL_DEPTH_TEST);
|
|
||||||
|
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE);
|
|
||||||
glBlendEquation(GL_FUNC_ADD);
|
|
||||||
|
|
||||||
glMatrixMode(GL_PROJECTION);
|
|
||||||
glPushMatrix();
|
|
||||||
|
|
||||||
glLoadIdentity();
|
|
||||||
glOrtho(0, Width(), 0, Height(), -1, 1);
|
|
||||||
|
|
||||||
glMatrixMode(GL_MODELVIEW);
|
|
||||||
glPushMatrix();
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
PrintText(xOffset, y, scale, it->message);
|
|
||||||
|
|
||||||
glBlendFunc(GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR);
|
|
||||||
glBlendEquation(GL_FUNC_SUBTRACT);
|
|
||||||
|
|
||||||
glEnable(GL_STENCIL_TEST);
|
|
||||||
glEnable(GL_DEPTH_TEST);
|
|
||||||
|
|
||||||
glMatrixMode(GL_PROJECTION);
|
|
||||||
glPopMatrix();
|
|
||||||
|
|
||||||
glMatrixMode(GL_MODELVIEW);
|
|
||||||
glPopMatrix();
|
|
||||||
// Check if it's time to remove the notification (display for 2 seconds)
|
|
||||||
if (timeSinceDisplay >= 4.0f) {
|
|
||||||
it = notifications.erase(it); // Remove the notification
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
++it;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void Engine::DisplayCrosshair() {
|
void Engine::DisplayCrosshair() {
|
||||||
m_textureCrosshair.Bind();
|
m_textureCrosshair.Bind();
|
||||||
static const int crossSize = 32;
|
static const int crossSize = 32;
|
||||||
@@ -364,17 +261,6 @@ void Engine::DrawHud(float elapsedTime, BlockType bloc) {
|
|||||||
|
|
||||||
int timer = GetCountdown(elapsedTime);
|
int timer = GetCountdown(elapsedTime);
|
||||||
|
|
||||||
// Appel de la fonction pour l'affichage de notifications
|
|
||||||
if (m_keyK) {
|
|
||||||
SystemNotification(m_messageNotification);
|
|
||||||
m_keyK = false;
|
|
||||||
}
|
|
||||||
if (m_keyL) {
|
|
||||||
|
|
||||||
KillNotification(m_player, m_player);
|
|
||||||
m_keyL = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (m_displayInfo) {
|
if (m_displayInfo) {
|
||||||
DisplayInfo(elapsedTime, bloc);
|
DisplayInfo(elapsedTime, bloc);
|
||||||
}
|
}
|
||||||
@@ -537,7 +423,6 @@ void Engine::Render(float elapsedTime) {
|
|||||||
|
|
||||||
if (m_isSkybox) m_skybox.Render(skybox);
|
if (m_isSkybox) m_skybox.Render(skybox);
|
||||||
|
|
||||||
ProcessNotificationQueue();
|
|
||||||
DrawHud(elapsedTime, bloc);
|
DrawHud(elapsedTime, bloc);
|
||||||
|
|
||||||
static bool fell = false;
|
static bool fell = false;
|
||||||
@@ -589,13 +474,6 @@ void Engine::KeyPressEvent(unsigned char key) {
|
|||||||
break;
|
break;
|
||||||
case 5: // F - Ignorer
|
case 5: // F - Ignorer
|
||||||
break;
|
break;
|
||||||
case 10: // K - Debugging DisplayNotification()
|
|
||||||
m_keyK = true;
|
|
||||||
m_messageNotification = "notifications systeme peuvent <20>tre affich<63>";
|
|
||||||
break;
|
|
||||||
case 11: // L - Debugging DisplayNotification()
|
|
||||||
m_keyL = true;
|
|
||||||
break;
|
|
||||||
case 6: // G - Ignorer
|
case 6: // G - Ignorer
|
||||||
break;
|
break;
|
||||||
case 12: // M - Ignorer
|
case 12: // M - Ignorer
|
||||||
@@ -644,12 +522,6 @@ void Engine::KeyReleaseEvent(unsigned char key) {
|
|||||||
m_displayInfo = !m_displayInfo;
|
m_displayInfo = !m_displayInfo;
|
||||||
std::cout << "DISPLAY INFO " << (m_displayInfo ? "enabled" : "disabled") << std::endl;
|
std::cout << "DISPLAY INFO " << (m_displayInfo ? "enabled" : "disabled") << std::endl;
|
||||||
break;
|
break;
|
||||||
case 10: // K
|
|
||||||
m_keyK = false;
|
|
||||||
break;
|
|
||||||
case 11: // L - Debugging DisplayNotification()
|
|
||||||
m_keyL = false;
|
|
||||||
break;
|
|
||||||
case 12: // M - Toggle music
|
case 12: // M - Toggle music
|
||||||
m_audio.ToggleMusicState();
|
m_audio.ToggleMusicState();
|
||||||
break;
|
break;
|
||||||
|
@@ -43,10 +43,6 @@ private:
|
|||||||
|
|
||||||
bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
|
bool LoadTexture(Texture& texture, const std::string& filename, bool useMipmaps = true, bool stopOnError = true);
|
||||||
|
|
||||||
void SystemNotification(std::string systemLog);
|
|
||||||
void KillNotification(Player killer, Player killed);
|
|
||||||
void DisplayNotification(std::string message);
|
|
||||||
void ProcessNotificationQueue();
|
|
||||||
void DisplayCrosshair();
|
void DisplayCrosshair();
|
||||||
void DisplayCurrentItem();
|
void DisplayCurrentItem();
|
||||||
void DisplayHud(int timer);
|
void DisplayHud(int timer);
|
||||||
@@ -74,7 +70,7 @@ private:
|
|||||||
irrklang::ISound* m_scream;
|
irrklang::ISound* m_scream;
|
||||||
|
|
||||||
Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
|
Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
|
||||||
|
|
||||||
Bullet* m_bullets[MAX_BULLETS];
|
Bullet* m_bullets[MAX_BULLETS];
|
||||||
|
|
||||||
float m_scale;
|
float m_scale;
|
||||||
@@ -93,8 +89,6 @@ private:
|
|||||||
bool m_resetcountdown = false;
|
bool m_resetcountdown = false;
|
||||||
bool m_stopcountdown = false;
|
bool m_stopcountdown = false;
|
||||||
|
|
||||||
bool m_keyK = false;
|
|
||||||
bool m_keyL = false;
|
|
||||||
bool m_keyW = false;
|
bool m_keyW = false;
|
||||||
bool m_keyA = false;
|
bool m_keyA = false;
|
||||||
bool m_keyS = false;
|
bool m_keyS = false;
|
||||||
@@ -105,8 +99,6 @@ private:
|
|||||||
bool m_mouseC = false;
|
bool m_mouseC = false;
|
||||||
bool m_mouseWU = false;
|
bool m_mouseWU = false;
|
||||||
bool m_mouseWD = false;
|
bool m_mouseWD = false;
|
||||||
|
|
||||||
std::string m_messageNotification = "";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // ENGINE_H__
|
#endif // ENGINE_H__
|
||||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,98 +0,0 @@
|
|||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
|
||||||
<head>
|
|
||||||
<title>SFML - Simple and Fast Multimedia Library</title>
|
|
||||||
<meta http-equiv="Content-Type" content="text/html;"/>
|
|
||||||
<meta charset="utf-8"/>
|
|
||||||
<!--<link rel='stylesheet' type='text/css' href="https://fonts.googleapis.com/css?family=Ubuntu:400,700,400italic"/>-->
|
|
||||||
<link rel="stylesheet" type="text/css" href="doxygen.css" title="default" media="screen,print" />
|
|
||||||
<script type="text/javascript" src="jquery.js"></script>
|
|
||||||
<script type="text/javascript" src="dynsections.js"></script>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<div id="banner-container">
|
|
||||||
<div id="banner">
|
|
||||||
<span id="sfml">SFML 2.5.1</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div id="content">
|
|
||||||
<!-- Generated by Doxygen 1.8.14 -->
|
|
||||||
<div id="navrow1" class="tabs">
|
|
||||||
<ul class="tablist">
|
|
||||||
<li><a href="index.html"><span>Main Page</span></a></li>
|
|
||||||
<li><a href="pages.html"><span>Related Pages</span></a></li>
|
|
||||||
<li><a href="modules.html"><span>Modules</span></a></li>
|
|
||||||
<li><a href="namespaces.html"><span>Namespaces</span></a></li>
|
|
||||||
<li><a href="annotated.html"><span>Classes</span></a></li>
|
|
||||||
<li class="current"><a href="files.html"><span>Files</span></a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div id="navrow2" class="tabs2">
|
|
||||||
<ul class="tablist">
|
|
||||||
<li><a href="files.html"><span>File List</span></a></li>
|
|
||||||
<li><a href="globals.html"><span>File Members</span></a></li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
<div id="nav-path" class="navpath">
|
|
||||||
<ul>
|
|
||||||
<li class="navelem"><a class="el" href="dir_d44c64559bbebec7f509842c48db8b23.html">include</a></li><li class="navelem"><a class="el" href="dir_c0a853e81d6f1c1f0a3eb7a27dc24256.html">SFML</a></li> </ul>
|
|
||||||
</div>
|
|
||||||
</div><!-- top -->
|
|
||||||
<div class="header">
|
|
||||||
<div class="summary">
|
|
||||||
<a href="#define-members">Macros</a> </div>
|
|
||||||
<div class="headertitle">
|
|
||||||
<div class="title">GpuPreference.hpp File Reference</div> </div>
|
|
||||||
</div><!--header-->
|
|
||||||
<div class="contents">
|
|
||||||
|
|
||||||
<p>Headers.
|
|
||||||
<a href="#details">More...</a></p>
|
|
||||||
<div class="textblock"><code>#include <SFML/Config.hpp></code><br />
|
|
||||||
</div>
|
|
||||||
<p><a href="GpuPreference_8hpp_source.html">Go to the source code of this file.</a></p>
|
|
||||||
<table class="memberdecls">
|
|
||||||
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
|
|
||||||
Macros</h2></td></tr>
|
|
||||||
<tr class="memitem:ab0233c2d867cbd561036ed2440a4fec0"><td class="memItemLeft" align="right" valign="top">#define </td><td class="memItemRight" valign="bottom"><a class="el" href="GpuPreference_8hpp.html#ab0233c2d867cbd561036ed2440a4fec0">SFML_DEFINE_DISCRETE_GPU_PREFERENCE</a></td></tr>
|
|
||||||
<tr class="memdesc:ab0233c2d867cbd561036ed2440a4fec0"><td class="mdescLeft"> </td><td class="mdescRight">A macro to encourage usage of the discrete GPU. <a href="#ab0233c2d867cbd561036ed2440a4fec0">More...</a><br /></td></tr>
|
|
||||||
<tr class="separator:ab0233c2d867cbd561036ed2440a4fec0"><td class="memSeparator" colspan="2"> </td></tr>
|
|
||||||
</table>
|
|
||||||
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
|
|
||||||
<div class="textblock"><p>Headers. </p>
|
|
||||||
<p>File containing SFML_DEFINE_DISCRETE_GPU_PREFERENCE </p>
|
|
||||||
|
|
||||||
<p class="definition">Definition in file <a class="el" href="GpuPreference_8hpp_source.html">GpuPreference.hpp</a>.</p>
|
|
||||||
</div><h2 class="groupheader">Macro Definition Documentation</h2>
|
|
||||||
<a id="ab0233c2d867cbd561036ed2440a4fec0"></a>
|
|
||||||
<h2 class="memtitle"><span class="permalink"><a href="#ab0233c2d867cbd561036ed2440a4fec0">◆ </a></span>SFML_DEFINE_DISCRETE_GPU_PREFERENCE</h2>
|
|
||||||
|
|
||||||
<div class="memitem">
|
|
||||||
<div class="memproto">
|
|
||||||
<table class="memname">
|
|
||||||
<tr>
|
|
||||||
<td class="memname">#define SFML_DEFINE_DISCRETE_GPU_PREFERENCE</td>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
</div><div class="memdoc">
|
|
||||||
|
|
||||||
<p>A macro to encourage usage of the discrete GPU. </p>
|
|
||||||
<p>In order to inform the Nvidia/AMD driver that an SFML application could benefit from using the more powerful discrete GPU, special symbols have to be publicly exported from the final executable.</p>
|
|
||||||
<p>SFML defines a helper macro to easily do this.</p>
|
|
||||||
<p>Place SFML_DEFINE_DISCRETE_GPU_PREFERENCE in the global scope of a source file that will be linked into the final executable. Typically it is best to place it where the main function is also defined. </p>
|
|
||||||
|
|
||||||
<p class="definition">Definition at line <a class="el" href="GpuPreference_8hpp_source.html#l00069">69</a> of file <a class="el" href="GpuPreference_8hpp_source.html">GpuPreference.hpp</a>.</p>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div><!-- contents -->
|
|
||||||
</div>
|
|
||||||
<div id="footer-container">
|
|
||||||
<div id="footer">
|
|
||||||
SFML is licensed under the terms and conditions of the <a href="https://www.sfml-dev.org/license.php">zlib/png license</a>.<br>
|
|
||||||
Copyright © Laurent Gomila ::
|
|
||||||
Documentation generated by <a href="http://www.doxygen.org/" title="doxygen website">doxygen</a> ::
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user