Skip to content

Commit

Permalink
Replace C casts with static casts
Browse files Browse the repository at this point in the history
  • Loading branch information
@GsLogiMaker
GsLogiMaker committed Sep 25, 2024
1 parent 4d1b4eb commit 65323fb
Show file tree
Hide file tree
Showing 9 changed files with 237 additions and 240 deletions.
122 changes: 62 additions & 60 deletions addons/glecs/cpp/src/component.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,10 @@ Variant GFComponent::getm(String member) {

void* GFComponent::get_member_ptr_mut_at(int offset) {
ecs_world_t* raw = get_world()->raw();
int8_t* bytes = (int8_t*) ecs_get_mut_id(raw, get_source_id(), get_id());
return (void*) &bytes[offset];
int8_t* bytes = static_cast<int8_t*>(
ecs_get_mut_id(raw, get_source_id(), get_id())
);
return static_cast<void*>(&bytes[offset]);
}

const EcsMember* GFComponent::get_member_data(String member) {
Expand Down Expand Up @@ -139,24 +141,24 @@ Variant GFComponent::member_value_as_primitive(
ecs_primitive_kind_t primitive
) {
switch (primitive) {
case ecs_primitive_kind_t::EcsBool: return *(bool*) ptr;
case ecs_primitive_kind_t::EcsChar: return *(char*) ptr;
case ecs_primitive_kind_t::EcsByte: return *(uint8_t*) ptr;
case ecs_primitive_kind_t::EcsU8: return *(uint8_t*) ptr;
case ecs_primitive_kind_t::EcsU16: return *(uint16_t*) ptr;
case ecs_primitive_kind_t::EcsU32: return *(uint32_t*) ptr;
case ecs_primitive_kind_t::EcsU64: return *(uint64_t*) ptr;
case ecs_primitive_kind_t::EcsI8: return *(int8_t*) ptr;
case ecs_primitive_kind_t::EcsI16: return *(int16_t*) ptr;
case ecs_primitive_kind_t::EcsI32: return *(int32_t*) ptr;
case ecs_primitive_kind_t::EcsI64: return *(int64_t*) ptr;
case ecs_primitive_kind_t::EcsF32: return *(float*) ptr;
case ecs_primitive_kind_t::EcsF64: return *(double*) ptr;
case ecs_primitive_kind_t::EcsBool: return *static_cast<bool*>(ptr);
case ecs_primitive_kind_t::EcsChar: return *static_cast<char*>(ptr);
case ecs_primitive_kind_t::EcsByte: return *static_cast<uint8_t*>(ptr);
case ecs_primitive_kind_t::EcsU8: return *static_cast<uint8_t*>(ptr);
case ecs_primitive_kind_t::EcsU16: return *static_cast<uint16_t*>(ptr);
case ecs_primitive_kind_t::EcsU32: return *static_cast<uint32_t*>(ptr);
case ecs_primitive_kind_t::EcsU64: return *static_cast<uint64_t*>(ptr);
case ecs_primitive_kind_t::EcsI8: return *static_cast<int8_t*>(ptr);
case ecs_primitive_kind_t::EcsI16: return *static_cast<int16_t*>(ptr);
case ecs_primitive_kind_t::EcsI32: return *static_cast<int32_t*>(ptr);
case ecs_primitive_kind_t::EcsI64: return *static_cast<int64_t*>(ptr);
case ecs_primitive_kind_t::EcsF32: return *static_cast<float*>(ptr);
case ecs_primitive_kind_t::EcsF64: return *static_cast<double*>(ptr);
case ecs_primitive_kind_t::EcsUPtr: ERR(nullptr, "Can't get primitive\nCan't handle uptr");
case ecs_primitive_kind_t::EcsIPtr: ERR(nullptr, "Can't get primitive\nCan't handle iptr");
case ecs_primitive_kind_t::EcsString: return *(char**) ptr;
case ecs_primitive_kind_t::EcsEntity: return *(ecs_entity_t*) ptr;
case ecs_primitive_kind_t::EcsId: return *(ecs_entity_t*) ptr;
case ecs_primitive_kind_t::EcsString: return *static_cast<char**>(ptr);
case ecs_primitive_kind_t::EcsEntity: return *static_cast<ecs_entity_t*>(ptr);
case ecs_primitive_kind_t::EcsId: return *static_cast<ecs_entity_t*>(ptr);
default: ERR(nullptr, "Can't get primitive\nUnknown primitive type");
}
}
Expand All @@ -182,44 +184,44 @@ Variant GFComponent::member_value_as_type(
"Can't convert type ", ecs_get_name(raw, type), " to Variant"
);
}
case(Variant::Type::BOOL): return Variant( *(bool*) ptr );
case(Variant::Type::INT): return Variant( *(int64_t*) ptr );
case(Variant::Type::FLOAT): return Variant( *(double*) ptr );
case(Variant::Type::STRING): return Variant( *(String*) ptr );
case(Variant::Type::VECTOR2): return Variant( *(Vector2*) ptr );
case(Variant::Type::VECTOR2I): return Variant( *(Vector2i*) ptr );
case(Variant::Type::RECT2): return Variant( *(Rect2*) ptr );
case(Variant::Type::RECT2I): return Variant( *(Rect2i*) ptr );
case(Variant::Type::VECTOR3): return Variant( *(Vector3*) ptr );
case(Variant::Type::VECTOR3I): return Variant( *(Vector3i*) ptr );
case(Variant::Type::TRANSFORM2D): return Variant( *(Transform2D*) ptr );
case(Variant::Type::VECTOR4): return Variant( *(Vector4*) ptr );
case(Variant::Type::VECTOR4I): return Variant( *(Vector4i*) ptr );
case(Variant::Type::PLANE): return Variant( *(Plane*) ptr );
case(Variant::Type::QUATERNION): return Variant( *(Quaternion*) ptr );
case(Variant::Type::AABB): return Variant( *(AABB*) ptr );
case(Variant::Type::BASIS): return Variant( *(Basis*) ptr );
case(Variant::Type::TRANSFORM3D): return Variant( *(Transform3D*) ptr );
case(Variant::Type::PROJECTION): return Variant( *(Projection*) ptr );
case(Variant::Type::COLOR): return Variant( *(Color*) ptr );
case(Variant::Type::STRING_NAME): return Variant( *(StringName*) ptr );
case(Variant::Type::NODE_PATH): return Variant( *(NodePath*) ptr );
case(Variant::Type::RID): return Variant( *(RID*) ptr );
case(Variant::Type::OBJECT): return Variant( *(Variant*) ptr );
case(Variant::Type::CALLABLE): return Variant( *(Callable*) ptr );
case(Variant::Type::SIGNAL): return Variant( *(Signal*) ptr );
case(Variant::Type::DICTIONARY): return *(Dictionary*) ptr;
case(Variant::Type::ARRAY): return *(Array*) ptr;
case(Variant::Type::PACKED_BYTE_ARRAY): return Variant( *(PackedByteArray*) ptr );
case(Variant::Type::PACKED_INT32_ARRAY): return Variant( *(PackedInt32Array*) ptr );
case(Variant::Type::PACKED_INT64_ARRAY): return Variant( *(PackedInt64Array*) ptr );
case(Variant::Type::PACKED_FLOAT32_ARRAY): return Variant( *(PackedFloat32Array*) ptr );
case(Variant::Type::PACKED_FLOAT64_ARRAY): return Variant( *(PackedFloat64Array*) ptr );
case(Variant::Type::PACKED_STRING_ARRAY): return Variant( *(PackedStringArray*) ptr );
case(Variant::Type::PACKED_VECTOR2_ARRAY): return Variant( *(PackedVector2Array*) ptr );
case(Variant::Type::PACKED_VECTOR3_ARRAY): return Variant( *(PackedVector3Array*) ptr );
case(Variant::Type::PACKED_COLOR_ARRAY): return Variant( *(PackedColorArray*) ptr );
case(Variant::Type::PACKED_VECTOR4_ARRAY): return Variant( *(PackedVector4Array*) ptr );
case(Variant::Type::BOOL): return Variant( *static_cast<bool*>(ptr) );
case(Variant::Type::INT): return Variant( *static_cast<int64_t*>(ptr) );
case(Variant::Type::FLOAT): return Variant( *static_cast<double*>(ptr) );
case(Variant::Type::STRING): return Variant( *static_cast<String*>(ptr) );
case(Variant::Type::VECTOR2): return Variant( *static_cast<Vector2*>(ptr) );
case(Variant::Type::VECTOR2I): return Variant( *static_cast<Vector2i*>(ptr) );
case(Variant::Type::RECT2): return Variant( *static_cast<Rect2*>(ptr) );
case(Variant::Type::RECT2I): return Variant( *static_cast<Rect2i*>(ptr) );
case(Variant::Type::VECTOR3): return Variant( *static_cast<Vector3*>(ptr) );
case(Variant::Type::VECTOR3I): return Variant( *static_cast<Vector3i*>(ptr) );
case(Variant::Type::TRANSFORM2D): return Variant( *static_cast<Transform2D*>(ptr) );
case(Variant::Type::VECTOR4): return Variant( *static_cast<Vector4*>(ptr) );
case(Variant::Type::VECTOR4I): return Variant( *static_cast<Vector4i*>(ptr) );
case(Variant::Type::PLANE): return Variant( *static_cast<Plane*>(ptr) );
case(Variant::Type::QUATERNION): return Variant( *static_cast<Quaternion*>(ptr) );
case(Variant::Type::AABB): return Variant( *static_cast<AABB*>(ptr) );
case(Variant::Type::BASIS): return Variant( *static_cast<Basis*>(ptr) );
case(Variant::Type::TRANSFORM3D): return Variant( *static_cast<Transform3D*>(ptr) );
case(Variant::Type::PROJECTION): return Variant( *static_cast<Projection*>(ptr) );
case(Variant::Type::COLOR): return Variant( *static_cast<Color*>(ptr) );
case(Variant::Type::STRING_NAME): return Variant( *static_cast<StringName*>(ptr) );
case(Variant::Type::NODE_PATH): return Variant( *static_cast<NodePath*>(ptr) );
case(Variant::Type::RID): return Variant( *static_cast<RID*>(ptr) );
case(Variant::Type::OBJECT): return Variant( *static_cast<Variant*>(ptr) );
case(Variant::Type::CALLABLE): return Variant( *static_cast<Callable*>(ptr) );
case(Variant::Type::SIGNAL): return Variant( *static_cast<Signal*>(ptr) );
case(Variant::Type::DICTIONARY): return *static_cast<Dictionary*>(ptr);
case(Variant::Type::ARRAY): return *static_cast<Array*>(ptr);
case(Variant::Type::PACKED_BYTE_ARRAY): return Variant( *static_cast<PackedByteArray*>(ptr) );
case(Variant::Type::PACKED_INT32_ARRAY): return Variant( *static_cast<PackedInt32Array*>(ptr) );
case(Variant::Type::PACKED_INT64_ARRAY): return Variant( *static_cast<PackedInt64Array*>(ptr) );
case(Variant::Type::PACKED_FLOAT32_ARRAY): return Variant( *static_cast<PackedFloat32Array*>(ptr) );
case(Variant::Type::PACKED_FLOAT64_ARRAY): return Variant( *static_cast<PackedFloat64Array*>(ptr) );
case(Variant::Type::PACKED_STRING_ARRAY): return Variant( *static_cast<PackedStringArray*>(ptr) );
case(Variant::Type::PACKED_VECTOR2_ARRAY): return Variant( *static_cast<PackedVector2Array*>(ptr) );
case(Variant::Type::PACKED_VECTOR3_ARRAY): return Variant( *static_cast<PackedVector3Array*>(ptr) );
case(Variant::Type::PACKED_COLOR_ARRAY): return Variant( *static_cast<PackedColorArray*>(ptr) );
case(Variant::Type::PACKED_VECTOR4_ARRAY): return Variant( *static_cast<PackedVector4Array*>(ptr) );
case(Variant::Type::VARIANT_MAX): throw "Can't get type VARIANT_MAX";
}

