From 414a67ae5111b352c20511b0d611fdd9cf163177 Mon Sep 17 00:00:00 2001 From: Yixing Lao Date: Mon, 10 Aug 2020 22:04:24 -0700 Subject: [PATCH] update formatter: clang-format-10, yapf 0.30.0 (#2149) --- .clang-format | 3 +- .travis.yml | 4 +- 3rdparty/clang-format/clang-foramt@10.rb | 100 ++++ cpp/benchmarks/core/Reduction.cpp | 4 +- cpp/benchmarks/geometry/KDTreeFlann.cpp | 5 +- cpp/benchmarks/geometry/SamplePoints.cpp | 4 +- cpp/benchmarks/io/PointCloudIO.cpp | 3 +- cpp/open3d/camera/PinholeCameraIntrinsic.cpp | 1 + cpp/open3d/core/CUDAState.cuh | 1 + cpp/open3d/core/Dtype.h | 2 +- cpp/open3d/core/Indexer.h | 4 +- cpp/open3d/core/MemoryManagerCPU.cpp | 4 +- cpp/open3d/core/MemoryManagerCUDA.cu | 3 +- cpp/open3d/core/TensorKey.cpp | 1 + cpp/open3d/core/kernel/BinaryEWCPU.cpp | 3 +- cpp/open3d/core/kernel/BinaryEWCUDA.cu | 3 +- cpp/open3d/core/kernel/IndexGetSetCPU.cpp | 3 +- cpp/open3d/core/kernel/IndexGetSetCUDA.cu | 3 +- cpp/open3d/core/kernel/Kernel.cpp | 4 +- cpp/open3d/core/kernel/NonZeroCPU.cpp | 3 +- cpp/open3d/core/kernel/NonZeroCUDA.cu | 3 +- cpp/open3d/core/kernel/Reduction.cpp | 1 + cpp/open3d/core/kernel/Reduction.h | 4 +- cpp/open3d/core/kernel/ReductionCPU.cpp | 3 +- cpp/open3d/core/kernel/ReductionCUDA.cu | 3 +- cpp/open3d/core/kernel/UnaryEWCPU.cpp | 3 +- cpp/open3d/core/kernel/UnaryEWCUDA.cu | 3 +- cpp/open3d/geometry/BoundingVolume.cpp | 8 +- cpp/open3d/geometry/EstimateNormals.cpp | 3 +- cpp/open3d/geometry/HalfEdgeTriangleMesh.cpp | 2 +- cpp/open3d/geometry/LineSet.cpp | 3 +- cpp/open3d/geometry/MeshBase.cpp | 12 +- cpp/open3d/geometry/Octree.cpp | 3 +- cpp/open3d/geometry/PointCloud.cpp | 4 +- cpp/open3d/geometry/PointCloudCluster.cpp | 3 +- .../geometry/PointCloudSegmentation.cpp | 3 +- cpp/open3d/geometry/Qhull.cpp | 6 +- .../SurfaceReconstructionAlphaShape.cpp | 9 +- .../SurfaceReconstructionBallPivoting.cpp | 9 +- .../geometry/SurfaceReconstructionPoisson.cpp | 8 +- cpp/open3d/geometry/TetraMesh.cpp | 6 +- cpp/open3d/geometry/TriangleMesh.cpp | 11 +- .../geometry/TriangleMeshDeformation.cpp | 3 +- .../geometry/TriangleMeshSimplification.cpp | 3 +- cpp/open3d/geometry/TriangleMeshSubdivide.cpp | 3 +- cpp/open3d/geometry/VoxelGrid.h | 1 - cpp/open3d/io/FileFormatIO.cpp | 4 +- cpp/open3d/io/file_format/FileGLTF.cpp | 4 +- cpp/open3d/io/file_format/FileJPG.cpp | 3 +- cpp/open3d/io/file_format/FileJSON.cpp | 1 + cpp/open3d/io/file_format/FileOBJ.cpp | 4 +- cpp/open3d/io/file_format/FilePCD.cpp | 1 + .../azure_kinect/AzureKinectRecorder.cpp | 6 +- .../sensor/azure_kinect/AzureKinectSensor.cpp | 1 + .../azure_kinect/AzureKinectSensorConfig.cpp | 1 + .../io/sensor/azure_kinect/K4aPlugin.cpp | 1 + .../io/sensor/azure_kinect/MKVMetadata.cpp | 1 + .../io/sensor/azure_kinect/MKVReader.cpp | 1 + .../Misc/BuildSpatialHashTableOpKernel.cu | 1 + .../PyTorch/Misc/BuildSpatialHashTableOps.cpp | 1 + .../PyTorch/Misc/FixedRadiusSearchOpKernel.cu | 1 + .../ml/PyTorch/Misc/FixedRadiusSearchOps.cpp | 1 + .../Misc/InvertNeighborsListOpKernel.cu | 1 + .../PyTorch/Misc/InvertNeighborsListOps.cpp | 1 + cpp/open3d/ml/PyTorch/Misc/KnnSearchOps.cpp | 1 + .../ml/PyTorch/Misc/RadiusSearchOps.cpp | 1 + .../Misc/ReduceSubarraysSumOpKernel.cu | 1 + .../ml/PyTorch/Misc/ReduceSubarraysSumOps.cpp | 1 + cpp/open3d/ml/PyTorch/TorchHelper.h | 2 + .../ContinuousConvBackpropFilterOpKernel.cpp | 1 + .../ContinuousConv/ContinuousConvOpKernel.cpp | 1 + ...ousConvTransposeBackpropFilterOpKernel.cpp | 1 + .../ContinuousConvTransposeOpKernel.cpp | 1 + .../ContinuousConvTransposeOps.cpp | 1 - .../Misc/BuildSpatialHashTableOpKernel.cpp | 1 + .../Misc/FixedRadiusSearchOpKernel.cpp | 1 + .../Misc/InvertNeighborsListOpKernel.cpp | 1 + .../ml/TensorFlow/Misc/KnnSearchOpKernel.cpp | 1 + .../TensorFlow/Misc/RadiusSearchOpKernel.cpp | 1 + .../Misc/ReduceSubarraysSumOpKernel.cpp | 1 + .../Misc/VoxelPoolingGradOpKernel.cpp | 1 + .../TensorFlow/Misc/VoxelPoolingOpKernel.cpp | 1 + .../ml/impl/continuous_conv/ContinuousConv.h | 2 - .../ContinuousConvBackpropFilter.h | 3 +- .../ContinuousConvCUDAKernels.cu | 1 - .../continuous_conv/ContinuousConvTranspose.h | 2 - .../ContinuousConvTransposeBackpropFilter.h | 3 +- cpp/open3d/ml/impl/misc/FixedRadiusSearch.h | 5 +- cpp/open3d/ml/impl/misc/KnnSearch.h | 2 +- cpp/open3d/ml/impl/misc/RadiusSearch.h | 2 +- cpp/open3d/ml/impl/misc/VoxelPooling.h | 1 + cpp/open3d/tgeometry/TensorListMap.cpp | 4 +- cpp/open3d/utility/Console.h | 6 +- cpp/open3d/utility/FileSystem.cpp | 1 + cpp/open3d/utility/ParallelScan.h | 1 + cpp/open3d/visualization/gui/Application.cpp | 1 + cpp/open3d/visualization/gui/Button.cpp | 1 + cpp/open3d/visualization/gui/Checkbox.cpp | 1 + cpp/open3d/visualization/gui/ColorEdit.cpp | 1 + cpp/open3d/visualization/gui/Combobox.cpp | 1 + .../visualization/gui/FileDialogNative.cpp | 3 +- .../visualization/gui/ImguiFilamentBridge.cpp | 1 + .../visualization/gui/ImguiFilamentBridge.h | 1 + cpp/open3d/visualization/gui/Label.cpp | 1 + cpp/open3d/visualization/gui/Layout.cpp | 1 + cpp/open3d/visualization/gui/ListView.cpp | 1 + cpp/open3d/visualization/gui/Menu.cpp | 1 + cpp/open3d/visualization/gui/Native.h | 4 +- cpp/open3d/visualization/gui/NativeLinux.cpp | 6 +- cpp/open3d/visualization/gui/NativeWin32.cpp | 5 +- cpp/open3d/visualization/gui/NumberEdit.cpp | 3 +- cpp/open3d/visualization/gui/ProgressBar.cpp | 1 + cpp/open3d/visualization/gui/Slider.cpp | 1 + cpp/open3d/visualization/gui/TabControl.cpp | 1 + cpp/open3d/visualization/gui/TextEdit.cpp | 1 + cpp/open3d/visualization/gui/TreeView.cpp | 6 +- cpp/open3d/visualization/gui/UIImage.cpp | 4 +- cpp/open3d/visualization/gui/Util.cpp | 1 + cpp/open3d/visualization/gui/Util.h | 1 + cpp/open3d/visualization/gui/VectorEdit.cpp | 1 + cpp/open3d/visualization/gui/Window.cpp | 1 + .../rendering/IBLRotationInteractorLogic.h | 1 - .../visualization/rendering/RendererStructs.h | 1 + .../rendering/filament/FilamentEngine.cpp | 4 +- .../filament/FilamentGeometryBuffersBuilder.h | 3 + .../rendering/filament/FilamentRenderer.h | 5 +- .../rendering/filament/FilamentScene.h | 1 + .../rendering/filament/FilamentView.h | 1 + .../rendering/filament/LineSetBuffers.cpp | 1 + .../rendering/filament/PointCloudBuffers.cpp | 1 + .../visualization/shader/RGBDImageShader.cpp | 1 + .../visualization/utility/DrawGeometry.cpp | 4 +- .../visualization/utility/DrawGeometry.h | 1 + cpp/open3d/visualization/utility/GLHelper.h | 1 + .../visualizer/GuiSettingsModel.h | 4 +- .../visualizer/GuiSettingsView.cpp | 1 + .../visualizer/GuiSettingsView.h | 4 +- .../visualization/visualizer/RenderOption.cpp | 1 + .../visualization/visualizer/ViewControl.cpp | 2 + .../ViewControlWithCustomAnimation.cpp | 2 +- .../visualizer/ViewParameters.cpp | 1 + .../visualizer/ViewTrajectory.cpp | 1 + .../visualization/visualizer/Visualizer.h | 1 + cpp/pybind/camera/camera.cpp | 4 +- cpp/pybind/core/blob.cpp | 4 +- cpp/pybind/core/core.cpp | 1 + cpp/pybind/core/cuda_utils.cpp | 3 +- cpp/pybind/core/device.cpp | 4 +- cpp/pybind/core/dtype.cpp | 4 +- cpp/pybind/core/kernel.cpp | 4 +- cpp/pybind/core/size_vector.cpp | 3 +- cpp/pybind/core/tensor.cpp | 48 +- cpp/pybind/core/tensor_key.cpp | 5 +- cpp/pybind/docstring.cpp | 3 +- cpp/pybind/geometry/geometry_trampoline.h | 1 - cpp/pybind/geometry/halfedgetrianglemesh.cpp | 4 +- cpp/pybind/geometry/image.cpp | 82 +-- cpp/pybind/geometry/kdtreeflann.cpp | 212 ++++---- cpp/pybind/geometry/lineset.cpp | 2 +- cpp/pybind/geometry/meshbase.cpp | 2 +- cpp/pybind/geometry/octree.cpp | 4 +- cpp/pybind/geometry/pointcloud.cpp | 4 +- cpp/pybind/geometry/tetramesh.cpp | 2 +- cpp/pybind/geometry/trianglemesh.cpp | 23 +- cpp/pybind/geometry/voxelgrid.cpp | 6 +- cpp/pybind/io/class_io.cpp | 483 +++++++++--------- cpp/pybind/io/io.cpp | 1 + cpp/pybind/io/sensor.cpp | 1 - cpp/pybind/open3d_pybind.cpp | 4 +- cpp/pybind/pipelines/color_map/color_map.cpp | 4 +- .../pipelines/integration/integration.cpp | 4 +- cpp/pybind/pipelines/odometry/odometry.cpp | 2 +- cpp/pybind/pipelines/registration/feature.cpp | 2 +- .../registration/global_optimization.cpp | 25 +- .../pipelines/registration/registration.cpp | 2 +- cpp/pybind/pybind_utils.cpp | 1 - cpp/pybind/pybind_utils.h | 1 - cpp/pybind/utility/console.cpp | 18 +- cpp/pybind/utility/eigen.cpp | 5 +- cpp/pybind/utility/utility.cpp | 1 + cpp/pybind/visualization/gui/gui.cpp | 244 ++++----- .../visualization/rendering/rendering.cpp | 8 +- cpp/pybind/visualization/renderoption.cpp | 36 +- cpp/pybind/visualization/utility.cpp | 293 ++++++----- cpp/pybind/visualization/viewcontrol.cpp | 19 +- .../visualization/visualization_trampoline.h | 1 - cpp/pybind/visualization/visualizer.cpp | 2 +- cpp/tests/Main.cpp | 1 + cpp/tests/UnitTest.h | 1 + cpp/tests/camera/PinholeCameraIntrinsic.cpp | 3 +- cpp/tests/camera/PinholeCameraTrajectory.cpp | 3 +- cpp/tests/core/Blob.cpp | 2 +- cpp/tests/core/CUDAState.cpp | 1 + cpp/tests/core/CoreTest.h | 1 - cpp/tests/core/Indexer.cpp | 4 +- cpp/tests/core/MemoryManager.cpp | 6 +- cpp/tests/core/Tensor.cpp | 13 +- cpp/tests/geometry/HalfEdgeTriangleMesh.cpp | 3 +- cpp/tests/geometry/Image.cpp | 1 + cpp/tests/geometry/IntersectionTest.cpp | 1 + cpp/tests/geometry/KDTreeFlann.cpp | 1 + cpp/tests/geometry/LineSet.cpp | 1 + cpp/tests/geometry/Octree.cpp | 4 +- cpp/tests/geometry/PointCloud.cpp | 3 +- cpp/tests/geometry/RGBDImage.cpp | 3 +- cpp/tests/geometry/TetraMesh.cpp | 2 + cpp/tests/geometry/TriangleMesh.cpp | 1 + cpp/tests/geometry/VoxelGrid.cpp | 1 + cpp/tests/io/OctreeIO.cpp | 4 +- cpp/tests/io/PointCloudIO.cpp | 1 + cpp/tests/io/VoxelGridIO.cpp | 1 + .../AzureKinect/AzureKinectSensorConfig.cpp | 5 +- cpp/tests/ml/ShapeChecking.cpp | 1 + .../integration/UniformTSDFVolume.cpp | 5 +- cpp/tests/test_utility/Compare.h | 1 + cpp/tests/test_utility/Sort.h | 6 +- cpp/tests/tgeometry/PointCloud.cpp | 2 +- cpp/tests/tgeometry/TensorListMap.cpp | 3 +- cpp/tests/utility/Console.cpp | 1 + cpp/tests/utility/Eigen.cpp | 1 + cpp/tests/utility/FileSystem.cpp | 4 +- cpp/tests/utility/IJsonConvertible.cpp | 3 +- docs/_static/C++/TestVisualizer.cpp | 2 +- docs/contribute/styleguide.rst | 54 +- examples/cpp/AzureKinectMKVReader.cpp | 1 + examples/cpp/AzureKinectRecord.cpp | 5 +- examples/cpp/AzureKinectViewer.cpp | 5 +- examples/cpp/OpenMP.cpp | 1 + examples/cpp/PoseGraph.cpp | 3 +- examples/python/open3d_tutorial.py | 26 +- python/test/core/test_core.py | 8 +- python/test/ml_ops/cconv_python.py | 17 +- python/test/ml_ops/mltest.py | 3 +- python/test/ml_ops/test_cconv.py | 6 +- python/test/ml_ops/test_cconv_python.py | 6 +- .../test/ml_ops/test_invert_neighbors_list.py | 18 +- python/test/ml_ops/test_sparseconv.py | 12 +- util/check_cpp_style.cmake | 6 +- util/check_style.py | 33 +- util/run_ci.sh | 2 +- 240 files changed, 1293 insertions(+), 1047 deletions(-) create mode 100644 3rdparty/clang-format/clang-foramt@10.rb diff --git a/.clang-format b/.clang-format index 678d1f6b781..63f78edb55a 100644 --- a/.clang-format +++ b/.clang-format @@ -2,8 +2,7 @@ BasedOnStyle: Google IndentWidth: 4 ColumnLimit: 80 UseTab: Never -Language: Cpp -Standard: Cpp11 +Standard: c++14 ContinuationIndentWidth: 8 AccessModifierOffset: -4 BinPackParameters: false diff --git a/.travis.yml b/.travis.yml index de4a3370361..7893124f186 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,14 +27,14 @@ matrix: packages: - cmake - clang-7 - - clang-format-5.0 + - clang-format-10 install: - ./util/install_deps_ubuntu.sh assume-yes script: - mkdir build - cd build - cmake .. - - pip install -U yapf==0.28.0 nbformat + - pip install -U yapf==0.30.0 nbformat - make check-style # Build headless and docs diff --git a/3rdparty/clang-format/clang-foramt@10.rb b/3rdparty/clang-format/clang-foramt@10.rb new file mode 100644 index 00000000000..ebfa24d1f8f --- /dev/null +++ b/3rdparty/clang-format/clang-foramt@10.rb @@ -0,0 +1,100 @@ +# BSD 2-Clause License +# +# Copyright (c) 2009-present, Homebrew contributors +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# * Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# +# Ref: +# https://github.com/Homebrew/homebrew-core/blob/7f9aa30778d3e3c391b0060a1ac4af230f351dcc/Formula/clang-format.rb#L1 + +class ClangFormatAT10 < Formula + desc "Formatting tools for C, C++, Obj-C, Java, JavaScript, TypeScript" + homepage "https://clang.llvm.org/docs/ClangFormat.html" + # The LLVM Project is under the Apache License v2.0 with LLVM Exceptions + license "Apache-2.0" + version "10.0.1" + head "https://github.com/llvm/llvm-project.git" + + stable do + url "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/llvm-10.0.1.src.tar.xz" + sha256 "c5d8e30b57cbded7128d78e5e8dad811bff97a8d471896812f57fa99ee82cdf3" + + resource "clang" do + url "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/clang-10.0.1.src.tar.xz" + sha256 "f99afc382b88e622c689b6d96cadfa6241ef55dca90e87fc170352e12ddb2b24" + end + + resource "libcxx" do + url "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/libcxx-10.0.1.src.tar.xz" + sha256 "def674535f22f83131353b3c382ccebfef4ba6a35c488bdb76f10b68b25be86c" + end + end + + bottle do + cellar :any_skip_relocation + sha256 "65667bcca091df96d9f27b56a7726a41c9998ebbcd3b10bc2eb2d43aa871c216" => :catalina + sha256 "9b711f49db65634cb1dca8149804040f337ce3e68e66eeba7270c2aec66b90e0" => :mojave + sha256 "9bbc58f9d5afb228c2aeda8ea03d305d7912860f27941933d0824bee505752bd" => :high_sierra + end + + depends_on "cmake" => :build + depends_on "ninja" => :build + + uses_from_macos "libxml2" + uses_from_macos "ncurses" + uses_from_macos "zlib" + + def install + if build.head? + ln_s buildpath/"libcxx", buildpath/"llvm/projects/libcxx" + ln_s buildpath/"clang", buildpath/"llvm/tools/clang" + else + (buildpath/"projects/libcxx").install resource("libcxx") + (buildpath/"tools/clang").install resource("clang") + end + + llvmpath = build.head? ? buildpath/"llvm" : buildpath + + mkdir llvmpath/"build" do + args = std_cmake_args + args << "-DLLVM_ENABLE_LIBCXX=ON" + args << ".." + system "cmake", "-G", "Ninja", *args + system "ninja", "clang-format" + end + + bin.install llvmpath/"build/bin/clang-format" + bin.install llvmpath/"tools/clang/tools/clang-format/git-clang-format" + (share/"clang").install Dir[llvmpath/"tools/clang/tools/clang-format/clang-format*"] + end + + test do + # NB: below C code is messily formatted on purpose. + (testpath/"test.c").write <<~EOS + int main(char *args) { \n \t printf("hello"); } + EOS + + assert_equal "int main(char *args) { printf(\"hello\"); }\n", + shell_output("#{bin}/clang-format -style=Google test.c") + end + end diff --git a/cpp/benchmarks/core/Reduction.cpp b/cpp/benchmarks/core/Reduction.cpp index 9c2ee9c82f6..53a7ddd1ff7 100644 --- a/cpp/benchmarks/core/Reduction.cpp +++ b/cpp/benchmarks/core/Reduction.cpp @@ -24,6 +24,8 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include + #include "open3d/core/AdvancedIndexing.h" #include "open3d/core/Dtype.h" #include "open3d/core/MemoryManager.h" @@ -31,8 +33,6 @@ #include "open3d/core/Tensor.h" #include "open3d/core/kernel/Kernel.h" -#include - namespace open3d { namespace core { diff --git a/cpp/benchmarks/geometry/KDTreeFlann.cpp b/cpp/benchmarks/geometry/KDTreeFlann.cpp index 333fa882e50..bf041d7844b 100644 --- a/cpp/benchmarks/geometry/KDTreeFlann.cpp +++ b/cpp/benchmarks/geometry/KDTreeFlann.cpp @@ -25,11 +25,12 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/KDTreeFlann.h" -#include "open3d/geometry/PointCloud.h" -#include "open3d/geometry/TriangleMesh.h" #include +#include "open3d/geometry/PointCloud.h" +#include "open3d/geometry/TriangleMesh.h" + namespace open3d { namespace benchmarks { diff --git a/cpp/benchmarks/geometry/SamplePoints.cpp b/cpp/benchmarks/geometry/SamplePoints.cpp index b4abd30aab9..7ee54bdcd93 100644 --- a/cpp/benchmarks/geometry/SamplePoints.cpp +++ b/cpp/benchmarks/geometry/SamplePoints.cpp @@ -24,11 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include + #include "open3d/geometry/TriangleMesh.h" #include "open3d/io/TriangleMeshIO.h" -#include - namespace open3d { namespace benchmarks { diff --git a/cpp/benchmarks/io/PointCloudIO.cpp b/cpp/benchmarks/io/PointCloudIO.cpp index 529217c0d30..5ededbc56fb 100644 --- a/cpp/benchmarks/io/PointCloudIO.cpp +++ b/cpp/benchmarks/io/PointCloudIO.cpp @@ -25,10 +25,11 @@ // ---------------------------------------------------------------------------- #include "open3d/io/PointCloudIO.h" -#include "open3d/utility/Console.h" #include +#include "open3d/utility/Console.h" + namespace open3d { namespace benchmarks { diff --git a/cpp/open3d/camera/PinholeCameraIntrinsic.cpp b/cpp/open3d/camera/PinholeCameraIntrinsic.cpp index 77632db3f43..0eb4bba0889 100644 --- a/cpp/open3d/camera/PinholeCameraIntrinsic.cpp +++ b/cpp/open3d/camera/PinholeCameraIntrinsic.cpp @@ -27,6 +27,7 @@ #include "open3d/camera/PinholeCameraIntrinsic.h" #include + #include #include "open3d/utility/Console.h" diff --git a/cpp/open3d/core/CUDAState.cuh b/cpp/open3d/core/CUDAState.cuh index 78cd4e640f1..742c2aac359 100644 --- a/cpp/open3d/core/CUDAState.cuh +++ b/cpp/open3d/core/CUDAState.cuh @@ -32,6 +32,7 @@ #include #include + #include #include diff --git a/cpp/open3d/core/Dtype.h b/cpp/open3d/core/Dtype.h index 0cdd12cbfbf..16a7240634b 100644 --- a/cpp/open3d/core/Dtype.h +++ b/cpp/open3d/core/Dtype.h @@ -26,7 +26,7 @@ #pragma once -#include "string" +#include #include "open3d/core/Dispatch.h" #include "open3d/utility/Console.h" diff --git a/cpp/open3d/core/Indexer.h b/cpp/open3d/core/Indexer.h index d9b73a2bc81..1fe16c27550 100644 --- a/cpp/open3d/core/Indexer.h +++ b/cpp/open3d/core/Indexer.h @@ -26,6 +26,8 @@ #pragma once +#include + #include "open3d/core/CUDAUtils.h" #include "open3d/core/Dtype.h" #include "open3d/core/ShapeUtil.h" @@ -33,8 +35,6 @@ #include "open3d/core/Tensor.h" #include "open3d/utility/Console.h" -#include - namespace open3d { namespace core { diff --git a/cpp/open3d/core/MemoryManagerCPU.cpp b/cpp/open3d/core/MemoryManagerCPU.cpp index 2f62d3799ec..5e3ea0f8a8e 100644 --- a/cpp/open3d/core/MemoryManagerCPU.cpp +++ b/cpp/open3d/core/MemoryManagerCPU.cpp @@ -24,10 +24,10 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/MemoryManager.h" - #include +#include "open3d/core/MemoryManager.h" + namespace open3d { namespace core { diff --git a/cpp/open3d/core/MemoryManagerCUDA.cu b/cpp/open3d/core/MemoryManagerCUDA.cu index 4389e9809ec..466f6304799 100644 --- a/cpp/open3d/core/MemoryManagerCUDA.cu +++ b/cpp/open3d/core/MemoryManagerCUDA.cu @@ -24,13 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/MemoryManager.h" - #include #include #include "open3d/core/CUDAState.cuh" #include "open3d/core/CUDAUtils.h" +#include "open3d/core/MemoryManager.h" namespace open3d { namespace core { diff --git a/cpp/open3d/core/TensorKey.cpp b/cpp/open3d/core/TensorKey.cpp index b9e27778908..a3771d675c9 100644 --- a/cpp/open3d/core/TensorKey.cpp +++ b/cpp/open3d/core/TensorKey.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "open3d/core/TensorKey.h" + #include "open3d/core/Tensor.h" #include "open3d/utility/Console.h" diff --git a/cpp/open3d/core/kernel/BinaryEWCPU.cpp b/cpp/open3d/core/kernel/BinaryEWCPU.cpp index 9a7791b7336..5df2f3c5529 100644 --- a/cpp/open3d/core/kernel/BinaryEWCPU.cpp +++ b/cpp/open3d/core/kernel/BinaryEWCPU.cpp @@ -24,13 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/BinaryEW.h" - #include "open3d/core/Dispatch.h" #include "open3d/core/Dtype.h" #include "open3d/core/MemoryManager.h" #include "open3d/core/SizeVector.h" #include "open3d/core/Tensor.h" +#include "open3d/core/kernel/BinaryEW.h" #include "open3d/core/kernel/CPULauncher.h" #include "open3d/utility/Console.h" diff --git a/cpp/open3d/core/kernel/BinaryEWCUDA.cu b/cpp/open3d/core/kernel/BinaryEWCUDA.cu index 7a71927dc5b..143967228ba 100644 --- a/cpp/open3d/core/kernel/BinaryEWCUDA.cu +++ b/cpp/open3d/core/kernel/BinaryEWCUDA.cu @@ -24,12 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/BinaryEW.h" - #include "open3d/core/CUDAState.cuh" #include "open3d/core/CUDAUtils.h" #include "open3d/core/Dispatch.h" #include "open3d/core/Tensor.h" +#include "open3d/core/kernel/BinaryEW.h" #include "open3d/core/kernel/CUDALauncher.cuh" namespace open3d { diff --git a/cpp/open3d/core/kernel/IndexGetSetCPU.cpp b/cpp/open3d/core/kernel/IndexGetSetCPU.cpp index ad07ccdf060..7d0499fa593 100644 --- a/cpp/open3d/core/kernel/IndexGetSetCPU.cpp +++ b/cpp/open3d/core/kernel/IndexGetSetCPU.cpp @@ -24,12 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/IndexGetSet.h" - #include "open3d/core/AdvancedIndexing.h" #include "open3d/core/Dispatch.h" #include "open3d/core/Tensor.h" #include "open3d/core/kernel/CPULauncher.h" +#include "open3d/core/kernel/IndexGetSet.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/core/kernel/IndexGetSetCUDA.cu b/cpp/open3d/core/kernel/IndexGetSetCUDA.cu index ae5e63d44ea..c81054f0c74 100644 --- a/cpp/open3d/core/kernel/IndexGetSetCUDA.cu +++ b/cpp/open3d/core/kernel/IndexGetSetCUDA.cu @@ -24,13 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/IndexGetSet.h" - #include "open3d/core/CUDAState.cuh" #include "open3d/core/CUDAUtils.h" #include "open3d/core/Dispatch.h" #include "open3d/core/Tensor.h" #include "open3d/core/kernel/CUDALauncher.cuh" +#include "open3d/core/kernel/IndexGetSet.h" namespace open3d { namespace core { diff --git a/cpp/open3d/core/kernel/Kernel.cpp b/cpp/open3d/core/kernel/Kernel.cpp index 9b43fb3180a..71c356382d0 100644 --- a/cpp/open3d/core/kernel/Kernel.cpp +++ b/cpp/open3d/core/kernel/Kernel.cpp @@ -24,11 +24,13 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/core/kernel/Kernel.h" + #include + #include #include -#include "open3d/core/kernel/Kernel.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/core/kernel/NonZeroCPU.cpp b/cpp/open3d/core/kernel/NonZeroCPU.cpp index 27f1ee4bde0..26ba8505dbf 100644 --- a/cpp/open3d/core/kernel/NonZeroCPU.cpp +++ b/cpp/open3d/core/kernel/NonZeroCPU.cpp @@ -24,9 +24,8 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/NonZero.h" - #include "open3d/core/Indexer.h" +#include "open3d/core/kernel/NonZero.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/core/kernel/NonZeroCUDA.cu b/cpp/open3d/core/kernel/NonZeroCUDA.cu index cb750d6945b..5b1018c1870 100644 --- a/cpp/open3d/core/kernel/NonZeroCUDA.cu +++ b/cpp/open3d/core/kernel/NonZeroCUDA.cu @@ -24,14 +24,13 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/NonZero.h" - #include #include #include #include #include "open3d/core/Indexer.h" +#include "open3d/core/kernel/NonZero.h" namespace open3d { namespace core { diff --git a/cpp/open3d/core/kernel/Reduction.cpp b/cpp/open3d/core/kernel/Reduction.cpp index b88829a22da..b0f3c71565e 100644 --- a/cpp/open3d/core/kernel/Reduction.cpp +++ b/cpp/open3d/core/kernel/Reduction.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "open3d/core/kernel/Reduction.h" + #include "open3d/core/SizeVector.h" namespace open3d { diff --git a/cpp/open3d/core/kernel/Reduction.h b/cpp/open3d/core/kernel/Reduction.h index e42f82923ce..2fca3a9d63c 100644 --- a/cpp/open3d/core/kernel/Reduction.h +++ b/cpp/open3d/core/kernel/Reduction.h @@ -26,13 +26,13 @@ #pragma once +#include + #include "open3d/core/SizeVector.h" #include "open3d/core/Tensor.h" #include "open3d/utility/Console.h" #include "open3d/utility/Helper.h" -#include - namespace open3d { namespace core { namespace kernel { diff --git a/cpp/open3d/core/kernel/ReductionCPU.cpp b/cpp/open3d/core/kernel/ReductionCPU.cpp index 43aa37296dc..7447ad71f27 100644 --- a/cpp/open3d/core/kernel/ReductionCPU.cpp +++ b/cpp/open3d/core/kernel/ReductionCPU.cpp @@ -24,14 +24,13 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/Reduction.h" - #include #include "open3d/core/Dispatch.h" #include "open3d/core/Indexer.h" #include "open3d/core/Tensor.h" #include "open3d/core/kernel/ParallelUtil.h" +#include "open3d/core/kernel/Reduction.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/core/kernel/ReductionCUDA.cu b/cpp/open3d/core/kernel/ReductionCUDA.cu index 203dbb08ac2..d3443e739e4 100644 --- a/cpp/open3d/core/kernel/ReductionCUDA.cu +++ b/cpp/open3d/core/kernel/ReductionCUDA.cu @@ -24,8 +24,6 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/Reduction.h" - #include #include #include @@ -47,6 +45,7 @@ #include "open3d/core/SizeVector.h" #include "open3d/core/Tensor.h" #include "open3d/core/kernel/CUDALauncher.cuh" +#include "open3d/core/kernel/Reduction.h" #include "open3d/utility/Console.h" // CUDA reduction is based on PyTorch's CUDA reduction implementation. diff --git a/cpp/open3d/core/kernel/UnaryEWCPU.cpp b/cpp/open3d/core/kernel/UnaryEWCPU.cpp index 52408321301..47edffaf878 100644 --- a/cpp/open3d/core/kernel/UnaryEWCPU.cpp +++ b/cpp/open3d/core/kernel/UnaryEWCPU.cpp @@ -24,8 +24,6 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/UnaryEW.h" - #include #include "open3d/core/Dispatch.h" @@ -34,6 +32,7 @@ #include "open3d/core/SizeVector.h" #include "open3d/core/Tensor.h" #include "open3d/core/kernel/CPULauncher.h" +#include "open3d/core/kernel/UnaryEW.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/core/kernel/UnaryEWCUDA.cu b/cpp/open3d/core/kernel/UnaryEWCUDA.cu index 0c1d59ac7f0..90afc64a5ba 100644 --- a/cpp/open3d/core/kernel/UnaryEWCUDA.cu +++ b/cpp/open3d/core/kernel/UnaryEWCUDA.cu @@ -24,13 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/core/kernel/UnaryEW.h" - #include "open3d/core/CUDAState.cuh" #include "open3d/core/CUDAUtils.h" #include "open3d/core/Dispatch.h" #include "open3d/core/Tensor.h" #include "open3d/core/kernel/CUDALauncher.cuh" +#include "open3d/core/kernel/UnaryEW.h" namespace open3d { namespace core { diff --git a/cpp/open3d/geometry/BoundingVolume.cpp b/cpp/open3d/geometry/BoundingVolume.cpp index 3d2f666f8e1..ba12a9001d9 100644 --- a/cpp/open3d/geometry/BoundingVolume.cpp +++ b/cpp/open3d/geometry/BoundingVolume.cpp @@ -25,15 +25,15 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/BoundingVolume.h" + +#include +#include + #include "open3d/geometry/PointCloud.h" #include "open3d/geometry/Qhull.h" #include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" -#include - -#include - namespace open3d { namespace geometry { diff --git a/cpp/open3d/geometry/EstimateNormals.cpp b/cpp/open3d/geometry/EstimateNormals.cpp index 20b0283cf2a..d6fc880e7e0 100644 --- a/cpp/open3d/geometry/EstimateNormals.cpp +++ b/cpp/open3d/geometry/EstimateNormals.cpp @@ -24,9 +24,8 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include - #include +#include #include "open3d/geometry/KDTreeFlann.h" #include "open3d/geometry/PointCloud.h" diff --git a/cpp/open3d/geometry/HalfEdgeTriangleMesh.cpp b/cpp/open3d/geometry/HalfEdgeTriangleMesh.cpp index fb08385f436..e023df37bf1 100644 --- a/cpp/open3d/geometry/HalfEdgeTriangleMesh.cpp +++ b/cpp/open3d/geometry/HalfEdgeTriangleMesh.cpp @@ -25,10 +25,10 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/HalfEdgeTriangleMesh.h" -#include "open3d/geometry/TriangleMesh.h" #include +#include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" #include "open3d/utility/Helper.h" diff --git a/cpp/open3d/geometry/LineSet.cpp b/cpp/open3d/geometry/LineSet.cpp index f02366b0a42..af6c74f5966 100644 --- a/cpp/open3d/geometry/LineSet.cpp +++ b/cpp/open3d/geometry/LineSet.cpp @@ -25,10 +25,11 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/LineSet.h" -#include "open3d/geometry/BoundingVolume.h" #include +#include "open3d/geometry/BoundingVolume.h" + namespace open3d { namespace geometry { diff --git a/cpp/open3d/geometry/MeshBase.cpp b/cpp/open3d/geometry/MeshBase.cpp index 0b27d4b1f0a..e18bab001a5 100644 --- a/cpp/open3d/geometry/MeshBase.cpp +++ b/cpp/open3d/geometry/MeshBase.cpp @@ -25,12 +25,6 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/MeshBase.h" -#include "open3d/geometry/BoundingVolume.h" -#include "open3d/geometry/IntersectionTest.h" -#include "open3d/geometry/KDTreeFlann.h" -#include "open3d/geometry/PointCloud.h" -#include "open3d/geometry/Qhull.h" -#include "open3d/geometry/TriangleMesh.h" #include #include @@ -38,6 +32,12 @@ #include #include +#include "open3d/geometry/BoundingVolume.h" +#include "open3d/geometry/IntersectionTest.h" +#include "open3d/geometry/KDTreeFlann.h" +#include "open3d/geometry/PointCloud.h" +#include "open3d/geometry/Qhull.h" +#include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/geometry/Octree.cpp b/cpp/open3d/geometry/Octree.cpp index 251237fc911..32006e1061b 100644 --- a/cpp/open3d/geometry/Octree.cpp +++ b/cpp/open3d/geometry/Octree.cpp @@ -25,13 +25,14 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/Octree.h" -#include "open3d/geometry/BoundingVolume.h" #include + #include #include #include +#include "open3d/geometry/BoundingVolume.h" #include "open3d/geometry/PointCloud.h" #include "open3d/geometry/VoxelGrid.h" #include "open3d/utility/Console.h" diff --git a/cpp/open3d/geometry/PointCloud.cpp b/cpp/open3d/geometry/PointCloud.cpp index e5fdf9d0437..7ee062c6eca 100644 --- a/cpp/open3d/geometry/PointCloud.cpp +++ b/cpp/open3d/geometry/PointCloud.cpp @@ -25,14 +25,14 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/PointCloud.h" -#include "open3d/geometry/BoundingVolume.h" -#include "open3d/geometry/TriangleMesh.h" #include #include +#include "open3d/geometry/BoundingVolume.h" #include "open3d/geometry/KDTreeFlann.h" #include "open3d/geometry/Qhull.h" +#include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/geometry/PointCloudCluster.cpp b/cpp/open3d/geometry/PointCloudCluster.cpp index 6bb63f35081..3074f278b66 100644 --- a/cpp/open3d/geometry/PointCloudCluster.cpp +++ b/cpp/open3d/geometry/PointCloudCluster.cpp @@ -24,12 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/geometry/PointCloud.h" - #include #include #include "open3d/geometry/KDTreeFlann.h" +#include "open3d/geometry/PointCloud.h" #include "open3d/utility/Console.h" #ifdef _OPENMP diff --git a/cpp/open3d/geometry/PointCloudSegmentation.cpp b/cpp/open3d/geometry/PointCloudSegmentation.cpp index d5fe4e0af8b..140944b0ef1 100644 --- a/cpp/open3d/geometry/PointCloudSegmentation.cpp +++ b/cpp/open3d/geometry/PointCloudSegmentation.cpp @@ -24,8 +24,6 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/geometry/PointCloud.h" - #include #include #include @@ -33,6 +31,7 @@ #include #include +#include "open3d/geometry/PointCloud.h" #include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" diff --git a/cpp/open3d/geometry/Qhull.cpp b/cpp/open3d/geometry/Qhull.cpp index a0fc8f97864..99b75c99f97 100644 --- a/cpp/open3d/geometry/Qhull.cpp +++ b/cpp/open3d/geometry/Qhull.cpp @@ -25,15 +25,15 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/Qhull.h" -#include "open3d/geometry/TetraMesh.h" -#include "open3d/geometry/TriangleMesh.h" -#include "open3d/utility/Console.h" #include "libqhullcpp/PointCoordinates.h" #include "libqhullcpp/Qhull.h" #include "libqhullcpp/QhullFacet.h" #include "libqhullcpp/QhullFacetList.h" #include "libqhullcpp/QhullVertexSet.h" +#include "open3d/geometry/TetraMesh.h" +#include "open3d/geometry/TriangleMesh.h" +#include "open3d/utility/Console.h" namespace open3d { namespace geometry { diff --git a/cpp/open3d/geometry/SurfaceReconstructionAlphaShape.cpp b/cpp/open3d/geometry/SurfaceReconstructionAlphaShape.cpp index 6b15187f4ae..2d8496dba2c 100644 --- a/cpp/open3d/geometry/SurfaceReconstructionAlphaShape.cpp +++ b/cpp/open3d/geometry/SurfaceReconstructionAlphaShape.cpp @@ -24,17 +24,16 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include +#include +#include + #include "open3d/geometry/PointCloud.h" #include "open3d/geometry/Qhull.h" #include "open3d/geometry/TetraMesh.h" #include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" -#include - -#include -#include - namespace open3d { namespace geometry { diff --git a/cpp/open3d/geometry/SurfaceReconstructionBallPivoting.cpp b/cpp/open3d/geometry/SurfaceReconstructionBallPivoting.cpp index 1b441d6f83d..7d70713ec97 100644 --- a/cpp/open3d/geometry/SurfaceReconstructionBallPivoting.cpp +++ b/cpp/open3d/geometry/SurfaceReconstructionBallPivoting.cpp @@ -24,17 +24,16 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include +#include +#include + #include "open3d/geometry/IntersectionTest.h" #include "open3d/geometry/KDTreeFlann.h" #include "open3d/geometry/PointCloud.h" #include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" -#include - -#include -#include - namespace open3d { namespace geometry { diff --git a/cpp/open3d/geometry/SurfaceReconstructionPoisson.cpp b/cpp/open3d/geometry/SurfaceReconstructionPoisson.cpp index 24c9b024170..8d9044046a7 100644 --- a/cpp/open3d/geometry/SurfaceReconstructionPoisson.cpp +++ b/cpp/open3d/geometry/SurfaceReconstructionPoisson.cpp @@ -24,10 +24,6 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/geometry/PointCloud.h" -#include "open3d/geometry/TriangleMesh.h" -#include "open3d/utility/Console.h" - #include #include #include @@ -36,6 +32,10 @@ #include #include +#include "open3d/geometry/PointCloud.h" +#include "open3d/geometry/TriangleMesh.h" +#include "open3d/utility/Console.h" + // clang-format off #include "PoissonRecon/Src/PreProcessor.h" #include "PoissonRecon/Src/MyMiscellany.h" diff --git a/cpp/open3d/geometry/TetraMesh.cpp b/cpp/open3d/geometry/TetraMesh.cpp index 93b3446b699..0dc160c5cf5 100644 --- a/cpp/open3d/geometry/TetraMesh.cpp +++ b/cpp/open3d/geometry/TetraMesh.cpp @@ -25,15 +25,15 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/TetraMesh.h" -#include "open3d/geometry/BoundingVolume.h" -#include "open3d/geometry/PointCloud.h" -#include "open3d/geometry/TriangleMesh.h" #include #include #include #include +#include "open3d/geometry/BoundingVolume.h" +#include "open3d/geometry/PointCloud.h" +#include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/geometry/TriangleMesh.cpp b/cpp/open3d/geometry/TriangleMesh.cpp index 5d1ea836b70..2ec3be62c5e 100644 --- a/cpp/open3d/geometry/TriangleMesh.cpp +++ b/cpp/open3d/geometry/TriangleMesh.cpp @@ -25,11 +25,6 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/TriangleMesh.h" -#include "open3d/geometry/BoundingVolume.h" -#include "open3d/geometry/IntersectionTest.h" -#include "open3d/geometry/KDTreeFlann.h" -#include "open3d/geometry/PointCloud.h" -#include "open3d/geometry/Qhull.h" #include #include @@ -37,6 +32,12 @@ #include #include +#include "open3d/geometry/BoundingVolume.h" +#include "open3d/geometry/IntersectionTest.h" +#include "open3d/geometry/KDTreeFlann.h" +#include "open3d/geometry/PointCloud.h" +#include "open3d/geometry/Qhull.h" + #ifdef _OPENMP #include #endif diff --git a/cpp/open3d/geometry/TriangleMeshDeformation.cpp b/cpp/open3d/geometry/TriangleMeshDeformation.cpp index e6b79824d77..87a5f0a7ade 100644 --- a/cpp/open3d/geometry/TriangleMeshDeformation.cpp +++ b/cpp/open3d/geometry/TriangleMeshDeformation.cpp @@ -24,12 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/geometry/TriangleMesh.h" - #include #include #include +#include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/geometry/TriangleMeshSimplification.cpp b/cpp/open3d/geometry/TriangleMeshSimplification.cpp index 4d3d337dbc6..33322c97689 100644 --- a/cpp/open3d/geometry/TriangleMeshSimplification.cpp +++ b/cpp/open3d/geometry/TriangleMeshSimplification.cpp @@ -24,12 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/geometry/TriangleMesh.h" - #include #include #include +#include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/geometry/TriangleMeshSubdivide.cpp b/cpp/open3d/geometry/TriangleMeshSubdivide.cpp index 31d05a70e76..d6a606a7964 100644 --- a/cpp/open3d/geometry/TriangleMeshSubdivide.cpp +++ b/cpp/open3d/geometry/TriangleMeshSubdivide.cpp @@ -24,12 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/geometry/TriangleMesh.h" - #include #include #include +#include "open3d/geometry/TriangleMesh.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/geometry/VoxelGrid.h b/cpp/open3d/geometry/VoxelGrid.h index a931451d223..095a382540c 100644 --- a/cpp/open3d/geometry/VoxelGrid.h +++ b/cpp/open3d/geometry/VoxelGrid.h @@ -33,7 +33,6 @@ #include "open3d/geometry/Geometry3D.h" #include "open3d/utility/Console.h" - #include "open3d/utility/Helper.h" namespace open3d { diff --git a/cpp/open3d/io/FileFormatIO.cpp b/cpp/open3d/io/FileFormatIO.cpp index 829f4df597f..56dd8d70f0f 100644 --- a/cpp/open3d/io/FileFormatIO.cpp +++ b/cpp/open3d/io/FileFormatIO.cpp @@ -26,10 +26,10 @@ #include "FileFormatIO.h" -#include "open3d/utility/FileSystem.h" - #include +#include "open3d/utility/FileSystem.h" + namespace open3d { namespace io { diff --git a/cpp/open3d/io/file_format/FileGLTF.cpp b/cpp/open3d/io/file_format/FileGLTF.cpp index c947ef1320e..5c418d52a31 100644 --- a/cpp/open3d/io/file_format/FileGLTF.cpp +++ b/cpp/open3d/io/file_format/FileGLTF.cpp @@ -24,6 +24,8 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include + #include #include @@ -32,8 +34,6 @@ #include "open3d/utility/Console.h" #include "open3d/utility/FileSystem.h" -#include - namespace open3d { namespace io { diff --git a/cpp/open3d/io/file_format/FileJPG.cpp b/cpp/open3d/io/file_format/FileJPG.cpp index bb8dacc2f35..7c9ecf39bc6 100644 --- a/cpp/open3d/io/file_format/FileJPG.cpp +++ b/cpp/open3d/io/file_format/FileJPG.cpp @@ -24,10 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +// clang-format off #include #include - #include // Include after cstddef to define size_t +// clang-format on #include "open3d/io/ImageIO.h" #include "open3d/utility/Console.h" diff --git a/cpp/open3d/io/file_format/FileJSON.cpp b/cpp/open3d/io/file_format/FileJSON.cpp index 5bc3f041580..6d815b76c2e 100644 --- a/cpp/open3d/io/file_format/FileJSON.cpp +++ b/cpp/open3d/io/file_format/FileJSON.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include + #include #include diff --git a/cpp/open3d/io/file_format/FileOBJ.cpp b/cpp/open3d/io/file_format/FileOBJ.cpp index fb1ac4b0306..77da62601b5 100644 --- a/cpp/open3d/io/file_format/FileOBJ.cpp +++ b/cpp/open3d/io/file_format/FileOBJ.cpp @@ -24,6 +24,8 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include + #include #include #include @@ -34,8 +36,6 @@ #include "open3d/utility/Console.h" #include "open3d/utility/FileSystem.h" -#include - namespace open3d { namespace io { diff --git a/cpp/open3d/io/file_format/FilePCD.cpp b/cpp/open3d/io/file_format/FilePCD.cpp index 1163b8d3f8b..479ee32df35 100644 --- a/cpp/open3d/io/file_format/FilePCD.cpp +++ b/cpp/open3d/io/file_format/FilePCD.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include + #include #include #include diff --git a/cpp/open3d/io/sensor/azure_kinect/AzureKinectRecorder.cpp b/cpp/open3d/io/sensor/azure_kinect/AzureKinectRecorder.cpp index ed4de4fa7b9..1ac1fc53d0f 100644 --- a/cpp/open3d/io/sensor/azure_kinect/AzureKinectRecorder.cpp +++ b/cpp/open3d/io/sensor/azure_kinect/AzureKinectRecorder.cpp @@ -30,15 +30,15 @@ #include "open3d/io/sensor/azure_kinect/AzureKinectRecorder.h" #include +#include +#include + #include #include #include #include #include -#include -#include - #include "open3d/geometry/RGBDImage.h" #include "open3d/io/sensor/azure_kinect/K4aPlugin.h" #include "open3d/io/sensor/azure_kinect/MKVReader.h" diff --git a/cpp/open3d/io/sensor/azure_kinect/AzureKinectSensor.cpp b/cpp/open3d/io/sensor/azure_kinect/AzureKinectSensor.cpp index 012a30f83fe..1d41d2153e1 100644 --- a/cpp/open3d/io/sensor/azure_kinect/AzureKinectSensor.cpp +++ b/cpp/open3d/io/sensor/azure_kinect/AzureKinectSensor.cpp @@ -29,6 +29,7 @@ #include #include #include + #include #include "open3d/geometry/RGBDImage.h" diff --git a/cpp/open3d/io/sensor/azure_kinect/AzureKinectSensorConfig.cpp b/cpp/open3d/io/sensor/azure_kinect/AzureKinectSensorConfig.cpp index 0ed23247e25..c1aac69c589 100644 --- a/cpp/open3d/io/sensor/azure_kinect/AzureKinectSensorConfig.cpp +++ b/cpp/open3d/io/sensor/azure_kinect/AzureKinectSensorConfig.cpp @@ -28,6 +28,7 @@ #include #include + #include #include #include diff --git a/cpp/open3d/io/sensor/azure_kinect/K4aPlugin.cpp b/cpp/open3d/io/sensor/azure_kinect/K4aPlugin.cpp index 08ce209a8a0..9af0ecae6a1 100644 --- a/cpp/open3d/io/sensor/azure_kinect/K4aPlugin.cpp +++ b/cpp/open3d/io/sensor/azure_kinect/K4aPlugin.cpp @@ -27,6 +27,7 @@ #include #include #include + #include #include #include diff --git a/cpp/open3d/io/sensor/azure_kinect/MKVMetadata.cpp b/cpp/open3d/io/sensor/azure_kinect/MKVMetadata.cpp index 06102697322..5ba5a97b802 100644 --- a/cpp/open3d/io/sensor/azure_kinect/MKVMetadata.cpp +++ b/cpp/open3d/io/sensor/azure_kinect/MKVMetadata.cpp @@ -27,6 +27,7 @@ #include "open3d/io/sensor/azure_kinect/MKVMetadata.h" #include + #include namespace open3d { diff --git a/cpp/open3d/io/sensor/azure_kinect/MKVReader.cpp b/cpp/open3d/io/sensor/azure_kinect/MKVReader.cpp index 2a2a5d4bb59..599dcfdd8cb 100644 --- a/cpp/open3d/io/sensor/azure_kinect/MKVReader.cpp +++ b/cpp/open3d/io/sensor/azure_kinect/MKVReader.cpp @@ -31,6 +31,7 @@ #include #include #include + #include #include "open3d/io/sensor/azure_kinect/AzureKinectSensor.h" diff --git a/cpp/open3d/ml/PyTorch/Misc/BuildSpatialHashTableOpKernel.cu b/cpp/open3d/ml/PyTorch/Misc/BuildSpatialHashTableOpKernel.cu index cae15d4fe9d..7822673b4e3 100644 --- a/cpp/open3d/ml/PyTorch/Misc/BuildSpatialHashTableOpKernel.cu +++ b/cpp/open3d/ml/PyTorch/Misc/BuildSpatialHashTableOpKernel.cu @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/TorchHelper.h" #include "open3d/ml/impl/misc/FixedRadiusSearch.cuh" #include "torch/script.h" diff --git a/cpp/open3d/ml/PyTorch/Misc/BuildSpatialHashTableOps.cpp b/cpp/open3d/ml/PyTorch/Misc/BuildSpatialHashTableOps.cpp index 8397de9f9c3..ea3479a7ca2 100644 --- a/cpp/open3d/ml/PyTorch/Misc/BuildSpatialHashTableOps.cpp +++ b/cpp/open3d/ml/PyTorch/Misc/BuildSpatialHashTableOps.cpp @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/TorchHelper.h" #include "torch/script.h" diff --git a/cpp/open3d/ml/PyTorch/Misc/FixedRadiusSearchOpKernel.cu b/cpp/open3d/ml/PyTorch/Misc/FixedRadiusSearchOpKernel.cu index 7ca761f00ad..314a99e4627 100644 --- a/cpp/open3d/ml/PyTorch/Misc/FixedRadiusSearchOpKernel.cu +++ b/cpp/open3d/ml/PyTorch/Misc/FixedRadiusSearchOpKernel.cu @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/Misc/NeighborSearchAllocator.h" #include "open3d/ml/PyTorch/TorchHelper.h" #include "open3d/ml/impl/misc/FixedRadiusSearch.cuh" diff --git a/cpp/open3d/ml/PyTorch/Misc/FixedRadiusSearchOps.cpp b/cpp/open3d/ml/PyTorch/Misc/FixedRadiusSearchOps.cpp index 9598745f947..438f9aa1dde 100644 --- a/cpp/open3d/ml/PyTorch/Misc/FixedRadiusSearchOps.cpp +++ b/cpp/open3d/ml/PyTorch/Misc/FixedRadiusSearchOps.cpp @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/TorchHelper.h" #include "open3d/ml/impl/misc/NeighborSearchCommon.h" #include "torch/script.h" diff --git a/cpp/open3d/ml/PyTorch/Misc/InvertNeighborsListOpKernel.cu b/cpp/open3d/ml/PyTorch/Misc/InvertNeighborsListOpKernel.cu index 2f215d589a1..2aa6a198341 100644 --- a/cpp/open3d/ml/PyTorch/Misc/InvertNeighborsListOpKernel.cu +++ b/cpp/open3d/ml/PyTorch/Misc/InvertNeighborsListOpKernel.cu @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/TorchHelper.h" #include "open3d/ml/impl/misc/InvertNeighborsList.cuh" #include "torch/script.h" diff --git a/cpp/open3d/ml/PyTorch/Misc/InvertNeighborsListOps.cpp b/cpp/open3d/ml/PyTorch/Misc/InvertNeighborsListOps.cpp index 68f45051a35..fb07a224e6a 100644 --- a/cpp/open3d/ml/PyTorch/Misc/InvertNeighborsListOps.cpp +++ b/cpp/open3d/ml/PyTorch/Misc/InvertNeighborsListOps.cpp @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/TorchHelper.h" #include "torch/script.h" diff --git a/cpp/open3d/ml/PyTorch/Misc/KnnSearchOps.cpp b/cpp/open3d/ml/PyTorch/Misc/KnnSearchOps.cpp index 94010faa6f2..f041950eb68 100644 --- a/cpp/open3d/ml/PyTorch/Misc/KnnSearchOps.cpp +++ b/cpp/open3d/ml/PyTorch/Misc/KnnSearchOps.cpp @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/TorchHelper.h" #include "open3d/ml/impl/misc/NeighborSearchCommon.h" #include "torch/script.h" diff --git a/cpp/open3d/ml/PyTorch/Misc/RadiusSearchOps.cpp b/cpp/open3d/ml/PyTorch/Misc/RadiusSearchOps.cpp index b5efeae80ea..fdd1e8916ab 100644 --- a/cpp/open3d/ml/PyTorch/Misc/RadiusSearchOps.cpp +++ b/cpp/open3d/ml/PyTorch/Misc/RadiusSearchOps.cpp @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/TorchHelper.h" #include "open3d/ml/impl/misc/NeighborSearchCommon.h" #include "torch/script.h" diff --git a/cpp/open3d/ml/PyTorch/Misc/ReduceSubarraysSumOpKernel.cu b/cpp/open3d/ml/PyTorch/Misc/ReduceSubarraysSumOpKernel.cu index 58ab9614937..7c67a63ede6 100644 --- a/cpp/open3d/ml/PyTorch/Misc/ReduceSubarraysSumOpKernel.cu +++ b/cpp/open3d/ml/PyTorch/Misc/ReduceSubarraysSumOpKernel.cu @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/TorchHelper.h" #include "open3d/ml/impl/misc/ReduceSubarraysSum.cuh" #include "torch/script.h" diff --git a/cpp/open3d/ml/PyTorch/Misc/ReduceSubarraysSumOps.cpp b/cpp/open3d/ml/PyTorch/Misc/ReduceSubarraysSumOps.cpp index 8bd00e121ad..4204b850e20 100644 --- a/cpp/open3d/ml/PyTorch/Misc/ReduceSubarraysSumOps.cpp +++ b/cpp/open3d/ml/PyTorch/Misc/ReduceSubarraysSumOps.cpp @@ -26,6 +26,7 @@ // #include + #include "open3d/ml/PyTorch/TorchHelper.h" #include "torch/script.h" diff --git a/cpp/open3d/ml/PyTorch/TorchHelper.h b/cpp/open3d/ml/PyTorch/TorchHelper.h index 1e58d82bcd7..acfa306d5b5 100644 --- a/cpp/open3d/ml/PyTorch/TorchHelper.h +++ b/cpp/open3d/ml/PyTorch/TorchHelper.h @@ -26,7 +26,9 @@ #pragma once #include + #include + #include "open3d/ml/ShapeChecking.h" // Macros for checking tensor properties diff --git a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvBackpropFilterOpKernel.cpp b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvBackpropFilterOpKernel.cpp index 46281ff355b..79cc0869e9a 100644 --- a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvBackpropFilterOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvBackpropFilterOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "ContinuousConvBackpropFilterOpKernel.h" + #include "open3d/ml/impl/continuous_conv/ContinuousConvBackpropFilter.h" using namespace open3d; diff --git a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvOpKernel.cpp b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvOpKernel.cpp index 6cb76baa7a2..35e5f3df4da 100644 --- a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "ContinuousConvOpKernel.h" + #include "open3d/ml/impl/continuous_conv/ContinuousConv.h" using namespace open3d; diff --git a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeBackpropFilterOpKernel.cpp b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeBackpropFilterOpKernel.cpp index 3981020e86e..b42b20ecd2a 100644 --- a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeBackpropFilterOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeBackpropFilterOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "ContinuousConvTransposeBackpropFilterOpKernel.h" + #include "open3d/ml/impl/continuous_conv/ContinuousConvTransposeBackpropFilter.h" using namespace open3d; diff --git a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeOpKernel.cpp b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeOpKernel.cpp index 0cf62d449ae..40d30a74002 100644 --- a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "ContinuousConvTransposeOpKernel.h" + #include "open3d/ml/impl/continuous_conv/ContinuousConvTranspose.h" using namespace open3d; diff --git a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeOps.cpp b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeOps.cpp index cc1f28c8029..e7a1f841a98 100644 --- a/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeOps.cpp +++ b/cpp/open3d/ml/TensorFlow/ContinuousConv/ContinuousConvTransposeOps.cpp @@ -58,7 +58,6 @@ REGISTER_OP("Open3DContinuousConvTranspose") .Input("neighbors_row_splits: int64") // [num_points_out+1] .Output("out_features : TReal") // [num_points_out, out_ch] .SetShapeFn([](::tensorflow::shape_inference::InferenceContext* c) { - using namespace ::tensorflow::shape_inference; ShapeHandle filters_shape, out_positions_shape, out_importance_shape, extents_shape, offset_shape, diff --git a/cpp/open3d/ml/TensorFlow/Misc/BuildSpatialHashTableOpKernel.cpp b/cpp/open3d/ml/TensorFlow/Misc/BuildSpatialHashTableOpKernel.cpp index 95ee1c82f21..16f729bed97 100644 --- a/cpp/open3d/ml/TensorFlow/Misc/BuildSpatialHashTableOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/Misc/BuildSpatialHashTableOpKernel.cpp @@ -26,6 +26,7 @@ // #include "BuildSpatialHashTableOpKernel.h" + #include "open3d/ml/impl/misc/FixedRadiusSearch.h" using namespace open3d::ml::impl; diff --git a/cpp/open3d/ml/TensorFlow/Misc/FixedRadiusSearchOpKernel.cpp b/cpp/open3d/ml/TensorFlow/Misc/FixedRadiusSearchOpKernel.cpp index 416c9352906..23ccb0b4ded 100644 --- a/cpp/open3d/ml/TensorFlow/Misc/FixedRadiusSearchOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/Misc/FixedRadiusSearchOpKernel.cpp @@ -26,6 +26,7 @@ // #include "FixedRadiusSearchOpKernel.h" + #include "open3d/ml/impl/misc/FixedRadiusSearch.h" using namespace open3d::ml::impl; diff --git a/cpp/open3d/ml/TensorFlow/Misc/InvertNeighborsListOpKernel.cpp b/cpp/open3d/ml/TensorFlow/Misc/InvertNeighborsListOpKernel.cpp index 4728a8e88ec..ad9822d346a 100644 --- a/cpp/open3d/ml/TensorFlow/Misc/InvertNeighborsListOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/Misc/InvertNeighborsListOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "InvertNeighborsListOpKernel.h" + #include "open3d/ml/impl/misc/InvertNeighborsList.h" using namespace open3d::ml::impl; diff --git a/cpp/open3d/ml/TensorFlow/Misc/KnnSearchOpKernel.cpp b/cpp/open3d/ml/TensorFlow/Misc/KnnSearchOpKernel.cpp index 6c7c738c417..8bc5a1a83d9 100644 --- a/cpp/open3d/ml/TensorFlow/Misc/KnnSearchOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/Misc/KnnSearchOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "KnnSearchOpKernel.h" + #include "open3d/ml/impl/misc/KnnSearch.h" using namespace open3d::ml::impl; diff --git a/cpp/open3d/ml/TensorFlow/Misc/RadiusSearchOpKernel.cpp b/cpp/open3d/ml/TensorFlow/Misc/RadiusSearchOpKernel.cpp index 4b07d7e258d..e2faa16f099 100644 --- a/cpp/open3d/ml/TensorFlow/Misc/RadiusSearchOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/Misc/RadiusSearchOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "RadiusSearchOpKernel.h" + #include "open3d/ml/impl/misc/RadiusSearch.h" using namespace open3d::ml::impl; diff --git a/cpp/open3d/ml/TensorFlow/Misc/ReduceSubarraysSumOpKernel.cpp b/cpp/open3d/ml/TensorFlow/Misc/ReduceSubarraysSumOpKernel.cpp index 483de80fe11..4ff5ecaf7d6 100644 --- a/cpp/open3d/ml/TensorFlow/Misc/ReduceSubarraysSumOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/Misc/ReduceSubarraysSumOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "ReduceSubarraysSumOpKernel.h" + #include "open3d/ml/impl/misc/ReduceSubarraysSum.h" using namespace open3d::ml::impl; diff --git a/cpp/open3d/ml/TensorFlow/Misc/VoxelPoolingGradOpKernel.cpp b/cpp/open3d/ml/TensorFlow/Misc/VoxelPoolingGradOpKernel.cpp index 5ac3baf6e83..9b1b8cc9ebe 100644 --- a/cpp/open3d/ml/TensorFlow/Misc/VoxelPoolingGradOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/Misc/VoxelPoolingGradOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "VoxelPoolingGradOpKernel.h" + #include "open3d/ml/impl/misc/VoxelPooling.h" using namespace open3d::ml::impl; diff --git a/cpp/open3d/ml/TensorFlow/Misc/VoxelPoolingOpKernel.cpp b/cpp/open3d/ml/TensorFlow/Misc/VoxelPoolingOpKernel.cpp index 46303e856b5..a6effb1b7ba 100644 --- a/cpp/open3d/ml/TensorFlow/Misc/VoxelPoolingOpKernel.cpp +++ b/cpp/open3d/ml/TensorFlow/Misc/VoxelPoolingOpKernel.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "VoxelPoolingOpKernel.h" + #include "open3d/ml/impl/misc/VoxelPooling.h" using namespace open3d::ml::impl; diff --git a/cpp/open3d/ml/impl/continuous_conv/ContinuousConv.h b/cpp/open3d/ml/impl/continuous_conv/ContinuousConv.h index 169fdc9fc5d..14daf12d76b 100644 --- a/cpp/open3d/ml/impl/continuous_conv/ContinuousConv.h +++ b/cpp/open3d/ml/impl/continuous_conv/ContinuousConv.h @@ -79,7 +79,6 @@ void _CConvComputeFeaturesCPU(TReal* out_features, tbb::parallel_for( tbb::blocked_range(0, num_out, 32), [&](const tbb::blocked_range& r) { - int range_length = r.end() - r.begin(); Eigen::Matrix normalizers( @@ -216,7 +215,6 @@ void _CConvComputeFeaturesCPU(TReal* out_features, if (normalizers(i) != 0) C.col(i) /= normalizers(i); } } - }); } diff --git a/cpp/open3d/ml/impl/continuous_conv/ContinuousConvBackpropFilter.h b/cpp/open3d/ml/impl/continuous_conv/ContinuousConvBackpropFilter.h index 2d593855d76..3ffc7e3d80c 100644 --- a/cpp/open3d/ml/impl/continuous_conv/ContinuousConvBackpropFilter.h +++ b/cpp/open3d/ml/impl/continuous_conv/ContinuousConvBackpropFilter.h @@ -27,6 +27,7 @@ #pragma once #include + #include #include "open3d/ml/impl/continuous_conv/CoordinateTransformation.h" @@ -82,7 +83,6 @@ void _CConvBackropFilterCPU(TReal* filter_backprop, tbb::parallel_for( tbb::blocked_range(0, num_out, 32), [&](const tbb::blocked_range& r) { - int range_length = r.end() - r.begin(); Eigen::Matrix B( @@ -225,7 +225,6 @@ void _CConvBackropFilterCPU(TReal* filter_backprop, filter_backprop[linear_i] += A(i, j); } } - }); } diff --git a/cpp/open3d/ml/impl/continuous_conv/ContinuousConvCUDAKernels.cu b/cpp/open3d/ml/impl/continuous_conv/ContinuousConvCUDAKernels.cu index 703855674dc..6c3e8e474dc 100644 --- a/cpp/open3d/ml/impl/continuous_conv/ContinuousConvCUDAKernels.cu +++ b/cpp/open3d/ml/impl/continuous_conv/ContinuousConvCUDAKernels.cu @@ -25,7 +25,6 @@ // ---------------------------------------------------------------------------- #include "open3d/ml/impl/continuous_conv/ContinuousConvCUDAKernels.h" - #include "open3d/utility/Helper.h" using open3d::utility::DivUp; diff --git a/cpp/open3d/ml/impl/continuous_conv/ContinuousConvTranspose.h b/cpp/open3d/ml/impl/continuous_conv/ContinuousConvTranspose.h index e3a77462fbf..c88b0be9ce7 100644 --- a/cpp/open3d/ml/impl/continuous_conv/ContinuousConvTranspose.h +++ b/cpp/open3d/ml/impl/continuous_conv/ContinuousConvTranspose.h @@ -81,7 +81,6 @@ void _CConvTransposeComputeFeaturesCPU( tbb::parallel_for( tbb::blocked_range(0, num_out, 32), [&](const tbb::blocked_range& r) { - int range_length = r.end() - r.begin(); Eigen::Matrix B( @@ -215,7 +214,6 @@ void _CConvTransposeComputeFeaturesCPU( for (int i = 0; i < range_length; ++i) C.col(i) *= out_importance[r.begin() + i]; } - }); } diff --git a/cpp/open3d/ml/impl/continuous_conv/ContinuousConvTransposeBackpropFilter.h b/cpp/open3d/ml/impl/continuous_conv/ContinuousConvTransposeBackpropFilter.h index 91cc9febbef..f68c395437c 100644 --- a/cpp/open3d/ml/impl/continuous_conv/ContinuousConvTransposeBackpropFilter.h +++ b/cpp/open3d/ml/impl/continuous_conv/ContinuousConvTransposeBackpropFilter.h @@ -27,6 +27,7 @@ #pragma once #include + #include #include "open3d/ml/impl/continuous_conv/CoordinateTransformation.h" @@ -83,7 +84,6 @@ void _CConvTransposeBackpropFilterCPU(TReal* filter_backprop, tbb::parallel_for( tbb::blocked_range(0, num_out, 32), [&](const tbb::blocked_range& r) { - int range_length = r.end() - r.begin(); Eigen::Matrix B( @@ -230,7 +230,6 @@ void _CConvTransposeBackpropFilterCPU(TReal* filter_backprop, filter_backprop[linear_i] += A(i, j); } } - }); } diff --git a/cpp/open3d/ml/impl/misc/FixedRadiusSearch.h b/cpp/open3d/ml/impl/misc/FixedRadiusSearch.h index 81665806513..173d1711c53 100644 --- a/cpp/open3d/ml/impl/misc/FixedRadiusSearch.h +++ b/cpp/open3d/ml/impl/misc/FixedRadiusSearch.h @@ -27,6 +27,7 @@ #pragma once #include + #include #include "open3d/core/Atomic.h" @@ -253,7 +254,6 @@ void _FixedRadiusSearchCPU(int64_t* query_neighbors_row_splits, tbb::blocked_range(queries_row_splits[i], queries_row_splits[i + 1]), [&](const tbb::blocked_range& r) { - size_t num_indices_local = 0; for (size_t i = r.begin(); i != r.end(); ++i) { size_t neighbors_count = 0; @@ -362,7 +362,6 @@ void _FixedRadiusSearchCPU(int64_t* query_neighbors_row_splits, tbb::blocked_range(queries_row_splits[i], queries_row_splits[i + 1]), [&](const tbb::blocked_range& r) { - for (size_t i = r.begin(); i != r.end(); ++i) { size_t neighbors_count = 0; @@ -564,7 +563,7 @@ void FixedRadiusSearchCPU(int64_t* query_neighbors_row_splits, const bool ignore_query_point, const bool return_distances, OUTPUT_ALLOCATOR& output_allocator) { -// Dispatch all template parameter combinations + // Dispatch all template parameter combinations #define FN_PARAMETERS \ query_neighbors_row_splits, num_points, points, num_queries, queries, \ diff --git a/cpp/open3d/ml/impl/misc/KnnSearch.h b/cpp/open3d/ml/impl/misc/KnnSearch.h index f0d5f310e0f..aa9d386d2a1 100644 --- a/cpp/open3d/ml/impl/misc/KnnSearch.h +++ b/cpp/open3d/ml/impl/misc/KnnSearch.h @@ -27,6 +27,7 @@ #pragma once #include + #include #include "open3d/core/Atomic.h" @@ -153,7 +154,6 @@ void _KnnSearchCPU(int64_t* query_neighbors_row_splits, // fill output index and distance arrays tbb::parallel_for(tbb::blocked_range(0, pairs.size()), [&](const tbb::blocked_range& r) { - for (size_t i = r.begin(); i != r.end(); ++i) { Pair pair = pairs[i]; diff --git a/cpp/open3d/ml/impl/misc/RadiusSearch.h b/cpp/open3d/ml/impl/misc/RadiusSearch.h index a8a37e4bba1..bf4f47198d2 100644 --- a/cpp/open3d/ml/impl/misc/RadiusSearch.h +++ b/cpp/open3d/ml/impl/misc/RadiusSearch.h @@ -27,6 +27,7 @@ #pragma once #include + #include #include "open3d/core/Atomic.h" @@ -159,7 +160,6 @@ void _RadiusSearchCPU(int64_t* query_neighbors_row_splits, // fill output index and distance arrays tbb::parallel_for(tbb::blocked_range(0, pairs.size()), [&](const tbb::blocked_range& r) { - for (size_t i = r.begin(); i != r.end(); ++i) { Pair pair = pairs[i]; diff --git a/cpp/open3d/ml/impl/misc/VoxelPooling.h b/cpp/open3d/ml/impl/misc/VoxelPooling.h index 21d63b39a3c..a510a9f6ed9 100644 --- a/cpp/open3d/ml/impl/misc/VoxelPooling.h +++ b/cpp/open3d/ml/impl/misc/VoxelPooling.h @@ -27,6 +27,7 @@ #pragma once #include + #include #include diff --git a/cpp/open3d/tgeometry/TensorListMap.cpp b/cpp/open3d/tgeometry/TensorListMap.cpp index 03b4b1e9593..3b86e6709ee 100644 --- a/cpp/open3d/tgeometry/TensorListMap.cpp +++ b/cpp/open3d/tgeometry/TensorListMap.cpp @@ -24,12 +24,14 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/tgeometry/TensorListMap.h" + #include + #include #include #include -#include "open3d/tgeometry/TensorListMap.h" #include "open3d/utility/Console.h" namespace open3d { diff --git a/cpp/open3d/utility/Console.h b/cpp/open3d/utility/Console.h index fd0d1e51709..7b429bcb7d3 100644 --- a/cpp/open3d/utility/Console.h +++ b/cpp/open3d/utility/Console.h @@ -88,7 +88,7 @@ class Logger { return instance; } - void VError[[noreturn]](const char *format, fmt::format_args args) const { + void VError [[noreturn]] (const char *format, fmt::format_args args) const { std::string err_msg = fmt::vformat(format, args); err_msg = fmt::format("[Open3D ERROR] {}", err_msg); err_msg = ColorString(err_msg, TextColor::Red, 1); @@ -121,7 +121,7 @@ class Logger { } template - void Error[[noreturn]](const char *format, const Args &... args) const { + void Error [[noreturn]] (const char *format, const Args &... args) const { VError(format, fmt::make_format_args(args...)); } @@ -173,7 +173,7 @@ inline VerbosityLevel GetVerbosityLevel() { } template -inline void LogError[[noreturn]](const char *format, const Args &... args) { +inline void LogError [[noreturn]] (const char *format, const Args &... args) { Logger::i().VError(format, fmt::make_format_args(args...)); } diff --git a/cpp/open3d/utility/FileSystem.cpp b/cpp/open3d/utility/FileSystem.cpp index c3e05c23916..f9288358577 100644 --- a/cpp/open3d/utility/FileSystem.cpp +++ b/cpp/open3d/utility/FileSystem.cpp @@ -27,6 +27,7 @@ #include "open3d/utility/FileSystem.h" #include + #include #include #include diff --git a/cpp/open3d/utility/ParallelScan.h b/cpp/open3d/utility/ParallelScan.h index 61fe596daaf..137a475a239 100644 --- a/cpp/open3d/utility/ParallelScan.h +++ b/cpp/open3d/utility/ParallelScan.h @@ -27,6 +27,7 @@ #pragma once #include + #include "tbb/parallel_scan.h" #if TBB_INTERFACE_VERSION >= 10000 #include "pstl/execution" diff --git a/cpp/open3d/visualization/gui/Application.cpp b/cpp/open3d/visualization/gui/Application.cpp index 9c63920b201..8021922189d 100644 --- a/cpp/open3d/visualization/gui/Application.cpp +++ b/cpp/open3d/visualization/gui/Application.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/Application.h" #include + #include #include #include diff --git a/cpp/open3d/visualization/gui/Button.cpp b/cpp/open3d/visualization/gui/Button.cpp index 7d15de593a6..eccb87dd60f 100644 --- a/cpp/open3d/visualization/gui/Button.cpp +++ b/cpp/open3d/visualization/gui/Button.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/Button.h" #include + #include #include diff --git a/cpp/open3d/visualization/gui/Checkbox.cpp b/cpp/open3d/visualization/gui/Checkbox.cpp index 08ebbd91324..35a0464a15e 100644 --- a/cpp/open3d/visualization/gui/Checkbox.cpp +++ b/cpp/open3d/visualization/gui/Checkbox.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/Checkbox.h" #include + #include #include diff --git a/cpp/open3d/visualization/gui/ColorEdit.cpp b/cpp/open3d/visualization/gui/ColorEdit.cpp index c775533fe1b..dc5451bce96 100644 --- a/cpp/open3d/visualization/gui/ColorEdit.cpp +++ b/cpp/open3d/visualization/gui/ColorEdit.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/ColorEdit.h" #include + #include #include diff --git a/cpp/open3d/visualization/gui/Combobox.cpp b/cpp/open3d/visualization/gui/Combobox.cpp index 07132f1ff5d..a467ecbe2b8 100644 --- a/cpp/open3d/visualization/gui/Combobox.cpp +++ b/cpp/open3d/visualization/gui/Combobox.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/Combobox.h" #include + #include #include #include diff --git a/cpp/open3d/visualization/gui/FileDialogNative.cpp b/cpp/open3d/visualization/gui/FileDialogNative.cpp index 70cb30f66be..275495a08f4 100644 --- a/cpp/open3d/visualization/gui/FileDialogNative.cpp +++ b/cpp/open3d/visualization/gui/FileDialogNative.cpp @@ -26,11 +26,10 @@ #if defined(__APPLE__) -#include "open3d/visualization/gui/FileDialog.h" - #include #include +#include "open3d/visualization/gui/FileDialog.h" #include "open3d/visualization/gui/Native.h" namespace open3d { diff --git a/cpp/open3d/visualization/gui/ImguiFilamentBridge.cpp b/cpp/open3d/visualization/gui/ImguiFilamentBridge.cpp index 0880fb90ac2..875dbdf295d 100644 --- a/cpp/open3d/visualization/gui/ImguiFilamentBridge.cpp +++ b/cpp/open3d/visualization/gui/ImguiFilamentBridge.cpp @@ -58,6 +58,7 @@ #include #include #include + #include #include // recursive includes needs this, std::size_t especially #include diff --git a/cpp/open3d/visualization/gui/ImguiFilamentBridge.h b/cpp/open3d/visualization/gui/ImguiFilamentBridge.h index 90f0a218f8a..87dc98dba07 100644 --- a/cpp/open3d/visualization/gui/ImguiFilamentBridge.h +++ b/cpp/open3d/visualization/gui/ImguiFilamentBridge.h @@ -51,6 +51,7 @@ #include #include #include + #include // recursive includes needs this, std::size_t especially #include diff --git a/cpp/open3d/visualization/gui/Label.cpp b/cpp/open3d/visualization/gui/Label.cpp index de157b20f6d..8d831a2eb9c 100644 --- a/cpp/open3d/visualization/gui/Label.cpp +++ b/cpp/open3d/visualization/gui/Label.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/Label.h" #include + #include #include #include diff --git a/cpp/open3d/visualization/gui/Layout.cpp b/cpp/open3d/visualization/gui/Layout.cpp index d084ecdd262..27bf529cc38 100644 --- a/cpp/open3d/visualization/gui/Layout.cpp +++ b/cpp/open3d/visualization/gui/Layout.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/Layout.h" #include + #include #include #include diff --git a/cpp/open3d/visualization/gui/ListView.cpp b/cpp/open3d/visualization/gui/ListView.cpp index 3a3dd002dfc..8b8d98c68fb 100644 --- a/cpp/open3d/visualization/gui/ListView.cpp +++ b/cpp/open3d/visualization/gui/ListView.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/ListView.h" #include + #include #include #include diff --git a/cpp/open3d/visualization/gui/Menu.cpp b/cpp/open3d/visualization/gui/Menu.cpp index 5d9f9c17f99..227f518bdc6 100644 --- a/cpp/open3d/visualization/gui/Menu.cpp +++ b/cpp/open3d/visualization/gui/Menu.cpp @@ -31,6 +31,7 @@ #else #include + #include #include #include diff --git a/cpp/open3d/visualization/gui/Native.h b/cpp/open3d/visualization/gui/Native.h index 7c236e24ad7..d80964d7610 100644 --- a/cpp/open3d/visualization/gui/Native.h +++ b/cpp/open3d/visualization/gui/Native.h @@ -19,11 +19,11 @@ #pragma once -#include "FileDialog.h" - #include #include +#include "FileDialog.h" + struct GLFWwindow; namespace open3d { diff --git a/cpp/open3d/visualization/gui/NativeLinux.cpp b/cpp/open3d/visualization/gui/NativeLinux.cpp index 6020188aced..b86f3fd1130 100644 --- a/cpp/open3d/visualization/gui/NativeLinux.cpp +++ b/cpp/open3d/visualization/gui/NativeLinux.cpp @@ -24,14 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "Native.h" +#include #include "Application.h" - -#include +#include "Native.h" #define GLFW_EXPOSE_NATIVE_X11 1 #include - #include namespace open3d { diff --git a/cpp/open3d/visualization/gui/NativeWin32.cpp b/cpp/open3d/visualization/gui/NativeWin32.cpp index f0d5e84ae8f..7e7034d5a75 100644 --- a/cpp/open3d/visualization/gui/NativeWin32.cpp +++ b/cpp/open3d/visualization/gui/NativeWin32.cpp @@ -24,12 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "Native.h" - #include + +#include "Native.h" #define GLFW_EXPOSE_NATIVE_WIN32 1 #include - #include namespace open3d { diff --git a/cpp/open3d/visualization/gui/NumberEdit.cpp b/cpp/open3d/visualization/gui/NumberEdit.cpp index 1956fe55545..4d95459df12 100644 --- a/cpp/open3d/visualization/gui/NumberEdit.cpp +++ b/cpp/open3d/visualization/gui/NumberEdit.cpp @@ -27,7 +27,8 @@ #include "open3d/visualization/gui/NumberEdit.h" #include -#include // for snprintf +#include // for snprintf + #include // for min, max #include #include diff --git a/cpp/open3d/visualization/gui/ProgressBar.cpp b/cpp/open3d/visualization/gui/ProgressBar.cpp index 480c9a7aaf2..19451270f4c 100644 --- a/cpp/open3d/visualization/gui/ProgressBar.cpp +++ b/cpp/open3d/visualization/gui/ProgressBar.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/ProgressBar.h" #include + #include #include "open3d/visualization/gui/Theme.h" diff --git a/cpp/open3d/visualization/gui/Slider.cpp b/cpp/open3d/visualization/gui/Slider.cpp index eb7ae36bf10..189dc319a7e 100644 --- a/cpp/open3d/visualization/gui/Slider.cpp +++ b/cpp/open3d/visualization/gui/Slider.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/Slider.h" #include + #include #include #include diff --git a/cpp/open3d/visualization/gui/TabControl.cpp b/cpp/open3d/visualization/gui/TabControl.cpp index 2f429798832..b764935b5fd 100644 --- a/cpp/open3d/visualization/gui/TabControl.cpp +++ b/cpp/open3d/visualization/gui/TabControl.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/TabControl.h" #include + #include #include #include diff --git a/cpp/open3d/visualization/gui/TextEdit.cpp b/cpp/open3d/visualization/gui/TextEdit.cpp index 9974c8c1a16..9de4e53595c 100644 --- a/cpp/open3d/visualization/gui/TextEdit.cpp +++ b/cpp/open3d/visualization/gui/TextEdit.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/TextEdit.h" #include + #include #include #include diff --git a/cpp/open3d/visualization/gui/TreeView.cpp b/cpp/open3d/visualization/gui/TreeView.cpp index 6d45719a426..6a19a971cf6 100644 --- a/cpp/open3d/visualization/gui/TreeView.cpp +++ b/cpp/open3d/visualization/gui/TreeView.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/TreeView.h" #include + #include #include #include @@ -358,8 +359,9 @@ Widget::DrawResult TreeView::Draw(const DrawContext &context) { } bool is_selectable = (item.children.empty() || impl_->can_select_parents_); - auto DrawThis = [ this, &tree_frame = frame, &context, &new_selection ]( - TreeView::Impl::Item & item, int height, bool is_selectable) { + auto DrawThis = [this, &tree_frame = frame, &context, &new_selection]( + TreeView::Impl::Item &item, int height, + bool is_selectable) { ImGui::SameLine(0, 0); auto x = ImGui::GetCursorScreenPos().x; auto y = ImGui::GetCursorScreenPos().y; diff --git a/cpp/open3d/visualization/gui/UIImage.cpp b/cpp/open3d/visualization/gui/UIImage.cpp index 131fb5cb604..ba0cb31d499 100644 --- a/cpp/open3d/visualization/gui/UIImage.cpp +++ b/cpp/open3d/visualization/gui/UIImage.cpp @@ -24,13 +24,13 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/visualization/gui/ImageLabel.h" - #include + #include #include "open3d/geometry/Image.h" #include "open3d/io/ImageIO.h" +#include "open3d/visualization/gui/ImageLabel.h" #include "open3d/visualization/gui/Theme.h" #include "open3d/visualization/rendering/Renderer.h" #include "open3d/visualization/rendering/filament/FilamentEngine.h" diff --git a/cpp/open3d/visualization/gui/Util.cpp b/cpp/open3d/visualization/gui/Util.cpp index 64dc5846aaa..5c66f286acf 100644 --- a/cpp/open3d/visualization/gui/Util.cpp +++ b/cpp/open3d/visualization/gui/Util.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/Util.h" #include + #include "open3d/visualization/gui/Color.h" namespace open3d { diff --git a/cpp/open3d/visualization/gui/Util.h b/cpp/open3d/visualization/gui/Util.h index cf2bea901ce..bcd478fc6e6 100644 --- a/cpp/open3d/visualization/gui/Util.h +++ b/cpp/open3d/visualization/gui/Util.h @@ -28,6 +28,7 @@ // These are internal helper functions #include + #include #include diff --git a/cpp/open3d/visualization/gui/VectorEdit.cpp b/cpp/open3d/visualization/gui/VectorEdit.cpp index 08d9bf73d04..d07f2cb4e43 100644 --- a/cpp/open3d/visualization/gui/VectorEdit.cpp +++ b/cpp/open3d/visualization/gui/VectorEdit.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/gui/VectorEdit.h" #include + #include #include "open3d/visualization/gui/Theme.h" diff --git a/cpp/open3d/visualization/gui/Window.cpp b/cpp/open3d/visualization/gui/Window.cpp index 76cf7f908de..5a057e66d85 100644 --- a/cpp/open3d/visualization/gui/Window.cpp +++ b/cpp/open3d/visualization/gui/Window.cpp @@ -30,6 +30,7 @@ #include #include #include // so we can examine the current context + #include #include #include diff --git a/cpp/open3d/visualization/rendering/IBLRotationInteractorLogic.h b/cpp/open3d/visualization/rendering/IBLRotationInteractorLogic.h index 0e06fd939ef..bd91229fc25 100644 --- a/cpp/open3d/visualization/rendering/IBLRotationInteractorLogic.h +++ b/cpp/open3d/visualization/rendering/IBLRotationInteractorLogic.h @@ -27,7 +27,6 @@ #pragma once #include "open3d/visualization/rendering/MatrixInteractorLogic.h" - #include "open3d/visualization/rendering/RendererHandle.h" namespace open3d { diff --git a/cpp/open3d/visualization/rendering/RendererStructs.h b/cpp/open3d/visualization/rendering/RendererStructs.h index eea1a6bfc45..3dec51e0012 100644 --- a/cpp/open3d/visualization/rendering/RendererStructs.h +++ b/cpp/open3d/visualization/rendering/RendererStructs.h @@ -27,6 +27,7 @@ #pragma once #include + #include #include "open3d/visualization/rendering/RendererHandle.h" diff --git a/cpp/open3d/visualization/rendering/filament/FilamentEngine.cpp b/cpp/open3d/visualization/rendering/filament/FilamentEngine.cpp index b09b24241e8..0e734b90a41 100644 --- a/cpp/open3d/visualization/rendering/filament/FilamentEngine.cpp +++ b/cpp/open3d/visualization/rendering/filament/FilamentEngine.cpp @@ -24,11 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "open3d/visualization/rendering/filament/FilamentResourceManager.h" +#include "open3d/visualization/rendering/filament/FilamentEngine.h" #include // recursive includes needs this, std::size_t especially -#include "open3d/visualization/rendering/filament/FilamentEngine.h" +#include "open3d/visualization/rendering/filament/FilamentResourceManager.h" namespace open3d { namespace visualization { diff --git a/cpp/open3d/visualization/rendering/filament/FilamentGeometryBuffersBuilder.h b/cpp/open3d/visualization/rendering/filament/FilamentGeometryBuffersBuilder.h index 3841ace8689..422143ae39b 100644 --- a/cpp/open3d/visualization/rendering/filament/FilamentGeometryBuffersBuilder.h +++ b/cpp/open3d/visualization/rendering/filament/FilamentGeometryBuffersBuilder.h @@ -26,12 +26,15 @@ #pragma once +// clang-format off // NOTE: This header must precede the Filament headers otherwise a conflict // occurs between Filament and standard headers #include "open3d/visualization/rendering/RendererHandle.h" #include #include +// clang-format on + #include #include diff --git a/cpp/open3d/visualization/rendering/filament/FilamentRenderer.h b/cpp/open3d/visualization/rendering/filament/FilamentRenderer.h index 605349f24a1..0cff551dd40 100644 --- a/cpp/open3d/visualization/rendering/filament/FilamentRenderer.h +++ b/cpp/open3d/visualization/rendering/filament/FilamentRenderer.h @@ -26,13 +26,14 @@ #pragma once -#include "open3d/visualization/rendering/Renderer.h" - #include + #include #include #include +#include "open3d/visualization/rendering/Renderer.h" + /// @cond namespace filament { class Engine; diff --git a/cpp/open3d/visualization/rendering/filament/FilamentScene.h b/cpp/open3d/visualization/rendering/filament/FilamentScene.h index ac46f24b559..a11f0fee370 100644 --- a/cpp/open3d/visualization/rendering/filament/FilamentScene.h +++ b/cpp/open3d/visualization/rendering/filament/FilamentScene.h @@ -29,6 +29,7 @@ #include #include #include + #include #include #include diff --git a/cpp/open3d/visualization/rendering/filament/FilamentView.h b/cpp/open3d/visualization/rendering/filament/FilamentView.h index cd00d5cfed8..b74cddb3d66 100644 --- a/cpp/open3d/visualization/rendering/filament/FilamentView.h +++ b/cpp/open3d/visualization/rendering/filament/FilamentView.h @@ -27,6 +27,7 @@ #pragma once #include + #include #include diff --git a/cpp/open3d/visualization/rendering/filament/LineSetBuffers.cpp b/cpp/open3d/visualization/rendering/filament/LineSetBuffers.cpp index 259e70fe4e2..a80b1c16db0 100644 --- a/cpp/open3d/visualization/rendering/filament/LineSetBuffers.cpp +++ b/cpp/open3d/visualization/rendering/filament/LineSetBuffers.cpp @@ -26,6 +26,7 @@ #include #include + #include #include diff --git a/cpp/open3d/visualization/rendering/filament/PointCloudBuffers.cpp b/cpp/open3d/visualization/rendering/filament/PointCloudBuffers.cpp index 0785fe545f9..acadf7e3b57 100644 --- a/cpp/open3d/visualization/rendering/filament/PointCloudBuffers.cpp +++ b/cpp/open3d/visualization/rendering/filament/PointCloudBuffers.cpp @@ -27,6 +27,7 @@ #include #include #include + #include #include "open3d/geometry/BoundingVolume.h" diff --git a/cpp/open3d/visualization/shader/RGBDImageShader.cpp b/cpp/open3d/visualization/shader/RGBDImageShader.cpp index 968789e69df..558f3f5f2c3 100644 --- a/cpp/open3d/visualization/shader/RGBDImageShader.cpp +++ b/cpp/open3d/visualization/shader/RGBDImageShader.cpp @@ -27,6 +27,7 @@ #include "RGBDImageShader.h" #include + #include #include "open3d/geometry/Image.h" diff --git a/cpp/open3d/visualization/utility/DrawGeometry.cpp b/cpp/open3d/visualization/utility/DrawGeometry.cpp index 8474d82a8c2..aa683d591ee 100644 --- a/cpp/open3d/visualization/utility/DrawGeometry.cpp +++ b/cpp/open3d/visualization/utility/DrawGeometry.cpp @@ -24,10 +24,10 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include - #include "open3d/visualization/utility/DrawGeometry.h" +#include + #include "open3d/visualization/gui/Application.h" #include "open3d/visualization/visualizer/GuiVisualizer.h" #include "open3d/visualization/visualizer/ViewControlWithCustomAnimation.h" diff --git a/cpp/open3d/visualization/utility/DrawGeometry.h b/cpp/open3d/visualization/utility/DrawGeometry.h index 354562ab7c6..38870834c52 100644 --- a/cpp/open3d/visualization/utility/DrawGeometry.h +++ b/cpp/open3d/visualization/utility/DrawGeometry.h @@ -26,6 +26,7 @@ #pragma once +#include #include #include #include diff --git a/cpp/open3d/visualization/utility/GLHelper.h b/cpp/open3d/visualization/utility/GLHelper.h index 115c2125fbf..00e65b0987b 100644 --- a/cpp/open3d/visualization/utility/GLHelper.h +++ b/cpp/open3d/visualization/utility/GLHelper.h @@ -34,6 +34,7 @@ #include // Make sure glew.h is included before gl.h #include + #include #include #include diff --git a/cpp/open3d/visualization/visualizer/GuiSettingsModel.h b/cpp/open3d/visualization/visualizer/GuiSettingsModel.h index 0e8d4932f52..7f896718cf2 100644 --- a/cpp/open3d/visualization/visualizer/GuiSettingsModel.h +++ b/cpp/open3d/visualization/visualizer/GuiSettingsModel.h @@ -26,10 +26,10 @@ #pragma once -#include "open3d/visualization/rendering/Scene.h" - #include +#include "open3d/visualization/rendering/Scene.h" + namespace open3d { namespace visualization { diff --git a/cpp/open3d/visualization/visualizer/GuiSettingsView.cpp b/cpp/open3d/visualization/visualizer/GuiSettingsView.cpp index 4e63c5e7986..2908452d9a6 100644 --- a/cpp/open3d/visualization/visualizer/GuiSettingsView.cpp +++ b/cpp/open3d/visualization/visualizer/GuiSettingsView.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/visualizer/GuiSettingsView.h" #include + #include "open3d/utility/Console.h" #include "open3d/utility/FileSystem.h" #include "open3d/visualization/gui/Checkbox.h" diff --git a/cpp/open3d/visualization/visualizer/GuiSettingsView.h b/cpp/open3d/visualization/visualizer/GuiSettingsView.h index f7a4328d5e7..d867da7c10a 100644 --- a/cpp/open3d/visualization/visualizer/GuiSettingsView.h +++ b/cpp/open3d/visualization/visualizer/GuiSettingsView.h @@ -26,11 +26,11 @@ #pragma once -#include "open3d/visualization/gui/Layout.h" - #include #include +#include "open3d/visualization/gui/Layout.h" + namespace open3d { namespace visualization { diff --git a/cpp/open3d/visualization/visualizer/RenderOption.cpp b/cpp/open3d/visualization/visualizer/RenderOption.cpp index eaa7b6aff38..6799cfe4505 100644 --- a/cpp/open3d/visualization/visualizer/RenderOption.cpp +++ b/cpp/open3d/visualization/visualizer/RenderOption.cpp @@ -28,6 +28,7 @@ #include #include + #include #include "open3d/utility/Console.h" diff --git a/cpp/open3d/visualization/visualizer/ViewControl.cpp b/cpp/open3d/visualization/visualizer/ViewControl.cpp index 65720f2e03b..e28d4d754a2 100644 --- a/cpp/open3d/visualization/visualizer/ViewControl.cpp +++ b/cpp/open3d/visualization/visualizer/ViewControl.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "open3d/visualization/visualizer/ViewControl.h" + #include "open3d/utility/Console.h" // Avoid warning caused by redefinition of APIENTRY macro @@ -34,6 +35,7 @@ #endif #include + #include #include // jspark diff --git a/cpp/open3d/visualization/visualizer/ViewControlWithCustomAnimation.cpp b/cpp/open3d/visualization/visualizer/ViewControlWithCustomAnimation.cpp index 37dc5c9655d..10c53db0f57 100644 --- a/cpp/open3d/visualization/visualizer/ViewControlWithCustomAnimation.cpp +++ b/cpp/open3d/visualization/visualizer/ViewControlWithCustomAnimation.cpp @@ -25,9 +25,9 @@ // ---------------------------------------------------------------------------- #include "open3d/visualization/visualizer/ViewControlWithCustomAnimation.h" -#include "open3d/utility/Console.h" #include "open3d/io/IJsonConvertibleIO.h" +#include "open3d/utility/Console.h" namespace open3d { namespace visualization { diff --git a/cpp/open3d/visualization/visualizer/ViewParameters.cpp b/cpp/open3d/visualization/visualizer/ViewParameters.cpp index bfed0b018be..33d25bf147a 100644 --- a/cpp/open3d/visualization/visualizer/ViewParameters.cpp +++ b/cpp/open3d/visualization/visualizer/ViewParameters.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/visualizer/ViewParameters.h" #include + #include #include "open3d/utility/Console.h" diff --git a/cpp/open3d/visualization/visualizer/ViewTrajectory.cpp b/cpp/open3d/visualization/visualizer/ViewTrajectory.cpp index cc809a9c976..4446a9bc405 100644 --- a/cpp/open3d/visualization/visualizer/ViewTrajectory.cpp +++ b/cpp/open3d/visualization/visualizer/ViewTrajectory.cpp @@ -27,6 +27,7 @@ #include "open3d/visualization/visualizer/ViewTrajectory.h" #include + #include #include "open3d/utility/Console.h" diff --git a/cpp/open3d/visualization/visualizer/Visualizer.h b/cpp/open3d/visualization/visualizer/Visualizer.h index bdd4d5f25b3..095bc4444e3 100644 --- a/cpp/open3d/visualization/visualizer/Visualizer.h +++ b/cpp/open3d/visualization/visualizer/Visualizer.h @@ -34,6 +34,7 @@ #include #include + #include #include #include diff --git a/cpp/pybind/camera/camera.cpp b/cpp/pybind/camera/camera.cpp index 093a47e9368..aa52c354305 100644 --- a/cpp/pybind/camera/camera.cpp +++ b/cpp/pybind/camera/camera.cpp @@ -24,10 +24,10 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "pybind/camera/camera.h" + #include "open3d/camera/PinholeCameraIntrinsic.h" #include "open3d/camera/PinholeCameraTrajectory.h" - -#include "pybind/camera/camera.h" #include "pybind/docstring.h" namespace open3d { diff --git a/cpp/pybind/core/blob.cpp b/cpp/pybind/core/blob.cpp index 96e46b72ff9..da96223387c 100644 --- a/cpp/pybind/core/blob.cpp +++ b/cpp/pybind/core/blob.cpp @@ -24,12 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/core/Blob.h" + #include "pybind/core/core.h" #include "pybind/docstring.h" #include "pybind/open3d_pybind.h" -#include "open3d/core/Blob.h" - namespace open3d { void pybind_core_blob(py::module &m) { diff --git a/cpp/pybind/core/core.cpp b/cpp/pybind/core/core.cpp index 4cedbff98ca..d2b996dc249 100644 --- a/cpp/pybind/core/core.cpp +++ b/cpp/pybind/core/core.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "pybind/core/core.h" + #include "pybind/open3d_pybind.h" namespace open3d { diff --git a/cpp/pybind/core/cuda_utils.cpp b/cpp/pybind/core/cuda_utils.cpp index 4ddf5efdd32..15780d4c234 100644 --- a/cpp/pybind/core/cuda_utils.cpp +++ b/cpp/pybind/core/cuda_utils.cpp @@ -24,9 +24,8 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include "pybind/core/core.h" - #include "open3d/core/CUDAUtils.h" +#include "pybind/core/core.h" namespace open3d { diff --git a/cpp/pybind/core/device.cpp b/cpp/pybind/core/device.cpp index c4287f20349..fe4a8d43ccf 100644 --- a/cpp/pybind/core/device.cpp +++ b/cpp/pybind/core/device.cpp @@ -24,12 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/core/Device.h" + #include "pybind/core/core.h" #include "pybind/docstring.h" #include "pybind/open3d_pybind.h" -#include "open3d/core/Device.h" - namespace open3d { void pybind_core_device(py::module &m) { diff --git a/cpp/pybind/core/dtype.cpp b/cpp/pybind/core/dtype.cpp index 189eb22b214..756c714d57d 100644 --- a/cpp/pybind/core/dtype.cpp +++ b/cpp/pybind/core/dtype.cpp @@ -24,12 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/core/Dtype.h" + #include "pybind/core/core.h" #include "pybind/docstring.h" #include "pybind/open3d_pybind.h" -#include "open3d/core/Dtype.h" - namespace open3d { void pybind_core_dtype(py::module &m) { diff --git a/cpp/pybind/core/kernel.cpp b/cpp/pybind/core/kernel.cpp index d37a21d9a0e..e15951df3c0 100644 --- a/cpp/pybind/core/kernel.cpp +++ b/cpp/pybind/core/kernel.cpp @@ -24,12 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/core/kernel/Kernel.h" + #include "pybind/core/core.h" #include "pybind/docstring.h" #include "pybind/open3d_pybind.h" -#include "open3d/core/kernel/Kernel.h" - namespace open3d { void pybind_core_kernel(py::module &m) { diff --git a/cpp/pybind/core/size_vector.cpp b/cpp/pybind/core/size_vector.cpp index 81ebe077fe2..43f753a39e2 100644 --- a/cpp/pybind/core/size_vector.cpp +++ b/cpp/pybind/core/size_vector.cpp @@ -24,12 +24,11 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/core/SizeVector.h" #include "pybind/core/core.h" #include "pybind/docstring.h" #include "pybind/open3d_pybind.h" -#include "open3d/core/SizeVector.h" - namespace open3d { void pybind_core_size_vector(py::module &m) { diff --git a/cpp/pybind/core/tensor.cpp b/cpp/pybind/core/tensor.cpp index 0cda6953e71..97b23718e87 100644 --- a/cpp/pybind/core/tensor.cpp +++ b/cpp/pybind/core/tensor.cpp @@ -24,12 +24,9 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include +#include "open3d/core/Tensor.h" -#include "pybind/core/core.h" -#include "pybind/docstring.h" -#include "pybind/open3d_pybind.h" -#include "pybind/pybind_utils.h" +#include #include "open3d/core/Blob.h" #include "open3d/core/CUDAUtils.h" @@ -37,8 +34,11 @@ #include "open3d/core/Dispatch.h" #include "open3d/core/Dtype.h" #include "open3d/core/SizeVector.h" -#include "open3d/core/Tensor.h" #include "open3d/core/TensorKey.h" +#include "pybind/core/core.h" +#include "pybind/docstring.h" +#include "pybind/open3d_pybind.h" +#include "pybind/pybind_utils.h" #define CONST_ARG const #define NON_CONST_ARG @@ -108,26 +108,22 @@ void pybind_core_tensor(py::module& m) { tensor.def("shallow_copy_from", &core::Tensor::ShallowCopyFrom); // Device transfer - tensor.def("cuda", - [](const core::Tensor& tensor, int device_id = 0) { - if (!core::cuda::IsAvailable()) { - utility::LogError( - "CUDA is not available, cannot copy Tensor."); - } - if (device_id < 0 || - device_id >= core::cuda::DeviceCount()) { - utility::LogError( - "Invalid device_id {}, must satisfy 0 <= " - "device_id < {}", - device_id, core::cuda::DeviceCount()); - } - return tensor.Copy(core::Device( - core::Device::DeviceType::CUDA, device_id)); - }) - .def("cpu", [](const core::Tensor& tensor) { - return tensor.Copy( - core::Device(core::Device::DeviceType::CPU, 0)); - }); + tensor.def("cuda", [](const core::Tensor& tensor, int device_id = 0) { + if (!core::cuda::IsAvailable()) { + utility::LogError( + "CUDA is not available, cannot copy Tensor."); + } + if (device_id < 0 || device_id >= core::cuda::DeviceCount()) { + utility::LogError( + "Invalid device_id {}, must satisfy 0 <= " + "device_id < {}", + device_id, core::cuda::DeviceCount()); + } + return tensor.Copy( + core::Device(core::Device::DeviceType::CUDA, device_id)); + }).def("cpu", [](const core::Tensor& tensor) { + return tensor.Copy(core::Device(core::Device::DeviceType::CPU, 0)); + }); // Buffer I/O for Numpy and DLPack(PyTorch) tensor.def("numpy", [](const core::Tensor& tensor) { diff --git a/cpp/pybind/core/tensor_key.cpp b/cpp/pybind/core/tensor_key.cpp index 56029756f5b..eaec4dc1b4b 100644 --- a/cpp/pybind/core/tensor_key.cpp +++ b/cpp/pybind/core/tensor_key.cpp @@ -24,13 +24,12 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/core/Tensor.h" +#include "open3d/core/TensorKey.h" #include "pybind/core/core.h" #include "pybind/docstring.h" #include "pybind/open3d_pybind.h" -#include "open3d/core/Tensor.h" -#include "open3d/core/TensorKey.h" - namespace open3d { void pybind_core_tensor_key(py::module& m) { diff --git a/cpp/pybind/docstring.cpp b/cpp/pybind/docstring.cpp index 979ff3d7186..93073a0e962 100644 --- a/cpp/pybind/docstring.cpp +++ b/cpp/pybind/docstring.cpp @@ -24,6 +24,8 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "pybind/docstring.h" + #include #include #include @@ -33,7 +35,6 @@ #include "open3d/utility/Console.h" #include "open3d/utility/Helper.h" -#include "pybind/docstring.h" namespace open3d { namespace docstring { diff --git a/cpp/pybind/geometry/geometry_trampoline.h b/cpp/pybind/geometry/geometry_trampoline.h index d9e560e12b2..9053ac005a9 100644 --- a/cpp/pybind/geometry/geometry_trampoline.h +++ b/cpp/pybind/geometry/geometry_trampoline.h @@ -32,7 +32,6 @@ #include "open3d/geometry/Geometry3D.h" #include "open3d/geometry/TetraMesh.h" #include "open3d/geometry/TriangleMesh.h" - #include "pybind/geometry/geometry.h" #include "pybind/open3d_pybind.h" diff --git a/cpp/pybind/geometry/halfedgetrianglemesh.cpp b/cpp/pybind/geometry/halfedgetrianglemesh.cpp index ee4bdafa548..8cb1e6ec34c 100644 --- a/cpp/pybind/geometry/halfedgetrianglemesh.cpp +++ b/cpp/pybind/geometry/halfedgetrianglemesh.cpp @@ -24,10 +24,10 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- -#include - #include "open3d/geometry/HalfEdgeTriangleMesh.h" +#include + #include "pybind/docstring.h" #include "pybind/geometry/geometry.h" #include "pybind/geometry/geometry_trampoline.h" diff --git a/cpp/pybind/geometry/image.cpp b/cpp/pybind/geometry/image.cpp index 10a17f0c419..8d0df818927 100644 --- a/cpp/pybind/geometry/image.cpp +++ b/cpp/pybind/geometry/image.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/Image.h" + #include "open3d/geometry/RGBDImage.h" #include "pybind/docstring.h" #include "pybind/geometry/geometry.h" @@ -163,50 +164,53 @@ void pybind_image(py::module &m) { "buffer " "data."); }) - .def("filter", - [](const geometry::Image &input, - geometry::Image::FilterType filter_type) { - if (input.num_of_channels_ != 1 || - input.bytes_per_channel_ != 4) { - auto input_f = input.CreateFloatImage(); - auto output = input_f->Filter(filter_type); - return *output; - } else { - auto output = input.Filter(filter_type); - return *output; - } - }, - "Function to filter Image", "filter_type"_a) + .def( + "filter", + [](const geometry::Image &input, + geometry::Image::FilterType filter_type) { + if (input.num_of_channels_ != 1 || + input.bytes_per_channel_ != 4) { + auto input_f = input.CreateFloatImage(); + auto output = input_f->Filter(filter_type); + return *output; + } else { + auto output = input.Filter(filter_type); + return *output; + } + }, + "Function to filter Image", "filter_type"_a) .def("flip_vertical", &geometry::Image::FlipVertical, "Function to flip image vertically (upside down)") .def("flip_horizontal", &geometry::Image::FlipHorizontal, "Function to flip image horizontally (from left to right)") - .def("create_pyramid", - [](const geometry::Image &input, size_t num_of_levels, - bool with_gaussian_filter) { - if (input.num_of_channels_ != 1 || - input.bytes_per_channel_ != 4) { - auto input_f = input.CreateFloatImage(); - auto output = input_f->CreatePyramid( - num_of_levels, with_gaussian_filter); - return output; - } else { - auto output = input.CreatePyramid( - num_of_levels, with_gaussian_filter); - return output; - } - }, - "Function to create ImagePyramid", "num_of_levels"_a, - "with_gaussian_filter"_a) - .def_static("filter_pyramid", - [](const geometry::ImagePyramid &input, - geometry::Image::FilterType filter_type) { - auto output = geometry::Image::FilterPyramid( - input, filter_type); + .def( + "create_pyramid", + [](const geometry::Image &input, size_t num_of_levels, + bool with_gaussian_filter) { + if (input.num_of_channels_ != 1 || + input.bytes_per_channel_ != 4) { + auto input_f = input.CreateFloatImage(); + auto output = input_f->CreatePyramid( + num_of_levels, with_gaussian_filter); + return output; + } else { + auto output = input.CreatePyramid( + num_of_levels, with_gaussian_filter); return output; - }, - "Function to filter ImagePyramid", "image_pyramid"_a, - "filter_type"_a); + } + }, + "Function to create ImagePyramid", "num_of_levels"_a, + "with_gaussian_filter"_a) + .def_static( + "filter_pyramid", + [](const geometry::ImagePyramid &input, + geometry::Image::FilterType filter_type) { + auto output = geometry::Image::FilterPyramid( + input, filter_type); + return output; + }, + "Function to filter ImagePyramid", "image_pyramid"_a, + "filter_type"_a); docstring::ClassMethodDocInject(m, "Image", "filter", map_shared_argument_docstrings); diff --git a/cpp/pybind/geometry/kdtreeflann.cpp b/cpp/pybind/geometry/kdtreeflann.cpp index 8aa6c20b476..12d4e526d61 100644 --- a/cpp/pybind/geometry/kdtreeflann.cpp +++ b/cpp/pybind/geometry/kdtreeflann.cpp @@ -152,106 +152,118 @@ void pybind_kdtreeflann(py::module &m) { //.def("search_hybrid_vector_3d_in_place", // &KDTreeFlann::SearchHybrid, "query"_a, // "radius"_a, "max_nn"_a, "indices"_a, "distance2"_a) - .def("search_vector_3d", - [](const geometry::KDTreeFlann &tree, - const Eigen::Vector3d &query, - const geometry::KDTreeSearchParam ¶m) { - std::vector indices; - std::vector distance2; - int k = tree.Search(query, param, indices, distance2); - if (k < 0) - throw std::runtime_error("search_vector_3d() error!"); - return std::make_tuple(k, indices, distance2); - }, - "query"_a, "search_param"_a) - .def("search_knn_vector_3d", - [](const geometry::KDTreeFlann &tree, - const Eigen::Vector3d &query, int knn) { - std::vector indices; - std::vector distance2; - int k = tree.SearchKNN(query, knn, indices, distance2); - if (k < 0) - throw std::runtime_error( - "search_knn_vector_3d() error!"); - return std::make_tuple(k, indices, distance2); - }, - "query"_a, "knn"_a) - .def("search_radius_vector_3d", - [](const geometry::KDTreeFlann &tree, - const Eigen::Vector3d &query, double radius) { - std::vector indices; - std::vector distance2; - int k = tree.SearchRadius(query, radius, indices, - distance2); - if (k < 0) - throw std::runtime_error( - "search_radius_vector_3d() error!"); - return std::make_tuple(k, indices, distance2); - }, - "query"_a, "radius"_a) - .def("search_hybrid_vector_3d", - [](const geometry::KDTreeFlann &tree, - const Eigen::Vector3d &query, double radius, int max_nn) { - std::vector indices; - std::vector distance2; - int k = tree.SearchHybrid(query, radius, max_nn, indices, - distance2); - if (k < 0) - throw std::runtime_error( - "search_hybrid_vector_3d() error!"); - return std::make_tuple(k, indices, distance2); - }, - "query"_a, "radius"_a, "max_nn"_a) - .def("search_vector_xd", - [](const geometry::KDTreeFlann &tree, - const Eigen::VectorXd &query, - const geometry::KDTreeSearchParam ¶m) { - std::vector indices; - std::vector distance2; - int k = tree.Search(query, param, indices, distance2); - if (k < 0) - throw std::runtime_error("search_vector_xd() error!"); - return std::make_tuple(k, indices, distance2); - }, - "query"_a, "search_param"_a) - .def("search_knn_vector_xd", - [](const geometry::KDTreeFlann &tree, - const Eigen::VectorXd &query, int knn) { - std::vector indices; - std::vector distance2; - int k = tree.SearchKNN(query, knn, indices, distance2); - if (k < 0) - throw std::runtime_error( - "search_knn_vector_xd() error!"); - return std::make_tuple(k, indices, distance2); - }, - "query"_a, "knn"_a) - .def("search_radius_vector_xd", - [](const geometry::KDTreeFlann &tree, - const Eigen::VectorXd &query, double radius) { - std::vector indices; - std::vector distance2; - int k = tree.SearchRadius(query, radius, indices, - distance2); - if (k < 0) - throw std::runtime_error( - "search_radius_vector_xd() error!"); - return std::make_tuple(k, indices, distance2); - }, - "query"_a, "radius"_a) - .def("search_hybrid_vector_xd", - [](const geometry::KDTreeFlann &tree, - const Eigen::VectorXd &query, double radius, int max_nn) { - std::vector indices; - std::vector distance2; - int k = tree.SearchHybrid(query, radius, max_nn, indices, - distance2); - if (k < 0) - throw std::runtime_error( - "search_hybrid_vector_xd() error!"); - return std::make_tuple(k, indices, distance2); - }, - "query"_a, "radius"_a, "max_nn"_a); + .def( + "search_vector_3d", + [](const geometry::KDTreeFlann &tree, + const Eigen::Vector3d &query, + const geometry::KDTreeSearchParam ¶m) { + std::vector indices; + std::vector distance2; + int k = tree.Search(query, param, indices, distance2); + if (k < 0) + throw std::runtime_error( + "search_vector_3d() error!"); + return std::make_tuple(k, indices, distance2); + }, + "query"_a, "search_param"_a) + .def( + "search_knn_vector_3d", + [](const geometry::KDTreeFlann &tree, + const Eigen::Vector3d &query, int knn) { + std::vector indices; + std::vector distance2; + int k = tree.SearchKNN(query, knn, indices, distance2); + if (k < 0) + throw std::runtime_error( + "search_knn_vector_3d() error!"); + return std::make_tuple(k, indices, distance2); + }, + "query"_a, "knn"_a) + .def( + "search_radius_vector_3d", + [](const geometry::KDTreeFlann &tree, + const Eigen::Vector3d &query, double radius) { + std::vector indices; + std::vector distance2; + int k = tree.SearchRadius(query, radius, indices, + distance2); + if (k < 0) + throw std::runtime_error( + "search_radius_vector_3d() error!"); + return std::make_tuple(k, indices, distance2); + }, + "query"_a, "radius"_a) + .def( + "search_hybrid_vector_3d", + [](const geometry::KDTreeFlann &tree, + const Eigen::Vector3d &query, double radius, + int max_nn) { + std::vector indices; + std::vector distance2; + int k = tree.SearchHybrid(query, radius, max_nn, + indices, distance2); + if (k < 0) + throw std::runtime_error( + "search_hybrid_vector_3d() error!"); + return std::make_tuple(k, indices, distance2); + }, + "query"_a, "radius"_a, "max_nn"_a) + .def( + "search_vector_xd", + [](const geometry::KDTreeFlann &tree, + const Eigen::VectorXd &query, + const geometry::KDTreeSearchParam ¶m) { + std::vector indices; + std::vector distance2; + int k = tree.Search(query, param, indices, distance2); + if (k < 0) + throw std::runtime_error( + "search_vector_xd() error!"); + return std::make_tuple(k, indices, distance2); + }, + "query"_a, "search_param"_a) + .def( + "search_knn_vector_xd", + [](const geometry::KDTreeFlann &tree, + const Eigen::VectorXd &query, int knn) { + std::vector indices; + std::vector distance2; + int k = tree.SearchKNN(query, knn, indices, distance2); + if (k < 0) + throw std::runtime_error( + "search_knn_vector_xd() error!"); + return std::make_tuple(k, indices, distance2); + }, + "query"_a, "knn"_a) + .def( + "search_radius_vector_xd", + [](const geometry::KDTreeFlann &tree, + const Eigen::VectorXd &query, double radius) { + std::vector indices; + std::vector distance2; + int k = tree.SearchRadius(query, radius, indices, + distance2); + if (k < 0) + throw std::runtime_error( + "search_radius_vector_xd() error!"); + return std::make_tuple(k, indices, distance2); + }, + "query"_a, "radius"_a) + .def( + "search_hybrid_vector_xd", + [](const geometry::KDTreeFlann &tree, + const Eigen::VectorXd &query, double radius, + int max_nn) { + std::vector indices; + std::vector distance2; + int k = tree.SearchHybrid(query, radius, max_nn, + indices, distance2); + if (k < 0) + throw std::runtime_error( + "search_hybrid_vector_xd() error!"); + return std::make_tuple(k, indices, distance2); + }, + "query"_a, "radius"_a, "max_nn"_a); docstring::ClassMethodDocInject(m, "KDTreeFlann", "search_hybrid_vector_3d", map_kd_tree_flann_method_docs); docstring::ClassMethodDocInject(m, "KDTreeFlann", "search_hybrid_vector_xd", diff --git a/cpp/pybind/geometry/lineset.cpp b/cpp/pybind/geometry/lineset.cpp index cd7be38a271..f5dbc4c2fb1 100644 --- a/cpp/pybind/geometry/lineset.cpp +++ b/cpp/pybind/geometry/lineset.cpp @@ -25,8 +25,8 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/LineSet.h" -#include "open3d/geometry/PointCloud.h" +#include "open3d/geometry/PointCloud.h" #include "pybind/docstring.h" #include "pybind/geometry/geometry.h" #include "pybind/geometry/geometry_trampoline.h" diff --git a/cpp/pybind/geometry/meshbase.cpp b/cpp/pybind/geometry/meshbase.cpp index 14c2f410199..639f94a1bfb 100644 --- a/cpp/pybind/geometry/meshbase.cpp +++ b/cpp/pybind/geometry/meshbase.cpp @@ -25,8 +25,8 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/MeshBase.h" -#include "open3d/geometry/PointCloud.h" +#include "open3d/geometry/PointCloud.h" #include "pybind/docstring.h" #include "pybind/geometry/geometry.h" #include "pybind/geometry/geometry_trampoline.h" diff --git a/cpp/pybind/geometry/octree.cpp b/cpp/pybind/geometry/octree.cpp index 3c741bb7d56..563b379aa18 100644 --- a/cpp/pybind/geometry/octree.cpp +++ b/cpp/pybind/geometry/octree.cpp @@ -24,13 +24,13 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/geometry/Octree.h" + #include #include -#include "open3d/geometry/Octree.h" #include "open3d/geometry/PointCloud.h" #include "open3d/geometry/VoxelGrid.h" - #include "pybind/docstring.h" #include "pybind/geometry/geometry.h" #include "pybind/geometry/geometry_trampoline.h" diff --git a/cpp/pybind/geometry/pointcloud.cpp b/cpp/pybind/geometry/pointcloud.cpp index 87cb1e08443..86023a674f1 100644 --- a/cpp/pybind/geometry/pointcloud.cpp +++ b/cpp/pybind/geometry/pointcloud.cpp @@ -24,13 +24,13 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "open3d/geometry/PointCloud.h" + #include #include "open3d/camera/PinholeCameraIntrinsic.h" #include "open3d/geometry/Image.h" -#include "open3d/geometry/PointCloud.h" #include "open3d/geometry/RGBDImage.h" - #include "pybind/docstring.h" #include "pybind/geometry/geometry.h" #include "pybind/geometry/geometry_trampoline.h" diff --git a/cpp/pybind/geometry/tetramesh.cpp b/cpp/pybind/geometry/tetramesh.cpp index 77406f83b62..398188bc1f1 100644 --- a/cpp/pybind/geometry/tetramesh.cpp +++ b/cpp/pybind/geometry/tetramesh.cpp @@ -25,8 +25,8 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/TetraMesh.h" -#include "open3d/geometry/PointCloud.h" +#include "open3d/geometry/PointCloud.h" #include "pybind/docstring.h" #include "pybind/geometry/geometry.h" #include "pybind/geometry/geometry_trampoline.h" diff --git a/cpp/pybind/geometry/trianglemesh.cpp b/cpp/pybind/geometry/trianglemesh.cpp index d280cd55b2d..6b6f5db5d37 100644 --- a/cpp/pybind/geometry/trianglemesh.cpp +++ b/cpp/pybind/geometry/trianglemesh.cpp @@ -25,9 +25,9 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/TriangleMesh.h" + #include "open3d/geometry/Image.h" #include "open3d/geometry/PointCloud.h" - #include "pybind/docstring.h" #include "pybind/geometry/geometry.h" #include "pybind/geometry/geometry_trampoline.h" @@ -326,16 +326,17 @@ void pybind_trianglemesh(py::module &m) { "energy"_a = geometry::MeshBase:: DeformAsRigidAsPossibleEnergy::Spokes, "smoothed_alpha"_a = 0.01) - .def_static("create_from_point_cloud_alpha_shape", - [](const geometry::PointCloud &pcd, double alpha) { - return geometry::TriangleMesh:: - CreateFromPointCloudAlphaShape(pcd, alpha); - }, - "Alpha shapes are a generalization of the convex hull. " - "With decreasing alpha value the shape schrinks and " - "creates cavities. See Edelsbrunner and Muecke, " - "\"Three-Dimensional Alpha Shapes\", 1994.", - "pcd"_a, "alpha"_a) + .def_static( + "create_from_point_cloud_alpha_shape", + [](const geometry::PointCloud &pcd, double alpha) { + return geometry::TriangleMesh:: + CreateFromPointCloudAlphaShape(pcd, alpha); + }, + "Alpha shapes are a generalization of the convex hull. " + "With decreasing alpha value the shape schrinks and " + "creates cavities. See Edelsbrunner and Muecke, " + "\"Three-Dimensional Alpha Shapes\", 1994.", + "pcd"_a, "alpha"_a) .def_static("create_from_point_cloud_alpha_shape", &geometry::TriangleMesh::CreateFromPointCloudAlphaShape, "Alpha shapes are a generalization of the convex hull. " diff --git a/cpp/pybind/geometry/voxelgrid.cpp b/cpp/pybind/geometry/voxelgrid.cpp index a86582112d5..18decd06b73 100644 --- a/cpp/pybind/geometry/voxelgrid.cpp +++ b/cpp/pybind/geometry/voxelgrid.cpp @@ -25,17 +25,17 @@ // ---------------------------------------------------------------------------- #include "open3d/geometry/VoxelGrid.h" + +#include + #include "open3d/camera/PinholeCameraParameters.h" #include "open3d/geometry/Image.h" #include "open3d/geometry/Octree.h" #include "open3d/geometry/PointCloud.h" - #include "pybind/docstring.h" #include "pybind/geometry/geometry.h" #include "pybind/geometry/geometry_trampoline.h" -#include - namespace open3d { void pybind_voxelgrid(py::module &m) { diff --git a/cpp/pybind/io/class_io.cpp b/cpp/pybind/io/class_io.cpp index 1b86c236641..de188a155c1 100644 --- a/cpp/pybind/io/class_io.cpp +++ b/cpp/pybind/io/class_io.cpp @@ -39,7 +39,6 @@ #include "open3d/io/PoseGraphIO.h" #include "open3d/io/TriangleMeshIO.h" #include "open3d/io/VoxelGridIO.h" - #include "pybind/docstring.h" #include "pybind/io/io.h" @@ -115,312 +114,334 @@ void pybind_class_io(py::module &m_io) { "point cloud, mesh, or line set in turn."); // open3d::geometry::Image - m_io.def("read_image", - [](const std::string &filename) { - py::gil_scoped_release release; - geometry::Image image; - io::ReadImage(filename, image); - return image; - }, - "Function to read Image from file", "filename"_a); + m_io.def( + "read_image", + [](const std::string &filename) { + py::gil_scoped_release release; + geometry::Image image; + io::ReadImage(filename, image); + return image; + }, + "Function to read Image from file", "filename"_a); docstring::FunctionDocInject(m_io, "read_image", map_shared_argument_docstrings); - m_io.def("write_image", - [](const std::string &filename, const geometry::Image &image, - int quality) { - py::gil_scoped_release release; - return io::WriteImage(filename, image, quality); - }, - "Function to write Image to file", "filename"_a, "image"_a, - "quality"_a = 90); + m_io.def( + "write_image", + [](const std::string &filename, const geometry::Image &image, + int quality) { + py::gil_scoped_release release; + return io::WriteImage(filename, image, quality); + }, + "Function to write Image to file", "filename"_a, "image"_a, + "quality"_a = 90); docstring::FunctionDocInject(m_io, "write_image", map_shared_argument_docstrings); // open3d::geometry::LineSet - m_io.def("read_line_set", - [](const std::string &filename, const std::string &format, - bool print_progress) { - py::gil_scoped_release release; - geometry::LineSet line_set; - io::ReadLineSet(filename, line_set, format, print_progress); - return line_set; - }, - "Function to read LineSet from file", "filename"_a, - "format"_a = "auto", "print_progress"_a = false); + m_io.def( + "read_line_set", + [](const std::string &filename, const std::string &format, + bool print_progress) { + py::gil_scoped_release release; + geometry::LineSet line_set; + io::ReadLineSet(filename, line_set, format, print_progress); + return line_set; + }, + "Function to read LineSet from file", "filename"_a, + "format"_a = "auto", "print_progress"_a = false); docstring::FunctionDocInject(m_io, "read_line_set", map_shared_argument_docstrings); - m_io.def("write_line_set", - [](const std::string &filename, const geometry::LineSet &line_set, - bool write_ascii, bool compressed, bool print_progress) { - py::gil_scoped_release release; - return io::WriteLineSet(filename, line_set, write_ascii, - compressed, print_progress); - }, - "Function to write LineSet to file", "filename"_a, "line_set"_a, - "write_ascii"_a = false, "compressed"_a = false, - "print_progress"_a = false); + m_io.def( + "write_line_set", + [](const std::string &filename, const geometry::LineSet &line_set, + bool write_ascii, bool compressed, bool print_progress) { + py::gil_scoped_release release; + return io::WriteLineSet(filename, line_set, write_ascii, + compressed, print_progress); + }, + "Function to write LineSet to file", "filename"_a, "line_set"_a, + "write_ascii"_a = false, "compressed"_a = false, + "print_progress"_a = false); docstring::FunctionDocInject(m_io, "write_line_set", map_shared_argument_docstrings); // open3d::geometry::PointCloud - m_io.def("read_point_cloud", - [](const std::string &filename, const std::string &format, - bool remove_nan_points, bool remove_infinite_points, - bool print_progress) { - py::gil_scoped_release release; - geometry::PointCloud pcd; - io::ReadPointCloud(filename, pcd, - {format, remove_nan_points, - remove_infinite_points, print_progress}); - return pcd; - }, - "Function to read PointCloud from file", "filename"_a, - "format"_a = "auto", "remove_nan_points"_a = true, - "remove_infinite_points"_a = true, "print_progress"_a = false); + m_io.def( + "read_point_cloud", + [](const std::string &filename, const std::string &format, + bool remove_nan_points, bool remove_infinite_points, + bool print_progress) { + py::gil_scoped_release release; + geometry::PointCloud pcd; + io::ReadPointCloud(filename, pcd, + {format, remove_nan_points, + remove_infinite_points, print_progress}); + return pcd; + }, + "Function to read PointCloud from file", "filename"_a, + "format"_a = "auto", "remove_nan_points"_a = true, + "remove_infinite_points"_a = true, "print_progress"_a = false); docstring::FunctionDocInject(m_io, "read_point_cloud", map_shared_argument_docstrings); - m_io.def("write_point_cloud", - [](const std::string &filename, - const geometry::PointCloud &pointcloud, bool write_ascii, - bool compressed, bool print_progress) { - py::gil_scoped_release release; - return io::WritePointCloud( - filename, pointcloud, - {write_ascii, compressed, print_progress}); - }, - "Function to write PointCloud to file", "filename"_a, - "pointcloud"_a, "write_ascii"_a = false, "compressed"_a = false, - "print_progress"_a = false); + m_io.def( + "write_point_cloud", + [](const std::string &filename, + const geometry::PointCloud &pointcloud, bool write_ascii, + bool compressed, bool print_progress) { + py::gil_scoped_release release; + return io::WritePointCloud( + filename, pointcloud, + {write_ascii, compressed, print_progress}); + }, + "Function to write PointCloud to file", "filename"_a, + "pointcloud"_a, "write_ascii"_a = false, "compressed"_a = false, + "print_progress"_a = false); docstring::FunctionDocInject(m_io, "write_point_cloud", map_shared_argument_docstrings); // open3d::geometry::TriangleMesh - m_io.def("read_triangle_mesh", - [](const std::string &filename, bool print_progress) { - py::gil_scoped_release release; - geometry::TriangleMesh mesh; - io::ReadTriangleMesh(filename, mesh, print_progress); - return mesh; - }, - "Function to read TriangleMesh from file", "filename"_a, - "print_progress"_a = false); + m_io.def( + "read_triangle_mesh", + [](const std::string &filename, bool print_progress) { + py::gil_scoped_release release; + geometry::TriangleMesh mesh; + io::ReadTriangleMesh(filename, mesh, print_progress); + return mesh; + }, + "Function to read TriangleMesh from file", "filename"_a, + "print_progress"_a = false); docstring::FunctionDocInject(m_io, "read_triangle_mesh", map_shared_argument_docstrings); - m_io.def("write_triangle_mesh", - [](const std::string &filename, const geometry::TriangleMesh &mesh, - bool write_ascii, bool compressed, bool write_vertex_normals, - bool write_vertex_colors, bool write_triangle_uvs, - bool print_progress) { - py::gil_scoped_release release; - return io::WriteTriangleMesh( - filename, mesh, write_ascii, compressed, - write_vertex_normals, write_vertex_colors, - write_triangle_uvs, print_progress); - }, - "Function to write TriangleMesh to file", "filename"_a, "mesh"_a, - "write_ascii"_a = false, "compressed"_a = false, - "write_vertex_normals"_a = true, "write_vertex_colors"_a = true, - "write_triangle_uvs"_a = true, "print_progress"_a = false); + m_io.def( + "write_triangle_mesh", + [](const std::string &filename, const geometry::TriangleMesh &mesh, + bool write_ascii, bool compressed, bool write_vertex_normals, + bool write_vertex_colors, bool write_triangle_uvs, + bool print_progress) { + py::gil_scoped_release release; + return io::WriteTriangleMesh( + filename, mesh, write_ascii, compressed, + write_vertex_normals, write_vertex_colors, + write_triangle_uvs, print_progress); + }, + "Function to write TriangleMesh to file", "filename"_a, "mesh"_a, + "write_ascii"_a = false, "compressed"_a = false, + "write_vertex_normals"_a = true, "write_vertex_colors"_a = true, + "write_triangle_uvs"_a = true, "print_progress"_a = false); docstring::FunctionDocInject(m_io, "write_triangle_mesh", map_shared_argument_docstrings); // open3d::geometry::VoxelGrid - m_io.def("read_voxel_grid", - [](const std::string &filename, const std::string &format, - bool print_progress) { - py::gil_scoped_release release; - geometry::VoxelGrid voxel_grid; - io::ReadVoxelGrid(filename, voxel_grid, format); - return voxel_grid; - }, - "Function to read VoxelGrid from file", "filename"_a, - "format"_a = "auto", "print_progress"_a = false); + m_io.def( + "read_voxel_grid", + [](const std::string &filename, const std::string &format, + bool print_progress) { + py::gil_scoped_release release; + geometry::VoxelGrid voxel_grid; + io::ReadVoxelGrid(filename, voxel_grid, format); + return voxel_grid; + }, + "Function to read VoxelGrid from file", "filename"_a, + "format"_a = "auto", "print_progress"_a = false); docstring::FunctionDocInject(m_io, "read_voxel_grid", map_shared_argument_docstrings); - m_io.def("write_voxel_grid", - [](const std::string &filename, - const geometry::VoxelGrid &voxel_grid, bool write_ascii, - bool compressed, bool print_progress) { - py::gil_scoped_release release; - return io::WriteVoxelGrid(filename, voxel_grid, write_ascii, - compressed, print_progress); - }, - "Function to write VoxelGrid to file", "filename"_a, - "voxel_grid"_a, "write_ascii"_a = false, "compressed"_a = false, - "print_progress"_a = false); + m_io.def( + "write_voxel_grid", + [](const std::string &filename, + const geometry::VoxelGrid &voxel_grid, bool write_ascii, + bool compressed, bool print_progress) { + py::gil_scoped_release release; + return io::WriteVoxelGrid(filename, voxel_grid, write_ascii, + compressed, print_progress); + }, + "Function to write VoxelGrid to file", "filename"_a, "voxel_grid"_a, + "write_ascii"_a = false, "compressed"_a = false, + "print_progress"_a = false); docstring::FunctionDocInject(m_io, "write_voxel_grid", map_shared_argument_docstrings); // open3d::camera - m_io.def("read_pinhole_camera_intrinsic", - [](const std::string &filename) { - py::gil_scoped_release release; - camera::PinholeCameraIntrinsic intrinsic; - io::ReadIJsonConvertible(filename, intrinsic); - return intrinsic; - }, - "Function to read PinholeCameraIntrinsic from file", "filename"_a); + m_io.def( + "read_pinhole_camera_intrinsic", + [](const std::string &filename) { + py::gil_scoped_release release; + camera::PinholeCameraIntrinsic intrinsic; + io::ReadIJsonConvertible(filename, intrinsic); + return intrinsic; + }, + "Function to read PinholeCameraIntrinsic from file", "filename"_a); docstring::FunctionDocInject(m_io, "read_pinhole_camera_intrinsic", map_shared_argument_docstrings); - m_io.def("write_pinhole_camera_intrinsic", - [](const std::string &filename, - const camera::PinholeCameraIntrinsic &intrinsic) { - py::gil_scoped_release release; - return io::WriteIJsonConvertible(filename, intrinsic); - }, - "Function to write PinholeCameraIntrinsic to file", "filename"_a, - "intrinsic"_a); + m_io.def( + "write_pinhole_camera_intrinsic", + [](const std::string &filename, + const camera::PinholeCameraIntrinsic &intrinsic) { + py::gil_scoped_release release; + return io::WriteIJsonConvertible(filename, intrinsic); + }, + "Function to write PinholeCameraIntrinsic to file", "filename"_a, + "intrinsic"_a); docstring::FunctionDocInject(m_io, "write_pinhole_camera_intrinsic", map_shared_argument_docstrings); - m_io.def("read_pinhole_camera_parameters", - [](const std::string &filename) { - py::gil_scoped_release release; - camera::PinholeCameraParameters parameters; - io::ReadIJsonConvertible(filename, parameters); - return parameters; - }, - "Function to read PinholeCameraParameters from file", - "filename"_a); + m_io.def( + "read_pinhole_camera_parameters", + [](const std::string &filename) { + py::gil_scoped_release release; + camera::PinholeCameraParameters parameters; + io::ReadIJsonConvertible(filename, parameters); + return parameters; + }, + "Function to read PinholeCameraParameters from file", "filename"_a); docstring::FunctionDocInject(m_io, "read_pinhole_camera_parameters", map_shared_argument_docstrings); - m_io.def("write_pinhole_camera_parameters", - [](const std::string &filename, - const camera::PinholeCameraParameters ¶meters) { - py::gil_scoped_release release; - return io::WriteIJsonConvertible(filename, parameters); - }, - "Function to write PinholeCameraParameters to file", "filename"_a, - "parameters"_a); + m_io.def( + "write_pinhole_camera_parameters", + [](const std::string &filename, + const camera::PinholeCameraParameters ¶meters) { + py::gil_scoped_release release; + return io::WriteIJsonConvertible(filename, parameters); + }, + "Function to write PinholeCameraParameters to file", "filename"_a, + "parameters"_a); docstring::FunctionDocInject(m_io, "write_pinhole_camera_parameters", map_shared_argument_docstrings); - m_io.def("read_pinhole_camera_trajectory", - [](const std::string &filename) { - py::gil_scoped_release release; - camera::PinholeCameraTrajectory trajectory; - io::ReadPinholeCameraTrajectory(filename, trajectory); - return trajectory; - }, - "Function to read PinholeCameraTrajectory from file", - "filename"_a); + m_io.def( + "read_pinhole_camera_trajectory", + [](const std::string &filename) { + py::gil_scoped_release release; + camera::PinholeCameraTrajectory trajectory; + io::ReadPinholeCameraTrajectory(filename, trajectory); + return trajectory; + }, + "Function to read PinholeCameraTrajectory from file", "filename"_a); docstring::FunctionDocInject(m_io, "read_pinhole_camera_trajectory", map_shared_argument_docstrings); - m_io.def("write_pinhole_camera_trajectory", - [](const std::string &filename, - const camera::PinholeCameraTrajectory &trajectory) { - py::gil_scoped_release release; - return io::WritePinholeCameraTrajectory(filename, trajectory); - }, - "Function to write PinholeCameraTrajectory to file", "filename"_a, - "trajectory"_a); + m_io.def( + "write_pinhole_camera_trajectory", + [](const std::string &filename, + const camera::PinholeCameraTrajectory &trajectory) { + py::gil_scoped_release release; + return io::WritePinholeCameraTrajectory(filename, trajectory); + }, + "Function to write PinholeCameraTrajectory to file", "filename"_a, + "trajectory"_a); docstring::FunctionDocInject(m_io, "write_pinhole_camera_trajectory", map_shared_argument_docstrings); // open3d::registration - m_io.def("read_feature", - [](const std::string &filename) { - py::gil_scoped_release release; - pipelines::registration::Feature feature; - io::ReadFeature(filename, feature); - return feature; - }, - "Function to read registration.Feature from file", "filename"_a); + m_io.def( + "read_feature", + [](const std::string &filename) { + py::gil_scoped_release release; + pipelines::registration::Feature feature; + io::ReadFeature(filename, feature); + return feature; + }, + "Function to read registration.Feature from file", "filename"_a); docstring::FunctionDocInject(m_io, "read_feature", map_shared_argument_docstrings); - m_io.def("write_feature", - [](const std::string &filename, - const pipelines::registration::Feature &feature) { - py::gil_scoped_release release; - return io::WriteFeature(filename, feature); - }, - "Function to write Feature to file", "filename"_a, "feature"_a); + m_io.def( + "write_feature", + [](const std::string &filename, + const pipelines::registration::Feature &feature) { + py::gil_scoped_release release; + return io::WriteFeature(filename, feature); + }, + "Function to write Feature to file", "filename"_a, "feature"_a); docstring::FunctionDocInject(m_io, "write_feature", map_shared_argument_docstrings); - m_io.def("read_pose_graph", - [](const std::string &filename) { - py::gil_scoped_release release; - pipelines::registration::PoseGraph pose_graph; - io::ReadPoseGraph(filename, pose_graph); - return pose_graph; - }, - "Function to read PoseGraph from file", "filename"_a); + m_io.def( + "read_pose_graph", + [](const std::string &filename) { + py::gil_scoped_release release; + pipelines::registration::PoseGraph pose_graph; + io::ReadPoseGraph(filename, pose_graph); + return pose_graph; + }, + "Function to read PoseGraph from file", "filename"_a); docstring::FunctionDocInject(m_io, "read_pose_graph", map_shared_argument_docstrings); - m_io.def("write_pose_graph", - [](const std::string &filename, - const pipelines::registration::PoseGraph pose_graph) { - py::gil_scoped_release release; - io::WritePoseGraph(filename, pose_graph); - }, - "Function to write PoseGraph to file", "filename"_a, - "pose_graph"_a); + m_io.def( + "write_pose_graph", + [](const std::string &filename, + const pipelines::registration::PoseGraph pose_graph) { + py::gil_scoped_release release; + io::WritePoseGraph(filename, pose_graph); + }, + "Function to write PoseGraph to file", "filename"_a, + "pose_graph"_a); docstring::FunctionDocInject(m_io, "write_pose_graph", map_shared_argument_docstrings); #ifdef BUILD_AZURE_KINECT - m_io.def("read_azure_kinect_sensor_config", - [](const std::string &filename) { - io::AzureKinectSensorConfig config; - bool success = - io::ReadIJsonConvertibleFromJSON(filename, config); - if (!success) { - utility::LogWarning( - "Invalid sensor config {}, using default instead", - filename); - return io::AzureKinectSensorConfig(); - } - return config; - }, - "Function to read Azure Kinect sensor config from file", - "filename"_a); + m_io.def( + "read_azure_kinect_sensor_config", + [](const std::string &filename) { + io::AzureKinectSensorConfig config; + bool success = + io::ReadIJsonConvertibleFromJSON(filename, config); + if (!success) { + utility::LogWarning( + "Invalid sensor config {}, using default instead", + filename); + return io::AzureKinectSensorConfig(); + } + return config; + }, + "Function to read Azure Kinect sensor config from file", + "filename"_a); docstring::FunctionDocInject(m_io, "read_azure_kinect_sensor_config", map_shared_argument_docstrings); - m_io.def("write_azure_kinect_sensor_config", - [](const std::string &filename, - const io::AzureKinectSensorConfig config) { - return io::WriteIJsonConvertibleToJSON(filename, config); - }, - "Function to write Azure Kinect sensor config to file", - "filename"_a, "config"_a); + m_io.def( + "write_azure_kinect_sensor_config", + [](const std::string &filename, + const io::AzureKinectSensorConfig config) { + return io::WriteIJsonConvertibleToJSON(filename, config); + }, + "Function to write Azure Kinect sensor config to file", + "filename"_a, "config"_a); docstring::FunctionDocInject(m_io, "write_azure_kinect_sensor_config", map_shared_argument_docstrings); - m_io.def("read_azure_kinect_mkv_metadata", - [](const std::string &filename) { - io::MKVMetadata metadata; - bool success = - io::ReadIJsonConvertibleFromJSON(filename, metadata); - if (!success) { - utility::LogWarning( - "Invalid mkv metadata {}, using default instead", - filename); - return io::MKVMetadata(); - } - return metadata; - }, - "Function to read Azure Kinect metadata from file", "filename"_a); + m_io.def( + "read_azure_kinect_mkv_metadata", + [](const std::string &filename) { + io::MKVMetadata metadata; + bool success = + io::ReadIJsonConvertibleFromJSON(filename, metadata); + if (!success) { + utility::LogWarning( + "Invalid mkv metadata {}, using default instead", + filename); + return io::MKVMetadata(); + } + return metadata; + }, + "Function to read Azure Kinect metadata from file", "filename"_a); docstring::FunctionDocInject(m_io, "read_azure_kinect_mkv_metadata", map_shared_argument_docstrings); - m_io.def("write_azure_kinect_mkv_metadata", - [](const std::string &filename, const io::MKVMetadata metadata) { - return io::WriteIJsonConvertibleToJSON(filename, metadata); - }, - "Function to write Azure Kinect metadata to file", "filename"_a, - "config"_a); + m_io.def( + "write_azure_kinect_mkv_metadata", + [](const std::string &filename, const io::MKVMetadata metadata) { + return io::WriteIJsonConvertibleToJSON(filename, metadata); + }, + "Function to write Azure Kinect metadata to file", "filename"_a, + "config"_a); docstring::FunctionDocInject(m_io, "write_azure_kinect_mkv_metadata", map_shared_argument_docstrings); #endif diff --git a/cpp/pybind/io/io.cpp b/cpp/pybind/io/io.cpp index 8de69cdf40a..aa2f792eddf 100644 --- a/cpp/pybind/io/io.cpp +++ b/cpp/pybind/io/io.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "pybind/io/io.h" + #include "pybind/open3d_pybind.h" namespace open3d { diff --git a/cpp/pybind/io/sensor.cpp b/cpp/pybind/io/sensor.cpp index 92d65c6151a..bacd2626f0d 100644 --- a/cpp/pybind/io/sensor.cpp +++ b/cpp/pybind/io/sensor.cpp @@ -29,7 +29,6 @@ #include "open3d/io/sensor/azure_kinect/AzureKinectSensor.h" #include "open3d/io/sensor/azure_kinect/AzureKinectSensorConfig.h" #include "open3d/io/sensor/azure_kinect/MKVReader.h" - #include "pybind/docstring.h" #include "pybind/io/io.h" diff --git a/cpp/pybind/open3d_pybind.cpp b/cpp/pybind/open3d_pybind.cpp index 6b50243d65f..122b58db1f5 100644 --- a/cpp/pybind/open3d_pybind.cpp +++ b/cpp/pybind/open3d_pybind.cpp @@ -25,6 +25,8 @@ // ---------------------------------------------------------------------------- #include "pybind/open3d_pybind.h" + +#include "open3d/utility/Console.h" #include "pybind/camera/camera.h" #include "pybind/core/core.h" #include "pybind/geometry/geometry.h" @@ -33,8 +35,6 @@ #include "pybind/utility/utility.h" #include "pybind/visualization/visualization.h" -#include "open3d/utility/Console.h" - namespace open3d { PYBIND11_MODULE(pybind, m) { diff --git a/cpp/pybind/pipelines/color_map/color_map.cpp b/cpp/pybind/pipelines/color_map/color_map.cpp index 391d69d13e2..abfd03fc55f 100644 --- a/cpp/pybind/pipelines/color_map/color_map.cpp +++ b/cpp/pybind/pipelines/color_map/color_map.cpp @@ -24,14 +24,14 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "pybind/pipelines/color_map/color_map.h" + #include "open3d/camera/PinholeCameraTrajectory.h" #include "open3d/geometry/RGBDImage.h" #include "open3d/geometry/TriangleMesh.h" #include "open3d/pipelines/color_map/ColorMapOptimization.h" #include "open3d/utility/Console.h" - #include "pybind/docstring.h" -#include "pybind/pipelines/color_map/color_map.h" namespace open3d { diff --git a/cpp/pybind/pipelines/integration/integration.cpp b/cpp/pybind/pipelines/integration/integration.cpp index f376b789870..86134439e43 100644 --- a/cpp/pybind/pipelines/integration/integration.cpp +++ b/cpp/pybind/pipelines/integration/integration.cpp @@ -24,13 +24,13 @@ // IN THE SOFTWARE. // ---------------------------------------------------------------------------- +#include "pybind/pipelines/integration/integration.h" + #include "open3d/geometry/VoxelGrid.h" #include "open3d/pipelines/integration/ScalableTSDFVolume.h" #include "open3d/pipelines/integration/TSDFVolume.h" #include "open3d/pipelines/integration/UniformTSDFVolume.h" - #include "pybind/docstring.h" -#include "pybind/pipelines/integration/integration.h" namespace open3d { diff --git a/cpp/pybind/pipelines/odometry/odometry.cpp b/cpp/pybind/pipelines/odometry/odometry.cpp index 8b5d8cc299d..ccc9bcde46d 100644 --- a/cpp/pybind/pipelines/odometry/odometry.cpp +++ b/cpp/pybind/pipelines/odometry/odometry.cpp @@ -25,11 +25,11 @@ // ---------------------------------------------------------------------------- #include "open3d/pipelines/odometry/Odometry.h" + #include "open3d/geometry/Image.h" #include "open3d/geometry/RGBDImage.h" #include "open3d/pipelines/odometry/OdometryOption.h" #include "open3d/pipelines/odometry/RGBDOdometryJacobian.h" - #include "pybind/docstring.h" #include "pybind/pipelines/odometry/odometry.h" diff --git a/cpp/pybind/pipelines/registration/feature.cpp b/cpp/pybind/pipelines/registration/feature.cpp index a8ff017edf2..a2d5055a27b 100644 --- a/cpp/pybind/pipelines/registration/feature.cpp +++ b/cpp/pybind/pipelines/registration/feature.cpp @@ -25,8 +25,8 @@ // ---------------------------------------------------------------------------- #include "open3d/pipelines/registration/Feature.h" -#include "open3d/geometry/PointCloud.h" +#include "open3d/geometry/PointCloud.h" #include "pybind/docstring.h" #include "pybind/pipelines/registration/registration.h" diff --git a/cpp/pybind/pipelines/registration/global_optimization.cpp b/cpp/pybind/pipelines/registration/global_optimization.cpp index e6a9d89d11e..7d064d07689 100644 --- a/cpp/pybind/pipelines/registration/global_optimization.cpp +++ b/cpp/pybind/pipelines/registration/global_optimization.cpp @@ -28,7 +28,6 @@ #include "open3d/pipelines/registration/GlobalOptimizationConvergenceCriteria.h" #include "open3d/pipelines/registration/GlobalOptimizationMethod.h" #include "open3d/pipelines/registration/PoseGraph.h" - #include "pybind/docstring.h" #include "pybind/pipelines/registration/registration.h" @@ -387,17 +386,19 @@ void pybind_global_optimization(py::module &m) { } void pybind_global_optimization_methods(py::module &m) { - m.def("global_optimization", - [](pipelines::registration::PoseGraph &pose_graph, - const pipelines::registration::GlobalOptimizationMethod &method, - const pipelines::registration:: - GlobalOptimizationConvergenceCriteria &criteria, - const pipelines::registration::GlobalOptimizationOption &option) { - pipelines::registration::GlobalOptimization(pose_graph, method, - criteria, option); - }, - "Function to optimize pipelines::registration::PoseGraph", - "pose_graph"_a, "method"_a, "criteria"_a, "option"_a); + m.def( + "global_optimization", + [](pipelines::registration::PoseGraph &pose_graph, + const pipelines::registration::GlobalOptimizationMethod &method, + const pipelines::registration:: + GlobalOptimizationConvergenceCriteria &criteria, + const pipelines::registration::GlobalOptimizationOption + &option) { + pipelines::registration::GlobalOptimization(pose_graph, method, + criteria, option); + }, + "Function to optimize pipelines::registration::PoseGraph", + "pose_graph"_a, "method"_a, "criteria"_a, "option"_a); docstring::FunctionDocInject( m, "global_optimization", {{"pose_graph", "The pose_graph to be optimized (in-place)."}, diff --git a/cpp/pybind/pipelines/registration/registration.cpp b/cpp/pybind/pipelines/registration/registration.cpp index dcbbd0cc400..533d322cf1b 100644 --- a/cpp/pybind/pipelines/registration/registration.cpp +++ b/cpp/pybind/pipelines/registration/registration.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "open3d/pipelines/registration/Registration.h" + #include "open3d/geometry/PointCloud.h" #include "open3d/pipelines/registration/ColoredICP.h" #include "open3d/pipelines/registration/CorrespondenceChecker.h" @@ -32,7 +33,6 @@ #include "open3d/pipelines/registration/Feature.h" #include "open3d/pipelines/registration/TransformationEstimation.h" #include "open3d/utility/Console.h" - #include "pybind/docstring.h" #include "pybind/pipelines/registration/registration.h" diff --git a/cpp/pybind/pybind_utils.cpp b/cpp/pybind/pybind_utils.cpp index acd70ad27ff..a75e2cd3d03 100644 --- a/cpp/pybind/pybind_utils.cpp +++ b/cpp/pybind/pybind_utils.cpp @@ -30,7 +30,6 @@ #include "open3d/core/Dtype.h" #include "open3d/core/Tensor.h" - #include "pybind/open3d_pybind.h" namespace open3d { diff --git a/cpp/pybind/pybind_utils.h b/cpp/pybind/pybind_utils.h index eb53aa47bea..8abad9424a7 100644 --- a/cpp/pybind/pybind_utils.h +++ b/cpp/pybind/pybind_utils.h @@ -30,7 +30,6 @@ #include "open3d/core/Dtype.h" #include "open3d/core/Tensor.h" - #include "pybind/open3d_pybind.h" namespace open3d { diff --git a/cpp/pybind/utility/console.cpp b/cpp/pybind/utility/console.cpp index bb32ea884ab..215110f797f 100644 --- a/cpp/pybind/utility/console.cpp +++ b/cpp/pybind/utility/console.cpp @@ -65,14 +65,16 @@ void pybind_console(py::module& m) { .def(py::init(), "Create a VerbosityContextManager with a given VerbosityLevel", "level"_a) - .def("__enter__", - [&](utility::VerbosityContextManager& cm) { cm.enter(); }, - "Enter the context manager") - .def("__exit__", - [&](utility::VerbosityContextManager& cm, - pybind11::object exc_type, pybind11::object exc_value, - pybind11::object traceback) { cm.exit(); }, - "Exit the context manager"); + .def( + "__enter__", + [&](utility::VerbosityContextManager& cm) { cm.enter(); }, + "Enter the context manager") + .def( + "__exit__", + [&](utility::VerbosityContextManager& cm, + pybind11::object exc_type, pybind11::object exc_value, + pybind11::object traceback) { cm.exit(); }, + "Exit the context manager"); } } // namespace open3d diff --git a/cpp/pybind/utility/eigen.cpp b/cpp/pybind/utility/eigen.cpp index 3591a3b9131..a0db5904d28 100644 --- a/cpp/pybind/utility/eigen.cpp +++ b/cpp/pybind/utility/eigen.cpp @@ -39,8 +39,9 @@ py::class_ bind_vector_without_repr( using Class_ = py::class_; Class_ cl(m, name.c_str(), std::forward(args)...); cl.def(py::init<>()); - cl.def("__bool__", [](const Vector &v) -> bool { return !v.empty(); }, - "Check whether the list is nonempty"); + cl.def( + "__bool__", [](const Vector &v) -> bool { return !v.empty(); }, + "Check whether the list is nonempty"); cl.def("__len__", &Vector::size); return cl; } diff --git a/cpp/pybind/utility/utility.cpp b/cpp/pybind/utility/utility.cpp index 90fa73b45f0..79abcb9412f 100644 --- a/cpp/pybind/utility/utility.cpp +++ b/cpp/pybind/utility/utility.cpp @@ -25,6 +25,7 @@ // ---------------------------------------------------------------------------- #include "pybind/utility/utility.h" + #include "pybind/docstring.h" #include "pybind/open3d_pybind.h" diff --git a/cpp/pybind/visualization/gui/gui.cpp b/cpp/pybind/visualization/gui/gui.cpp index 4090afc70a4..c2ecc749f9e 100644 --- a/cpp/pybind/visualization/gui/gui.cpp +++ b/cpp/pybind/visualization/gui/gui.cpp @@ -26,9 +26,6 @@ #include "pybind/visualization/gui/gui.h" -#include "pybind/docstring.h" -#include "pybind11/functional.h" - #include "open3d/utility/FileSystem.h" #include "open3d/visualization/gui/Application.h" #include "open3d/visualization/gui/Button.h" @@ -56,6 +53,8 @@ #include "open3d/visualization/gui/Window.h" #include "open3d/visualization/rendering/Open3DScene.h" #include "open3d/visualization/rendering/Renderer.h" +#include "pybind/docstring.h" +#include "pybind11/functional.h" using namespace open3d::visualization::gui; using namespace open3d::visualization::rendering; @@ -85,44 +84,50 @@ void pybind_gui_classes(py::module &m) { }, py::return_value_policy::reference, "Gets the Application singleton (read-only)") - .def("initialize", - [](Application &instance) { - // We need to find the resources directory. Fortunately, - // Python knows where the module lives (open3d.__file__ is - // the path to - // __init__.py), so we can use that to find the resources - // included in the wheel. - py::object o3d = py::module::import("open3d"); - auto o3d_init_path = - o3d.attr("__file__").cast(); - auto module_path = - utility::filesystem::GetFileParentDirectory( - o3d_init_path); - auto resource_path = module_path + "/resources"; - instance.Initialize(resource_path.c_str()); - }, - "Initializes the application, using the resources included " - "in the wheel. One of the `initialize` functions _must_ be " - "called prior to using anything in the gui module") - .def("initialize", - [](Application &instance, const char *resource_dir) { - instance.Initialize(resource_dir); - }, - "Initializes the application with location of the resources " - "provided by the caller. One of the `initialize` functions " - "_must_ be called prior to using anything in the gui module") - .def("run", - [](Application &instance) { - while (instance.RunOneTick()) { - // Enable Ctrl-C to kill Python - if (PyErr_CheckSignals() != 0) { - throw py::error_already_set(); - } - } - }, - "Runs the event loop") - .def("quit", [](Application &instance) { instance.Quit(); }, - "Closes all the windows, exiting as a result") + .def( + "initialize", + [](Application &instance) { + // We need to find the resources directory. Fortunately, + // Python knows where the module lives (open3d.__file__ + // is the path to + // __init__.py), so we can use that to find the + // resources included in the wheel. + py::object o3d = py::module::import("open3d"); + auto o3d_init_path = + o3d.attr("__file__").cast(); + auto module_path = + utility::filesystem::GetFileParentDirectory( + o3d_init_path); + auto resource_path = module_path + "/resources"; + instance.Initialize(resource_path.c_str()); + }, + "Initializes the application, using the resources included " + "in the wheel. One of the `initialize` functions _must_ be " + "called prior to using anything in the gui module") + .def( + "initialize", + [](Application &instance, const char *resource_dir) { + instance.Initialize(resource_dir); + }, + "Initializes the application with location of the " + "resources " + "provided by the caller. One of the `initialize` functions " + "_must_ be called prior to using anything in the gui " + "module") + .def( + "run", + [](Application &instance) { + while (instance.RunOneTick()) { + // Enable Ctrl-C to kill Python + if (PyErr_CheckSignals() != 0) { + throw py::error_already_set(); + } + } + }, + "Runs the event loop") + .def( + "quit", [](Application &instance) { instance.Quit(); }, + "Closes all the windows, exiting as a result") .def_property("menubar", &Application::GetMenubar, &Application::SetMenubar, "The Menu for the application (initially None)") @@ -228,12 +233,13 @@ void pybind_gui_classes(py::module &m) { .def("set_on_menu_item_activated", &PyWindow::SetOnMenuItemActivated, "Sets callback function for menu item: callback()") - .def("set_on_layout", - [](PyWindow *w, std::function f) { - w->on_layout_ = f; - }, - "Sets a callback function that manually sets the frames of " - "children of the window") + .def( + "set_on_layout", + [](PyWindow *w, std::function f) { + w->on_layout_ = f; + }, + "Sets a callback function that manually sets the frames of " + "children of the window") .def_property_readonly("theme", &PyWindow::GetTheme, "Get's window's theme info") .def("show_dialog", &PyWindow::ShowDialog, "Displays the dialog") @@ -250,34 +256,38 @@ void pybind_gui_classes(py::module &m) { py::class_> menu( m, "Menu", "A menu, possibly a menu tree"); menu.def(py::init<>()) - .def("add_item", - [](std::shared_ptr menu, const char *text, int item_id) { - menu->AddItem(text, item_id); - }, - "Adds a menu item with id to the menu") - .def("add_menu", - [](std::shared_ptr menu, const char *text, - std::shared_ptr submenu) { - menu->AddMenu(text, submenu); - }, - "Adds a submenu to the menu") + .def( + "add_item", + [](std::shared_ptr menu, const char *text, + int item_id) { menu->AddItem(text, item_id); }, + "Adds a menu item with id to the menu") + .def( + "add_menu", + [](std::shared_ptr menu, const char *text, + std::shared_ptr submenu) { + menu->AddMenu(text, submenu); + }, + "Adds a submenu to the menu") .def("add_separator", &Menu::AddSeparator, "Adds a separator to the menu") - .def("set_enabled", - [](std::shared_ptr menu, int item_id, bool enabled) { - menu->SetEnabled(item_id, enabled); - }, - "Sets menu item enabled or disabled") - .def("is_checked", - [](std::shared_ptr menu, int item_id) -> bool { - return menu->IsChecked(item_id); - }, - "Returns True if menu item is checked") - .def("set_checked", - [](std::shared_ptr menu, int item_id, bool checked) { - menu->SetChecked(item_id, checked); - }, - "Sets menu item (un)checked"); + .def( + "set_enabled", + [](std::shared_ptr menu, int item_id, bool enabled) { + menu->SetEnabled(item_id, enabled); + }, + "Sets menu item enabled or disabled") + .def( + "is_checked", + [](std::shared_ptr menu, int item_id) -> bool { + return menu->IsChecked(item_id); + }, + "Returns True if menu item is checked") + .def( + "set_checked", + [](std::shared_ptr menu, int item_id, bool checked) { + menu->SetChecked(item_id, checked); + }, + "Sets menu item (un)checked"); // ---- Color ---- py::class_> color( @@ -404,33 +414,34 @@ void pybind_gui_classes(py::module &m) { // and float and int are different types. Fortunately, we want // a float, which is easily castable from int. So we can pass // a py::object and cast it ourselves. - .def_property("horizontal_padding_em", - &Button::GetHorizontalPaddingEm, - [](std::shared_ptr