shared-modules @ 1bb53934

+Subproject commit 1bb53934f105743f84f923693847185dce613cef

build.sh

 #! /bin/bash
-set -e
 
-if [[ ! -d "build/" ]]
-then
-	mkdir build
+CACHE=/tmp/fggl/
+LOG=$CACHE/demo.log
+
+BUILD_PATH="builds/cli"
+DEMO_EXE="$PWD/$BUILD_PATH/demo/demo"
+
+# check cmake exists
+if [ ! -x "$(command -v cmake)" ]; then
+	sudo dnf install -y cmake extra-cmake-modules
+	sudo dnf install -y wayland-devel libxkbcommon-devel wayland-protocols-devel
+	sudo dnf install -y glew-devel glm-devel
 fi
 
 # if doing shader development, disable the cache to make sure changes take affect
-rm -rf /tmp/fggl/
+rm -rf builds/cli
+rm -rf $CACHE
 
-pushd build
-cmake ..
-make
-popd
+#
+# build step
+#
+cmake -S . -B $BUILD_PATH -DCMAKE_BUILD_TYPE=RelWithDebInfo
+cmake --build $BUILD_PATH
+cmake --install $BUILD_PATH --prefix /tmp/fggl-lib
+
+#
+# additional stuff
+#
+
+#EXE="gdb $EXE"
+
+# gamemoderun
+if [ -x "$(command -v gamemoderun)" ]; then
+    DEMO_EXE="gamemoderun $DEMO_EXE"
+fi
+
+# mangohud
+if [ -x "$(command -v mangohud)" ]; then
+    DEMO_EXE="mangohud --dlsym $DEMO_EXE"
+fi
 
 pushd demo
-gdb ../build/demo/FgglDemo
+$DEMO_EXE
 popd

demo/CMakeLists.txt

+cmake_minimum_required(VERSION 3.16)
+project(demo)
+
 # Executable
-add_executable(FgglDemo main.cpp)
-target_link_libraries(FgglDemo fggl)
-target_include_directories(FgglDemo PUBLIC ${PROJECT_BINARY_DIR})
+add_executable(demo
+        demo/main.cpp
+        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 fgglbt)
+if ( FGGL_EXT_LUA )
+    target_link_libraries( demo fggl-lua )
+endif()
 
