UI + Model Loading

CMakeLists.txt

@@ -19,6 +19,12 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS True)
 
 # Tell CMake to ignore warnings from stuff in our dependencies. Surely GLM
 # knows what it is doing... https://7tv.app/emotes/61e8fae862858c6406126ced
+IF (NOT WIN32)
+    set_property(
+        DIRECTORY build 
+        PROPERTY COMPILE_OPTIONS "-w"
+    )
+ENDIF()
 
 # Add google test to CMake
 add_subdirectory(dependencies/google-test) 
@@ -57,6 +63,8 @@ add_custom_target(lint
     --inline-suppr
     # return error exit code 1 on failures
     --error-exitcode=1
+    # ignore certain warnings that are annoying
+    --suppress=unusedVariable
     # tell it about our include directory
     -I ${CMAKE_SOURCE_DIR}/include
     # only check include and src
@@ -66,4 +74,9 @@ add_custom_target(lint
     -i${CMAKE_SOURCE_DIR}/src/client/tests
     -i${CMAKE_SOURCE_DIR}/src/server/tests
     -i${CMAKE_SOURCE_DIR}/src/shared/tests
-)
+)
+
+add_custom_target(pull_models
+  COMMAND 
+  gdown 1N7a5cDgMcXbPO0RtgznnEo-1XUfdMScM -O ${CMAKE_SOURCE_DIR}/assets/graphics --folder
+)

README.md

