Merge branch 'master' into fix-scale

zenustech · Aug 10, 2023 · f310221 · f310221
2 parents 6f56b48 + d411573
commit f310221
Show file tree

Hide file tree

Showing 215 changed files with 195,712 additions and 16,319 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -166,6 +166,8 @@ function (zeno_add_asset_dir dir)
 endfunction()
 ## --- end cihou asset dir
 
+add_subdirectory(zeno)
+
 ## --- begin cihou perf-geeks
 if (ZENO_MARCH_NATIVE)
     if (MSVC)
@@ -183,8 +185,6 @@ if (ZENO_USE_FAST_MATH)
 endif()
 ## --- end cihou perf-geeks
 
-add_subdirectory(zeno)
-
 target_compile_options(zeno
             PUBLIC $<$<COMPILE_LANGUAGE:CXX>: $<IF:$<CXX_COMPILER_ID:MSVC>, /utf-8, >>
             )

diff --git a/hdr/studio_small_08_1k.hdr b/hdr/studio_small_08_1k.hdr