.gitattributes

 *,ogg filter=lfs diff=lfs merge=lfs -text
+*.mtl filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.obj filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -5,6 +5,9 @@ imgui.ini
 .flatpak-builder/
 compile_commands.json
 
+# Engine data
+demo/data/*.bin
+
 # dotfiles (IDE)
 .idea/
 .cache/

.gitlab-ci.yml

@@ -15,22 +15,28 @@
 
 image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine:latest
 
-stages:          # List of stages for jobs, and their order of execution
+stages:
   - build
   - test
   - deploy
 
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
 .f34-ogl:
   image: git.fossgalaxy.com:8042/gamedev/containers/fedora:36-opengl
   before_script:
-    - dnf install -y pkgconfig\(dri\) pkgconfig\(glu\) pkgconfig\(x11\) pkgconfig\(xcursor\) pkgconfig\(xi\) pkgconfig\(xinerama\) pkgconfig\(xrandr\) doxygen
-    - dnf install -y glm-devel glfw-devel openal-soft-devel spdlog-devel freetype-devel yaml-cpp-devel assimp-devel bullet-devel gtest-devel gmock-devel
+    - dnf install -y pkgconfig\(dri\) pkgconfig\(glu\) pkgconfig\(x11\) pkgconfig\(xcursor\) pkgconfig\(xi\) pkgconfig\(xinerama\) pkgconfig\(xrandr\) pkgconfig\(lua\) doxygen
+    - dnf install -y glm-devel glfw-devel openal-soft-devel spdlog-devel freetype-devel yaml-cpp-devel assimp-devel gtest-devel gmock-devel
 
+##
+# Build Targets check it builds on popular Linux Distributions
+##
 build:fedora:
   extends: .f34-ogl
   stage: build
   script:
-    - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
+    - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DFGGL_EXT_BULLET=OFF
     - cmake --build build
   artifacts:
     paths:
@@ -41,11 +47,41 @@ build:ubuntu:
   stage: build
   before_script:
     - apt update && apt install -y build-essential cmake
-    - apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-dev libbullet-extras-dev libgtest-dev libgmock-dev
+    - apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-extras-dev libgtest-dev libgmock-dev liblua5.2-dev
   script:
-    - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
+    - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DFGGL_EXT_BULLET=OFF -DFGGL_EXT_LUA=OFF
     - cmake --build build
 
+
+# Based on Bruce Cowan's wordsearch package:
+flatpak:
+  image: alpine:latest
+  stage: deploy
+  when: manual
+  only:
+    - develop
+  variables:
+    MANIFEST_PATH: "build-aux/com.fossgalaxy.fggl.demo.yml"
+    RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
+    FLATPAK_MODULE: "fggl"
+    BUNDLE: "fggl-demo.flatpak"
+    APP_ID: "com.fossgalaxy.fggl.demo"
+  script:
+    - apk update && apk add flatpak-builder
+    - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    - flatpak install -y flathub org.freedesktop.Platform 21.08
+    - flatpak install -y flathub org.freedesktop.Sdk 21.08
+    - flatpak-builder _repo ${MANIFEST_PATH}
+    - flatpak build-bundle _repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID}
+  artifacts:
+    paths:
+      - ${BUNDLE}
+      - _build/meson-logs/meson-log.txt
+  cache:
+    paths:
+      - .flatpak-builder/cache
+      - .flatpak-builder/downloads
+
 # Deploy doxygen pages
 pages:
   extends: .f34-ogl

CMakeLists.txt

@@ -8,6 +8,9 @@ option(FGGL_EXAMPLES "Should we build examples or just the library" ON)
 option(FGGL_TESTS "Should we enable the testing suite?" ON)
 option(FGGL_DOCS "Should we build documentation?" ON)
 
+option(FGGL_EXT_BULLET "Should we build the bullet module?" OFF)
+option(FGGL_EXT_LUA "Should we build the lua module?" ON)
+
 ##
 # Windows
 # When on windows, integrate vcpkg
@@ -31,8 +34,9 @@ project(fggl
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # vendor dependencies
+add_subdirectory( vendor/entt )
 add_subdirectory( vendor/imgui )
-add_subdirectory( vendor/header_only )
+add_subdirectory( vendor/glad )
 
 # engine headers
 file(GLOB_RECURSE public_headers
@@ -44,10 +48,6 @@ add_subdirectory( fggl )
 target_compile_options( fggl PRIVATE -Wall -Wpedantic -Wextra -Wodr -fno-strict-aliasing -fno-strict-overflow )
 set_property(TARGET fggl PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
 
-
-# 3rd party integrations
-add_subdirectory( integrations/bullet )
-
 # Unit Tests
 if (FGGL_TESTS)
 	include(CTest)
@@ -64,11 +64,25 @@ if (FGGL_DOCS)
 	endif()
 endif()
 
+##
+# Optional/Extra modules
+##
+
+# 3rd party integrations
+if ( FGGL_EXT_BULLET )
+	add_subdirectory( integrations/bullet )
+endif()
+
+if ( FGGL_EXT_LUA )
+	add_subdirectory( integrations/lua )
+endif()
+
+# Tools
+# add_subdirectory( tools/pack )
+
 # Demo project
 if (FGGL_EXAMPLES)
-  add_subdirectory(demo)
-  target_compile_options( demo PRIVATE -Wall -Wextra -Wodr -Wdouble-promotion -fno-strict-aliasing -fno-strict-overflow )
-  set_property(TARGET demo PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+	add_subdirectory(demo EXCLUDE_FROM_ALL)
 endif()
 
 ##

Config.cmake.in

@@ -3,6 +3,7 @@
 include(CMakeFindDependencyMacro)
 find_dependency(glm)
 find_dependency(fmt)
+find_dependency(Lua)
 find_dependency(spdlog)
 find_dependency(Freetype)
 find_dependency(OpenAL CONFIG)

README.md

@@ -12,6 +12,10 @@ On Ubuntu:
 sudo apt install build-essential cmake
 sudo apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-dev
 ```
+On Fedora:
+```bash
+sudo dnf install -y glm-devel glfw-devel openal-soft-devel spdlog-devel freetype-devel yaml-cpp-devel assimp-devel bullet-devel gcc gcc-c++ cmake gtest-devel doxygen lua lua-devel gmock gmock-devel
+```
 
 ### Building
 It's designed to be a fairly standard cmake project, so the standard cmake steps should work:

build-aux/com.fossgalaxy.fggl.demo.yml

@@ -9,18 +9,7 @@ finish-args:
   - "--socket=fallback-x11"
   - "--socket=wayland"
 modules:
-  - name: glfw
-    buildsystem: cmake-ninja
-    builddir: true
-    sources:
-      - type: archive
-        url: https://github.com/glfw/glfw/releases/download/3.3.4/glfw-3.3.4.zip
-        sha256: bbd2c42c660b725e9755eb417e40b373f0d4c03138c9b2e210d02cd308bd99cd
-    cleanup:
-      - /include
-      - /lib/cmake
-      - /lib/pkgconfig
-      - '*.a'
+  - modules/glfw.yml
   - modules/glm-0.9.9.8.json
   - modules/fmt.yml
   - modules/spdlog.json

build-aux/modules/glfw.yml

+name: glfw
+buildsystem: cmake-ninja
+builddir: true
+sources:
+  - type: archive
+    url: https://github.com/glfw/glfw/releases/download/3.3.4/glfw-3.3.4.zip
+    sha256: bbd2c42c660b725e9755eb417e40b373f0d4c03138c9b2e210d02cd308bd99cd
+cleanup:
+  - /include
+  - /lib/cmake
+  - /lib/pkgconfig
+  - '*.a'

demo/CMakeLists.txt

@@ -7,24 +7,40 @@ add_executable(demo
         demo/GameScene.cpp
         demo/rollball.cpp
         demo/topdown.cpp
-        )
+        demo/grid.cpp
+        demo/robot/programmer.cpp
+        demo/models/viewer.cpp
+        demo/hexboard/board.cpp
+        demo/hexboard/camera.cpp
+)
 
+# set build flags
+target_compile_options( demo PRIVATE -Wall -Wextra -Wodr -Wdouble-promotion -fno-strict-aliasing -fno-strict-overflow )
+set_property(TARGET demo PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
 
 target_include_directories(demo
         PRIVATE
             ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
-target_link_libraries(demo fggl)
+target_link_libraries( demo fggl )
+#target_link_libraries(demo fggl fgglbt)
+if ( FGGL_EXT_LUA )
+    target_link_libraries( demo fggl-lua )
+endif()
 
 find_package(spdlog)
 target_link_libraries(demo spdlog::spdlog)
 #target_include_directories(FgglDemo PUBLIC ${PROJECT_BINARY_DIR})
 
-# rssources
+#find_package(Lua)
+#target_link_libraries(demo ${LUA_LIBRARIES})
+
+# resources
 file(GLOB_RECURSE data data/*)
 file(COPY ${data} DESTINATION data )
 
+include(GNUInstallDirs)
 install(
         TARGETS demo
         RUNTIME

demo/data/.gitignore

+packs/

demo/data/backpack/source_attribution.txt

+Model by Berk Gedik, from: https://sketchfab.com/3d-models/survival-guitar-backpack-low-poly-799f8c4511f84fab8c3f12887f7e6b36
+
+Modified material assignment (Joey de Vries) for easier load in OpenGL model loading chapter, and renamed albedo to diffuse and metallic to specular to match non-PBR lighting setup.
\ No newline at end of file

demo/data/gui.yaml

+---
+- define: label
+  attrs:
+    value: """
+- define: button
+  children:
+    - template: label
+- define: textinput
+  children:
+    - template: label
+- define: checkbox
+  attrs:
+    state: False
+- define: radio
+  attrs:
+    state: False
+- define: frame

demo/data/normals_vert.glsl

@@ -12,7 +12,7 @@ uniform mat4 model;
 
 void main()
 {
-    gl_Position = view * model * vec4(aPos, 1.0); 
+    gl_Position = view * model * vec4(aPos, 1.0);
     mat3 normalMatrix = mat3(transpose(inverse(view * model)));
     vs_out.normal = normalize(vec3(vec4(normalMatrix * aNormal, 0.0)));
 }