remove ifndef guards & qt_common

CMakeLists.txt

@@ -31,14 +31,25 @@ add_library(engine STATIC
 target_include_directories(engine PUBLIC src/include ${CMAKE_BINARY_DIR})
 target_link_libraries(engine PUBLIC ${BOOST_LIBRARIES})
 
+if(COMPILE_PLAYER OR COMPILE_STUDIO)
+    project(qt_common)
+    find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OpenGLWidgets)
+    set(QT6_LIBRARIES_INCL Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets)
+    qt_standard_project_setup()
+
+    qt_add_library(qt_common STATIC
+        # tbd
+    )
+endif()
+
 if(COMPILE_PLAYER)
     create_resources(rsc/client ${CMAKE_BINARY_DIR}/player_rsc.h)
-    add_executable(player
+    qt_add_executable(player
         src/client/player/main.cpp
 
         ${CMAKE_BINARY_DIR}/player_rsc.h
     )
-    target_link_libraries(player PRIVATE engine)
+    target_link_libraries(player PRIVATE ${QT6_LIBRARIES_INCL} engine)
 endif()
 
 if(COMPILE_SERVER)
@@ -52,9 +63,6 @@ if(COMPILE_SERVER)
 endif()
 
 if(COMPILE_STUDIO)
-    find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets OpenGLWidgets)
-    qt_standard_project_setup()
-    set(QT6_LIBRARIES_INCL Qt6::Core Qt6::Gui Qt6::Widgets Qt6::OpenGLWidgets)
     create_resources(rsc/studio ${CMAKE_BINARY_DIR}/studio_rsc.h)
     qt_add_executable(studio 
         src/client/studio/StudioWindow.cpp

src/include/client/common/RBXNUGraphicsWidget.hpp

@@ -0,0 +1,8 @@
+#pragma once
+
+#include <QOpenGLWidget>
+
+class RBXNuGraphicsWidget : public QOpenGLWidget
+{
+    Q_OBJECT
+};

src/include/client/studio/StudioWindow.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QMainWindow>
-#include <QOpenGLWidget>
+#include <client/common/RBXNUGraphicsWidget.hpp>
 
 class StudioWindow : public QMainWindow
 {

src/include/engine/app/Name.hpp

@@ -1,5 +1,4 @@
-#ifndef __APP_NAME_HPP__
+#pragma once
-#define __APP_NAME_HPP__
 
 #include <map>
 
@@ -15,6 +14,4 @@ namespace RBX
         static void declare(const char* sName, int dictionaryIndex);
         static std::map<int, RBX::Name*>* dictionary();
     };
-}
+}
-
-#endif

src/include/engine/app/gui/Adorn.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 // TODO: add G3D
 
 namespace RBX
@@ -20,7 +22,7 @@ namespace RBX
         {
 
         };
-        
+
         virtual void prepareRenderPass() {}; // NOT IN AdornG3D
         virtual void finishRenderPass() {};  // NOT IN AdornG3D
         virtual void sparkles() {}; // NOT IN AdornG3D

src/include/engine/app/humanoid/Forcefield.hpp

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <engine/app/gui/Adorn.hpp>
 
 namespace RBX

src/include/engine/app/humanoid/Humanoid.hpp

@@ -1,5 +1,5 @@
-#ifndef __APP_HUMANOID_HUMANOID_HPP__
+#pragma once
-#define __APP_HUMANOID_HUMANOID_HPP__
+
 #include <engine/app/v8/tree/Instance.hpp>
 
 namespace RBX
@@ -21,6 +21,4 @@ namespace RBX
             void getTorso();
             void getHead();
     };
-}
+}
-
-#endif  

src/include/engine/app/v8/tree/Instance.hpp

@@ -1,5 +1,4 @@
-#ifndef __APP_V8_TREE_INSTANCE_HPP__
+#pragma once
-#define __APP_V8_TREE_INSTANCE_HPP__
 
 #include <string>
 #include <engine/app/Name.hpp>
@@ -39,6 +38,4 @@ namespace RBX
             void onChildAdded(RBX::Instance* childAdded);
 
     };
-}
+}
-
-#endif

src/include/engine/app/v8/world/World.hpp

@@ -1,5 +1,4 @@
-#ifndef __APP_V8_WORLD_WORLD_HPP__
+#pragma once
-#define __APP_V8_WORLD_WORLD_HPP__
 
 namespace RBX
 {
@@ -13,6 +12,4 @@ namespace RBX
             double step(float timestep);
             void update();
     };
-}
+}
-
-#endif

src/include/engine/network/Guid.hpp

@@ -1,5 +1,4 @@
-#ifndef __NETWORK_GUID_HPP__
+#pragma once
-#define __NETWORK_GUID_HPP__
 
 #include <string>
 
@@ -13,6 +12,4 @@ namespace RBX
         static void generateGUID(std::string *result);
         static void compare(RBX::Guid* a, RBX::Guid* b);
     };
-}
+}
-
-#endif