Expand Down Expand Up @@ -273,8 +275,8 @@ void GFComponent::build_data_from_variant(
// No member with that name exists, skip
continue;
}
void* member_ptr = (void*)(
((uint8_t*)output) + member_data->offset
void* member_ptr = static_cast<void*>(
static_cast<uint8_t*>(output) + member_data->offset
);
// Set member from dictionary
Utils::set_type_from_variant(value, member_data->type, raw, member_ptr);
Expand All @@ -288,8 +290,8 @@ void GFComponent::build_data_from_variant(
Variant value = arr[i];

ecs_member_t* member_data = ecs_vec_get_t(&struct_data->members, ecs_member_t, i);
void* member_ptr = (void*)(
((uint8_t*)output) + member_data->offset
void* member_ptr = static_cast<void*>(
static_cast<uint8_t*>(output) + member_data->offset
);
// Set member from array
Utils::set_type_from_variant(value, member_data->type, raw, member_ptr);
Expand Down
30 changes: 15 additions & 15 deletions addons/glecs/cpp/src/component_builder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void GFComponentBuilder::build() {
.move = GFComponentBuilder::move,
.binding_ctx = new HooksBindingContext(world),
.binding_ctx_free = [](void* ptr) {
HooksBindingContext* ctx = (HooksBindingContext*)ptr;
HooksBindingContext* ctx = static_cast<HooksBindingContext*>(ptr);
delete ctx;
}
}; ecs_set_hooks_id(raw, component_id, &hooks);
Expand Down Expand Up @@ -144,21 +144,21 @@ void GFComponentBuilder::_bind_methods() {
// **********************************************

void GFComponentBuilder::ctor(void* ptr, int32_t count, const ecs_type_info_t* type_info) {
uint8_t* list = (uint8_t*)ptr;
HooksBindingContext* ctx = (HooksBindingContext*) type_info->hooks.binding_ctx;
uint8_t* list = static_cast<uint8_t*>(ptr);
HooksBindingContext* ctx = static_cast<HooksBindingContext*>(type_info->hooks.binding_ctx);

for (int i=0; i != count; i++) {
uint8_t* item = &list[i*type_info->size];
ctx->world->init_component_ptr((void*)item, type_info->component, Variant());
ctx->world->init_component_ptr(static_cast<void*>(item), type_info->component, Variant());
}
}
void GFComponentBuilder::dtor(void* ptr, int32_t count, const ecs_type_info_t* type_info) {
uint8_t* list = (uint8_t*)ptr;
HooksBindingContext* ctx = (HooksBindingContext*) type_info->hooks.binding_ctx;
uint8_t* list = static_cast<uint8_t*>(ptr);
HooksBindingContext* ctx = static_cast<HooksBindingContext*>(type_info->hooks.binding_ctx);

for (int i=0; i != count; i++) {
uint8_t* item = &list[i*type_info->size];
ctx->world->deinit_component_ptr((void*)item, type_info->component);
ctx->world->deinit_component_ptr(static_cast<void*>(item), type_info->component);
}
}
void GFComponentBuilder::copy(
Expand All @@ -167,15 +167,15 @@ void GFComponentBuilder::copy(
int32_t count,
const ecs_type_info_t* type_info
) {
const uint8_t* src_list = (const uint8_t*)src_ptr;
uint8_t* dst_list = (uint8_t*)dst_ptr;
HooksBindingContext* ctx = (HooksBindingContext*) type_info->hooks.binding_ctx;
const uint8_t* src_list = static_cast<const uint8_t*>(src_ptr);
uint8_t* dst_list = static_cast<uint8_t*>(dst_ptr);
HooksBindingContext* ctx = static_cast<HooksBindingContext*>(type_info->hooks.binding_ctx);

for (int i=0; i != count; i++) {
const uint8_t* src = &src_list[i*type_info->size];
uint8_t* dst = &dst_list[i*type_info->size];

ctx->world->copy_component_ptr((const void*)src, (void*)dst, type_info->component);
ctx->world->copy_component_ptr(static_cast<const void*>(src), static_cast<void*>(dst), type_info->component);
}
}
void GFComponentBuilder::move(
Expand All @@ -184,15 +184,15 @@ void GFComponentBuilder::move(
int32_t count,
const ecs_type_info_t* type_info
) {
uint8_t* src_list = (uint8_t*)src_ptr;
uint8_t* dst_list = (uint8_t*)dst_ptr;
HooksBindingContext* ctx = (HooksBindingContext*) type_info->hooks.binding_ctx;
uint8_t* src_list = static_cast<uint8_t*>(src_ptr);
uint8_t* dst_list = static_cast<uint8_t*>(dst_ptr);
HooksBindingContext* ctx = static_cast<HooksBindingContext*>(type_info->hooks.binding_ctx);

for (int i=0; i != count; i++) {
uint8_t* src = &src_list[i*type_info->size];
uint8_t* dst = &dst_list[i*type_info->size];

ctx->world->copy_component_ptr((void*)src, (void*)dst, type_info->component);
ctx->world->copy_component_ptr(static_cast<void*>(src), static_cast<void*>(dst), type_info->component);
}
}

Expand Down
10 changes: 2 additions & 8 deletions addons/glecs/cpp/src/module.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ GFModule::~GFModule() {

Ref<GFModule> GFModule::spawn(String name, GFWorld* world_) {
CharString name_utf8 = name.utf8();
GFWorld* world = world_;
if (world == nullptr) {
// world = GlWorld::singleton();
}
GFWorld* world = GFWorld::world_or_singleton(world_);
ecs_component_desc_t comp_desc = {0};
ecs_entity_t module_id = ecs_module_init(
world->raw(),
Expand All @@ -38,10 +35,7 @@ Ref<GFModule> GFModule::from(Variant module, GFWorld* world) {
}

Ref<GFModule> GFModule::from_id(ecs_entity_t module_id, GFWorld* world_) {
GFWorld* world = world_;
if (world == nullptr) {
// world = GlWorld::singleton();
}
GFWorld* world = GFWorld::world_or_singleton(world_);
if (!ecs_has_id(world->raw(), module_id, EcsModule)) {
ERR(nullptr,
"Could not instantiate module from ID\n",
Expand Down
5 changes: 1 addition & 4 deletions addons/glecs/cpp/src/pair.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ Ref<GFPair> GFPair::from(Variant first, Variant second, GFWorld* world) {
}

Ref<GFPair> GFPair::from_id(ecs_entity_t pair_id, GFWorld* world_) {
GFWorld* world = world_;
if (world == nullptr) {
// world = GlWorld::singleton();
}
GFWorld* world = GFWorld::world_or_singleton(world_);
if (!ECS_IS_PAIR(pair_id)) {
ERR(nullptr,
"Could not instantiate pair from ID\n",
Expand Down
8 changes: 6 additions & 2 deletions addons/glecs/cpp/src/query_iterator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ bool GFQueryIterator::_iter_next(Variant arg) {
);
}

QueryIterationContext* ctx = (QueryIterationContext*) iterator.query->binding_ctx;
QueryIterationContext* ctx = static_cast<QueryIterationContext*>(
iterator.query->binding_ctx
);

if (index == iterator.count) {
index = 0;
Expand All @@ -51,7 +53,9 @@ bool GFQueryIterator::_iter_next(Variant arg) {
return !is_done();
}
Variant GFQueryIterator::_iter_get(Variant arg) {
QueryIterationContext* ctx = (QueryIterationContext*) iterator.query->binding_ctx;
QueryIterationContext* ctx = static_cast<QueryIterationContext*>(
iterator.query->binding_ctx
);
return ctx->comp_ref_args;
}

Expand Down
4 changes: 2 additions & 2 deletions addons/glecs/cpp/src/querylike_builder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ QueryIterationContext* GFQuerylikeBuilder::setup_ctx(Callable callable) {
);
query_desc.binding_ctx = ctx;
query_desc.binding_ctx_free = [](void* ptr) {
delete (QueryIterationContext*) ptr;
delete static_cast<QueryIterationContext*>(ptr);
};

if (callable.get_argument_count() != ctx->comp_ref_args.size()) {
Expand Down Expand Up @@ -292,7 +292,7 @@ void QueryIterationContext::update_component_terms(ecs_iter_t* it) {
}

void QueryIterationContext::iterator_callback(ecs_iter_t* it) {
QueryIterationContext* ctx = (QueryIterationContext*) it->query->binding_ctx;
QueryIterationContext* ctx = static_cast<QueryIterationContext*>(it->query->binding_ctx);
ctx->update_component_terms(it);
for (int i=0; i != it->count; i++) {
ctx->update_component_entities(it, i);
Expand Down
Loading

0 comments on commit 65323fb

Please sign in to comment.