@@ -132,6 +132,10 @@ Depending on where you need to link the library (client, server, shared), you wi
 - [C++ Intellisense](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools)
 - [General Productivity](https://marketplace.visualstudio.com/items?itemName=jirkavrba.subway-surfers)
 
+## Models
+
+You can download models from our Google Drive folder [here](https://drive.google.com/drive/folders/1N7a5cDgMcXbPO0RtgznnEo-1XUfdMScM?usp=sharing) and place them in `src/client/models`. Alternatively, you can install [gdown](https://github.com/wkentaro/gdown) and run `make pull_models` to automatically pull them.
+
 ## Documentation
 
 View deployed documentation [here](https://cse125.ucsd.edu/2024/cse125g3/site/docs/html/)

assets/graphics/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

config.json

@@ -11,12 +11,13 @@
         "server_port": 2355
     },
     "server": {
-        "lobby_name": "My Test Lobby",
-        "lobby_broadcast": false,
+        "lobby_name": "Unnamed Lobby",
+        "lobby_broadcast": true,
         "max_players": 1
     },
     "client": {
-        "default_name": "Player",
-        "lobby_discovery": false 
+        "default_name": "John Doe",
+        "lobby_discovery": true,
+        "window_width": 1500
     }
 }

dependencies/assimp/CMakeLists.txt

@@ -0,0 +1,15 @@
+include(FetchContent)
+
+FetchContent_Declare(assimp
+    GIT_REPOSITORY https://github.com/assimp/assimp
+    GIT_TAG v5.3.1
+    GIT_PROGRESS TRUE
+)
+
+FetchContent_MakeAvailable(assimp)
+
+set(ASSIMP_INCLUDE_DIRS
+    ${CMAKE_BINARY_DIR}/_deps/assimp-src/include/
+    ${CMAKE_BINARY_DIR}/_deps/assimp-build/include/
+    PARENT_SCOPE
+)

dependencies/freetype/CMakeLists.txt

@@ -0,0 +1,9 @@
+#shoutout chatgpt 
+
+FetchContent_Declare(
+  freetype
+  GIT_REPOSITORY https://gitlab.freedesktop.org/freetype/freetype.git
+  GIT_TAG        VER-2-13-2
+)
+
+FetchContent_MakeAvailable(freetype)

dependencies/glew/CMakeLists.txt

@@ -8,6 +8,6 @@ FetchContent_Declare(glew
 
 FetchContent_MakeAvailable(glew)
 
-# find_package(GLEW 2.0 REQUIRED)
-# target_link_libraries(Starting GLEW::GLEW)
-
+set(GLEW_INCLUDE_DIRS
+    ${CMAKE_BINARY_DIR}/_deps/glew-src/include
+    PARENT_SCOPE)

dependencies/imgui/CMakeLists.txt

@@ -10,19 +10,20 @@ FetchContent_MakeAvailable(imgui)
 set(imgui-directory ${CMAKE_BINARY_DIR}/_deps/imgui-src/ PARENT_SCOPE)
 set(imgui-directory ${CMAKE_BINARY_DIR}/_deps/imgui-src/)
 
-set(imgui-source 
-${imgui-directory}/imconfig.h
-	${imgui-directory}/imgui.h
+set(IMGUI_INCLUDE_DIRS
+    ${imgui-directory}
+    ${imgui-directory}/backends
+    PARENT_SCOPE
+)
+
+set(IMGUI_SOURCES
 	${imgui-directory}/imgui.cpp
 	${imgui-directory}/imgui_draw.cpp
-	${imgui-directory}/imgui_internal.h
 	${imgui-directory}/imgui_widgets.cpp
-	${imgui-directory}/imstb_rectpack.h
-	${imgui-directory}/imstb_textedit.h
-	${imgui-directory}/imstb_truetype.h
     ${imgui-directory}/imgui_tables.cpp
 	${imgui-directory}/imgui_demo.cpp
 	${imgui-directory}/backends/imgui_impl_glfw.cpp
 	${imgui-directory}/backends/imgui_impl_opengl3.cpp
+    ${imgui-directory}misc/cpp/imgui_stdlib.cpp
 	PARENT_SCOPE
 )

dependencies/stb/CMakeLists.txt

@@ -0,0 +1,11 @@
+include(FetchContent)
+
+FetchContent_Declare(stb
+    GIT_REPOSITORY https://github.com/nothings/stb
+    GIT_PROGRESS TRUE
+)
+FetchContent_MakeAvailable(stb)
+
+set(STB_INCLUDE_DIRS
+    ${CMAKE_BINARY_DIR}/_deps/stb-src/
+    PARENT_SCOPE)

include/client/camera.hpp

@@ -30,6 +30,8 @@ class Camera {
     glm::mat4 getViewProj();
     void updatePos(glm::vec3 pos);
 
+    glm::vec3 getPos();
+
 private:
     // Perspective controls
     float FOV;       // Field of View Angle (degrees)

include/client/client.hpp

@@ -1,19 +1,22 @@
-#pragma once
-
 #include "client/core.hpp"
 
 #include <iostream>
 #include <ostream>
 #include <utility>
 #include <unordered_map>
+#include <chrono>
 
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/io_service.hpp>
 #include <boost/filesystem.hpp>
 
 #include "client/cube.hpp"
+#include "client/lightsource.hpp"
+#include "client/shader.hpp"
+#include "client/model.hpp"
 #include "client/util.hpp"
 #include "client/lobbyfinder.hpp"
+#include "client/gui/gui.hpp"
 #include "client/camera.hpp"
 
 //#include "shared/game/gamestate.hpp"
@@ -22,20 +25,35 @@
 #include "shared/network/session.hpp"
 #include "shared/utilities/config.hpp"
 
+#define WINDOW_WIDTH Client::getWindowSize().x
+#define WINDOW_HEIGHT Client::getWindowSize().y
+
+// position something a "frac" of the way across the screen
+// e.g. WIDTH_FRAC(1, 4) -> a fourth of the way from the left
+//      HEIGHT_FRAC(2, 3) -> two thirds of the way from the bottom
+#define FRAC_WINDOW_WIDTH(num, denom) Client::window_width * static_cast<float>(num) / static_cast<float>(denom)
+#define FRAC_WINDOW_HEIGHT(num, denom) Client::window_height * static_cast<float>(num) / static_cast<float>(denom)
+
 using namespace boost::asio::ip;
 
 class Client {
 
 public:
     // Callbacks
     void displayCallback();
+
     void idleCallback(boost::asio::io_context& context);
     void handleKeys(int eid, int keyType, bool keyHeld, bool *eventSent, glm::vec3 movement = glm::vec3(0.0f));
 
     // Bound window callbacks
     static void keyCallback(GLFWwindow *window, int key, int scancode, int action, int mods);
-    static void mouseCallback(GLFWwindow *window, double xposIn, double yposIn);
+    static void mouseCallback(GLFWwindow* window, double xposIn, double yposIn);
+    static void mouseButtonCallback(GLFWwindow* window, int button, int action, int mods);
+    static void charCallback(GLFWwindow* window, unsigned int codepoint);
+
+    static glm::vec2 getWindowSize();
 
+    static time_t getTimeOfLastKeystroke();
 
     // Getter / Setters
     GLFWwindow* getWindow() { return window; }
@@ -49,19 +67,27 @@ class Client {
     void draw();
     void connectAndListen(std::string ip_addr);
 
-    boost::filesystem::path getRootPath();
-
 private:
     void processClientInput();
     void processServerInput(boost::asio::io_context& context);
 
     SharedGameState gameState;
 
-    float cubeMovementDelta = 0.05f;
+    std::shared_ptr<Shader> cube_shader; 
+    std::shared_ptr<Shader> model_shader;
+    std::shared_ptr<Shader> light_source_shader;
+
+    std::unique_ptr<Model> player_model;
+    std::unique_ptr<Model> bear_model;
+    std::unique_ptr<LightSource> light_source;
+
+    float playerMovementDelta = 0.05f;
 
     GLFWwindow *window;
-    GLuint cubeShaderProgram;
 
+    friend class gui::GUI;
+    gui::GUI gui;
+    gui::GUIState gui_state;
     Camera *cam;
 
     // Flags
@@ -77,17 +103,24 @@ class Client {
     static bool cam_is_held_right;
     static bool cam_is_held_left;
 
+    static bool is_left_mouse_down;
+    static bool is_click_available;
     static float mouse_xpos;
     static float mouse_ypos;
 
+    static int window_width;
+    static int window_height;
+
+    static time_t time_of_last_keystroke;
+
     GameConfig config;
     tcp::resolver resolver;
     tcp::socket socket;
 
+    LobbyFinder lobby_finder;
+
     /// @brief Generate endpoints the client can connect to
     basic_resolver_results<class boost::asio::ip::tcp> endpoints;
     std::shared_ptr<Session> session;
-
-    boost::filesystem::path root_path;
 };
 

include/client/constants.hpp

@@ -0,0 +1,11 @@
+#pragma once
+
+#define MIN_WINDOW_WIDTH  900
+#define MIN_WINDOW_HEIGHT 600
+
+// The screen width that's defined as 1:1, from which other 
+// resolutions can calculate pixel sizes
+#define UNIT_WINDOW_WIDTH  1500
+#define UNIT_WINDOW_HEIGHT 1000
+
+#define PLAYER_EYE_LEVEL 2.0f

include/client/core.hpp

@@ -1,3 +1,4 @@
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>
-#include <glm/glm.hpp>
+#include <glm/glm.hpp>
+#include <glm/gtc/matrix_transform.hpp>

include/client/cube.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "client/core.hpp"
+#include "client/renderable.hpp"
 
 #define GLM_ENABLE_EXPERIMENTAL
 #include <glm/gtx/transform.hpp>
@@ -11,23 +12,22 @@
 #include <ostream>
 #include <vector>
 
-class Cube {
+class Cube : public Renderable {
 public:
-    Cube(glm::vec3 newColor, glm::vec3 scale);
+    explicit Cube(glm::vec3 newColor);
     ~Cube();
 
-    void draw(glm::mat4 viewProjMat, GLuint shader, bool fill);
-    void update(glm::vec3 new_pos);
-    void update_delta(glm::vec3 delta);
-
+    void draw(std::shared_ptr<Shader> shader,
+            glm::mat4 viewProj,
+            glm::vec3 camPos, 
+            glm::vec3 lightPos,
+            bool fill) override;
 private:
     GLuint VAO;
     GLuint VBO_positions, VBO_normals, EBO;
 
-    glm::mat4 model;    
     glm::vec3 color;
 
-
     // Cube Information
     std::vector<glm::vec3> positions;
     std::vector<glm::vec3> normals;

include/client/gui/font/font.hpp

@@ -0,0 +1,63 @@
+#pragma once
+
+#include "client/core.hpp"
+
+#include <cstddef>
+#include <string>
+#include <unordered_map>
+
+namespace gui::font {
+
+
+/**
+ * Abstract representation of the different fonts to use in our game
+ * 
+ * NOTE: currently I haven't found a good font for "Text", so both of these
+ * map to the same font.
+ */
+enum class Font {
+    MENU,
+    TEXT
+};
+
+/**
+ * Mappings from our specified abstract fonts to the file to load
+ */
+std::string getFilepath(Font font);
+
+/**
+ * Preset colors for text
+ */
+enum class Color {
+    BLACK,
+    RED,
+    BLUE,
+    GRAY,
+    WHITE,
+    TORCHLIGHT_GAMES
+};
+
+/**
+ * Mapping from preset font colors to RGB values
+ */
+glm::vec3 getRGB(Color color);
+
+const int UNIT_LARGE_SIZE_PX = 128; // how many pixels a small font is on the unit screen size
+enum class Size {
+    SMALL,
+    MEDIUM,
+    LARGE,
+    XLARGE
+};
+const std::unordered_map<Size, float> SIZE_TO_SCALE = {
+    {Size::SMALL,   0.25f},
+    {Size::MEDIUM,  0.50f},
+    {Size::LARGE,   1.0f},
+    {Size::XLARGE,  2.0f},
+};
+
+int getFontSizePx(Size size);
+float getScaleFactor(Size size);
+
+
+}