Merge pull request #60627 from aaronfranke/rename-elements

Rename Transform2D and Basis `elements` to `columns` and `rows` respectively

4 files changed, 135 insertions, 132 deletions

diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp
index e14018c562..1197f4aac1 100644
--- a/drivers/gles3/rasterizer_canvas_gles3.cpp
+++ b/drivers/gles3/rasterizer_canvas_gles3.cpp
@@ -57,57 +57,57 @@
 //};
 
 void RasterizerCanvasGLES3::_update_transform_2d_to_mat4(const Transform2D &p_transform, float *p_mat4) {
-	p_mat4[0] = p_transform.elements[0][0];
-	p_mat4[1] = p_transform.elements[0][1];
+	p_mat4[0] = p_transform.columns[0][0];
+	p_mat4[1] = p_transform.columns[0][1];
 	p_mat4[2] = 0;
 	p_mat4[3] = 0;
-	p_mat4[4] = p_transform.elements[1][0];
-	p_mat4[5] = p_transform.elements[1][1];
+	p_mat4[4] = p_transform.columns[1][0];
+	p_mat4[5] = p_transform.columns[1][1];
 	p_mat4[6] = 0;
 	p_mat4[7] = 0;
 	p_mat4[8] = 0;
 	p_mat4[9] = 0;
 	p_mat4[10] = 1;
 	p_mat4[11] = 0;
-	p_mat4[12] = p_transform.elements[2][0];
-	p_mat4[13] = p_transform.elements[2][1];
+	p_mat4[12] = p_transform.columns[2][0];
+	p_mat4[13] = p_transform.columns[2][1];
 	p_mat4[14] = 0;
 	p_mat4[15] = 1;
 }
 
 void RasterizerCanvasGLES3::_update_transform_2d_to_mat2x4(const Transform2D &p_transform, float *p_mat2x4) {
-	p_mat2x4[0] = p_transform.elements[0][0];
-	p_mat2x4[1] = p_transform.elements[1][0];
+	p_mat2x4[0] = p_transform.columns[0][0];
+	p_mat2x4[1] = p_transform.columns[1][0];
 	p_mat2x4[2] = 0;
-	p_mat2x4[3] = p_transform.elements[2][0];
+	p_mat2x4[3] = p_transform.columns[2][0];
 
-	p_mat2x4[4] = p_transform.elements[0][1];
-	p_mat2x4[5] = p_transform.elements[1][1];
+	p_mat2x4[4] = p_transform.columns[0][1];
+	p_mat2x4[5] = p_transform.columns[1][1];
 	p_mat2x4[6] = 0;
-	p_mat2x4[7] = p_transform.elements[2][1];
+	p_mat2x4[7] = p_transform.columns[2][1];
 }
 
 void RasterizerCanvasGLES3::_update_transform_2d_to_mat2x3(const Transform2D &p_transform, float *p_mat2x3) {
-	p_mat2x3[0] = p_transform.elements[0][0];
-	p_mat2x3[1] = p_transform.elements[0][1];
-	p_mat2x3[2] = p_transform.elements[1][0];
-	p_mat2x3[3] = p_transform.elements[1][1];
-	p_mat2x3[4] = p_transform.elements[2][0];
-	p_mat2x3[5] = p_transform.elements[2][1];
+	p_mat2x3[0] = p_transform.columns[0][0];
+	p_mat2x3[1] = p_transform.columns[0][1];
+	p_mat2x3[2] = p_transform.columns[1][0];
+	p_mat2x3[3] = p_transform.columns[1][1];
+	p_mat2x3[4] = p_transform.columns[2][0];
+	p_mat2x3[5] = p_transform.columns[2][1];
 }
 
 void RasterizerCanvasGLES3::_update_transform_to_mat4(const Transform3D &p_transform, float *p_mat4) {
-	p_mat4[0] = p_transform.basis.elements[0][0];
-	p_mat4[1] = p_transform.basis.elements[1][0];
-	p_mat4[2] = p_transform.basis.elements[2][0];
+	p_mat4[0] = p_transform.basis.rows[0][0];
+	p_mat4[1] = p_transform.basis.rows[1][0];
+	p_mat4[2] = p_transform.basis.rows[2][0];
 	p_mat4[3] = 0;
-	p_mat4[4] = p_transform.basis.elements[0][1];
-	p_mat4[5] = p_transform.basis.elements[1][1];
-	p_mat4[6] = p_transform.basis.elements[2][1];
+	p_mat4[4] = p_transform.basis.rows[0][1];
+	p_mat4[5] = p_transform.basis.rows[1][1];
+	p_mat4[6] = p_transform.basis.rows[2][1];
 	p_mat4[7] = 0;
-	p_mat4[8] = p_transform.basis.elements[0][2];
-	p_mat4[9] = p_transform.basis.elements[1][2];
-	p_mat4[10] = p_transform.basis.elements[2][2];
+	p_mat4[8] = p_transform.basis.rows[0][2];
+	p_mat4[9] = p_transform.basis.rows[1][2];
+	p_mat4[10] = p_transform.basis.rows[2][2];
 	p_mat4[11] = 0;
 	p_mat4[12] = p_transform.origin.x;
 	p_mat4[13] = p_transform.origin.y;
@@ -142,9 +142,9 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_
 		_update_transform_2d_to_mat4(p_canvas_transform, state_buffer.canvas_transform);
 
 		Transform2D normal_transform = p_canvas_transform;
-		normal_transform.elements[0].normalize();
-		normal_transform.elements[1].normalize();
-		normal_transform.elements[2] = Vector2();
+		normal_transform.columns[0].normalize();
+		normal_transform.columns[1].normalize();
+		normal_transform.columns[2] = Vector2();
 		_update_transform_2d_to_mat4(normal_transform, state_buffer.canvas_normal_transform);
 
 		state_buffer.canvas_modulate[0] = p_modulate.r;
diff --git a/drivers/gles3/shaders/SCsub b/drivers/gles3/shaders/SCsub
index 8443b5df85..79247f38d4 100644
--- a/drivers/gles3/shaders/SCsub
+++ b/drivers/gles3/shaders/SCsub
@@ -2,6 +2,9 @@
 
 Import("env")
 
+env.Depends("#drivers/gles3/shaders/copy.glsl.gen.h", "#core/math/basis.h")
+env.Depends("#drivers/gles3/shaders/copy.glsl.gen.h", "#core/math/transform_2d.h")
+
 if "GLES3_GLSL" in env["BUILDERS"]:
     env.GLES3_GLSL("canvas.glsl")
     env.GLES3_GLSL("copy.glsl")
diff --git a/drivers/gles3/storage/material_storage.cpp b/drivers/gles3/storage/material_storage.cpp
index 8bfb09b83b..d14d26346c 100644
--- a/drivers/gles3/storage/material_storage.cpp
+++ b/drivers/gles3/storage/material_storage.cpp
@@ -558,13 +558,13 @@ _FORCE_INLINE_ static void _fill_std140_variant_ubo_value(ShaderLanguage::DataTy
 				Transform2D v = value;
 
 				//in std140 members of mat2 are treated as vec4s
-				gui[0] = v.elements[0][0];
-				gui[1] = v.elements[0][1];
+				gui[0] = v.columns[0][0];
+				gui[1] = v.columns[0][1];
 				gui[2] = 0; // ignored
 				gui[3] = 0; // ignored
 
-				gui[4] = v.elements[1][0];
-				gui[5] = v.elements[1][1];
+				gui[4] = v.columns[1][0];
+				gui[5] = v.columns[1][1];
 				gui[6] = 0; // ignored
 				gui[7] = 0; // ignored
 			}
@@ -608,19 +608,19 @@ _FORCE_INLINE_ static void _fill_std140_variant_ubo_value(ShaderLanguage::DataTy
 				}
 			} else {
 				Basis v = value;
-				gui[0] = v.elements[0][0];
-				gui[1] = v.elements[1][0];
-				gui[2] = v.elements[2][0];
+				gui[0] = v.rows[0][0];
+				gui[1] = v.rows[1][0];
+				gui[2] = v.rows[2][0];
 				gui[3] = 0; // ignored
 
-				gui[4] = v.elements[0][1];
-				gui[5] = v.elements[1][1];
-				gui[6] = v.elements[2][1];
+				gui[4] = v.rows[0][1];
+				gui[5] = v.rows[1][1];
+				gui[6] = v.rows[2][1];
 				gui[7] = 0; // ignored
 
-				gui[8] = v.elements[0][2];
-				gui[9] = v.elements[1][2];
-				gui[10] = v.elements[2][2];
+				gui[8] = v.rows[0][2];
+				gui[9] = v.rows[1][2];
+				gui[10] = v.rows[2][2];
 				gui[11] = 0; // ignored
 			}
 		} break;
