mirrors/raylib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some tweaks raymath related

Browse Source
This commit is contained in:
raysan5 2017-07-21 17:46:44 +02:00
parent e52032f646
commit c6cd07c373
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/models/models_skybox.c
View File

@ -10,7 +10,6 @@
********************************************************************************************/ ********************************************************************************************/
#include "raylib.h" #include "raylib.h"
#include "raymath.h"
int main() int main()
{ {

2
src/models.c
View File

@ -1297,8 +1297,8 @@ void DrawModelEx(Model model, Vector3 position, Vector3 rotationAxis, float rota
{ {
// Calculate transformation matrix from function parameters // Calculate transformation matrix from function parameters
// Get transform matrix (rotation -> scale -> translation) // Get transform matrix (rotation -> scale -> translation)
Matrix matRotation = MatrixRotate(rotationAxis, rotationAngle*DEG2RAD);
Matrix matScale = MatrixScale(scale.x, scale.y, scale.z); Matrix matScale = MatrixScale(scale.x, scale.y, scale.z);
Matrix matRotation = MatrixRotate(rotationAxis, rotationAngle*DEG2RAD);
Matrix matTranslation = MatrixTranslate(position.x, position.y, position.z); Matrix matTranslation = MatrixTranslate(position.x, position.y, position.z);
Matrix matTransform = MatrixMultiply(MatrixMultiply(matScale, matRotation), matTranslation); Matrix matTransform = MatrixMultiply(MatrixMultiply(matScale, matRotation), matTranslation);

12
src/raymath.h
View File

@ -1,6 +1,6 @@
/********************************************************************************************** /**********************************************************************************************
* *
* raymath v1.0 - Math functions to work with Vector3, Matrix and Quaternions * raymath v1.1 - Math functions to work with Vector3, Matrix and Quaternions
* *
* CONFIGURATION: * CONFIGURATION:
* *
@ -19,7 +19,7 @@
* *
* LICENSE: zlib/libpng * LICENSE: zlib/libpng
* *
* Copyright (c) 2015 Ramon Santamaria (@raysan5) * Copyright (c) 2015-2017 Ramon Santamaria (@raysan5)
* *
* This software is provided "as-is", without any express or implied warranty. In no event * This software is provided "as-is", without any express or implied warranty. In no event
* will the authors be held liable for any damages arising from the use of this software. * will the authors be held liable for any damages arising from the use of this software.
@ -405,7 +405,6 @@ RMDEF void VectorNormalize(Vector3 *v)
} }
// Transforms a Vector3 by a given Matrix // Transforms a Vector3 by a given Matrix
// TODO: Review math (matrix transpose required?)
RMDEF void VectorTransform(Vector3 *v, Matrix mat) RMDEF void VectorTransform(Vector3 *v, Matrix mat)
{ {
float x = v->x; float x = v->x;
@ -415,13 +414,6 @@ RMDEF void VectorTransform(Vector3 *v, Matrix mat)
v->x = mat.m0*x + mat.m4*y + mat.m8*z + mat.m12; v->x = mat.m0*x + mat.m4*y + mat.m8*z + mat.m12;
v->y = mat.m1*x + mat.m5*y + mat.m9*z + mat.m13; v->y = mat.m1*x + mat.m5*y + mat.m9*z + mat.m13;
v->z = mat.m2*x + mat.m6*y + mat.m10*z + mat.m14; v->z = mat.m2*x + mat.m6*y + mat.m10*z + mat.m14;
// TODO: Transposed matrix (?)
/*
v->x = mat.m0*x + mat.m1*y + mat.m2*z + mat.m3;
v->y = mat.m4*x + mat.m5*y + mat.m6*z + mat.m7;
v->z = mat.m8*x + mat.m9*y + mat.m10*z + mat.m11;
*/
}; };
// Calculate linear interpolation between two vectors // Calculate linear interpolation between two vectors