hyzboy/CMCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed values

Browse Source
This commit is contained in:
hyzboy
2024-08-02 22:39:21 +08:00
parent 866f69034b
commit 0dd89d78ab
3 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Math/Matrix4f.cpp
View File

@@ -182,16 +182,16 @@ namespace hgl
/**
* 计算一个方向旋转成另一个方向的变换矩阵
*/
const Matrix4f GetRotateMatrix(const Vector3f &world_position,const Vector3f &cur_direction,const Vector3f &new_direction)
const Matrix4f GetRotateMatrix(const Vector3f &world_position,const Vector3f &old_direction,const Vector3f &new_direction)
{
Vector3f axis=glm::cross(cur_direction,new_direction);
Vector3f axis=glm::cross(old_direction,new_direction);
if(glm::length2(axis)<0.0001)
return Matrix4f(1.0f);
axis=glm::normalize(axis);
float angle=acos(glm::dot(cur_direction,new_direction));
float angle=acos(glm::dot(old_direction,new_direction));
return glm::rotate(Matrix4f(1.0f),angle,axis);
}
@@ -199,16 +199,16 @@ namespace hgl
/**
* 计算一个方向旋转成另一个方向的四元数
*/
const Quatf GetRotateQuat(const Vector3f &world_position,const Vector3f &cur_direction,const Vector3f &new_direction)
const Quatf GetRotateQuat(const Vector3f &world_position,const Vector3f &old_direction,const Vector3f &new_direction)
{
Vector3f axis=glm::cross(cur_direction,new_direction);
Vector3f axis=glm::cross(old_direction,new_direction);
if(glm::length2(axis)<0.0001)
return Quatf(1.0f,0.0f,0.0f,0.0f);
axis=glm::normalize(axis);
float angle=acos(glm::dot(cur_direction,new_direction));
float angle=acos(glm::dot(old_direction,new_direction));
return glm::angleAxis(angle,axis);
}