Develop into master #9

Merged
SemvdH merged 126 commits from develop into main 2021-06-18 15:56:41 +00:00
2 changed files with 38 additions and 6 deletions
Showing only changes of commit 1558ee298b - Show all commits

View File

@@ -116,11 +116,7 @@ namespace scene
{
render();
update(window);
for (gui::GuiTexture* button : guis1) {
gui::Button* new_button = ConvertGuiTextureToButton(button);
if(new_button != NULL)
new_button->Update(window);
}
if (hand_mode) {
cameraFrame = objDetect.readCamera();
@@ -178,7 +174,11 @@ namespace scene
void scene::Startup_Scene::update(GLFWwindow* window)
{
for (gui::GuiTexture* button : guis1) {
gui::Button* new_button = ConvertGuiTextureToButton(button);
if (new_button != NULL)
new_button->Update(window);
}
}
void scene::Startup_Scene::onKey(GLFWwindow* window, int key, int scancode, int action, int mods)

View File

@@ -12,10 +12,42 @@ namespace scene
scene::Scenes return_value = scene::Scenes::STARTUP;
public:
/**
* @brief Constructor of the class Startup_Scene
*
*/
Startup_Scene();
/**
* @brief
*
* @param window
* @return
*/
Scenes start(GLFWwindow* window) override;
/**
* @brief
*
*/
void render() override;
/**
* @brief This method updates all the components on the window
*
* @param window Window it updates
*/
void update(GLFWwindow* window) override;
/**
* @brief Listener for key events
*
* @param window Window it listens to for key events
* @param key Key of event that is activated
* @param scancode Code of Key
* @param action
* @param mods
*/
void onKey(GLFWwindow* window, int key, int scancode, int action, int mods) override;
};
}