Merge branch 'miami' into lcs

# Conflicts:
#	src/core/World.cpp
This commit is contained in:
Sergeanur
2021-05-10 02:48:56 +03:00
14 changed files with 56 additions and 58 deletions

View File

@ -92,22 +92,6 @@ public:
void SetRotateXOnly(float angle);
void SetRotateYOnly(float angle);
void SetRotateZOnly(float angle);
void SetRotateZOnlyScaled(float angle, float scale) {
float c = Cos(angle);
float s = Sin(angle);
rx = c * scale;
ry = s * scale;
rz = 0.0f;
fx = -s * scale;
fy = c * scale;
fz = 0.0f;
ux = 0.0f;
uy = 0.0f;
uz = scale;
}
void SetRotateX(float angle);
void SetRotateY(float angle);
void SetRotateZ(float angle);