Skip to content

Commit 73b1a4b

Browse files
YuriSizovYuriSizov
committed
Merge pull request godotengine#59186 from aaronfranke/vardefinit
Rename `VariantZeroAssigner` to `VariantDefaultInitializer`
2 parents 8ccae16 + 849015a commit 73b1a4b

1 file changed

Lines changed: 76 additions & 76 deletions

File tree

‎core/variant/variant_internal.h‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,192 +1302,192 @@ struct VariantInitializer<Object *> {
13021302
};
13031303

13041304
template <class T>
1305-
struct VariantZeroAssigner {
1305+
struct VariantDefaultInitializer {
13061306
};
13071307

13081308
template <>
1309-
struct VariantZeroAssigner<bool> {
1310-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_bool(v) = false; }
1309+
struct VariantDefaultInitializer<bool> {
1310+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_bool(v) = false; }
13111311
};
13121312

13131313
template <>
1314-
struct VariantZeroAssigner<int64_t> {
1315-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_int(v) = 0; }
1314+
struct VariantDefaultInitializer<int64_t> {
1315+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_int(v) = 0; }
13161316
};
13171317

13181318
template <>
1319-
struct VariantZeroAssigner<double> {
1320-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_float(v) = 0.0; }
1319+
struct VariantDefaultInitializer<double> {
1320+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_float(v) = 0.0; }
13211321
};
13221322

13231323
template <>
1324-
struct VariantZeroAssigner<float> {
1325-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_float(v) = 0.0; }
1324+
struct VariantDefaultInitializer<float> {
1325+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_float(v) = 0.0; }
13261326
};
13271327

13281328
template <>
1329-
struct VariantZeroAssigner<String> {
1330-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_string(v) = String(); }
1329+
struct VariantDefaultInitializer<String> {
1330+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_string(v) = String(); }
13311331
};
13321332

13331333
template <>
1334-
struct VariantZeroAssigner<Vector2> {
1335-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_vector2(v) = Vector2(); }
1334+
struct VariantDefaultInitializer<Vector2> {
1335+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_vector2(v) = Vector2(); }
13361336
};
13371337

13381338
template <>
1339-
struct VariantZeroAssigner<Vector2i> {
1340-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_vector2i(v) = Vector2i(); }
1339+
struct VariantDefaultInitializer<Vector2i> {
1340+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_vector2i(v) = Vector2i(); }
13411341
};
13421342

13431343
template <>
1344-
struct VariantZeroAssigner<Rect2> {
1345-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_rect2(v) = Rect2(); }
1344+
struct VariantDefaultInitializer<Rect2> {
1345+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_rect2(v) = Rect2(); }
13461346
};
13471347

13481348
template <>
1349-
struct VariantZeroAssigner<Rect2i> {
1350-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_rect2i(v) = Rect2i(); }
1349+
struct VariantDefaultInitializer<Rect2i> {
1350+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_rect2i(v) = Rect2i(); }
13511351
};
13521352

13531353
template <>
1354-
struct VariantZeroAssigner<Vector3> {
1355-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_vector3(v) = Vector3(); }
1354+
struct VariantDefaultInitializer<Vector3> {
1355+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_vector3(v) = Vector3(); }
13561356
};
13571357

13581358
template <>
1359-
struct VariantZeroAssigner<Vector3i> {
1360-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_vector3i(v) = Vector3i(); }
1359+
struct VariantDefaultInitializer<Vector3i> {
1360+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_vector3i(v) = Vector3i(); }
13611361
};
13621362

13631363
template <>
1364-
struct VariantZeroAssigner<Vector4> {
1365-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_vector4(v) = Vector4(); }
1364+
struct VariantDefaultInitializer<Vector4> {
1365+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_vector4(v) = Vector4(); }
13661366
};
13671367

13681368
template <>
1369-
struct VariantZeroAssigner<Vector4i> {
1370-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_vector4i(v) = Vector4i(); }
1369+
struct VariantDefaultInitializer<Vector4i> {
1370+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_vector4i(v) = Vector4i(); }
13711371
};
13721372

13731373
template <>
1374-
struct VariantZeroAssigner<Transform2D> {
1375-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_transform2d(v) = Transform2D(); }
1374+
struct VariantDefaultInitializer<Transform2D> {
1375+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_transform2d(v) = Transform2D(); }
13761376
};
13771377

13781378
template <>
1379-
struct VariantZeroAssigner<Plane> {
1380-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_plane(v) = Plane(); }
1379+
struct VariantDefaultInitializer<Plane> {
1380+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_plane(v) = Plane(); }
13811381
};
13821382

13831383
template <>
1384-
struct VariantZeroAssigner<Quaternion> {
1385-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_quaternion(v) = Quaternion(); }
1384+
struct VariantDefaultInitializer<Quaternion> {
1385+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_quaternion(v) = Quaternion(); }
13861386
};
13871387

13881388
template <>
1389-
struct VariantZeroAssigner<AABB> {
1390-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_aabb(v) = AABB(); }
1389+
struct VariantDefaultInitializer<AABB> {
1390+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_aabb(v) = AABB(); }
13911391
};
13921392

13931393
template <>
1394-
struct VariantZeroAssigner<Basis> {
1395-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_basis(v) = Basis(); }
1394+
struct VariantDefaultInitializer<Basis> {
1395+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_basis(v) = Basis(); }
13961396
};
13971397

13981398
template <>
1399-
struct VariantZeroAssigner<Transform3D> {
1400-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_transform(v) = Transform3D(); }
1399+
struct VariantDefaultInitializer<Transform3D> {
1400+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_transform(v) = Transform3D(); }
14011401
};
14021402

