diff --git a/build/bin/mainV8.exe b/build/bin/mainV8.exe index 205f373..2eefb28 100644 Binary files a/build/bin/mainV8.exe and b/build/bin/mainV8.exe differ diff --git a/src/collections/headers/collection_interface.hpp b/src/collections/headers/collection_interface.hpp index dbd7e78..d57825e 100644 --- a/src/collections/headers/collection_interface.hpp +++ b/src/collections/headers/collection_interface.hpp @@ -13,6 +13,7 @@ struct collection{ class CollectionInterface{ public: virtual collection create(ReferencePlane plane) = 0; + virtual void update() = 0; virtual bool setTransparency(float alpha) = 0; virtual ~CollectionInterface(){}; }; diff --git a/src/collections/headers/gamba.hpp b/src/collections/headers/gamba.hpp index 2e7d2ad..307b217 100644 --- a/src/collections/headers/gamba.hpp +++ b/src/collections/headers/gamba.hpp @@ -15,6 +15,7 @@ class Gamba : public CollectionInterface { PieceInterface* getJointPiece(); void setDirection(Direction dir); bool setTransparency(float alpha) override; + void update() {}; float getZ_Acc(); }; diff --git a/src/collections/headers/lower_body.hpp b/src/collections/headers/lower_body.hpp index 82e1988..808b2e5 100644 --- a/src/collections/headers/lower_body.hpp +++ b/src/collections/headers/lower_body.hpp @@ -26,7 +26,7 @@ protected: public: Lower_Body(rb::Vector3 pos, std::vector data); ~Lower_Body(); - + void update() override; void setVisibility(bool c); bool setTransparency(float alpha) override; collection create(ReferencePlane plane) override; diff --git a/src/collections/methods/lower_body.cpp b/src/collections/methods/lower_body.cpp index 63d76f8..9803bd1 100644 --- a/src/collections/methods/lower_body.cpp +++ b/src/collections/methods/lower_body.cpp @@ -72,4 +72,8 @@ bool Lower_Body::setTransparency(float alpha){ dx->setTransparency(alpha); t->setTransparency(alpha); return true; +} + +void Lower_Body::update(){ + } \ No newline at end of file diff --git a/src/rigidbody/headers/rb.hpp b/src/rigidbody/headers/rb.hpp index 9e7b315..3b52bea 100644 --- a/src/rigidbody/headers/rb.hpp +++ b/src/rigidbody/headers/rb.hpp @@ -26,7 +26,7 @@ //funzioni void calcVel(const float Dtime); - void calcRot(const time_t Dtime); + void calcRot(const float Dtime); void calcAcc(const Vector3 Dacc); void calcTanAcc(const Vector3 Dacc); void calcPos(const float Dtime); @@ -45,6 +45,7 @@ void setRot(const Vector3 Nrot); void setVel(const Vector3 Nacc); void setAcc(const Vector3 Nvel); + void setTanAcc(const Vector3 Dacc, const Vector3 pos); void step(const sf::Clock time); //complesso, deve definire accelerazione e accelerazione tangenziale diff --git a/src/rigidbody/methods/rb_class.cpp b/src/rigidbody/methods/rb_class.cpp index ca3093b..943f3bf 100755 --- a/src/rigidbody/methods/rb_class.cpp +++ b/src/rigidbody/methods/rb_class.cpp @@ -97,4 +97,11 @@ void rigidbody::step(const sf::Clock time){ calcVel(dt); } +void rigidbody::setTanAcc(const Vector3 Dacc, const Vector3 pos){ + +} + +void rigidbody::calcRot(const float Dtime){ + +}