rename libcurv/geom -> libcurv/io

curv3d · Sep 28, 2021 · 01cbe59 · 01cbe59
1 parent 3226025
commit 01cbe59
Show file tree

Hide file tree

Showing 19 changed files with 26 additions and 26 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,10 +123,10 @@ file(GLOB LibCurvSrc "libcurv/*.cc")
 add_library(libcurv ${LibCurvSrc})
 set_property(TARGET libcurv PROPERTY OUTPUT_NAME curv)
 
-FILE(GLOB LibCurvGeomSrc "libcurv/geom/*.cc" "libcurv/viewer/*.cc")
-add_library(libcurv_geom ${LibCurvGeomSrc})
-set_property(TARGET libcurv_geom PROPERTY OUTPUT_NAME curv_geom)
-target_link_libraries(libcurv_geom PUBLIC imgui)
+FILE(GLOB LibCurvIoSrc "libcurv/io/*.cc" "libcurv/viewer/*.cc")
+add_library(libcurv_io ${LibCurvIoSrc})
+set_property(TARGET libcurv_io PROPERTY OUTPUT_NAME curv_io)
+target_link_libraries(libcurv_io PUBLIC imgui)
 
 file(GLOB Src "curv/*.c" "curv/*.cc")
 add_executable(curv ${Src})
@@ -143,17 +143,17 @@ else ()
     set(LibOmp "")
 endif ()
 set(Libs
-    libcurv_geom libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion
+    libcurv_io libcurv imgui glfw glad ${LibOpenGL} replxx double-conversion
     Boost::iostreams Boost::filesystem Boost::system ${LibOpenVDB} tbb
     ${LibHalf} pthread ${LibDl} ${LibOmp})
 
 target_link_libraries(curv PUBLIC ${Libs})
 
 file(GLOB TestSrc "tests/*.cc")
 add_executable(tester EXCLUDE_FROM_ALL ${TestSrc})
-target_link_libraries(tester PUBLIC gtest pthread libcurv libcurv_geom double-conversion Boost::iostreams Boost::filesystem Boost::system)
+target_link_libraries(tester PUBLIC gtest pthread libcurv libcurv_io double-conversion Boost::iostreams Boost::filesystem Boost::system)
 
-set_property(TARGET curv libcurv libcurv_geom tester PROPERTY CXX_STANDARD 17)
+set_property(TARGET curv libcurv libcurv_io tester PROPERTY CXX_STANDARD 17)
 
 if (APPLE)
     set(ompflags "-Xpreprocessor -fopenmp")

