LVGL glTF Viewer

.gitignore

@@ -1 +1,2 @@
-/build/
+build
+.cache

.gitmodules

@@ -1,9 +1,4 @@
-[submodule "lib/b64"]
-	path = lib/b64
-	url = https://github.com/liamHowatt/b64.git
-[submodule "lib/jsmn"]
-	path = lib/jsmn
-	url = https://github.com/zserge/jsmn.git
 [submodule "lvgl"]
 	path = lvgl
-	url = https://github.com/lvgl/lvgl.git
+	url = https://github.com/FishOfTheNorthStar/lvgl_pr_patch_func.git
+	branch = pr_3_mouse_ex

CMakeLists.txt

@@ -1,38 +1,168 @@
-cmake_minimum_required(VERSION 3.28)
+cmake_minimum_required(VERSION 3.25.1)
+project(gltf_view LANGUAGES C CXX)
 
-project(lvgl_workspace LANGUAGES C CXX)
+# Set policy to allow to run the target_link_libraries cmd on targets that are
+# build in another directory. Currently, the linking is not handled by
+# env_support/cmake/os.cmake This means that if a driver is enabled and it
+# requires linking an external library it needs to be handled in the top-level
+# project.
+cmake_policy(SET CMP0079 NEW)
 
-set(CONFIG_LV_BUILD_EXAMPLES 1)
-set(CONFIG_LV_BUILD_DEMOS 1)
+include(FetchContent)
 
-# LVGL
-include(${CMAKE_CURRENT_LIST_DIR}/lvgl/CMakeLists.txt)
-include_directories(${CMAKE_CURRENT_LIST_DIR})
+find_package(PkgConfig REQUIRED)
+find_package(OpenGL REQUIRED)
+find_package(glfw3 REQUIRED)
+find_package(GLEW REQUIRED)
 
-# find_package(Freetype REQUIRED)
-# include_directories(${FREETYPE_INCLUDE_DIRS})
+FetchContent_Declare(
+  fastgltf
+  GIT_REPOSITORY https://github.com/spnda/fastgltf
+  GIT_TAG 4e2261350888bae7c35a1f39991f6233d57795f5
+  GIT_SHALLOW TRUE)
 
-add_executable(lvgl_workspace
-    main.c
-    mouse_cursor_icon.c
-    gltf_loader.c
-)
+set(FASTGLTF_ENABLE_DEPRECATED_EXT
+    ON
+    CACHE BOOL "" FORCE)
 