14031403
template <>
1404-
struct VariantZeroAssigner<Projection> {
1405-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_projection(v) = Projection(); }
1404+
struct VariantDefaultInitializer<Projection> {
1405+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_projection(v) = Projection(); }
14061406
};
14071407

14081408
template <>
1409-
struct VariantZeroAssigner<Color> {
1410-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_color(v) = Color(); }
1409+
struct VariantDefaultInitializer<Color> {
1410+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_color(v) = Color(); }
14111411
};
14121412

14131413
template <>
1414-
struct VariantZeroAssigner<StringName> {
1415-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_string_name(v) = StringName(); }
1414+
struct VariantDefaultInitializer<StringName> {
1415+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_string_name(v) = StringName(); }
14161416
};
14171417

14181418
template <>
1419-
struct VariantZeroAssigner<NodePath> {
1420-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_node_path(v) = NodePath(); }
1419+
struct VariantDefaultInitializer<NodePath> {
1420+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_node_path(v) = NodePath(); }
14211421
};
14221422

14231423
template <>
1424-
struct VariantZeroAssigner<::RID> {
1425-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_rid(v) = RID(); }
1424+
struct VariantDefaultInitializer<::RID> {
1425+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_rid(v) = RID(); }
14261426
};
14271427

14281428
template <>
1429-
struct VariantZeroAssigner<Callable> {
1430-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_callable(v) = Callable(); }
1429+
struct VariantDefaultInitializer<Callable> {
1430+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_callable(v) = Callable(); }
14311431
};
14321432

14331433
template <>
1434-
struct VariantZeroAssigner<Signal> {
1435-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_signal(v) = Signal(); }
1434+
struct VariantDefaultInitializer<Signal> {
1435+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_signal(v) = Signal(); }
14361436
};
14371437

14381438
template <>
1439-
struct VariantZeroAssigner<Dictionary> {
1440-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_dictionary(v) = Dictionary(); }
1439+
struct VariantDefaultInitializer<Dictionary> {
1440+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_dictionary(v) = Dictionary(); }
14411441
};
14421442

14431443
template <>
1444-
struct VariantZeroAssigner<Array> {
1445-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_array(v) = Array(); }
1444+
struct VariantDefaultInitializer<Array> {
1445+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_array(v) = Array(); }
14461446
};
14471447

14481448
template <>
1449-
struct VariantZeroAssigner<PackedByteArray> {
1450-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_byte_array(v) = PackedByteArray(); }
1449+
struct VariantDefaultInitializer<PackedByteArray> {
1450+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_byte_array(v) = PackedByteArray(); }
14511451
};
14521452

14531453
template <>
1454-
struct VariantZeroAssigner<PackedInt32Array> {
1455-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_int32_array(v) = PackedInt32Array(); }
1454+
struct VariantDefaultInitializer<PackedInt32Array> {
1455+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_int32_array(v) = PackedInt32Array(); }
14561456
};
14571457

14581458
template <>
1459-
struct VariantZeroAssigner<PackedInt64Array> {
1460-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_int64_array(v) = PackedInt64Array(); }
1459+
struct VariantDefaultInitializer<PackedInt64Array> {
1460+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_int64_array(v) = PackedInt64Array(); }
14611461
};
14621462

14631463
template <>
1464-
struct VariantZeroAssigner<PackedFloat32Array> {
1465-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_float32_array(v) = PackedFloat32Array(); }
1464+
struct VariantDefaultInitializer<PackedFloat32Array> {
1465+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_float32_array(v) = PackedFloat32Array(); }
14661466
};
14671467

14681468
template <>
1469-
struct VariantZeroAssigner<PackedFloat64Array> {
1470-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_float64_array(v) = PackedFloat64Array(); }
1469+
struct VariantDefaultInitializer<PackedFloat64Array> {
1470+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_float64_array(v) = PackedFloat64Array(); }
14711471
};
14721472

14731473
template <>
1474-
struct VariantZeroAssigner<PackedStringArray> {
1475-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_string_array(v) = PackedStringArray(); }
1474+
struct VariantDefaultInitializer<PackedStringArray> {
1475+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_string_array(v) = PackedStringArray(); }
14761476
};
14771477

14781478
template <>
1479-
struct VariantZeroAssigner<PackedVector2Array> {
1480-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_vector2_array(v) = PackedVector2Array(); }
1479+
struct VariantDefaultInitializer<PackedVector2Array> {
1480+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_vector2_array(v) = PackedVector2Array(); }
14811481
};
14821482

14831483
template <>
1484-
struct VariantZeroAssigner<PackedVector3Array> {
1485-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_vector3_array(v) = PackedVector3Array(); }
1484+
struct VariantDefaultInitializer<PackedVector3Array> {
1485+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_vector3_array(v) = PackedVector3Array(); }
14861486
};
14871487

14881488
template <>
1489-
struct VariantZeroAssigner<PackedColorArray> {
1490-
static _FORCE_INLINE_ void zero(Variant *v) { *VariantInternal::get_color_array(v) = PackedColorArray(); }
1489+
struct VariantDefaultInitializer<PackedColorArray> {
1490+
static _FORCE_INLINE_ void init(Variant *v) { *VariantInternal::get_color_array(v) = PackedColorArray(); }
14911491
};
14921492

14931493
template <class T>
@@ -1504,7 +1504,7 @@ struct VariantTypeChanger {
15041504
VariantInitializer<T>::init(v);
15051505
}
15061506

1507-
VariantZeroAssigner<T>::zero(v);
1507+
VariantDefaultInitializer<T>::init(v);
15081508
}
15091509
};
15101510

0 commit comments

Comments
 (0)