Skip to content
Merged

V16 #1238

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions bindings/python/src/mesh/helpers/convert_edged_curve.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ namespace geode
{
void define_convert_edged_curve( pybind11::module& module )
{
module
.def( "convert_edged_curve3d_into_2d",
&convert_edged_curve3d_into_2d )
.def( "merge_edged_curves2D", &merge_edged_curves< 2 > )
.def( "merge_edged_curves3D", &merge_edged_curves< 3 > );
module.def(
"convert_edged_curve3d_into_2d", &convert_edged_curve3d_into_2d );
}
} // namespace geode
3 changes: 1 addition & 2 deletions bindings/python/src/mesh/helpers/convert_solid_mesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ namespace geode
.def( "convert_solid_mesh_into_tetrahedral_solid",
&convert_solid_mesh_into_tetrahedral_solid )
.def( "convert_grid_into_tetrahedral_solid",
&convert_grid_into_tetrahedral_solid )
.def( "merge_solid_meshes", &merge_solid_meshes );
&convert_grid_into_tetrahedral_solid );
}
} // namespace geode
4 changes: 1 addition & 3 deletions bindings/python/src/mesh/helpers/convert_surface_mesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ namespace geode
.def( "convert_triangulated_surface2d_into_3d",
&convert_triangulated_surface2d_into_3d )
.def( "convert_triangulated_surface3d_into_2d",
&convert_triangulated_surface3d_into_2d )
.def( "merge_surface_meshes2D", &merge_surface_meshes< 2 > )
.def( "merge_surface_meshes3D", &merge_surface_meshes< 3 > );
&convert_triangulated_surface3d_into_2d );
}
} // namespace geode
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

#include "../../common.hpp"

#include <geode/mesh/builder/surface_mesh_builder.hpp>
#include <geode/mesh/core/surface_mesh.hpp>
#include <geode/mesh/helpers/repair_polygon_orientations.hpp>

