sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIXED] merge errors

Browse Source
This commit is contained in:
Menno
2021-05-28 10:10:58 +02:00
parent 942ddf24d8
commit 820c5a2eb0
4 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/scenes/inGameScene.cpp
View File

@@ -1,30 +1,29 @@
#include "inGameScene.h"
#include <GLFW/glfw3.h>
void start()
void InGameScene::start()
{
}
void stop()
void InGameScene::stop()
{
}
void render()
void InGameScene::render()
{
}
void update(GLFWwindow* window)
void InGameScene::update(GLFWwindow* window)
{
}
void onKey(int key, int scancode, int action, int mods)
void InGameScene::onKey(int key, int scancode, int action, int mods)
{
/**
* misschien iets van als niet in settings dan hoeft alleen escape een knop zijn als reserve optie. Als wel in settings, dan heb je hetzelfde hoe je in het in het begin scherm hebt.
**/
}

12
src/scenes/inGameScene.h
View File

@@ -6,10 +6,12 @@ private:
public:
virtual void start() override;
virtual void stop() override;
virtual void render() override;
virtual void update(GLFWwindow* window) override;
virtual void onKey(int key, int scancode, int action, int mods) override;
void start() override;
void stop() override;
void render() override;
void update(GLFWwindow* window) override;
void onKey(int key, int scancode, int action, int mods) override;
};

12
src/scenes/startupScene.cpp
View File

@@ -1,31 +1,31 @@
#include "startupScene.h"
#include <GLFW/glfw3.h>
void start()
void StartupScene::start()
{
}
void stop()
void StartupScene::stop()
{
}
void render()
void StartupScene::render()
{
}
void update(GLFWwindow* window)
void StartupScene::update(GLFWwindow* window)
{
}
void onKey(int key, int scancode, int action, int mods)
void StartupScene::onKey(int key, int scancode, int action, int mods)
{
if (key == GLFW_KEY_DOWN && action == GLFW_RELEASE)
{
//ideetje voor het scrollen door het menu heen
menuIndex = (menuIndex + 1) % 4;
//menuIndex = (menuIndex + 1) % 4;
}
}

10
src/scenes/startupScene.h
View File

@@ -6,10 +6,10 @@ private:
int menuIndex;
public:
virtual void start() override;
virtual void stop() override;
virtual void render() override;
virtual void update(GLFWwindow* window) override;
virtual void onKey(int key, int scancode, int action, int mods) override;
void start() override;
void stop() override;
void render() override;
void update(GLFWwindow* window) override;
void onKey(int key, int scancode, int action, int mods) override;
};