Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SocialAgents3D
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
SocialAgents3D
Commits
f5ff2aab
Commit
f5ff2aab
authored
May 17, 2013
by
Arash HABIBI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reglage thomas ok
parent
406d546c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
9 deletions
+17
-9
include/agent.h
include/agent.h
+2
-2
include/moving_mesh.h
include/moving_mesh.h
+1
-1
src/agent.cpp
src/agent.cpp
+2
-2
src/simulator.cpp
src/simulator.cpp
+5
-4
src/viewer.cpp
src/viewer.cpp
+7
-0
No files found.
include/agent.h
View file @
f5ff2aab
...
...
@@ -8,9 +8,9 @@
#include "spatialHashing.h"
//
#define SECURED
#define SECURED
//#define EXPORTING_AGENT
//#define EXPORTING_OBJ
//
#define EXPORTING_OBJ
#ifdef SECURED
...
...
include/moving_mesh.h
View file @
f5ff2aab
...
...
@@ -18,7 +18,7 @@
using
namespace
std
;
//#define EXPORTING2
//
#define EXPORTING2
class
MovingMesh
{
...
...
src/agent.cpp
View file @
f5ff2aab
...
...
@@ -21,8 +21,8 @@ float Agent::averageMaxSpeed_ = 2.0f ;
//float Agent::neighborDist_ = 20.0f ;
float Agent::neighborDistSq_ = neighborDist_ * neighborDist_ ;
//float Agent::radius_ = 8.0f ;
//
float Agent::radius_ = 3.0f ;
float Agent::radius_ = 1.5f ;
float Agent::radius_ = 3.0f ;
//
float Agent::radius_ = 1.5f ;
float Agent::timeHorizon_ = 10.0f ;
//float Agent::timeHorizon_ = 100.0f ;
float Agent::timeHorizonObst_ = 10.0f ;
...
...
src/simulator.cpp
View file @
f5ff2aab
...
...
@@ -80,7 +80,7 @@ void Simulator::init( float dimension, unsigned int nbAgent, unsigned int nbObst
setupScenario(nbAgent, true) ;
// SelectorCellNotMarked<PFP::MAP> scnm(envMap_.pedWayMark);
addMovingObstacles(nbObst, 1);
//
addPathToObstacles(envMap_.pedWayMark, false);
addPathToObstacles(envMap_.pedWayMark, false);
addPathsToAgents();
break;
case 6:
...
...
@@ -665,9 +665,10 @@ void Simulator::setupScenario(unsigned int nbMaxAgent, bool pedWay)
*/
TraversorF<PFP::MAP> tF(envMap_.map);
Dart d = tF.begin() ;
unsigned int nbx = 1 ;
unsigned int nby = 1 ;
//-----------------------
unsigned int nbx = 2 ;
unsigned int nby = 2 ;
//-----------------------
unsigned int bMax = nbx * nby > 0 ? nbMaxAgent / (nbx * nby) : nbMaxAgent ;
...
...
src/viewer.cpp
View file @
f5ff2aab
...
...
@@ -1907,6 +1907,13 @@ void SocialAgents::keyPressEvent(QKeyEvent *e)
cam->lookAt(qglviewer::Vec(0,0,0));
cam->setSceneRadius(10000);
}
if(simulator.config==3)
{
cam->setPosition(qglviewer::Vec(0,-900,700));
cam->setUpVector(qglviewer::Vec(0,0,0));
cam->lookAt(qglviewer::Vec(0,0,0));
cam->setSceneRadius(10000);
}
break;
}
case Qt::Key_5 :
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment