100 add glslang to compile glsl in flight

engine/CMakeLists.txt

@@ -32,7 +32,6 @@ string(REPLACE "#PROJECT_PATH#" "${NICKEL_ENGINE_RELATIVE_PATH}" PROJECT_PATH_CO
 
 file(WRITE ${CMAKE_SOURCE_DIR}/nickel_engine_project_path.toml ${PROJECT_PATH_CONTENT})
 
-
 ## build
 
 add_subdirectory(engine)

engine/cmake/compile_shader.cmake

@@ -1,14 +1,15 @@
-macro(compile_shader shader_name output_name)
+macro(compile_shader shader_files)
     if (GLSLC_PROG)
-        add_custom_command(
-            OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/${output_name}
-            COMMAND ${GLSLC_PROG}  ${CMAKE_CURRENT_SOURCE_DIR}/${shader_name} -o ${CMAKE_CURRENT_SOURCE_DIR}/${output_name}
-            COMMENT "compiling shader ${CMAKE_CURRENT_SOURCE_DIR}/${shader_name} -> ${output_name}"
-            MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/${shader_name}
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            VERBATIM
-        )
-    else()
-        message(WARN "don't find glslc, can't compiling shader ${CMAKE_CURRENT_SOURCE_DIR}/${shader_name}")
+        foreach(file ${shader_files})
+            set(SHADER_COMPILED_FILE ${file}.spv)
+            add_custom_command(
+                OUTPUT ${SHADER_COMPILED_FILE}
+                COMMAND ${GLSLC_PROG} ${file} -o ${SHADER_COMPILED_FILE}
+                COMMENT "compiling shader ${file} -> ${SHADER_COMPILED_FILE}"
+                MAIN_DEPENDENCY ${file}
+                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                VERBATIM
+            )
+        endforeach()
     endif()
 endmacro()

engine/cmake/target_category_helper.cmake

@@ -39,3 +39,9 @@ macro(mark_as_tool target_name)
     target_link_libraries(${target_name} PRIVATE ${NICKEL_MAIN_ENTRY_NAME})
 endmacro()
 
+macro(mark_as_tool_without_engine target_name)
+    set_target_properties(${target_name} PROPERTIES
+        FOLDER tools
+        VS_DEBUGGER_WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+endmacro()
+

engine/doc/Doxyfile.inc

@@ -991,7 +991,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = ../engine/code_generator/parser.py ../engine/nickel ../tests/render ../tests/script @CMAKE_CURRENT_SOURCE_DIR@
+INPUT                  = ../engine/code_generator/parser.py ../engine/nickel ../tests/render ../tests/script ../tools/shader_compiler ../tools/vehicle_editor @CMAKE_CURRENT_SOURCE_DIR@
 
 # This tag can be used to specify the character encoding of the source files
 # that Doxygen parses. Internally Doxygen uses the UTF-8 encoding. Doxygen uses

engine/doc/engine_arch.md

@@ -6,4 +6,5 @@
 
 ## Engine Tools:
 
-- @ref code_generate_page
+- @ref code_generate_page
+- @ref shader_compiler_page

engine/engine/3rdlibs/CMakeLists.txt

@@ -50,4 +50,11 @@ add_3rdlib(implot)
 set(QJS_BUILD_COMPILER ON)
 set(QJS_BUILD_REPL ON)
 set(QJS_BUILD_LIBC ON)
-add_3rdlib(quickjs)
+add_3rdlib(quickjs)
+
+set(SPRIV_SKIP_TESTS ON)
+set(SPRIV_SKIP_EXECUTABLES ON)
+add_3rdlib(spirv-tools)
+
+set(BUILD_SHARED_LIBS OFF)
+add_3rdlib(glslang)