diff --git a/curv/curv.cc b/curv/curv.cc
@@ -28,9 +28,9 @@ extern "C" {
 #include <libcurv/source.h>
 #include <libcurv/system.h>
 
-#include <libcurv/geom/builtin.h>
-#include <libcurv/geom/import.h>
-#include <libcurv/geom/tempfile.h>
+#include <libcurv/io/builtin.h>
+#include <libcurv/io/import.h>
+#include <libcurv/io/tempfile.h>
 #include <libcurv/viewer/viewer.h>
 
 namespace fs = curv::Filesystem;

diff --git a/curv/export.cc b/curv/export.cc
@@ -4,8 +4,8 @@
 
 #include "export.h"
 
-#include <libcurv/geom/compiled_shape.h>
-#include <libcurv/geom/png.h>
+#include <libcurv/io/compiled_shape.h>
+#include <libcurv/io/png.h>
 #include <libcurv/viewer/viewer.h>
 
 #include <libcurv/context.h>

diff --git a/curv/export_mesh.cc b/curv/export_mesh.cc
@@ -12,7 +12,7 @@
 
 #include "export.h"
 #include "encode.h"
-#include <libcurv/geom/compiled_shape.h>
+#include <libcurv/io/compiled_shape.h>
 #include <libcurv/shape.h>
 #include <libcurv/exception.h>
 #include <libcurv/context.h>

diff --git a/docs/Implementation b/docs/Implementation
@@ -22,8 +22,8 @@ There are 3 libraries in the libcurv directory:
              Only depends on boost and double-conversion.
   libcurv/viewer -- Graphics window for rendering shapes using GPU.
                     Depends on libcurv, OpenGL, Glad, GLFW.
-  libcurv/geom -- Import and export various file formats.
-                  Depends on libcurv, viewer, and file-format libraries.
+  libcurv/io -- Import and export various file formats.
+                Depends on libcurv, viewer, and file-format libraries.
 
 LibCurv
 -------

diff --git a/libcurv/geom/builtin.cc → libcurv/io/builtin.cc b/libcurv/geom/builtin.cc → libcurv/io/builtin.cc
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, version 2.0
 // See accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0
 
-#include <libcurv/geom/builtin.h>
+#include <libcurv/io/builtin.h>
 
-#include <libcurv/geom/cpp_program.h>
+#include <libcurv/io/cpp_program.h>
 
 #include <libcurv/analyser.h>
 #include <libcurv/context.h>

diff --git a/libcurv/geom/builtin.h → libcurv/io/builtin.h b/libcurv/geom/builtin.h → libcurv/io/builtin.h
diff --git a/libcurv/geom/compiled_shape.cc → libcurv/io/compiled_shape.cc b/libcurv/geom/compiled_shape.cc → libcurv/io/compiled_shape.cc
@@ -2,7 +2,7 @@
 // Licensed under the Apache Licence, version 2.0
 // See https://www.apache.org/licenses/LICENSE-2.0
 
-#include <libcurv/geom/compiled_shape.h>
+#include <libcurv/io/compiled_shape.h>
 
 #include <libcurv/context.h>
 #include <libcurv/function.h>

diff --git a/libcurv/geom/compiled_shape.h → libcurv/io/compiled_shape.h b/libcurv/geom/compiled_shape.h → libcurv/io/compiled_shape.h
@@ -5,7 +5,7 @@
 #ifndef LIBCURV_GEOM_COMPILED_SHAPE_H
 #define LIBCURV_GEOM_COMPILED_SHAPE_H
 
-#include <libcurv/geom/cpp_program.h>
+#include <libcurv/io/cpp_program.h>
 #include <libcurv/shape.h>
 #include <ostream>
 #include <glm/vec3.hpp>

diff --git a/libcurv/geom/cpp_program.cc → libcurv/io/cpp_program.cc b/libcurv/geom/cpp_program.cc → libcurv/io/cpp_program.cc
@@ -2,9 +2,9 @@
 // Licensed under the Apache License, version 2.0
 // See accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0
 
-#include <libcurv/geom/cpp_program.h>
+#include <libcurv/io/cpp_program.h>
 
-#include <libcurv/geom/tempfile.h>
+#include <libcurv/io/tempfile.h>
 #include <libcurv/context.h>
 #include <libcurv/exception.h>
 

diff --git a/libcurv/geom/cpp_program.h → libcurv/io/cpp_program.h b/libcurv/geom/cpp_program.h → libcurv/io/cpp_program.h
diff --git a/libcurv/geom/import.cc → libcurv/io/import.cc b/libcurv/geom/import.cc → libcurv/io/import.cc
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, version 2.0
 // See accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0
 
-#include <libcurv/geom/import.h>
+#include <libcurv/io/import.h>
 #include <libcurv/system.h>
 #include <libcurv/exception.h>
 

diff --git a/libcurv/geom/import.h → libcurv/io/import.h b/libcurv/geom/import.h → libcurv/io/import.h
diff --git a/libcurv/geom/png.cc → libcurv/io/png.cc b/libcurv/geom/png.cc → libcurv/io/png.cc
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, version 2.0
 // See accompanying file LICENSE or https://www.apache.org/licenses/LICENSE-2.0
 
-#include <libcurv/geom/png.h>
+#include <libcurv/io/png.h>
 
 #include <libcurv/shape.h>
 #include <libcurv/viewer/viewer.h>

diff --git a/libcurv/geom/png.h → libcurv/io/png.h b/libcurv/geom/png.h → libcurv/io/png.h
diff --git a/libcurv/geom/tempfile.cc → libcurv/io/tempfile.cc b/libcurv/geom/tempfile.cc → libcurv/io/tempfile.cc
@@ -2,7 +2,7 @@
 // Licensed under the Apache Licence, version 2.0
 // See https://www.apache.org/licenses/LICENSE-2.0
 
-#include <libcurv/geom/tempfile.h>
+#include <libcurv/io/tempfile.h>
 #include <libcurv/exception.h>
 #include <libcurv/context.h>
 #include <algorithm>

diff --git a/libcurv/geom/tempfile.h → libcurv/io/tempfile.h b/libcurv/geom/tempfile.h → libcurv/io/tempfile.h
diff --git a/tests/eval.cc b/tests/eval.cc
@@ -11,7 +11,7 @@
 #include <libcurv/string.h>
 #include <libcurv/system.h>
 
-#include <libcurv/geom/builtin.h>
+#include <libcurv/io/builtin.h>
 
 using namespace std;
 using namespace curv;

diff --git a/tests/tests.cc b/tests/tests.cc
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include <libcurv/geom/tempfile.h>
+#include <libcurv/io/tempfile.h>
 extern "C" {
 #include <stdlib.h>
 }