[release] v33.0

.gitmodules

@@ -67,9 +67,12 @@
 [submodule "dependencies/libsoundio"]
 	path = dependencies/libsoundio
 	url = https://github.com/andrewrk/libsoundio
-[submodule "dependencies/nativefiledialog"]
-	path = dependencies/nativefiledialog
-	url = https://github.com/mlabbe/nativefiledialog
 [submodule "dependencies/tbb"]
 	path = dependencies/tbb
 	url = https://github.com/wjakob/tbb.git
+[submodule "dependencies/imguifiledialog"]
+	path = dependencies/imguifiledialog
+	url = https://github.com/aiekick/ImGuiFileDialog
+[submodule "dependencies/tinyobjloader-c"]
+	path = dependencies/tinyobjloader-c
+	url = https://github.com/syoyo/tinyobjloader-c

CMakeLists.txt

@@ -17,6 +17,7 @@ option(NANOEM_ENABLE_DEBUG_ALLOCATOR "Enable building debug memory allocator" OF
 option(NANOEM_ENABLE_DEBUG_LABEL "Enable building nanoem with debug labels." OFF)
 option(NANOEM_ENABLE_GLFW "Enable GLFW based application option." OFF)
 option(NANOEM_ENABLE_IMGUI_INDEX32 "Enable building ImGui with 32bit indices support" ON)
+option(NANOEM_ENABLE_IMGUI_FILE_DIALOG "Enable building ImGuiFileDialog (https://github.com/aiekick/ImGuiFileDialog) option" OFF)
 option(NANOEM_ENABLE_LTO "Enable Link Time Optimization when clang is used." OFF)
 option(NANOEM_ENABLE_MIMALLOC "Enable mimalloc as allocator" OFF)
 option(NANOEM_ENABLE_MSAN "Enable clang/gcc MSan (memory sanitizer) option." OFF)

README.md

@@ -2,32 +2,40 @@
 
 [![Build Status](https://github.com/hkrn/nanoem/workflows/CI/badge.svg)](https://github.com/hkrn/nanoem/actions) [![License: MPL 2.0](https://img.shields.io/badge/License-MPL%202.0-blue.svg)](https://opensource.org/licenses/MPL-2.0) [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-nanoem is an MMD (MikuMikuDance) like application mainly built for OSX.
+nanoem is an [MMD (MikuMikuDance)](https://sites.google.com/view/vpvp/) compatible implementation and its like application mainly built for macOS.
 
- - [Binary Distribution](https://bowlroll.net/file/71328)
- - [Usage Manual](https://nanoem.readthedocs.io)
+- [Binary Distribution of macOS](https://bowlroll.net/file/71328)
+- [Binary Distribution of Windows](https://bowlroll.net/file/122592)
+- [Usage Manual](https://nanoem.readthedocs.io)
 
 ## How to build?
 
 ### Prerequisites
 
-- [cmake](https://cmake.org) (> 3.5)
+- [cmake](https://cmake.org) (>= 3.5)
 - C++14 compliant compiler
   - confirmed on Clang and Visual Studio 2017
 - [git](https://git-scm.com)
 - [ninja-build](https://ninja-build.org/)
-  - Optional but recommend
+  - Optional but recommend on macOS/Linux
 
 ### Minimum build instruction
 
 See also [GitHub Action Workflow](.github/workflows/main.yml).
 
 ```bash
+git submodule update --init --recurse
+
+# needs setting NANOEM_TARGET_COMPILER explicitly when the compiler is clang (default is gcc on Linux)
+export NANOEM_TARGET_COMPILER=clang
 cmake -P scripts/build.cmake
 mkdir out
 cd out
 cmake -G Ninja ..
 cmake --build .
+
+# OpenGL 3.3 Core Profile or higher is required to run on Linux
+cd sapp && ./nanoem
 ```
 
 ## Architecture

dependencies/fx9/cmake/common.cmake

@@ -30,23 +30,18 @@ endfunction()
 
 # glslang
 fx9_cmake_get_install_path("glslang" GLSLANG_BASE_PATH GLSLANG_INSTALL_PATH_DEBUG GLSLANG_INSTALL_PATH_RELEASE)
-find_library(GLSLANG_GENERICCODEGEN_LIBRARY_DEBUG NAMES GenericCodeGend GenericCodeGen PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-find_library(GLSLANG_GENERICCODEGEN_LIBRARY_RELEASE NAMES GenericCodeGen PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_GLSLANG_LIBRARY_DEBUG NAMES glslangd glslang PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_GLSLANG_LIBRARY_RELEASE NAMES glslang PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_HLSL_LIBRARY_DEBUG NAMES HLSLd HLSL PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_HLSL_LIBRARY_RELEASE NAMES HLSL PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-find_library(GLSLANG_MACHINEINDEPENDENT_LIBRARY_DEBUG NAMES MachineIndependentd MachineIndependent PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
-find_library(GLSLANG_MACHINEINDEPENDENT_LIBRARY_RELEASE NAMES MachineIndependent PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_OGLCOMPILER_LIBRARY_DEBUG NAMES OGLCompilerd OGLCompiler PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_OGLCOMPILER_LIBRARY_RELEASE NAMES OGLCompiler PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_OSDEPENDENT_LIBRARY_DEBUG NAMES OSDependentd OSDependent PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_OSDEPENDENT_LIBRARY_RELEASE NAMES OSDependent PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_SPIRV_LIBRARY_DEBUG NAMES SPIRVd SPIRV PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_DEBUG} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 find_library(GLSLANG_SPIRV_LIBRARY_RELEASE NAMES SPIRV PATH_SUFFIXES lib PATHS ${GLSLANG_INSTALL_PATH_RELEASE} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
 mark_as_advanced(GLSLANG_OSDEPENDENT_LIBRARY_DEBUG GLSLANG_HLSL_LIBRARY_DEBUG GLSLANG_OGLCOMPILER_LIBRARY_DEBUG GLSLANG_SPIRV_LIBRARY_DEBUG GLSLANG_GLSLANG_LIBRARY_DEBUG
-                 GLSLANG_OSDEPENDENT_LIBRARY_RELEASE GLSLANG_HLSL_LIBRARY_RELEASE GLSLANG_OGLCOMPILER_LIBRARY_RELEASE GLSLANG_SPIRV_LIBRARY_RELEASE GLSLANG_GLSLANG_LIBRARY_RELEASE
-                 GLSLANG_GENERICCODEGEN_LIBRARY_DEBUG GLSLANG_GENERICCODEGEN_LIBRARY_RELEASE GLSLANG_MACHINEINDEPENDENT_LIBRARY_DEBUG GLSLANG_MACHINEINDEPENDENT_LIBRARY_RELEASE)
+                 GLSLANG_OSDEPENDENT_LIBRARY_RELEASE GLSLANG_HLSL_LIBRARY_RELEASE GLSLANG_OGLCOMPILER_LIBRARY_RELEASE GLSLANG_SPIRV_LIBRARY_RELEASE GLSLANG_GLSLANG_LIBRARY_RELEASE)
 
 # spirv-cross
 fx9_cmake_get_install_path("spirv-cross" SPIRV_CROSS_BASE_PATH SPIRV_CROSS_INSTALL_PATH_DEBUG SPIRV_CROSS_INSTALL_PATH_RELEASE)
@@ -105,8 +100,6 @@ target_link_libraries(fx9 fx9_protobuf
                           optimized ${GLSLANG_HLSL_LIBRARY_RELEASE}
                           optimized ${GLSLANG_OSDEPENDENT_LIBRARY_RELEASE}
                           optimized ${GLSLANG_GLSLANG_LIBRARY_RELEASE}
-                          optimized ${GLSLANG_GENERICCODEGEN_LIBRARY_RELEASE}
-                          optimized ${GLSLANG_MACHINEINDEPENDENT_LIBRARY_RELEASE}
                           optimized ${SPIRV_CROSS_CORE_LIBRARY_RELEASE}
                           optimized ${SPIRV_CROSS_CPP_LIBRARY_RELEASE}
                           optimized ${SPIRV_CROSS_GLSL_LIBRARY_RELEASE}
@@ -117,8 +110,6 @@ target_link_libraries(fx9 fx9_protobuf
                           debug ${GLSLANG_HLSL_LIBRARY_DEBUG}
                           debug ${GLSLANG_OSDEPENDENT_LIBRARY_DEBUG}
                           debug ${GLSLANG_GLSLANG_LIBRARY_DEBUG}
-                          debug ${GLSLANG_GENERICCODEGEN_LIBRARY_DEBUG}
-                          debug ${GLSLANG_MACHINEINDEPENDENT_LIBRARY_DEBUG}
                           debug ${SPIRV_CROSS_CORE_LIBRARY_DEBUG}
                           debug ${SPIRV_CROSS_CPP_LIBRARY_DEBUG}
                           debug ${SPIRV_CROSS_GLSL_LIBRARY_DEBUG}

dependencies/fx9/include/fx9/Parser.h

@@ -10,9 +10,9 @@
 
 /* GLSLang */
 #define ENABLE_HLSL
-#include "glslang/HLSL/hlslParseHelper.h"
-#include "glslang/HLSL/hlslParseables.h"
-#include "glslang/HLSL/hlslScanContext.h"
+#include "hlsl/hlslParseHelper.h"
+#include "hlsl/hlslParseables.h"
+#include "hlsl/hlslScanContext.h"
 
 namespace fx9 {
 

dependencies/fx9/sokol.cc

@@ -60,7 +60,7 @@ struct Main {
         if (succeeded) {
             bool found = false;
             for (int i = SG_MAX_SHADERSTAGE_IMAGES - 1; i >= 0; i--) {
-                const sg_image_type type = images[i].type;
+                const sg_image_type type = images[i].image_type;
                 if (!found && type != _SG_IMAGETYPE_DEFAULT) {
                     found = true;
                 }
@@ -88,8 +88,8 @@ struct Main {
             desc.source = shader->msl;
             break;
         case FX9__EFFECT__SHADER__BODY_SPIRV:
-            desc.byte_code = shader->spirv.data;
-            desc.byte_code_size = shader->spirv.len;
+            desc.bytecode.ptr = shader->spirv.data;
+            desc.bytecode.size = shader->spirv.len;
             break;
         default:
             break;
@@ -268,8 +268,8 @@ struct Main {
                         id.height = 1;
                         id.pixel_format = SG_PIXELFORMAT_RGBA8;
                         uint32_t pixel = 0;
-                        id.content.subimage[0][0].ptr = &pixel;
-                        id.content.subimage[0][0].size = sizeof(pixel);
+                        id.data.subimage[0][0].ptr = &pixel;
+                        id.data.subimage[0][0].size = sizeof(pixel);
                         sg_image ih = sg_make_image(&id);
                         for (int i = 0; i < SG_MAX_SHADERSTAGE_IMAGES; i++) {
                             if (sd.fs.images[i].name) {

dependencies/fx9/src/Compiler.cc

@@ -145,7 +145,6 @@ getDefaultResourceLimit(TBuiltInResource &resources)
         /* .maxTaskWorkGroupSizeY_NV = */ 1,
         /* .maxTaskWorkGroupSizeZ_NV = */ 1,
         /* .maxMeshViewCountNV = */ 4,
-        /* .maxDualSourceDrawBuffersEXT = */ 1,
 
         /* .limits = */
         {

dependencies/fx9/src/Parser.cc

@@ -20,11 +20,11 @@
 #endif
 
 /* GLSLang */
-#include "glslang/HLSL/hlslAttributes.h"
-#include "glslang/HLSL/hlslParseHelper.h"
-#include "glslang/HLSL/hlslParseables.h"
-#include "glslang/HLSL/hlslScanContext.h"
-#include "glslang/HLSL/hlslTokenStream.h"
+#include "hlsl/hlslAttributes.h"
+#include "hlsl/hlslParseHelper.h"
+#include "hlsl/hlslParseables.h"
+#include "hlsl/hlslScanContext.h"
+#include "hlsl/hlslTokenStream.h"
 
 using namespace glslang;