Compare commits
6 Commits
SQC-31
...
SQC32_sauv
Author | SHA1 | Date | |
---|---|---|---|
|
4a9ad70d48 | ||
|
1ab83a85a7 | ||
|
2ab201e93c | ||
|
8e041a314d | ||
|
6bb3ee9667 | ||
|
f654c5effa |
@@ -45,10 +45,18 @@ enum ANIM_TYPE { STILL = 0, SHOOTING = 8, JUMPING = 16, JUMPINGSHOOTING = 24, DE
|
||||
enum ANIM_POS {FRONT, QUARTER_FRONT_LEFT, QUATER_FRONT_RIGHT, PROFIL_LEFT, PROFIL_RIGHT, QUARTER_BACK_LEFT, QUARTER_BACK_RIGHT, BACK , POS_LAST};
|
||||
typedef uint64_t Timestamp;
|
||||
|
||||
enum Resolution {
|
||||
HD = 0, // 1280x720 (High Definition)
|
||||
FHD, // 1920x1080 (Full HD)
|
||||
QHD, // 2560x1440 (Quad HD)
|
||||
UHD // 3840x2160 (Ultra HD)
|
||||
};
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
#pragma comment(lib,"wsock32.lib") // Pour pouvoir faire fonctionner le linker sans le vcxproject
|
||||
#pragma comment(lib,"ws2_32.lib")
|
||||
|
||||
#include <ws2tcpip.h>
|
||||
#include <Windows.h>
|
||||
#include <cstdio>
|
||||
|
@@ -27,6 +27,7 @@
|
||||
<ClInclude Include="mesh.h" />
|
||||
<ClInclude Include="openglcontext.h" />
|
||||
<ClInclude Include="remoteplayer.h" />
|
||||
<ClInclude Include="settings.h" />
|
||||
<ClInclude Include="shader.h" />
|
||||
<ClInclude Include="skybox.h" />
|
||||
<ClInclude Include="texture.h" />
|
||||
@@ -44,6 +45,7 @@
|
||||
<ClCompile Include="mesh.cpp" />
|
||||
<ClCompile Include="openglcontext.cpp" />
|
||||
<ClCompile Include="remoteplayer.cpp" />
|
||||
<ClCompile Include="settings.cpp" />
|
||||
<ClCompile Include="shader.cpp" />
|
||||
<ClCompile Include="skybox.cpp" />
|
||||
<ClCompile Include="texture.cpp" />
|
||||
|
@@ -56,6 +56,9 @@
|
||||
<ClInclude Include="booster.h">
|
||||
<Filter>Fichiers d%27en-tête</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="settings.h">
|
||||
<Filter>Fichiers d%27en-tête</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="engine.cpp">
|
||||
@@ -103,5 +106,8 @@
|
||||
<ClCompile Include="booster.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="settings.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
@@ -48,3 +48,7 @@ void Audio::Render3DAudioObj(irrklang::ISound* sound, Vector3f& pos, Vector3f& v
|
||||
void Audio::ToggleMusicState() { m_music->setIsPaused(!m_music->getIsPaused()); }
|
||||
|
||||
void Audio::PauseEngine() { m_engine->setAllSoundsPaused(); }
|
||||
|
||||
float Audio::GetMusicVolume() const {
|
||||
return m_music->getVolume();
|
||||
}
|
||||
|
@@ -33,6 +33,8 @@ public:
|
||||
void ToggleMusicState();
|
||||
|
||||
void PauseEngine();
|
||||
|
||||
float GetMusicVolume() const;
|
||||
};
|
||||
|
||||
#endif // AUDIO_H__
|
||||
|
@@ -24,7 +24,7 @@
|
||||
#include "renderer.h"
|
||||
#include "remoteplayer.h"
|
||||
#include "booster.h"
|
||||
|
||||
#include "settings.h"
|
||||
|
||||
class Engine : public OpenglContext {
|
||||
public:
|
||||
@@ -64,10 +64,6 @@ private:
|
||||
void DrawHud(float elapsedTime, BlockType bloc);
|
||||
void PrintText(float x, float y, const std::string& t, float charSizeMultiplier = 1.0f);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Connector m_conn;
|
||||
Shader m_shader01;
|
||||
BlockInfo* m_blockinfo[BTYPE_LAST];
|
||||
@@ -99,6 +95,7 @@ private:
|
||||
irrklang::ISound *m_whoosh[MAX_BULLETS];
|
||||
|
||||
Player m_player = Player(Vector3f(.5f, CHUNK_SIZE_Y + 1.8f, .5f));
|
||||
Settings m_parameters = Settings(m_audio);
|
||||
|
||||
Bullet* m_bullets[MAX_BULLETS];
|
||||
|
||||
@@ -123,8 +120,6 @@ private:
|
||||
float m_time_SplashScreen = 0;
|
||||
float m_titleX = 0;
|
||||
float m_titleY = 0;
|
||||
float m_Width = 0;
|
||||
float m_Height = 0;
|
||||
|
||||
int m_renderCount = 0;
|
||||
int m_countdown = COUNTDOWN;
|
||||
|
146
SQCSim2021/settings.cpp
Normal file
146
SQCSim2021/settings.cpp
Normal file
@@ -0,0 +1,146 @@
|
||||
#include "settings.h"
|
||||
|
||||
Settings::Settings(Audio& audio)
|
||||
: m_audio(audio),
|
||||
m_mainVolume(0.5f),
|
||||
m_musicVolume(0.5f),
|
||||
m_sfxVolume(0.5f),
|
||||
m_resolution(FHD),
|
||||
m_fullscreen(false),
|
||||
m_brightness(0.5f),
|
||||
m_contrast(0.5f),
|
||||
m_mouseSensitivity(0.5f) {
|
||||
ApplyResolution(m_resolution);
|
||||
}
|
||||
|
||||
void Settings::SaveFile(const std::string& filename) {
|
||||
std::ofstream file(filename);
|
||||
if (!file.is_open()) {
|
||||
std::cerr << "Failed to open file for saving parameters" << std::endl;
|
||||
return;
|
||||
}
|
||||
|
||||
file << m_mainVolume << '\n';
|
||||
file << m_musicVolume << '\n';
|
||||
file << m_sfxVolume << '\n';
|
||||
|
||||
file << static_cast<int>(m_resolution) << '\n';
|
||||
file << m_fullscreen << '\n';
|
||||
file << m_brightness << '\n';
|
||||
file << m_contrast << '\n';
|
||||
|
||||
file << m_mouseSensitivity << '\n';
|
||||
|
||||
file.close();
|
||||
}
|
||||
|
||||
void Settings::LoadFile(const std::string& filename) {
|
||||
std::ifstream file(filename);
|
||||
if (!file.is_open()) {
|
||||
std::cerr << "Failed to open file for loading parameters" << std::endl;
|
||||
return;
|
||||
}
|
||||
|
||||
file >> m_mainVolume;
|
||||
file >> m_musicVolume;
|
||||
file >> m_sfxVolume;
|
||||
|
||||
int resolutionValue;
|
||||
file >> resolutionValue;
|
||||
m_resolution = static_cast<Resolution>(resolutionValue);
|
||||
|
||||
file >> m_fullscreen;
|
||||
file >> m_brightness;
|
||||
file >> m_contrast;
|
||||
|
||||
file >> m_mouseSensitivity;
|
||||
|
||||
file.close();
|
||||
}
|
||||
|
||||
float Settings::GetMainVolume() const {
|
||||
return m_mainVolume;
|
||||
}
|
||||
|
||||
void Settings::SetMainVolume(float volume) {
|
||||
m_mainVolume = volume;
|
||||
}
|
||||
|
||||
void Settings::GetMusicVolume() {
|
||||
m_musicVolume = m_audio.GetMusicVolume();
|
||||
}
|
||||
|
||||
void Settings::SetMusicVolume(float volume) {
|
||||
m_musicVolume = volume;
|
||||
}
|
||||
|
||||
float Settings::GetSfxVolume() const {
|
||||
return m_sfxVolume;
|
||||
}
|
||||
|
||||
void Settings::SetSfxVolume(float volume) {
|
||||
m_sfxVolume = volume;
|
||||
}
|
||||
|
||||
float Settings::GetBrightness() const {
|
||||
return m_brightness;
|
||||
}
|
||||
|
||||
void Settings::SetBrightness(float brightness) {
|
||||
m_brightness = brightness;
|
||||
}
|
||||
|
||||
float Settings::GetContrast() const {
|
||||
return m_contrast;
|
||||
}
|
||||
|
||||
void Settings::SetContrast(float contrast) {
|
||||
m_contrast = contrast;
|
||||
}
|
||||
|
||||
bool Settings::GetFullscreen() const {
|
||||
return m_fullscreen;
|
||||
}
|
||||
|
||||
void Settings::SetFullscreen(bool fullscreen) {
|
||||
m_fullscreen = fullscreen;
|
||||
}
|
||||
|
||||
const Resolution& Settings::GetResolution() const {
|
||||
return m_resolution;
|
||||
}
|
||||
|
||||
void Settings::SetResolution(const Resolution& resolution) {
|
||||
m_resolution = resolution;
|
||||
}
|
||||
|
||||
float Settings::GetMouseSensitivity() const {
|
||||
return m_mouseSensitivity;
|
||||
}
|
||||
|
||||
void Settings::SetMouseSensitivity(float sensitivity) {
|
||||
m_mouseSensitivity = sensitivity;
|
||||
}
|
||||
|
||||
void Settings::ApplyResolution(Resolution resolution) {
|
||||
switch (resolution) {
|
||||
case HD:
|
||||
m_rezWidth = 1280;
|
||||
m_rezHeight = 720;
|
||||
break;
|
||||
case FHD:
|
||||
m_rezWidth = 1920;
|
||||
m_rezHeight = 1080;
|
||||
break;
|
||||
case QHD:
|
||||
m_rezWidth = 2560;
|
||||
m_rezHeight = 1440;
|
||||
break;
|
||||
case UHD:
|
||||
m_rezWidth = 3840;
|
||||
m_rezHeight = 2160;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
70
SQCSim2021/settings.h
Normal file
70
SQCSim2021/settings.h
Normal file
@@ -0,0 +1,70 @@
|
||||
#ifndef SETTINGS_H__
|
||||
#define SETTINGS_H__
|
||||
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
#include "define.h"
|
||||
#include "audio.h"
|
||||
|
||||
class Settings {
|
||||
public:
|
||||
Settings(Audio& audio);
|
||||
|
||||
void SaveFile(const std::string& filename);
|
||||
void LoadFile(const std::string& filename);
|
||||
|
||||
// Audio
|
||||
float GetMainVolume() const;
|
||||
void SetMainVolume(float volume);
|
||||
|
||||
void GetMusicVolume();
|
||||
void SetMusicVolume(float volume);
|
||||
|
||||
float GetSfxVolume() const;
|
||||
void SetSfxVolume(float volume);
|
||||
|
||||
// Graphic
|
||||
float GetBrightness() const;
|
||||
void SetBrightness(float brightness);
|
||||
|
||||
float GetContrast() const;
|
||||
void SetContrast(float contrast);
|
||||
|
||||
bool GetFullscreen() const;
|
||||
void SetFullscreen(bool fullscreen);
|
||||
|
||||
const Resolution& GetResolution() const;
|
||||
void SetResolution(const Resolution& resolution);
|
||||
|
||||
// Gameplay
|
||||
float GetMouseSensitivity() const;
|
||||
void SetMouseSensitivity(float sensitivity);
|
||||
|
||||
void ApplyResolution(Resolution resolution);
|
||||
|
||||
private:
|
||||
|
||||
Audio& m_audio;
|
||||
// Audio
|
||||
float m_mainVolume;
|
||||
float m_musicVolume;
|
||||
float m_sfxVolume;
|
||||
|
||||
// Graphic
|
||||
Resolution m_resolution;
|
||||
bool m_fullscreen;
|
||||
int m_rezWidth;
|
||||
int m_rezHeight;
|
||||
float m_brightness;
|
||||
float m_contrast;
|
||||
|
||||
// Gameplay
|
||||
float m_mouseSensitivity;
|
||||
};
|
||||
|
||||
|
||||
#endif // PARAMETERS_H
|
Reference in New Issue
Block a user