Mathis merge

.gitignore

@@ -1,2 +1,2 @@
 .vs
-out
+out

CMakeLists.txt

@@ -2,23 +2,14 @@ cmake_minimum_required(VERSION 3.5)
 
 project(OpenGLProgram)
 
-set(CMAKE_CXX_STANDARD 17)
-
-# Set directories
 set(SRC_DIR src)
 set(INCLUDE_DIR include)
 set(EXTERNAL_DIR external)
 set(GLEW_DIR ${EXTERNAL_DIR}/glew-cmake)
 set(GLFW_DIR ${EXTERNAL_DIR}/glfw)
 set(GLM_DIR ${EXTERNAL_DIR}/glm)
+set(IMGUI_DIR ${EXTERNAL_DIR}/imgui)
 
-# Include directories
-include_directories(${INCLUDE_DIR})
-include_directories(${GLEW_DIR}/include)
-include_directories(${GLFW_DIR}/include)
-include_directories(${GLM_DIR})
-
-# Source files
 set(SOURCES
     ${SRC_DIR}/main.cpp
     ${SRC_DIR}/node.cpp
@@ -31,20 +22,33 @@ set(SOURCES
     ${SRC_DIR}/terrain_chunk.cpp
 )
 
-# Define Shader director
+set(IMGUI_SOURCES
+    ${IMGUI_DIR}/imgui.cpp
+    ${IMGUI_DIR}/imgui_draw.cpp
+    ${IMGUI_DIR}/imgui_tables.cpp
+    ${IMGUI_DIR}/imgui_widgets.cpp
+    ${IMGUI_DIR}/backends/imgui_impl_glfw.cpp
+    ${IMGUI_DIR}/backends/imgui_impl_opengl3.cpp
+)
+
 add_compile_definitions(SHADER_DIR="${CMAKE_CURRENT_SOURCE_DIR}/shaders/")
 
-# GLEW library
 add_subdirectory(${GLEW_DIR})
-set(LIBS ${LIBS} libglew_static)
-
-# GLFW library
 add_subdirectory(${GLFW_DIR})
-set(LIBS ${LIBS} glfw)
-
-# GLM library
 add_subdirectory(${GLM_DIR})
 
-# Executable
-add_executable(opengl_program ${SOURCES})
-target_link_libraries(opengl_program ${LIBS})
+add_executable(opengl_program ${SOURCES} ${IMGUI_SOURCES} "include/aircraft.h" "src/aircraft.cpp" "include/aircraft_controls.h" "src/aircraft_controls.cpp" "include/flight_model_physics.h" "src/flight_model_physics.cpp" "include/camera_controller.h" "src/camera_controller.cpp" "include/runway.h" "src/runway.cpp" "include/obj_model.h" "src/obj_model.cpp"   "include/afterburner_flame.h" "src/afterburner_flame.cpp")
+
+target_include_directories(opengl_program PRIVATE
+    ${INCLUDE_DIR}
+    ${GLEW_DIR}/include
+    ${GLFW_DIR}/include
+    ${GLM_DIR}
+    ${IMGUI_DIR}
+    ${IMGUI_DIR}/backends
+)
+
+target_link_libraries(opengl_program PRIVATE
+    libglew_static
+    glfw
+)

CMakeSettings.json

@@ -0,0 +1,15 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": ""
+    }
+  ]
+}

external/glew-cmake/.gitattributes

@@ -0,0 +1,6 @@
+*              text eol=lf
+*.png          binary
+*.pdf          binary
+build/*/*      text eol=crlf
+CMakeLists.txt text eol=lf
+build/cmake/*  text eol=lf

external/glew-cmake/.gitea/workflows/linux-clang.yaml

@@ -0,0 +1,22 @@
+name: Ubuntu Linux clang Build
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Dependencies
+        run: |
+          apt update
+          apt install -y clang libxmu-dev libxi-dev libgl-dev libegl1-mesa-dev dos2unix
+      - name: Git Checkout
+        uses: actions/checkout@v4
+      - name: Generate Code
+        run: |
+          make -C auto clobber
+          make extensions
+          make dist-src
+      - name: Build Binaries
+        run: |
+          make clean && SYSTEM=linux-clang      make
+          make clean && SYSTEM=linux-clang-egl  make

external/glew-cmake/.gitea/workflows/linux-cmake.yaml

@@ -0,0 +1,38 @@
+name: Ubuntu Linux cmake Build
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        flavour: [
+          "-DCMAKE_BUILD_TYPE=Debug -DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=N",
+          "-DCMAKE_BUILD_TYPE=Debug -DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=N",
+          "-DCMAKE_BUILD_TYPE=Debug -DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=Y",
+          "-DCMAKE_BUILD_TYPE=Debug -DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=Y",
+          "-DCMAKE_BUILD_TYPE=Release -DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=N",
+          "-DCMAKE_BUILD_TYPE=Release -DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=N",
+          "-DCMAKE_BUILD_TYPE=Release -DGLEW_X11=Y -DGLEW_EGL=N -DBUILD_SHARED_LIBS=Y",
+          "-DCMAKE_BUILD_TYPE=Release -DGLEW_X11=N -DGLEW_EGL=Y -DBUILD_SHARED_LIBS=Y",
+          ]
+    steps:
+      - name: Install Dependencies
+        run: |
+          apt update
+          apt install -y cmake ninja-build libxmu-dev libxi-dev libgl-dev libegl1-mesa-dev dos2unix
+      - name: Git Checkout
+        uses: actions/checkout@v4
+      - name: Generate Code
+        run: |
+          make -C auto clobber
+          make extensions
+          make dist-src
+      - name: Build Binaries
+        run: |
+          mkdir build_
+          cmake build/cmake -B build_ -G Ninja --fresh ${{ matrix.flavour }}
+          cmake --build build_
+          rm -Rf build_
+
+

external/glew-cmake/.gitea/workflows/linux-gcc.yaml

@@ -0,0 +1,22 @@
+name: Ubuntu Linux gcc Build
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Dependencies
+        run: |
+          apt update
+          apt install -y libxmu-dev libxi-dev libgl-dev libegl1-mesa-dev dos2unix
+      - name: Git Checkout
+        uses: actions/checkout@v4
+      - name: Generate Code
+        run: |
+          make -C auto clobber
+          make extensions
+          make dist-src
+      - name: Build Binaries
+        run: |
+          make clean && SYSTEM=linux            make
+          make clean && SYSTEM=linux-egl        make

external/glew-cmake/.gitea/workflows/linux-mingw.yaml

@@ -0,0 +1,22 @@
+name: Ubuntu Linux gcc cross-build
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Dependencies
+        run: |
+          apt update
+          apt install -y mingw-w64 dos2unix
+      - name: Git Checkout
+        uses: actions/checkout@v4
+      - name: Generate Code
+        run: |
+          make -C auto clobber
+          make extensions
+          make dist-src
+      - name: Build Binaries
+        run: |
+          make clean && SYSTEM=linux-mingw32 make
+          make clean && SYSTEM=linux-mingw64 make