From 3d5deecc87672ea0bce6b1de5805fada41b6cec4 Mon Sep 17 00:00:00 2001 From: Brett Laptop Date: Mon, 16 Jan 2023 14:18:53 -0500 Subject: [PATCH] Add window defines --- ...=> codemodel-v2-9815ffeff720abbe266c.json} | 2 +- ...on => index-2023-01-16T19-18-44-0163.json} | 4 +- ...l_Project-Debug-9b666a87047b10b6f81b.json} | 12 ++++- .../Testing/Temporary/LastTest.log | 4 +- cmake-build-debug/build.ninja | 9 +++- include/window/window.h | 17 +++++- src/main.cpp | 1 + src/window/window.cpp | 53 +++++++++++++++++++ 8 files changed, 93 insertions(+), 9 deletions(-) rename cmake-build-debug/.cmake/api/v1/reply/{codemodel-v2-3ef14ee1ded825530bb3.json => codemodel-v2-9815ffeff720abbe266c.json} (95%) rename cmake-build-debug/.cmake/api/v1/reply/{index-2023-01-16T19-11-47-0268.json => index-2023-01-16T19-18-44-0163.json} (93%) rename cmake-build-debug/.cmake/api/v1/reply/{target-Final_Project-Debug-b5832a3f1c00859bdae5.json => target-Final_Project-Debug-9b666a87047b10b6f81b.json} (94%) create mode 100644 src/window/window.cpp diff --git a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-3ef14ee1ded825530bb3.json b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-9815ffeff720abbe266c.json similarity index 95% rename from cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-3ef14ee1ded825530bb3.json rename to cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-9815ffeff720abbe266c.json index 5d6d685..085c67c 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-3ef14ee1ded825530bb3.json +++ b/cmake-build-debug/.cmake/api/v1/reply/codemodel-v2-9815ffeff720abbe266c.json @@ -81,7 +81,7 @@ { "directoryIndex" : 0, "id" : "Final_Project::@6890427a1f51a3e7e1df", - "jsonFile" : "target-Final_Project-Debug-b5832a3f1c00859bdae5.json", + "jsonFile" : "target-Final_Project-Debug-9b666a87047b10b6f81b.json", "name" : "Final_Project", "projectIndex" : 0 } diff --git a/cmake-build-debug/.cmake/api/v1/reply/index-2023-01-16T19-11-47-0268.json b/cmake-build-debug/.cmake/api/v1/reply/index-2023-01-16T19-18-44-0163.json similarity index 93% rename from cmake-build-debug/.cmake/api/v1/reply/index-2023-01-16T19-11-47-0268.json rename to cmake-build-debug/.cmake/api/v1/reply/index-2023-01-16T19-18-44-0163.json index 8e0d9b8..50c19b3 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/index-2023-01-16T19-11-47-0268.json +++ b/cmake-build-debug/.cmake/api/v1/reply/index-2023-01-16T19-18-44-0163.json @@ -26,7 +26,7 @@ "objects" : [ { - "jsonFile" : "codemodel-v2-3ef14ee1ded825530bb3.json", + "jsonFile" : "codemodel-v2-9815ffeff720abbe266c.json", "kind" : "codemodel", "version" : { @@ -86,7 +86,7 @@ }, "codemodel-v2" : { - "jsonFile" : "codemodel-v2-3ef14ee1ded825530bb3.json", + "jsonFile" : "codemodel-v2-9815ffeff720abbe266c.json", "kind" : "codemodel", "version" : { diff --git a/cmake-build-debug/.cmake/api/v1/reply/target-Final_Project-Debug-b5832a3f1c00859bdae5.json b/cmake-build-debug/.cmake/api/v1/reply/target-Final_Project-Debug-9b666a87047b10b6f81b.json similarity index 94% rename from cmake-build-debug/.cmake/api/v1/reply/target-Final_Project-Debug-b5832a3f1c00859bdae5.json rename to cmake-build-debug/.cmake/api/v1/reply/target-Final_Project-Debug-9b666a87047b10b6f81b.json index afec9cb..3079323 100644 --- a/cmake-build-debug/.cmake/api/v1/reply/target-Final_Project-Debug-b5832a3f1c00859bdae5.json +++ b/cmake-build-debug/.cmake/api/v1/reply/target-Final_Project-Debug-9b666a87047b10b6f81b.json @@ -96,7 +96,8 @@ }, "sourceIndexes" : [ - 0 + 0, + 1 ] } ], @@ -156,7 +157,8 @@ "name" : "Source Files", "sourceIndexes" : [ - 0 + 0, + 1 ] } ], @@ -167,6 +169,12 @@ "compileGroupIndex" : 0, "path" : "src/main.cpp", "sourceGroupIndex" : 0 + }, + { + "backtrace" : 1, + "compileGroupIndex" : 0, + "path" : "src/window/window.cpp", + "sourceGroupIndex" : 0 } ], "type" : "EXECUTABLE" diff --git a/cmake-build-debug/Testing/Temporary/LastTest.log b/cmake-build-debug/Testing/Temporary/LastTest.log index fbfa34a..93ffc61 100644 --- a/cmake-build-debug/Testing/Temporary/LastTest.log +++ b/cmake-build-debug/Testing/Temporary/LastTest.log @@ -1,3 +1,3 @@ -Start testing: Jan 16 14:11 EST +Start testing: Jan 16 14:18 EST ---------------------------------------------------------- -End testing: Jan 16 14:11 EST +End testing: Jan 16 14:18 EST diff --git a/cmake-build-debug/build.ninja b/cmake-build-debug/build.ninja index b36ad99..bbc4ee5 100644 --- a/cmake-build-debug/build.ninja +++ b/cmake-build-debug/build.ninja @@ -56,6 +56,13 @@ build CMakeFiles/Final_Project.dir/src/main.cpp.o: CXX_COMPILER__Final_Project_D OBJECT_DIR = CMakeFiles/Final_Project.dir OBJECT_FILE_DIR = CMakeFiles/Final_Project.dir/src +build CMakeFiles/Final_Project.dir/src/window/window.cpp.o: CXX_COMPILER__Final_Project_Debug /home/laptop/Documents/Brock/CS$ 3P98/Final$ Project/src/window/window.cpp || cmake_object_order_depends_target_Final_Project + DEP_FILE = CMakeFiles/Final_Project.dir/src/window/window.cpp.o.d + FLAGS = -g -fdiagnostics-color=always + INCLUDES = -I"/home/laptop/Documents/Brock/CS 3P98/Final Project/include" -I/usr/include/FreeImage.h -I"/home/laptop/Documents/Brock/CS 3P98/Final Project/libraries/BLT/include" + OBJECT_DIR = CMakeFiles/Final_Project.dir + OBJECT_FILE_DIR = CMakeFiles/Final_Project.dir/src/window + # ============================================================================= # Link build statements for EXECUTABLE target Final_Project @@ -64,7 +71,7 @@ build CMakeFiles/Final_Project.dir/src/main.cpp.o: CXX_COMPILER__Final_Project_D ############################################# # Link the executable Final_Project -build Final_Project: CXX_EXECUTABLE_LINKER__Final_Project_Debug CMakeFiles/Final_Project.dir/src/main.cpp.o | libraries/BLT/libBLT.a /usr/lib/x86_64-linux-gnu/libglut.so /usr/lib/x86_64-linux-gnu/libXi.so /usr/lib/x86_64-linux-gnu/libfreeimage.so || libraries/BLT/libBLT.a +build Final_Project: CXX_EXECUTABLE_LINKER__Final_Project_Debug CMakeFiles/Final_Project.dir/src/main.cpp.o CMakeFiles/Final_Project.dir/src/window/window.cpp.o | libraries/BLT/libBLT.a /usr/lib/x86_64-linux-gnu/libglut.so /usr/lib/x86_64-linux-gnu/libXi.so /usr/lib/x86_64-linux-gnu/libfreeimage.so || libraries/BLT/libBLT.a FLAGS = -g LINK_LIBRARIES = libraries/BLT/libBLT.a /usr/lib/x86_64-linux-gnu/libglut.so /usr/lib/x86_64-linux-gnu/libXi.so /usr/lib/x86_64-linux-gnu/libfreeimage.so OBJECT_DIR = CMakeFiles/Final_Project.dir diff --git a/include/window/window.h b/include/window/window.h index 68b7487..d6ada62 100644 --- a/include/window/window.h +++ b/include/window/window.h @@ -12,7 +12,22 @@ class glut_window : public blt::window { private: public: - + glut_window(); + virtual void createWindow() override; + virtual void destroyWindow() override; + virtual ~glut_window(); + + virtual bool setResizeable(bool resizeEnabled) override; + virtual bool setWindowSize(int width, int height) override; + virtual int getWidth() override; + virtual int getHeight() override; + + virtual bool isKeyDown(int key) override; + virtual bool isMouseDown(int button) override; + // Function signature is window pointer to this, key press, pressed/released (true/false) + virtual void registerKeyListener(std::function listener) override; + // Function signature is window pointer to this, mouse button press, pressed/released (true/false) + virtual void registerMouseListener(std::function listener) override; }; #endif //FINAL_PROJECT_WINDOW_H diff --git a/src/main.cpp b/src/main.cpp index bc8f460..7a46efd 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,5 @@ #include +#include int main() { std::cout << "Hello, World!" << std::endl; diff --git a/src/window/window.cpp b/src/window/window.cpp new file mode 100644 index 0000000..0b4503a --- /dev/null +++ b/src/window/window.cpp @@ -0,0 +1,53 @@ +/* + * Created by Brett Terpstra 6920201 on 16/01/23. + * Copyright (c) Brett Terpstra 2023 All Rights Reserved + */ +#include + +glut_window::glut_window() { + +} + +void glut_window::createWindow() { + +} + +void glut_window::destroyWindow() { + +} + +glut_window::~glut_window() { + +} + +bool glut_window::setResizeable(bool resizeEnabled) { + return false; +} + +bool glut_window::setWindowSize(int width, int height) { + return false; +} + +int glut_window::getWidth() { + return 0; +} + +int glut_window::getHeight() { + return 0; +} + +bool glut_window::isKeyDown(int key) { + return false; +} + +bool glut_window::isMouseDown(int button) { + return false; +} + +void glut_window::registerKeyListener(std::function<(void) (bool)...> listener) { + +} + +void glut_window::registerMouseListener(std::function<(void) (bool)...> listener) { + +}