thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Avoid copies in vector and matrix (#11959)

Browse Source
This commit is contained in:
AnoNymous
2018-09-30 06:04:40 +02:00
committed by Scott Lahteine
parent 693865a649
commit a644d8cb93
2 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Marlin/src/libs/vector_3.h
View File

@@ -39,8 +39,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef VECTOR_3_H
#define VECTOR_3_H
#pragma once
class matrix_3x3;
@@ -50,25 +49,24 @@ struct vector_3 {
vector_3();
vector_3(float x, float y, float z);
static vector_3 cross(vector_3 a, vector_3 b);
static vector_3 cross(const vector_3 &a, const vector_3 &b);
vector_3 operator+(vector_3 v);
vector_3 operator-(vector_3 v);
vector_3 operator+(const vector_3 &v);
vector_3 operator-(const vector_3 &v);
void normalize();
float get_length();
vector_3 get_normal();
float get_length() const;
vector_3 get_normal() const;
void debug(const char * const title);
void apply_rotation(matrix_3x3 matrix);
void apply_rotation(const matrix_3x3 &matrix);
};
struct matrix_3x3 {
float matrix[9];
static matrix_3x3 create_from_rows(vector_3 row_0, vector_3 row_1, vector_3 row_2);
static matrix_3x3 create_look_at(vector_3 target);
static matrix_3x3 transpose(matrix_3x3 original);
static matrix_3x3 create_from_rows(const vector_3 &row_0, const vector_3 &row_1, const vector_3 &row_2);
static matrix_3x3 create_look_at(const vector_3 &target);
static matrix_3x3 transpose(const matrix_3x3 &original);
void set_to_identity();
@@ -76,6 +74,5 @@ struct matrix_3x3 {
};
void apply_rotation_xyz(matrix_3x3 rotationMatrix, float &x, float &y, float &z);
void apply_rotation_xyz(const matrix_3x3 &rotationMatrix, float &x, float &y, float &z);
#endif // VECTOR_3_H