PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

display-swap-interval setting

Browse Source
This commit is contained in:
MihailRis 2023-11-09 02:02:48 +03:00
parent b0ccc5fd68
commit d5dc134737
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/voxel_engine.cpp
View File

@ -50,6 +50,8 @@ struct EngineSettings {
int displayHeight; int displayHeight;
/* Anti-aliasing samples */ /* Anti-aliasing samples */
int displaySamples; int displaySamples;
/* GLFW swap interval value, 0 - unlimited fps, 1 - vsync*/
int displaySwapInterval;
/* Window title */ /* Window title */
const char* displayTitle; const char* displayTitle;
/* Max milliseconds that engine uses for chunks loading only */ /* Max milliseconds that engine uses for chunks loading only */
@ -68,8 +70,8 @@ class Engine {
EngineSettings settings; EngineSettings settings;
uint64_t frame = 0; uint64_t frame = 0;
float lastTime = 0.0f; double lastTime = 0.0;
float delta = 0.0f; double delta = 0.0;
bool occlusion = true; bool occlusion = true;
public: public:
Engine(const EngineSettings& settings); Engine(const EngineSettings& settings);
@ -87,6 +89,7 @@ Engine::Engine(const EngineSettings& settings) {
settings.displayHeight, settings.displayHeight,
settings.displayTitle, settings.displayTitle,
settings.displaySamples); settings.displaySamples);
Window::swapInterval(settings.displaySwapInterval);
assets = new Assets(); assets = new Assets();
std::cout << "-- loading assets" << std::endl; std::cout << "-- loading assets" << std::endl;
@ -114,7 +117,7 @@ Engine::Engine(const EngineSettings& settings) {
void Engine::updateTimers() { void Engine::updateTimers() {
frame++; frame++;
float currentTime = Window::time(); double currentTime = Window::time();
delta = currentTime - lastTime; delta = currentTime - lastTime;
lastTime = currentTime; lastTime = currentTime;
} }
@ -146,7 +149,6 @@ void Engine::mainloop() {
HudRenderer hud(assets); HudRenderer hud(assets);
lastTime = Window::time(); lastTime = Window::time();
Window::swapInterval(1);
while (!Window::isShouldClose()){ while (!Window::isShouldClose()){
updateTimers(); updateTimers();
updateHotkeys(); updateHotkeys();
@ -187,6 +189,7 @@ void load_settings(EngineSettings& settings, std::string filename) {
obj->num("display-width", settings.displayWidth); obj->num("display-width", settings.displayWidth);
obj->num("display-height", settings.displayHeight); obj->num("display-height", settings.displayHeight);
obj->num("display-samples", settings.displaySamples); obj->num("display-samples", settings.displaySamples);
obj->num("display-swap-interval", settings.displaySwapInterval);
obj->num("chunks-load-distance", settings.chunksLoadDistance); obj->num("chunks-load-distance", settings.chunksLoadDistance);
obj->num("chunks-load-speed", settings.chunksLoadSpeed); obj->num("chunks-load-speed", settings.chunksLoadSpeed);
obj->num("chunks-padding", settings.chunksPadding); obj->num("chunks-padding", settings.chunksPadding);
@ -197,6 +200,7 @@ void save_settings(EngineSettings& settings, std::string filename) {
obj.put("display-width", settings.displayWidth); obj.put("display-width", settings.displayWidth);
obj.put("display-height", settings.displayHeight); obj.put("display-height", settings.displayHeight);
obj.put("display-samples", settings.displaySamples); obj.put("display-samples", settings.displaySamples);
obj.put("display-swap-interval", settings.displaySwapInterval);
obj.put("chunks-load-distance", settings.chunksLoadDistance); obj.put("chunks-load-distance", settings.chunksLoadDistance);
obj.put("chunks-load-speed", settings.chunksLoadSpeed); obj.put("chunks-load-speed", settings.chunksLoadSpeed);
obj.put("chunks-padding", settings.chunksPadding); obj.put("chunks-padding", settings.chunksPadding);
@ -214,6 +218,7 @@ int main() {
settings.chunksLoadSpeed = 10; settings.chunksLoadSpeed = 10;
settings.chunksLoadDistance = 12; settings.chunksLoadDistance = 12;
settings.chunksPadding = 2; settings.chunksPadding = 2;
settings.displaySwapInterval = 1;
if (std::filesystem::is_regular_file(SETTINGS_FILE)) { if (std::filesystem::is_regular_file(SETTINGS_FILE)) {
std::cout << "-- loading settings" << std::endl; std::cout << "-- loading settings" << std::endl;