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

maintenance: settings item refactoring, include dependencies fixes

Browse Source
This commit is contained in:
tmj-fstate
2018-01-26 16:44:47 +01:00
parent 9d008d2a3e
commit 0124032d3b
92 changed files with 2226 additions and 2233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Spring.cpp
View File

@@ -12,7 +12,7 @@ http://mozilla.org/MPL/2.0/.
TSpring::TSpring()
{
vForce1 = vForce2 = vector3(0, 0, 0);
vForce1 = vForce2 = Math3D::vector3(0, 0, 0);
Ks = 0;
Kd = 0;
restLen = 0;
@@ -29,15 +29,15 @@ void TSpring::Init(double nrestLen, double nKs, double nKd)
restLen = nrestLen;
}
Math3D::vector3 TSpring::ComputateForces(vector3 const &pPosition1, vector3 const &pPosition2)
Math3D::vector3 TSpring::ComputateForces( Math3D::vector3 const &pPosition1, Math3D::vector3 const &pPosition2)
{
double dist, Hterm, Dterm;
vector3 springForce, deltaV, deltaP;
Math3D::vector3 springForce, deltaV;
// p1 = &system[spring->p1];
// p2 = &system[spring->p2];
// VectorDifference(&p1->pos,&p2->pos,&deltaP); // Vector distance
deltaP = pPosition1 - pPosition2;
auto deltaP = pPosition1 - pPosition2;
// dist = VectorLength(&deltaP); // Magnitude of
// deltaP
dist = deltaP.Length();