-# rssources
+find_package(spdlog)
+target_link_libraries(demo spdlog::spdlog)
+#target_include_directories(FgglDemo PUBLIC ${PROJECT_BINARY_DIR})
+
+#find_package(Lua)
+#target_link_libraries(demo ${LUA_LIBRARIES})
+
+# resources
 file(GLOB_RECURSE data data/*)
-file(COPY ${data} DESTINATION data )
\ No newline at end of file
+file(COPY ${data} DESTINATION data )
+
+include(GNUInstallDirs)
+install(
+        TARGETS demo
+        RUNTIME
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+install(
+        DIRECTORY data/
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/fggl-demo
+)
+
+# Linux Desktop Entries
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    install(FILES aux/com.fossgalaxy.fggl.Demo.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+    install(FILES aux/com.fossgalaxy.fggl.Demo.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo )
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

demo/aux/com.fossgalaxy.fggl.Demo.desktop

+[Desktop Entry]
+Name=FGGL Demo
+Exec=demo
+Type=Application
+Categories=Game

demo/aux/com.fossgalaxy.fggl.Demo.metainfo.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>com.fossgalaxy.fggl.Demo</id>
+
+  <name>FGGL Demo</name>
+  <summary>An application for testing FGGL features</summary>
+  
+  <metadata_license>CC-BY-4.0</metadata_license>
+  <project_license>GPL-3.0-or-later</project_license>
+  
+  <description>
+    <p>
+      Test application for the FOSS Galaxy Game Library (FGGL)
+    </p>
+  </description>
+  
+  <launchable type="desktop-id">com.fossgalaxy.fggl.Demo.desktop</launchable>
+</component>

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/debug_frag.glsl

+#version 150
+
+in  vec4 v_Color;
+out vec4 out_FragColor;
+
+void main()
+{
+    out_FragColor = v_Color;
+}
\ No newline at end of file

demo/data/debug_vert.glsl

+#version 150
+
+in vec3 in_Position;
+in vec4 in_ColorPointSize;
+
+out vec4 v_Color;
+uniform mat4 u_MvpMatrix;
+
+void main()
+{
+    gl_Position  = u_MvpMatrix * vec4(in_Position, 1.0);
+    gl_PointSize = in_ColorPointSize.w;
+    v_Color      = vec4(in_ColorPointSize.xyz, 1.0);
+}
\ 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/include/phong.glsl

+/**
+ * OpenGL phong lighting model.
+ * Adapted from LearnOpenGL.com, by Joey de Vries, CC BY-NC 4.0
+ */
+
+struct Material {
+    sampler2D diffuse;
+    sample2D specular;
+    float shininess;
+};
+
+struct DirectionalLight {
+    vec3 direction;
+
+    vec3 ambient;
+    vec3 diffuse;
+    vec3 specular;
+};
+
+struct PointLight {
+    vec3 position;
+
+    vec3 ambient;
+    vec3 diffuse;
+    vec3 specular;
+
+    float constant;
+    float linear;
+    float quadratic;
+};
+
+struct SpotLight {
+    vec3 position;
+    vec3 direction;
+
+    vec3 ambient;
+    vec3 diffuse;
+    vec3 specular;
+
+    float constant;
+    float linear;
+    float quadratic;
+
+    float cutOff;
+    float outerCutOff;
+};
+
+vec3 CalcDirectionalLight(DirectionalLight light, vec3 normal, vec3 viewDir) {
+    vec3 lightDir = normalize(-light.direction);
+
+    // diffuse shading
+    float diff = max(dot(normal, lightDir), 0.0);
+
+    // specular shading
+    vec3 reflectDir = reflect(-lightDir, normal);
+    float spec = pow(max(dot(viewDir, reflectDir), 0.0), material.shininess);
+
+    // combine results
+    vec3 ambient = light.ambient * vec3(texture(material.diffuse, TexCoords));
+    vec3 diffuse = light.diffuse * diff * vec3(texture(material.diffuse, TexCoords));
+    vec3 specular = light.specular * spec * vec3(texture(material.specular, TexCoords));
+    return (ambient + diffuse + specular);
+}
+
+vec3 CalcPointLight(PointLight light, vec3 normal, vec3 fragPos, vec3 viewDir) {
+    vec3 lightDir = normalize(light.position - fragPos);
+
+    // diffuse shading
+    float diff = max(dot(normal, lightDir), 0.0);
+
+    // specular shading
+    vec3 reflectDir = reflect(-lightDir, normal);
+    float spec = pow(max(dot(viewDir, reflectDir), 0.0), material.shininess);
+
+    // attenuation
+    float distance = length(light.position - fragPos);
+    float attenuation = 1.0 / (light.constant + light.linear * distance + light.quadratic * (distance * distance));
+
+    // combine results
+    vec3 ambient = light.ambient * vec3(texture(material.diffuse, TexCoords));
+    vec3 diffuse = light.diffuse * diff * vec3(texture(material.diffuse, TexCoords));
+    vec3 specular = light.specular * spec * vec3(texture(material.specular, TexCoords));
+
+    ambient *= attenuation;
+    diffuse *= attenuation;
+    specular *= attenuation;
+    return (ambient + diffuse + specular);
+}
+
+vec3 CalcSpotLight(SpotLight light, vec3 normal, vec3 fragPos, vec3 viewDir) {
+    vec3 lightDir = normalize(light.position - fragPos);
+
+    // diffuse shading
+    float diff = max(dot(normal, lightDir), 0.0);
+
+    // specular shading
+    vec3 reflectDir = reflect(-lightDir, normal);
+    float spec = pow(max(dot(viewDir, reflectDir), 0.0), material.shininess);
+
+    // attenuation
+    float distance = length(light.position - fragPos);
+    float attenuation = 1.0 / (light.constant + light.linear * distance + light.quadratic * (distance * distance));
+
+    // spotlight intensity
+    float theta = dot(lightDir, normalize(-light.direction));
+    float epsilon = light.cutOff - light.outerCutOff;
+    float intensity = clamp((theta - light.outerCutOff) / epsilon, 0.0, 1.0);
+
+    // combine results
+    vec3 ambient = light.ambient * vec3(texture(material.diffuse, TexCoords));
+    vec3 diffuse = light.diffuse * diff * vec3(texture(material.diffuse, TexCoords));
+    vec3 specular = light.specular * spec * vec3(texture(material.specular, TexCoords));
+
+    ambient *= attenuation * intensity;
+    diffuse *= attenuation * intensity;
+    specular *= attenuation * intensity;
+    return (ambient + diffuse + specular);
+}
\ No newline at end of file