src/geometry.cpp

changeset 371
171d3f9638a9
parent 369
57de8fab2237
child 372
b2914aaeec1a
--- a/src/geometry.cpp	Mon Apr 10 14:18:11 2023 +0300
+++ b/src/geometry.cpp	Mon Apr 10 14:21:17 2023 +0300
@@ -54,10 +54,10 @@
  * @param matrix Matrix to compute
  * @return scaling vector and unscaled matrix
  */
-ScalingExtract extractScaling(const glm::mat4& matrix)
+unscaled_matrix unscale_matrix(const glm::mat4& matrix)
 {
-	ScalingExtract result;
-	result.scaling = scalingVector(matrix);
+	unscaled_matrix result;
+	result.scaling = calculate_matrix_scaling(matrix);
 	result.unscaled = glm::scale(matrix, 1.0f / result.scaling);
 	return result;
 }
@@ -67,7 +67,7 @@
  * @param matrix
  * @return scaling vector
  */
-glm::vec3 scalingVector(const glm::mat4 matrix)
+glm::vec3 calculate_matrix_scaling(const glm::mat4 matrix)
 {
 	auto component = [](const glm::mat4& matrix, const int i) -> float
 	{

mercurial