eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-17 23:39:18 +02:00
Code Issues 121 Wiki Activity

Remove not needed casts, variables and switch from double precission to float precission for some angle vectors

Browse Source
This commit is contained in:
docentYT
2026-04-28 00:51:17 +02:00
parent cba106e22e
commit 623c4f827e
15 changed files with 44 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
model/AnimModel.cpp
View File

@@ -29,11 +29,11 @@ std::list<std::weak_ptr<TAnimContainer>> TAnimModel::acAnimList;
TAnimContainer::TAnimContainer()
{
vRotateAngles = glm::dvec3(0.0f, 0.0f, 0.0f); // aktualne kąty obrotu
vDesiredAngles = glm::dvec3(0.0f, 0.0f, 0.0f); // docelowe kąty obrotu
vRotateAngles = glm::vec3(0.0f, 0.0f, 0.0f); // aktualne kąty obrotu
vDesiredAngles = glm::vec3(0.0f, 0.0f, 0.0f); // docelowe kąty obrotu
fRotateSpeed = 0.0;
vTranslation = glm::dvec3(0.0f, 0.0f, 0.0f); // aktualne przesunięcie
vTranslateTo = glm::dvec3(0.0f, 0.0f, 0.0f); // docelowe przesunięcie
vTranslation = glm::dvec3(0.0, 0.0, 0.0); // aktualne przesunięcie
vTranslateTo = glm::dvec3(0.0, 0.0, 0.0); // docelowe przesunięcie
fTranslateSpeed = 0.0;
fAngleSpeed = 0.0;
pSubModel = NULL;
@@ -48,7 +48,7 @@ bool TAnimContainer::Init(TSubModel *pNewSubModel)
return (pSubModel != NULL);
}
void TAnimContainer::SetRotateAnim(glm::dvec3 vNewRotateAngles, double fNewRotateSpeed)
void TAnimContainer::SetRotateAnim(glm::vec3 vNewRotateAngles, double fNewRotateSpeed)
{
vDesiredAngles = vNewRotateAngles;
fRotateSpeed = fNewRotateSpeed;

6
model/AnimModel.h
View File

@@ -51,8 +51,8 @@ class TAnimContainer : std::enable_shared_from_this<TAnimContainer>
friend TAnimModel;
private:
glm::dvec3 vRotateAngles; // dla obrotów Eulera
glm::dvec3 vDesiredAngles;
glm::vec3 vRotateAngles; // dla obrotów Eulera
glm::vec3 vDesiredAngles;
double fRotateSpeed;
glm::dvec3 vTranslation;
glm::dvec3 vTranslateTo;
@@ -81,7 +81,7 @@ class TAnimContainer : std::enable_shared_from_this<TAnimContainer>
inline
std::string NameGet() {
return (pSubModel ? pSubModel->pName : ""); };
void SetRotateAnim( glm::dvec3 vNewRotateAngles, double fNewRotateSpeed);
void SetRotateAnim( glm::vec3 vNewRotateAngles, double fNewRotateSpeed);
void SetTranslateAnim( glm::dvec3 vNewTranslate, double fNewSpeed);
void AnimSetVMD(double fNewSpeed);
void PrepareModel();