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

变量改名，以防止错误理解

Browse Source
This commit is contained in:
hyzboy
2025-07-07 00:28:17 +08:00
parent 24e867b0ca
commit e5c63827ab
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
inc/hgl/math/Matrix.h
View File

@@ -147,29 +147,29 @@ namespace hgl
return glm::scale(Matrix4f(1.0f),Vector3f(s,s,s)); return glm::scale(Matrix4f(1.0f),Vector3f(s,s,s));
} }
inline Matrix4f rotate(float angle,const Vector3f &axis) inline Matrix4f rotate(float rad,const Vector3f &axis)
{ {
return glm::rotate(Matrix4f(1.0f),angle,axis); return glm::rotate(Matrix4f(1.0f),rad,axis);
} }
inline Matrix4f rotate(float angle,float x,float y,float z) inline Matrix4f rotate(float rad,float x,float y,float z)
{ {
return glm::rotate(Matrix4f(1.0f),angle,Vector3f(x,y,z)); return glm::rotate(Matrix4f(1.0f),rad,Vector3f(x,y,z));
} }
inline Matrix4f rotate(float angle,float x,float y) inline Matrix4f rotate(float rad,float x,float y)
{ {
return rotate(angle,x,y,1.0f); return rotate(rad,x,y,1.0f);
} }
inline Matrix4f rotate(float angle,const Vector4f &axis) inline Matrix4f rotate(float rad,const Vector4f &axis)
{ {
return rotate(angle,Vector3f(axis.x,axis.y,axis.z)); return rotate(rad,Vector3f(axis.x,axis.y,axis.z));
} }
inline Vector3f rotate(const Vector3f &v3f,float angle,const Vector3f &axis) inline Vector3f rotate(const Vector3f &v3f,float rad,const Vector3f &axis)
{ {
Vector4f result = rotate(angle, axis)*Vector4f(v3f, 1.0f); Vector4f result = rotate(rad, axis)*Vector4f(v3f, 1.0f);
return Vector3f(result.x,result.y,result.z); return Vector3f(result.x,result.y,result.z);
} }