Skip to content
Permalink
Browse files
updates
  • Loading branch information
Daniel Bisig committed May 18, 2022
1 parent b465c61 commit 81210e1374712099995ecfc135e98e5d523186ec
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 4 deletions.
@@ -98,10 +98,10 @@ AccelerationBehavior::act()
float dotProd = prefAccel.dot(linearAccel);
linearAccel *= dotProd;
angularAccel = prefAccel - linearAccel;
linearAccel.cwiseMax(maxLinearAcceleration);
angularAccel.cwiseMax(maxAngularAcceleration);

linearAccel = linearAccel.cwiseMin(maxLinearAcceleration).cwiseMax(-maxLinearAcceleration);
angularAccel = angularAccel.cwiseMin(maxAngularAcceleration).cwiseMax(-maxAngularAcceleration);

acceleration = (linearAccel + angularAccel);

//std::cout << "AccelerationBehavior end: out values" << mOutputParameters[0]->values() << " bValues " << mOutputParameters[0]->backupValues() << "\n";
@@ -329,6 +329,17 @@ FlockVisuals::setAgentLineWidth( const std::string& pSwarmName, float pLineWidth
_visSwarm->setAgentLineWidth(pLineWidth);
}

void
FlockVisuals::setTrailColor(const std::string& pSwarmName, const std::array<float, 4>& pTrailColor)
{
VisSwarm* _visSwarm = visualSwarm(pSwarmName);

if (_visSwarm == nullptr) return;

_visSwarm->setTrailColor(pTrailColor);
}


VisGridSpace*
FlockVisuals::visualGridSpace( const std::string& pSpaceName )
{
@@ -64,6 +64,8 @@ public:
void setAgentScale( const std::string& pSwarmName, float pScale );
void setAgentScale( const std::string& pSwarmName, const ofVec3f& pAgentScale );
void setAgentLineWidth( const std::string& pSwarmName, float pLineWidth );

void setTrailColor(const std::string& pSwarmName, const std::array<float, 4>& pTrailColor);

VisGridSpace* visualGridSpace( const std::string& pSpaceName );
VisNeighborSpace* visualNeighborSpace( const std::string& pSpaceName );

0 comments on commit 81210e1

Please sign in to comment.