upgrade agz-utils

AirGuanZ · Mar 27, 2021 · 74cac11 · 74cac11
1 parent 5a9c0a4
commit 74cac11
Show file tree

Hide file tree

Showing 75 changed files with 104 additions and 98 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,10 @@ PROJECT(Atrc)
 
 SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)
 
+SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
 ############## optional submodules
 
 OPTION(USE_EMBREE              "use embree for finding triangle mesh intersection" OFF)

diff --git a/lib/utility b/lib/utility
diff --git a/src/cli/src/main.cpp b/src/cli/src/main.cpp
@@ -8,8 +8,8 @@
 #include <agz/factory/factory.h>
 #include <agz/tracer/tracer.h>
 
-#include <agz/utility/misc.h>
-#include <agz/utility/string.h>
+#include <agz-utils/misc.h>
+#include <agz-utils/string.h>
 
 void run(int argc, char *argv[])
 {

diff --git a/src/cli/src/params.cpp b/src/cli/src/params.cpp
@@ -1,7 +1,7 @@
 #include <cxxopts.hpp>
 
 #include <agz/cli/cli.h>
-#include <agz/utility/file.h>
+#include <agz-utils/file.h>
 
 std::optional<Params> parse_opts(int argc, char *argv[])
 {

diff --git a/src/editor/include/agz/editor/editor.h b/src/editor/include/agz/editor/editor.h
@@ -15,7 +15,7 @@
 #include <agz/editor/ui/right_panel.h>
 #include <agz/gui_common/gui.h>
 #include <agz/tracer/create/scene.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/include/agz/editor/geometry/triangle_bvh.h b/src/editor/include/agz/editor/geometry/triangle_bvh.h
@@ -2,7 +2,7 @@
 
 #include <agz/editor/geometry/geometry.h>
 #include <agz/editor/ui/utility/elided_label.h>
-#include <agz/utility/mesh.h>
+#include <agz-utils/mesh.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/include/agz/editor/imexport/model_importer.h b/src/editor/include/agz/editor/imexport/model_importer.h
@@ -6,7 +6,7 @@
 #include <QPushButton>
 
 #include <agz/editor/ui/utility/elided_label.h>
-#include <agz/utility/mesh.h>
+#include <agz-utils/mesh.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/include/agz/editor/scene/scene_mgr.h b/src/editor/include/agz/editor/scene/scene_mgr.h
@@ -3,7 +3,7 @@
 #include <agz/editor/displayer/preview_window.h>
 #include <agz/editor/entity/entity.h>
 #include <agz/editor/scene/scene_mgr_ui.h>
-#include <agz/utility/mesh.h>
+#include <agz-utils/mesh.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/src/editor.cpp b/src/editor/src/editor.cpp
@@ -11,7 +11,7 @@
 #include <agz/tracer/utility/embree.h>
 #include <agz/tracer/utility/logger.h>
 
-#include <agz/utility/file.h>
+#include <agz-utils/file.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/src/imexport/json_export_context.cpp b/src/editor/src/imexport/json_export_context.cpp
@@ -1,7 +1,7 @@
 #include <filesystem>
 
 #include <agz/editor/imexport/json_export_context.h>
-#include <agz/utility/file.h>
+#include <agz-utils/file.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/src/imexport/model_importer.cpp b/src/editor/src/imexport/model_importer.cpp
@@ -4,7 +4,7 @@
 
 #include <agz/editor/imexport/model_importer.h>
 #include <agz/editor/scene/scene_mgr.h>
-#include <agz/utility/string.h>
+#include <agz-utils/string.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/src/material/material_thumbnail.cpp b/src/editor/src/material/material_thumbnail.cpp
@@ -6,7 +6,7 @@
 #include <agz/tracer/create/envir_light.h>
 #include <agz/tracer/create/texture2d.h>
 #include <agz/tracer/utility/sphere_aux.h>
-#include <agz/utility/image.h>
+#include <agz-utils/image.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/src/renderer/ao.cpp b/src/editor/src/renderer/ao.cpp
@@ -1,6 +1,6 @@
 #include <agz/editor/renderer/ao.h>
 #include <agz/tracer/tracer.h>
-#include <agz/utility/thread.h>
+#include <agz-utils/thread.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/src/renderer/particle_renderer.cpp b/src/editor/src/renderer/particle_renderer.cpp
@@ -4,7 +4,7 @@
 #include <agz/tracer/core/scene.h>
 #include <agz/tracer/create/film_filter.h>
 #include <agz/tracer/utility/perthread_samplers.h>
-#include <agz/utility/thread.h>
+#include <agz-utils/thread.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/src/renderer/per_pixel_renderer.cpp b/src/editor/src/renderer/per_pixel_renderer.cpp
@@ -3,7 +3,7 @@
 #include <agz/tracer/core/sampler.h>
 #include <agz/tracer/core/scene.h>
 #include <agz/tracer/utility/perthread_samplers.h>
-#include <agz/utility/thread.h>
+#include <agz-utils/thread.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/src/texture2d/hdr.cpp b/src/editor/src/texture2d/hdr.cpp
@@ -4,8 +4,8 @@
 #include <agz/editor/imexport/json_export_context.h>
 #include <agz/editor/texture2d/hdr.h>
 #include <agz/tracer/create/texture2d.h>
-#include <agz/utility/image.h>
-#include <agz/utility/system.h>
+#include <agz-utils/image.h>
+#include <agz-utils/system.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/editor/src/texture2d/image2d.cpp b/src/editor/src/texture2d/image2d.cpp
@@ -4,8 +4,8 @@
 #include <agz/editor/imexport/json_export_context.h>
 #include <agz/editor/texture2d/image2d.h>
 #include <agz/tracer/create/texture2d.h>
-#include <agz/utility/image.h>
-#include <agz/utility/system.h>
+#include <agz-utils/image.h>
+#include <agz-utils/system.h>
 
 AGZ_EDITOR_BEGIN
 

diff --git a/src/factory/include/agz/factory/context.h b/src/factory/include/agz/factory/context.h
@@ -7,8 +7,8 @@
 #include <unordered_map>
 
 #include <agz/tracer/utility/config.h>
-#include <agz/utility/misc.h>
-#include <agz/utility/string.h>
+#include <agz-utils/misc.h>
+#include <agz-utils/string.h>
 
 AGZ_TRACER_FACTORY_BEGIN
 

diff --git a/src/factory/include/agz/factory/utility/bin_mesh.h b/src/factory/include/agz/factory/utility/bin_mesh.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <agz/tracer/common.h>
-#include <agz/utility/mesh.h>
+#include <agz-utils/mesh.h>
 
 AGZ_TRACER_FACTORY_BEGIN
 

diff --git a/src/factory/src/creator/scene_creators.cpp b/src/factory/src/creator/scene_creators.cpp
@@ -5,7 +5,7 @@
 #include <agz/tracer/create/aggregate.h>
 #include <agz/tracer/create/scene.h>
 #include <agz/tracer/utility/logger.h>
-#include <agz/utility/string.h>
+#include <agz-utils/string.h>
 
 AGZ_TRACER_FACTORY_BEGIN
 

diff --git a/src/factory/src/creator/texture2d_creators.cpp b/src/factory/src/creator/texture2d_creators.cpp
@@ -1,6 +1,6 @@
 #include <agz/factory/creator/texture2d_creators.h>
 #include <agz/tracer/create/texture2d.h>
-#include <agz/utility/image.h>
+#include <agz-utils/image.h>
 
 AGZ_TRACER_FACTORY_BEGIN
 

diff --git a/src/factory/src/utility/render_session.cpp b/src/factory/src/utility/render_session.cpp
@@ -5,7 +5,7 @@
 #include <agz/tracer/create/film_filter.h>
 #include <agz/tracer/utility/logger.h>
 
-#include <agz/utility/string.h>
+#include <agz-utils/string.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/factory/src/utility/texture3d_loader.cpp b/src/factory/src/utility/texture3d_loader.cpp
@@ -1,7 +1,7 @@
 #include <agz/factory/context.h>
 #include <agz/factory/utility/texture3d_loader.h>
-#include <agz/utility/image.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/image.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/gui_common/CMakeLists.txt b/src/gui_common/CMakeLists.txt
@@ -26,4 +26,4 @@ TARGET_INCLUDE_DIRECTORIES(GUICommon PUBLIC ${MISC_INCLUDE_DIRS})
 TARGET_INCLUDE_DIRECTORIES(GUICommon PUBLIC "${PROJECT_SOURCE_DIR}/include/")
 TARGET_INCLUDE_DIRECTORIES(GUICommon PUBLIC ${GLEW_INCLUDE_DIRS})
 
-TARGET_LINK_LIBRARIES(GUICommon Tracer Factory AGZUtils Qt5::Widgets)
+TARGET_LINK_LIBRARIES(GUICommon Tracer Factory AGZUtils Qt5::Core Qt5::Widgets)
diff --git a/src/gui_common/src/gui.cpp b/src/gui_common/src/gui.cpp
@@ -11,8 +11,8 @@
 
 #include <agz/gui_common/gui.h>
 #include <agz/tracer/tracer.h>
-#include <agz/utility/file.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/file.h>
+#include <agz-utils/misc.h>
 
 GUI::GUI()
 {

diff --git a/src/tracer/include/agz/tracer/common.h b/src/tracer/include/agz/tracer/common.h
@@ -2,8 +2,8 @@
 
 #include <stdexcept>
 
-#include <agz/utility/alloc.h>
-#include <agz/utility/texture.h>
+#include <agz-utils/alloc.h>
+#include <agz-utils/texture.h>
 
 #define AGZ_TRACER_BEGIN namespace agz::tracer {
 #define AGZ_TRACER_END   }

diff --git a/src/tracer/include/agz/tracer/core/bsdf.h b/src/tracer/include/agz/tracer/core/bsdf.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <agz/tracer/common.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/include/agz/tracer/core/render_target.h b/src/tracer/include/agz/tracer/core/render_target.h
@@ -2,7 +2,7 @@
 
 #include <agz/tracer/core/framebuffer.h>
 #include <agz/tracer/core/film_filter.h>
-#include <agz/utility/texture.h>
+#include <agz-utils/texture.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/include/agz/tracer/core/scene.h b/src/tracer/include/agz/tracer/core/scene.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 #include <agz/tracer/core/aggregate.h>
 

diff --git a/src/tracer/include/agz/tracer/create/geometry.h b/src/tracer/include/agz/tracer/create/geometry.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <agz/tracer/core/geometry.h>
-#include <agz/utility/mesh.h>
+#include <agz-utils/mesh.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/include/agz/tracer/create/medium.h b/src/tracer/include/agz/tracer/create/medium.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <agz/utility/texture.h>
+#include <agz-utils/texture.h>
 
 #include <agz/tracer/core/medium.h>
 #include <agz/tracer/core/texture3d.h>

diff --git a/src/tracer/include/agz/tracer/create/texture3d.h b/src/tracer/include/agz/tracer/create/texture3d.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <agz/tracer/core/texture3d.h>
-#include <agz/utility/texture/texture3d.h>
+#include <agz-utils/texture/texture3d.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/include/agz/tracer/utility/parallel_grid.h b/src/tracer/include/agz/tracer/utility/parallel_grid.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <agz/tracer/common.h>
-#include <agz/utility/thread.h>
+#include <agz-utils/thread.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/aggregate/embree_bvh.cpp b/src/tracer/src/core/aggregate/embree_bvh.cpp
@@ -5,7 +5,7 @@
 #include <agz/tracer/core/aggregate.h>
 #include <agz/tracer/core/entity.h>
 #include <agz/tracer/utility/embree.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/aggregate/entity_bvh.cpp b/src/tracer/src/core/aggregate/entity_bvh.cpp
@@ -1,6 +1,6 @@
 #include <agz/tracer/core/aggregate.h>
 #include <agz/tracer/core/entity.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/camera/thin_lens.cpp b/src/tracer/src/core/camera/thin_lens.cpp
@@ -1,5 +1,5 @@
 #include <agz/tracer/core/camera.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/envir_light/env_sampler.h b/src/tracer/src/core/envir_light/env_sampler.h
@@ -4,8 +4,8 @@
 #include <vector>
 
 #include <agz/tracer/core/texture2d.h>
-#include <agz/utility/texture.h>
-#include <agz/utility/thread.h>
+#include <agz-utils/texture.h>
+#include <agz-utils/thread.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/envir_light/ibl.cpp b/src/tracer/src/core/envir_light/ibl.cpp
@@ -1,8 +1,8 @@
 #include <agz/tracer/core/light.h>
 #include <agz/tracer/core/texture2d.h>
 #include <agz/tracer/create/texture2d.h>
-#include <agz/utility/misc.h>
-#include <agz/utility/texture.h>
+#include <agz-utils/misc.h>
+#include <agz-utils/texture.h>
 
 #include "./env_sampler.h"
 

diff --git a/src/tracer/src/core/envir_light/native_sky.cpp b/src/tracer/src/core/envir_light/native_sky.cpp
@@ -1,5 +1,5 @@
 #include <agz/tracer/core/light.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/film_filter/box_filter.cpp b/src/tracer/src/core/film_filter/box_filter.cpp
@@ -1,5 +1,5 @@
 #include <agz/tracer/core/film_filter.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/film_filter/gaussian_filter.cpp b/src/tracer/src/core/film_filter/gaussian_filter.cpp
@@ -1,7 +1,7 @@
 #include <random>
 
 #include <agz/tracer/core/film_filter.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/geometry/disk.cpp b/src/tracer/src/core/geometry/disk.cpp
@@ -1,4 +1,4 @@
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 #include "./transformed_geometry.h"
 
 AGZ_TRACER_BEGIN

diff --git a/src/tracer/src/core/geometry/double_sided.cpp b/src/tracer/src/core/geometry/double_sided.cpp
@@ -1,5 +1,5 @@
 #include <agz/tracer/core/geometry.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/geometry/quad.cpp b/src/tracer/src/core/geometry/quad.cpp
@@ -1,6 +1,6 @@
 #include <agz/tracer/core/geometry.h>
 #include <agz/tracer/utility/triangle_aux.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 AGZ_TRACER_BEGIN
 

diff --git a/src/tracer/src/core/geometry/sphere.cpp b/src/tracer/src/core/geometry/sphere.cpp
@@ -1,5 +1,5 @@
 #include <agz/tracer/utility/sphere_aux.h>
-#include <agz/utility/misc.h>
+#include <agz-utils/misc.h>
 
 #include "./transformed_geometry.h"