Skip to content

Commit dd53aff

Browse files
BenPinetBenPinet
committed
Merge branch 'next' into feat/add-ellipse-basic-object-ditance-and-intersection
1 parent 5a998c3 commit dd53aff

19 files changed

+441
-54
lines changed

‎bindings/python/src/image/core/raster_image.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#define PYTHON_RASTER_IMAGE( dimension ) \
3030
const auto name##dimension = \
3131
"RasterImage" + std::to_string( dimension ) + "D"; \
32-
pybind11::class_< RasterImage##dimension##D, CellArray##dimension##D >( \
33-
module, name##dimension.c_str() ) \
32+
pybind11::class_< RasterImage##dimension##D, CellArray##dimension##D, \
33+
Identifier >( module, name##dimension.c_str() ) \
3434
.def( pybind11::init< std::array< index_t, dimension > >() ) \
3535
.def( \
3636
"native_extension", &RasterImage##dimension##D::native_extension ) \

‎bindings/python/src/mesh/core/light_regular_grid.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
#define PYTHON_LIGHT_REGULAR_GRID( dimension ) \
3434
const auto name##dimension = \
3535
"LightRegularGrid" + std::to_string( dimension ) + "D"; \
36-
pybind11::class_< LightRegularGrid##dimension##D, Grid##dimension##D >( \
37-
module, name##dimension.c_str() ) \
36+
pybind11::class_< LightRegularGrid##dimension##D, Grid##dimension##D, \
37+
Identifier >( module, name##dimension.c_str() ) \
3838
.def( pybind11::init< Point< dimension >, \
3939
std::array< index_t, dimension >, \
4040
std::array< double, dimension > >() ) \

‎cmake/ConfigureEarcut.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ExternalProject_Add(earcut
2626
BINARY_DIR ${EARCUT_PATH}/build
2727
STAMP_DIR ${EARCUT_PATH}/stamp
2828
GIT_REPOSITORY https://github.com/mapbox/earcut.hpp
29-
GIT_TAG a30c14b5676adabe4714ff4173dae8a5d568ab59
29+
GIT_TAG 7fa7aa30183849e988ae79ab2eef19f9ae97acf4
3030
GIT_SHALLOW ON
3131
GIT_PROGRESS ON
3232
CMAKE_GENERATOR ${CMAKE_GENERATOR}

‎include/geode/basic/console_progress_logger_client.hpp‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,33 @@ namespace geode
4040

4141
private:
4242
void start( const uuid& progress_logger_id,
43+
Logger::LEVEL level,
4344
const std::string& message,
4445
index_t nb_steps ) override;
4546

4647
void update( const uuid& progress_logger_id,
48+
Logger::LEVEL level,
4749
index_t current_step,
4850
index_t nb_steps ) override;
4951

50-
void completed( const uuid& progress_logger_id ) override;
52+
void completed(
53+
const uuid& progress_logger_id, Logger::LEVEL level ) override;
5154

52-
void failed( const uuid& progress_logger_id ) override;
55+
void failed(
56+
const uuid& progress_logger_id, Logger::LEVEL level ) override;
57+
58+
[[deprecated]] void start( const uuid& progress_logger_id,
59+
const std::string& message,
60+
index_t nb_steps ) override;
61+
62+
[[deprecated]] void update( const uuid& progress_logger_id,
63+
index_t current_step,
64+
index_t nb_steps ) override;
65+
66+
[[deprecated]] void completed(
67+
const uuid& progress_logger_id ) override;
68+
69+
[[deprecated]] void failed( const uuid& progress_logger_id ) override;
5370

5471
private:
5572
IMPLEMENTATION_MEMBER( impl_ );

‎include/geode/basic/logger.hpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ namespace geode
5454

5555
static void set_level( LEVEL level );
5656

57+
template < typename... Args >
58+
static void log( LEVEL level, const Args &...args )
59+
{
60+
log( level, absl::StrCat( args... ) );
61+
}
62+
5763
template < typename... Args >
5864
static void trace( const Args &...args )
5965
{
@@ -96,6 +102,7 @@ namespace geode
96102

97103
[[nodiscard]] static Logger &instance();
98104

105+
static void log( LEVEL level, const std::string &message );
99106
static void log_trace( const std::string &message );
100107
static void log_debug( const std::string &message );
101108
static void log_info( const std::string &message );

‎include/geode/basic/progress_logger.hpp‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <string>
2727

2828
#include <geode/basic/common.hpp>
29+
#include <geode/basic/logger.hpp>
2930
#include <geode/basic/pimpl.hpp>
3031

3132
namespace absl
@@ -38,7 +39,10 @@ namespace geode
3839
class opengeode_basic_api ProgressLogger
3940
{
4041
public:
41-
ProgressLogger( const std::string& message, index_t nb_steps );
42+
[[deprecated]] ProgressLogger(
43+
const std::string& message, index_t nb_steps );
44+
ProgressLogger(
45+
Logger::LEVEL level, const std::string& message, index_t nb_steps );
4246
~ProgressLogger();
4347

4448
index_t increment();

‎include/geode/basic/progress_logger_client.hpp‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <string>
2727

2828
#include <geode/basic/common.hpp>
29+
#include <geode/basic/logger.hpp>
2930

3031
namespace geode
3132
{
@@ -40,16 +41,34 @@ namespace geode
4041
virtual ~ProgressLoggerClient() = default;
4142

4243
virtual void start( const uuid& progress_logger_id,
44+
Logger::LEVEL level,
4345
const std::string& message,
4446
index_t nb_steps ) = 0;
4547

4648
virtual void update( const uuid& progress_logger_id,
49+
Logger::LEVEL level,
4750
index_t current_step,
4851
index_t nb_steps ) = 0;
4952

50-
virtual void completed( const uuid& progress_logger_id ) = 0;
53+
virtual void completed(
54+
const uuid& progress_logger_id, Logger::LEVEL level ) = 0;
5155

52-
virtual void failed( const uuid& progress_logger_id ) = 0;
56+
virtual void failed(
57+
const uuid& progress_logger_id, Logger::LEVEL level ) = 0;
58+
59+
[[deprecated]] virtual void start( const uuid& progress_logger_id,
60+
const std::string& message,
61+
index_t nb_steps ) = 0;
62+
63+
[[deprecated]] virtual void update( const uuid& progress_logger_id,
64+
index_t current_step,
65+
index_t nb_steps ) = 0;
66+
67+
[[deprecated]] virtual void completed(
68+
const uuid& progress_logger_id ) = 0;
69+
70+
[[deprecated]] virtual void failed(
71+
const uuid& progress_logger_id ) = 0;
5372

5473
protected:
5574
ProgressLoggerClient() = default;

‎include/geode/basic/progress_logger_manager.hpp‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,32 @@ namespace geode
4343
std::unique_ptr< ProgressLoggerClient >&& client );
4444

4545
static void start( const uuid& progress_logger_id,
46+
Logger::LEVEL level,
4647
const std::string& message,
4748
index_t nb_steps );
4849

4950
static void update( const uuid& progress_logger_id,
51+
Logger::LEVEL level,
5052
index_t current_step,
5153
index_t nb_steps );
5254

53-
static void completed( const uuid& progress_logger_id );
55+
static void completed(
56+
const uuid& progress_logger_id, Logger::LEVEL level );
5457

55-
static void failed( const uuid& progress_logger_id );
58+
static void failed(
59+
const uuid& progress_logger_id, Logger::LEVEL level );
60+
61+
[[deprecated]] static void start( const uuid& progress_logger_id,
62+
const std::string& message,
63+
index_t nb_steps );
64+
65+
[[deprecated]] static void update( const uuid& progress_logger_id,
66+
index_t current_step,
67+
index_t nb_steps );
68+
69+
[[deprecated]] static void completed( const uuid& progress_logger_id );
70+
71+
[[deprecated]] static void failed( const uuid& progress_logger_id );
5672

5773
private:
5874
ProgressLoggerManager();

‎include/geode/basic/types.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#endif
2929

3030
#include <array>
31+
#include <string>
3132
#include <string_view>
3233

3334
namespace geode

‎include/geode/geometry/detail/aabb_impl.hpp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,15 @@ namespace geode
9595
bboxes, ROOT_INDEX, 0, bboxes.size() );
9696
}
9797
const auto grain = async::detail::auto_grain_size( bboxes.size() );
98-
const auto nb_async_depth = std::log2( grain );
99-
async_depth_ =
100-
depth_ > nb_async_depth ? depth_ - nb_async_depth : depth_;
98+
if( grain < 8 )
99+
{
100+
async_depth_ = 0;
101+
}
102+
else
103+
{
104+
const auto nb_async_depth = std::log2( grain );
105+
async_depth_ = depth_ - nb_async_depth;
106+
}
101107
}
102108

103109
[[nodiscard]] index_t nb_bboxes() const

0 commit comments

Comments
 (0)