godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-06 10:11:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename Transform2D "elements" to "columns"

Browse Source
This commit is contained in:
Aaron Franke
2022-04-24 16:59:24 -05:00
parent 81139c94a8
commit b831fb0a54
44 changed files with 410 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/variant/variant.cpp
View File

@@ -1908,12 +1908,12 @@ Variant::operator Transform3D() const {
} else if (type == TRANSFORM2D) {
const Transform2D &t = *_data._transform2d;
Transform3D m;
m.basis.elements[0][0] = t.elements[0][0];
m.basis.elements[1][0] = t.elements[0][1];
m.basis.elements[0][1] = t.elements[1][0];
m.basis.elements[1][1] = t.elements[1][1];
m.origin[0] = t.elements[2][0];
m.origin[1] = t.elements[2][1];
m.basis.elements[0][0] = t.columns[0][0];
m.basis.elements[1][0] = t.columns[0][1];
m.basis.elements[0][1] = t.columns[1][0];
m.basis.elements[1][1] = t.columns[1][1];
m.origin[0] = t.columns[2][0];
m.origin[1] = t.columns[2][1];
return m;
} else {
return Transform3D();
@@ -1926,12 +1926,12 @@ Variant::operator Transform2D() const {
} else if (type == TRANSFORM3D) {
const Transform3D &t = *_data._transform3d;
Transform2D m;
m.elements[0][0] = t.basis.elements[0][0];
m.elements[0][1] = t.basis.elements[1][0];
m.elements[1][0] = t.basis.elements[0][1];
m.elements[1][1] = t.basis.elements[1][1];
m.elements[2][0] = t.origin[0];
m.elements[2][1] = t.origin[1];
m.columns[0][0] = t.basis.elements[0][0];
m.columns[0][1] = t.basis.elements[1][0];
m.columns[1][0] = t.basis.elements[0][1];
m.columns[1][1] = t.basis.elements[1][1];
m.columns[2][0] = t.origin[0];
m.columns[2][1] = t.origin[1];
return m;
} else {
return Transform2D();
@@ -2790,7 +2790,7 @@ uint32_t Variant::recursive_hash(int recursion_count) const {
uint32_t hash = 5831;
for (int i = 0; i < 3; i++) {
for (int j = 0; j < 2; j++) {
hash = hash_djb2_one_float(_data._transform2d->elements[i][j], hash);
hash = hash_djb2_one_float(_data._transform2d->columns[i][j], hash);
}
}
@@ -3112,7 +3112,7 @@ bool Variant::hash_compare(const Variant &p_variant, int recursion_count) const
Transform2D *r = p_variant._data._transform2d;
for (int i = 0; i < 3; i++) {
if (!(hash_compare_vector2(l->elements[i], r->elements[i]))) {
if (!(hash_compare_vector2(l->columns[i], r->columns[i]))) {
return false;
}
}