Expand All @@ -31,10 +32,8 @@ namespace geode
void define_repair_polygon_orientations( pybind11::module& module )
{
module.def( "repair_polygon_orientations2D",
static_cast< void ( * )( SurfaceMesh< 2 >& ) >(
&repair_polygon_orientations< 2 > ) );
&repair_polygon_orientations< 2 > );
module.def( "repair_polygon_orientations3D",
static_cast< void ( * )( SurfaceMesh< 3 >& ) >(
&repair_polygon_orientations< 3 > ) );
&repair_polygon_orientations< 3 > );
}
} // namespace geode
2 changes: 1 addition & 1 deletion cmake/ConfigureGDAL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ExternalProject_Add(gdal
BINARY_DIR ${GDAL_PATH}/build
STAMP_DIR ${GDAL_PATH}/stamp
GIT_REPOSITORY https://github.com/Geode-solutions/gdal
GIT_TAG 18102025
GIT_TAG b98359e91c94cfc7486b419da3ba828c98fb31c6
GIT_SHALLOW ON
GIT_PROGRESS ON
GIT_CONFIG core.longpaths=true
Expand Down
2 changes: 1 addition & 1 deletion cmake/ConfigureMinizip.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ExternalProject_Add(minizip
BINARY_DIR ${MINIZIP_PATH}/build
STAMP_DIR ${MINIZIP_PATH}/stamp
GIT_REPOSITORY https://github.com/zlib-ng/minizip-ng
GIT_TAG 4.0.7
GIT_TAG 4.1.0
GIT_SHALLOW ON
GIT_PROGRESS ON
CMAKE_GENERATOR ${CMAKE_GENERATOR}
Expand Down
2 changes: 1 addition & 1 deletion cmake/ConfigureNanoflann.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ExternalProject_Add(nanoflann
BINARY_DIR ${NANOFLANN_PATH}/build
STAMP_DIR ${NANOFLANN_PATH}/stamp
GIT_REPOSITORY https://github.com/jlblancoc/nanoflann
GIT_TAG v1.5.5
GIT_TAG v1.9.0
GIT_SHALLOW ON
GIT_PROGRESS ON
CMAKE_GENERATOR ${CMAKE_GENERATOR}
Expand Down
2 changes: 1 addition & 1 deletion cmake/ConfigurePybind11.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ExternalProject_Add(pybind11
BINARY_DIR ${PYBIND11_PATH}/build
STAMP_DIR ${PYBIND11_PATH}/stamp
GIT_REPOSITORY https://github.com/pybind/pybind11
GIT_TAG v2.13.1
GIT_TAG v3.0.2
GIT_SHALLOW ON
GIT_PROGRESS ON
CMAKE_GENERATOR ${CMAKE_GENERATOR}
Expand Down
2 changes: 1 addition & 1 deletion cmake/ConfigureSpdlog.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ExternalProject_Add(spdlog
BINARY_DIR ${SPDLOG_PATH}/build
STAMP_DIR ${SPDLOG_PATH}/stamp
GIT_REPOSITORY https://github.com/gabime/spdlog
GIT_TAG v1.14.1
GIT_TAG v1.17.0
GIT_SHALLOW ON
GIT_PROGRESS ON
CMAKE_GENERATOR ${CMAKE_GENERATOR}
Expand Down
13 changes: 0 additions & 13 deletions include/geode/basic/console_progress_logger_client.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,6 @@ namespace geode
void failed(
const uuid& progress_logger_id, Logger::LEVEL level ) override;

[[deprecated]] void start( const uuid& progress_logger_id,
const std::string& message,
index_t nb_steps ) override;

[[deprecated]] void update( const uuid& progress_logger_id,
index_t current_step,
index_t nb_steps ) override;

[[deprecated]] void completed(
const uuid& progress_logger_id ) override;

[[deprecated]] void failed( const uuid& progress_logger_id ) override;

private:
IMPLEMENTATION_MEMBER( impl_ );
};
Expand Down
22 changes: 0 additions & 22 deletions include/geode/basic/detail/geode_input_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,27 +38,6 @@ namespace geode
{
namespace detail
{
template < typename Object >
void update_default_name( Object& object, std::string_view filename )
{
if( object.name() == Identifier::DEFAULT_NAME )
{
IdentifierBuilder{ object }.set_name(
filename_without_extension( filename ).string() );
}
}

template < typename Object >
void update_default_name(
std::unique_ptr< Object >& object, std::string_view filename )
{
if( object->name() == Identifier::DEFAULT_NAME )
{
IdentifierBuilder{ *object }.set_name(
filename_without_extension( filename ).string() );
}
}

template < typename Factory >
[[nodiscard]] std::unique_ptr< typename Factory::BaseClass >
geode_object_input_reader( std::string_view& filename )
Expand All @@ -80,7 +59,6 @@ namespace geode
const Timer timer;
auto input = geode_object_input_reader< Factory >( filename );
auto object = input->read( std::forward< Args >( args )... );
update_default_name( object, filename );
Logger::info(
type, " loaded from ", filename, " in ", timer.duration() );
return object;
Expand Down
6 changes: 3 additions & 3 deletions include/geode/basic/identifier.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@

#pragma once

#include <optional>

#include <geode/basic/common.hpp>
#include <geode/basic/passkey.hpp>
#include <geode/basic/pimpl.hpp>
Expand All @@ -46,14 +48,12 @@ namespace geode
friend class bitsery::Access;

public:
static constexpr auto DEFAULT_NAME = "default_name";

Identifier( Identifier&& other ) noexcept;
~Identifier();

[[nodiscard]] const uuid& id() const;

[[nodiscard]] std::string_view name() const;
[[nodiscard]] const std::optional< std::string >& name() const;

void save_identifier( std::string_view directory ) const;

Expand Down
2 changes: 0 additions & 2 deletions include/geode/basic/progress_logger.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ namespace geode
class opengeode_basic_api ProgressLogger
{
public:
[[deprecated]] ProgressLogger(
const std::string& message, index_t nb_steps );
ProgressLogger(
Logger::LEVEL level, const std::string& message, index_t nb_steps );
~ProgressLogger();
Expand Down
14 changes: 0 additions & 14 deletions include/geode/basic/progress_logger_client.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,6 @@ namespace geode
virtual void failed(
const uuid& progress_logger_id, Logger::LEVEL level ) = 0;

[[deprecated]] virtual void start( const uuid& progress_logger_id,
const std::string& message,
index_t nb_steps ) = 0;

[[deprecated]] virtual void update( const uuid& progress_logger_id,
index_t current_step,
index_t nb_steps ) = 0;

[[deprecated]] virtual void completed(
const uuid& progress_logger_id ) = 0;

[[deprecated]] virtual void failed(
const uuid& progress_logger_id ) = 0;

protected:
ProgressLoggerClient() = default;
};
Expand Down
12 changes: 0 additions & 12 deletions include/geode/basic/progress_logger_manager.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,6 @@ namespace geode
static void failed(
const uuid& progress_logger_id, Logger::LEVEL level );

[[deprecated]] static void start( const uuid& progress_logger_id,
const std::string& message,
index_t nb_steps );

[[deprecated]] static void update( const uuid& progress_logger_id,
index_t current_step,
index_t nb_steps );

[[deprecated]] static void completed( const uuid& progress_logger_id );

[[deprecated]] static void failed( const uuid& progress_logger_id );

private:
ProgressLoggerManager();

Expand Down
11 changes: 0 additions & 11 deletions include/geode/geometry/aabb.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,6 @@ namespace geode

[[nodiscard]] const BoundingBox< dimension >& bounding_box() const;

/*!
* @brief Whether or not the queries run on this tree are parallelized.
*/
[[deprecated, nodiscard]] bool parallel() const;

/*!
* @brief Sets whether or not the queries run on this tree are
* parallelized.
*/
[[deprecated]] void set_parallel( bool parallel );

/*!
* @brief Gets all the boxes containing a point
* @param[in] query the point to test
Expand Down
5 changes: 0 additions & 5 deletions include/geode/mesh/helpers/convert_edged_curve.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,4 @@ namespace geode
convert_edged_curve2d_into_3d( const EdgedCurve2D& curve2d,
local_index_t axis_to_add,
double axis_coordinate );

template < index_t dimension >
[[deprecated, nodiscard]] std::unique_ptr< EdgedCurve< dimension > >
merge_edged_curves( absl::Span< const std::reference_wrapper<
const EdgedCurve< dimension > > > curves );
} // namespace geode
5 changes: 0 additions & 5 deletions include/geode/mesh/helpers/convert_solid_mesh.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,4 @@ namespace geode
[[nodiscard]] std::optional< std::unique_ptr< HybridSolid3D > >
opengeode_mesh_api convert_solid_mesh_into_hybrid_solid(
const SolidMesh3D& solid );

[[deprecated, nodiscard]] std::unique_ptr< SolidMesh3D >
opengeode_mesh_api merge_solid_meshes(
absl::Span< const std::reference_wrapper< const SolidMesh3D > >
solids );
} // namespace geode
5 changes: 0 additions & 5 deletions include/geode/mesh/helpers/convert_surface_mesh.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,4 @@ namespace geode
opengeode_mesh_api convert_triangulated_surface3d_into_2d(
const TriangulatedSurface3D& surface3d,
local_index_t axis_to_remove );

template < index_t dimension >
[[deprecated, nodiscard]] std::unique_ptr< SurfaceMesh< dimension > >
merge_surface_meshes( absl::Span< const std::reference_wrapper<
const SurfaceMesh< dimension > > > surfaces );
} // namespace geode
5 changes: 4 additions & 1 deletion include/geode/mesh/helpers/internal/copy.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,10 @@ namespace geode
template < typename MeshFrom, typename Builder >
void copy_meta_info( const MeshFrom& from, Builder& builder )
{
builder.set_name( from.name() );
if( const auto name = from.name() )
{
builder.set_name( name.value() );
}
}

void copy_attributes(
Expand Down
8 changes: 0 additions & 8 deletions include/geode/mesh/helpers/ray_tracing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ namespace geode
};

public:
[[deprecated]] RayTracing2D(
const EdgedCurve2D& mesh, const Ray2D& ray );
[[deprecated]] RayTracing2D(
const EdgedCurve2D& mesh, const InfiniteLine2D& infinite_line );
RayTracing2D( const EdgedCurve2D& mesh,
const BoundingBox2D& bbox,
const Ray2D& ray );
Expand Down Expand Up @@ -135,10 +131,6 @@ namespace geode
};

public:
[[deprecated]] RayTracing3D(
const SurfaceMesh3D& mesh, const Ray3D& ray );
[[deprecated]] RayTracing3D(
const SurfaceMesh3D& mesh, const InfiniteLine3D& infinite_line );
RayTracing3D( const SurfaceMesh3D& mesh,
const BoundingBox3D& bbox,
const Ray3D& ray );
Expand Down
61 changes: 0 additions & 61 deletions include/geode/mesh/helpers/remove_vertex_duplication.hpp

This file was deleted.

4 changes: 0 additions & 4 deletions include/geode/mesh/helpers/repair_polygon_orientations.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ namespace geode

namespace geode
{
template < index_t dimension >
void OPENGEODE_MESH_DEPRECATED repair_polygon_orientations(
SurfaceMesh< dimension >& mesh );

template < index_t dimension >
void repair_polygon_orientations( const SurfaceMesh< dimension >& mesh,
SurfaceMeshBuilder< dimension >& builder );
Expand Down
Loading