@@ -676,19 +676,19 @@ _FORCE_INLINE_ static void _fill_std140_variant_ubo_value(ShaderLanguage::DataTy
 				}
 			} else {
 				Transform3D v = value;
-				gui[0] = v.basis.elements[0][0];
-				gui[1] = v.basis.elements[1][0];
-				gui[2] = v.basis.elements[2][0];
+				gui[0] = v.basis.rows[0][0];
+				gui[1] = v.basis.rows[1][0];
+				gui[2] = v.basis.rows[2][0];
 				gui[3] = 0;
 
-				gui[4] = v.basis.elements[0][1];
-				gui[5] = v.basis.elements[1][1];
-				gui[6] = v.basis.elements[2][1];
+				gui[4] = v.basis.rows[0][1];
+				gui[5] = v.basis.rows[1][1];
+				gui[6] = v.basis.rows[2][1];
 				gui[7] = 0;
 
-				gui[8] = v.basis.elements[0][2];
-				gui[9] = v.basis.elements[1][2];
-				gui[10] = v.basis.elements[2][2];
+				gui[8] = v.basis.rows[0][2];
+				gui[9] = v.basis.rows[1][2];
+				gui[10] = v.basis.rows[2][2];
 				gui[11] = 0;
 
 				gui[12] = v.origin.x;
@@ -1908,19 +1908,19 @@ void MaterialStorage::_global_variable_store_in_buffer(int32_t p_index, RS::Glob
 		case RS::GLOBAL_VAR_TYPE_MAT3: {
 			GlobalVariables::Value *bv = &global_variables.buffer_values[p_index];
 			Basis v = p_value;
-			bv[0].x = v.elements[0][0];
-			bv[0].y = v.elements[1][0];
-			bv[0].z = v.elements[2][0];
+			bv[0].x = v.rows[0][0];
+			bv[0].y = v.rows[1][0];
+			bv[0].z = v.rows[2][0];
 			bv[0].w = 0;
 
-			bv[1].x = v.elements[0][1];
-			bv[1].y = v.elements[1][1];
-			bv[1].z = v.elements[2][1];
+			bv[1].x = v.rows[0][1];
+			bv[1].y = v.rows[1][1];
+			bv[1].z = v.rows[2][1];
 			bv[1].w = 0;
 
-			bv[2].x = v.elements[0][2];
-			bv[2].y = v.elements[1][2];
-			bv[2].z = v.elements[2][2];
+			bv[2].x = v.rows[0][2];
+			bv[2].y = v.rows[1][2];
+			bv[2].z = v.rows[2][2];
 			bv[2].w = 0;
 
 		} break;
@@ -1956,18 +1956,18 @@ void MaterialStorage::_global_variable_store_in_buffer(int32_t p_index, RS::Glob
 		case RS::GLOBAL_VAR_TYPE_TRANSFORM_2D: {
 			GlobalVariables::Value *bv = &global_variables.buffer_values[p_index];
 			Transform2D v = p_value;
-			bv[0].x = v.elements[0][0];
-			bv[0].y = v.elements[0][1];
+			bv[0].x = v.columns[0][0];
+			bv[0].y = v.columns[0][1];
 			bv[0].z = 0;
 			bv[0].w = 0;
 
-			bv[1].x = v.elements[1][0];
-			bv[1].y = v.elements[1][1];
+			bv[1].x = v.columns[1][0];
+			bv[1].y = v.columns[1][1];
 			bv[1].z = 0;
 			bv[1].w = 0;
 
-			bv[2].x = v.elements[2][0];
-			bv[2].y = v.elements[2][1];
+			bv[2].x = v.columns[2][0];
+			bv[2].y = v.columns[2][1];
 			bv[2].z = 1;
 			bv[2].w = 0;
 
@@ -1975,19 +1975,19 @@ void MaterialStorage::_global_variable_store_in_buffer(int32_t p_index, RS::Glob
 		case RS::GLOBAL_VAR_TYPE_TRANSFORM: {
 			GlobalVariables::Value *bv = &global_variables.buffer_values[p_index];
 			Transform3D v = p_value;
-			bv[0].x = v.basis.elements[0][0];
-			bv[0].y = v.basis.elements[1][0];
-			bv[0].z = v.basis.elements[2][0];
+			bv[0].x = v.basis.rows[0][0];
+			bv[0].y = v.basis.rows[1][0];
+			bv[0].z = v.basis.rows[2][0];
 			bv[0].w = 0;
 
-			bv[1].x = v.basis.elements[0][1];
-			bv[1].y = v.basis.elements[1][1];
-			bv[1].z = v.basis.elements[2][1];
+			bv[1].x = v.basis.rows[0][1];
+			bv[1].y = v.basis.rows[1][1];
+			bv[1].z = v.basis.rows[2][1];
 			bv[1].w = 0;
 
-			bv[2].x = v.basis.elements[0][2];
-			bv[2].y = v.basis.elements[1][2];
-			bv[2].z = v.basis.elements[2][2];
+			bv[2].x = v.basis.rows[0][2];
+			bv[2].y = v.basis.rows[1][2];
+			bv[2].z = v.basis.rows[2][2];
 			bv[2].w = 0;
 
 			bv[3].x = v.origin.x;
diff --git a/drivers/gles3/storage/mesh_storage.cpp b/drivers/gles3/storage/mesh_storage.cpp
index 934f746423..41b5107b6c 100644
--- a/drivers/gles3/storage/mesh_storage.cpp
+++ b/drivers/gles3/storage/mesh_storage.cpp
@@ -384,12 +384,12 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
 
 					Transform3D mtx;
 
-					mtx.basis.elements[0].x = dataptr[0];
-					mtx.basis.elements[1].x = dataptr[1];
+					mtx.basis.rows[0].x = dataptr[0];
+					mtx.basis.rows[1].x = dataptr[1];
 					mtx.origin.x = dataptr[3];
 
-					mtx.basis.elements[0].y = dataptr[4];
-					mtx.basis.elements[1].y = dataptr[5];
+					mtx.basis.rows[0].y = dataptr[4];
+					mtx.basis.rows[1].y = dataptr[5];
 					mtx.origin.y = dataptr[7];
 
 					AABB baabb = mtx.xform(skbones[j]);
@@ -411,17 +411,17 @@ AABB MeshStorage::mesh_get_aabb(RID p_mesh, RID p_skeleton) {
 
 					Transform3D mtx;
 
-					mtx.basis.elements[0][0] = dataptr[0];
-					mtx.basis.elements[0][1] = dataptr[1];
-					mtx.basis.elements[0][2] = dataptr[2];
+					mtx.basis.rows[0][0] = dataptr[0];
+					mtx.basis.rows[0][1] = dataptr[1];
+					mtx.basis.rows[0][2] = dataptr[2];
 					mtx.origin.x = dataptr[3];
-					mtx.basis.elements[1][0] = dataptr[4];
-					mtx.basis.elements[1][1] = dataptr[5];
-					mtx.basis.elements[1][2] = dataptr[6];
+					mtx.basis.rows[1][0] = dataptr[4];
+					mtx.basis.rows[1][1] = dataptr[5];
+					mtx.basis.rows[1][2] = dataptr[6];
 					mtx.origin.y = dataptr[7];
-					mtx.basis.elements[2][0] = dataptr[8];
-					mtx.basis.elements[2][1] = dataptr[9];
-					mtx.basis.elements[2][2] = dataptr[10];
+					mtx.basis.rows[2][0] = dataptr[8];
+					mtx.basis.rows[2][1] = dataptr[9];
+					mtx.basis.rows[2][2] = dataptr[10];
 					mtx.origin.z = dataptr[11];
 
 					AABB baabb = mtx.xform(skbones[j]);
@@ -975,26 +975,26 @@ void MeshStorage::_multimesh_re_create_aabb(MultiMesh *multimesh, const float *p
 		Transform3D t;
 
 		if (multimesh->xform_format == RS::MULTIMESH_TRANSFORM_3D) {
-			t.basis.elements[0][0] = data[0];
-			t.basis.elements[0][1] = data[1];
-			t.basis.elements[0][2] = data[2];
+			t.basis.rows[0][0] = data[0];
+			t.basis.rows[0][1] = data[1];
+			t.basis.rows[0][2] = data[2];
 			t.origin.x = data[3];
-			t.basis.elements[1][0] = data[4];
-			t.basis.elements[1][1] = data[5];
-			t.basis.elements[1][2] = data[6];
+			t.basis.rows[1][0] = data[4];
+			t.basis.rows[1][1] = data[5];
+			t.basis.rows[1][2] = data[6];
 			t.origin.y = data[7];
-			t.basis.elements[2][0] = data[8];
-			t.basis.elements[2][1] = data[9];
-			t.basis.elements[2][2] = data[10];
+			t.basis.rows[2][0] = data[8];
+			t.basis.rows[2][1] = data[9];
+			t.basis.rows[2][2] = data[10];
 			t.origin.z = data[11];
 
 		} else {
-			t.basis.elements[0].x = data[0];
-			t.basis.elements[1].x = data[1];
+			t.basis.rows[0].x = data[0];
+			t.basis.rows[1].x = data[1];
 			t.origin.x = data[3];
 
-			t.basis.elements[0].y = data[4];
-			t.basis.elements[1].y = data[5];
+			t.basis.rows[0].y = data[4];
+			t.basis.rows[1].y = data[5];
 			t.origin.y = data[7];
 		}
 
@@ -1021,17 +1021,17 @@ void MeshStorage::multimesh_instance_set_transform(RID p_multimesh, int p_index,
 
 		float *dataptr = w + p_index * multimesh->stride_cache;
 
-		dataptr[0] = p_transform.basis.elements[0][0];
-		dataptr[1] = p_transform.basis.elements[0][1];
-		dataptr[2] = p_transform.basis.elements[0][2];
+		dataptr[0] = p_transform.basis.rows[0][0];
+		dataptr[1] = p_transform.basis.rows[0][1];
+		dataptr[2] = p_transform.basis.rows[0][2];
 		dataptr[3] = p_transform.origin.x;
-		dataptr[4] = p_transform.basis.elements[1][0];
-		dataptr[5] = p_transform.basis.elements[1][1];
-		dataptr[6] = p_transform.basis.elements[1][2];
+		dataptr[4] = p_transform.basis.rows[1][0];
+		dataptr[5] = p_transform.basis.rows[1][1];
+		dataptr[6] = p_transform.basis.rows[1][2];
 		dataptr[7] = p_transform.origin.y;
-		dataptr[8] = p_transform.basis.elements[2][0];
-		dataptr[9] = p_transform.basis.elements[2][1];
-		dataptr[10] = p_transform.basis.elements[2][2];
+		dataptr[8] = p_transform.basis.rows[2][0];
+		dataptr[9] = p_transform.basis.rows[2][1];
+		dataptr[10] = p_transform.basis.rows[2][2];
 		dataptr[11] = p_transform.origin.z;
 	}
 
@@ -1051,14 +1051,14 @@ void MeshStorage::multimesh_instance_set_transform_2d(RID p_multimesh, int p_ind
 
 		float *dataptr = w + p_index * multimesh->stride_cache;
 
-		dataptr[0] = p_transform.elements[0][0];
-		dataptr[1] = p_transform.elements[1][0];
+		dataptr[0] = p_transform.columns[0][0];
+		dataptr[1] = p_transform.columns[1][0];
 		dataptr[2] = 0;
-		dataptr[3] = p_transform.elements[2][0];
-		dataptr[4] = p_transform.elements[0][1];
-		dataptr[5] = p_transform.elements[1][1];
+		dataptr[3] = p_transform.columns[2][0];
+		dataptr[4] = p_transform.columns[0][1];
+		dataptr[5] = p_transform.columns[1][1];
 		dataptr[6] = 0;
-		dataptr[7] = p_transform.elements[2][1];
+		dataptr[7] = p_transform.columns[2][1];
 	}
 
 	_multimesh_mark_dirty(multimesh, p_index, true);
@@ -1138,17 +1138,17 @@ Transform3D MeshStorage::multimesh_instance_get_transform(RID p_multimesh, int p
 
 		const float *dataptr = r + p_index * multimesh->stride_cache;
 
-		t.basis.elements[0][0] = dataptr[0];
-		t.basis.elements[0][1] = dataptr[1];
-		t.basis.elements[0][2] = dataptr[2];
+		t.basis.rows[0][0] = dataptr[0];
+		t.basis.rows[0][1] = dataptr[1];
+		t.basis.rows[0][2] = dataptr[2];
 		t.origin.x = dataptr[3];
-		t.basis.elements[1][0] = dataptr[4];
-		t.basis.elements[1][1] = dataptr[5];
-		t.basis.elements[1][2] = dataptr[6];
+		t.basis.rows[1][0] = dataptr[4];
+		t.basis.rows[1][1] = dataptr[5];
+		t.basis.rows[1][2] = dataptr[6];
 		t.origin.y = dataptr[7];
-		t.basis.elements[2][0] = dataptr[8];
-		t.basis.elements[2][1] = dataptr[9];
-		t.basis.elements[2][2] = dataptr[10];
+		t.basis.rows[2][0] = dataptr[8];
+		t.basis.rows[2][1] = dataptr[9];
+		t.basis.rows[2][2] = dataptr[10];
 		t.origin.z = dataptr[11];
 	}
 
@@ -1169,12 +1169,12 @@ Transform2D MeshStorage::multimesh_instance_get_transform_2d(RID p_multimesh, in
 
 		const float *dataptr = r + p_index * multimesh->stride_cache;
 
-		t.elements[0][0] = dataptr[0];
-		t.elements[1][0] = dataptr[1];
-		t.elements[2][0] = dataptr[3];
-		t.elements[0][1] = dataptr[4];
-		t.elements[1][1] = dataptr[5];
-		t.elements[2][1] = dataptr[7];
+		t.columns[0][0] = dataptr[0];
+		t.columns[1][0] = dataptr[1];
+		t.columns[2][0] = dataptr[3];
+		t.columns[0][1] = dataptr[4];
+		t.columns[1][1] = dataptr[5];
+		t.columns[2][1] = dataptr[7];
 	}
 
 	return t;