Browse Source

fix compilation error

V2-integral-fix
Zhicheng Wang 2 days ago
parent
commit
60c59b4b6d
  1. 6
      primitive_process/interface/data/data_type.hpp
  2. 3
      shared_module/container/wrapper/object_map.hpp

6
primitive_process/interface/data/data_type.hpp

@ -15,6 +15,12 @@ struct paired_model_matrix {
transform_block world_to_local{internal::transform_block::Identity()};
};
static inline bool operator==(const paired_model_matrix& lhs, const paired_model_matrix& rhs)
{
return lhs.local_to_world.matrix() == rhs.local_to_world.matrix()
&& lhs.world_to_local.matrix() == rhs.world_to_local.matrix();
}
using paired_model_matrix_ptr_t = pointer_wrapper<paired_model_matrix>;
namespace hidden

3
shared_module/container/wrapper/object_map.hpp

@ -33,7 +33,8 @@ struct flat_object_map {
auto& value = iter->second;
if (is_new) {
value.refcount = 1;
value.object_pointer = mi_aligned_alloc(alignof(V), sizeof(V));
V* new_value = static_cast<V*>(mi_aligned_alloc(alignof(V), sizeof(V)));
value.object_pointer = make_pointer_wrapper(new_value);
if constexpr (std::is_same_v<V, K>)
*value.object_pointer = key;
else

Loading…
Cancel
Save