From d6ef60316ef6f5a149d29f0ab3d4c812ffe9eb1b Mon Sep 17 00:00:00 2001
From: roryf <rory.fitzgerald@ntnu.no>
Date: Fri, 3 May 2024 17:26:43 +0200
Subject: [PATCH] improved function names, and changed back to C++20

---
 .../subprojects/animationwindow/include/AnimationWindow.h     | 4 ++--
 dependencies/subprojects/animationwindow/meson.build          | 2 +-
 .../subprojects/animationwindow/src/AnimationWindow.cpp       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dependencies/subprojects/animationwindow/include/AnimationWindow.h b/dependencies/subprojects/animationwindow/include/AnimationWindow.h
index 970ab97..680c98d 100644
--- a/dependencies/subprojects/animationwindow/include/AnimationWindow.h
+++ b/dependencies/subprojects/animationwindow/include/AnimationWindow.h
@@ -78,8 +78,8 @@ class AnimationWindow {
     explicit AnimationWindow(int x = 50, int y = 50, int width = 1024, int height = 768, const std::string& title = "Animation Window", bool softwareRender = false);
     ~AnimationWindow();
     void screenshot(std::string name);
-    void pressPoint(TDT4102::Point p);
-    void pressWidgetNr(int n);
+    void simulateClickAtPoint(TDT4102::Point p);
+    void simulateClickOnWidget(int n);
     // When you have finished drawing a frame, call this function to display it (usually at the end of your main while loop)
     void next_frame();
 
diff --git a/dependencies/subprojects/animationwindow/meson.build b/dependencies/subprojects/animationwindow/meson.build
index fed1a55..814cc62 100644
--- a/dependencies/subprojects/animationwindow/meson.build
+++ b/dependencies/subprojects/animationwindow/meson.build
@@ -1,4 +1,4 @@
-project('animationwindow', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++17', 'default_library=static', 'buildtype=debugoptimized'])
+project('animationwindow', ['c', 'cpp'], version: '0.01', default_options: ['cpp_std=c++20', 'default_library=static', 'buildtype=debugoptimized'])
 
 if host_machine.system() == 'windows'
     sdl2_dep = subproject('sdl2_windows').get_variable('sdl2_windows_dep')
diff --git a/dependencies/subprojects/animationwindow/src/AnimationWindow.cpp b/dependencies/subprojects/animationwindow/src/AnimationWindow.cpp
index faaea65..bdd30c2 100644
--- a/dependencies/subprojects/animationwindow/src/AnimationWindow.cpp
+++ b/dependencies/subprojects/animationwindow/src/AnimationWindow.cpp
@@ -182,7 +182,7 @@ void TDT4102::AnimationWindow::screenshot(std::string name){
     }
 }
 
-void TDT4102::AnimationWindow::pressPoint(TDT4102::Point p){
+void TDT4102::AnimationWindow::simulateClickAtPoint(TDT4102::Point p){
     std::cout<<"pressPoint"<<std::endl;
     int posx=p.x;
     int posy=p.y;
@@ -201,7 +201,7 @@ void TDT4102::AnimationWindow::pressPoint(TDT4102::Point p){
     next_frame();
 }
 
-void TDT4102::AnimationWindow::pressWidgetNr(int n){
+void TDT4102::AnimationWindow::simulateClickOnWidget(int n){
     std::cout<<"pressKey"<<std::endl;
 
     int posx=widgets.at(n).get().position.x+20;
-- 
GitLab