-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Wextra -fsanitize=address -Wno-unused-parameter -Wunused-parameter -Wshadow")
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Wextra -fsanitize=address -Wno-unused-parameter")
-set (CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -fsanitize=address -Wno-unused-parameter")
+FetchContent_MakeAvailable(fastgltf)
 
-target_link_libraries(lvgl_workspace lvgl)
-target_link_libraries(lvgl_workspace pthread)
-target_link_libraries(lvgl_workspace m)
-# target_link_libraries(lvgl_workspace lvgl_thorvg)
-# target_link_libraries(lvgl_workspace lvgl_examples)
-# target_link_libraries(lvgl_workspace lvgl_demos)
+FetchContent_Declare(
+  webp
+  GIT_REPOSITORY https://github.com/webmproject/libwebp
+  GIT_TAG fa6f56496a442eed59b103250021e4b14ebf1427
+  GIT_SHALLOW TRUE)
 
-target_link_libraries(lvgl_workspace GL)
-target_link_libraries(lvgl_workspace GLEW)
-target_link_libraries(lvgl_workspace glfw)
+FetchContent_MakeAvailable(webp)
 
-# target_link_libraries(lvgl_workspace jpeg)
-# target_link_libraries(lvgl_workspace png)
-# target_link_libraries(lvgl_workspace ${FREETYPE_LIBRARIES})
+# Compiler settings
+set(CMAKE_C_STANDARD 99)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wpedantic -ggdb")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -pedantic -ggdb")
+set(CONFIG_LV_BUILD_EXAMPLES
+    OFF
+    CACHE BOOL "disable lvgl examples" FORCE)
+set(CONFIG_LV_BUILD_DEMOS
+    OFF
+    CACHE BOOL "disable lvgl demos" FORCE)
+set(CONFIG_LV_USE_THORVG_INTERNAL
+    OFF
+    CACHE BOOL "disable thorvg internal" FORCE)
+
+add_subdirectory(lvgl)
+
+# Define common include directories
+set(LVGL_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/lvgl ${CMAKE_SOURCE_DIR}/lvgl/src)
+set(PROTO_INCLUDE_DIRS lib/lv_gltf/data/deps/)
+
+# Create library targets
+add_library(lvgl_opengl_shader_cache
+            lib/lv_opengl_shader_cache/lv_opengl_shader_cache.cpp)
+target_include_directories(lvgl_opengl_shader_cache
+                           PRIVATE ${LVGL_INCLUDE_DIRS})
+
+add_library(
+  lvgl_gltfdata
+  lib/lv_gltf/data/lv_gltf_override.cpp lib/lv_gltf/data/sup/utils.cpp
+  lib/lv_gltf/data/sup/injest.cpp lib/lv_gltf/data/sup/reports.cpp
+  lib/lv_gltf/data/sup/datatypes.cpp)
+
+target_include_directories(lvgl_gltfdata PRIVATE fastgltf ${LVGL_INCLUDE_DIRS}
+                                                 ${PROTO_INCLUDE_DIRS})
+target_link_libraries(lvgl_gltfdata PRIVATE lvgl_opengl_shader_cache fastgltf)
+
+target_compile_definitions(lvgl_gltfdata PRIVATE LVGL_ENABLE_WEBP_IMAGES)
+
+add_library(
+  lvgl_gltfview
+  lib/lv_gltf/view/lv_gltf_view.cpp
+  lib/lv_gltf/view/sup/datatypes.cpp
+  lib/lv_gltf/view/sup/utils.cpp
+  lib/lv_gltf/view/sup/setup.cpp
+  lib/lv_gltf/view/sup/animation.cpp
+  lib/lv_gltf/view/sup/ibl_sampler.cpp
+  lib/lv_gltf/view/sup/shader_includes.cpp)
+
+target_include_directories(lvgl_gltfview PRIVATE ${LVGL_INCLUDE_DIRS}
+                                                 ${PROTO_INCLUDE_DIRS})
+target_link_libraries(lvgl_gltfview PRIVATE lvgl_opengl_shader_cache fastgltf
+                                            webp)
+target_link_libraries(lvgl_gltfview PRIVATE lvgl_gltfdata fastgltf)
+
+# Main executable
+add_executable(
+  gltf_view
+  src/demo.cpp
+  src/demo_ui.c
+  src/demo_cli.c
+  src/demo_nav.c
+  src/demo_os_integrate.c
+  src/demo_file_load_dialog.c
+  src/demo_misc_utils.c
+  src/mouse_cursor_icon.c
+  src/lvgl_icon_40px_ARGB888.c
+  src/sprites1_32x32x7.c)
+
+add_executable(demo src/simple_demo.c)
+
+# Build type definitions
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+  add_definitions(-DNDEBUG)
+endif()
+
+if(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
+  add_definitions(-DNDEBUG)
+endif()
+
+# Optional: Enable AddressSanitizer for Debug builds (can be disabled if
+# problematic)
+option(ENABLE_ASAN "Enable AddressSanitizer in Debug builds" OFF)
+
+if(ENABLE_ASAN AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+  target_compile_options(gltf_view PRIVATE -fsanitize=address)
+  target_link_options(gltf_view PRIVATE -fsanitize=address)
+endif()
+
+# Additional optimization for MinSizeRel
+if(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
+  target_link_options(gltf_view PRIVATE -Wl,--gc-sections)
+endif()
+
+target_link_libraries(
+  gltf_view
+  PRIVATE lvgl
+          lvgl_gltfview
+          lvgl_gltfdata
+          m
+          OpenGL::GL
+          GLEW::GLEW
+          glfw
+          webp
+          fastgltf)
+
+target_link_libraries(
+  demo
+  PRIVATE lvgl
+          lvgl_gltfview
+          lvgl_gltfdata
+          m
+          OpenGL::GL
+          GLEW::GLEW
+          glfw
+          webp
+          fastgltf)
+
+target_include_directories(
+  gltf_view PRIVATE ./lib/lv_gltf ./lib/lv_gltf/data/deps lvgl lvgl/src)
+
+set_target_properties(gltf_view PROPERTIES COMPILE_DEFINITIONS
+                                           "${LVGL_COMPILER_DEFINES}")
+
+set_target_properties(demo PROPERTIES COMPILE_DEFINITIONS
+                                      "${LVGL_COMPILER_DEFINES}")
+
+target_include_directories(demo PRIVATE ./lib/lv_gltf ./lib/lv_gltf/data/deps
+                                        lvgl lvgl/src)

README.md

@@ -1,20 +1,46 @@
-# `lv_example_3dtexture`
+# `lv_gltf_viewer`
 
-Example usage of the LVGL `3dtexture` widget.
+A simple glTF file viewer, made using the LVGL `3dtexture` widget.
 
-![example running screenclip](readme_image.png)
+![example running screenclip one](media/readme/readme_image.png)
 
 Ensure [GLFW is installed](https://docs.lvgl.io/master/details/integration/driver/opengles.html) for this example.
 
+## Getting Started
+
 ```shell
+git clone <TODO>
 git submodule update --init
-cmake -B build -S .
-make -C build -j$(nproc) lvgl_workspace
-./build/lvgl_workspace
+cmake -B build
+cmake --build build -j$(nproc)
+./build/gltf_view -in ./gltfs/logo1.glb
+```
+
+---
+
+The STB Image library is included temporarily, just copied from the latest build.  Ultimately it should probably be added as a git submodule, but it seems like that will add a few other things that aren't necessary so I'd like to look into a more minimal install for that.
+
+---
+
+To make this the default gltf / glb file viewer on your Raspberry Pi, you can do the following:
+
+(from the root directory of this project)
+```bash
+cp ./EXAMPLE_gltf-view.desktop ~/.local/share/applications/gltf-view.desktop
+xdg-mime default gltf-view.desktop model/gltf-binary
+xdg-mime default gltf-view.desktop model/gltf-json
 ```
 
-For demonstration purposes, there is a very simple
-glTF loader implemented in `gltf_loader.c`. It can only
-handle very simple glTFs with one mesh described by
-a `float` triangle vertex array and a `uint16_t` index array.
-Textured meshes are ignored.
+Now when you double click a gltf file in your file-manager, it should open glTF-View.
+
+You can confirm the mime-types are setup correctly by viewing 
+```
+~/.config/mimeapps.list
+```
+
+---
+More Samples:
+
+![example running screenclip two](media/readme/screenshot_image1.png)
+
+![example running screenclip three](media/readme/screenshot_image2.png)