Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Thomas Pitiot
SocialAgents3D
Commits
a81a5d60
Commit
a81a5d60
authored
May 30, 2013
by
pitiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ok
parent
56ab8a8e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
include/agent.h
include/agent.h
+1
-1
include/moving_obstacle.h
include/moving_obstacle.h
+1
-1
src/simulator.cpp
src/simulator.cpp
+2
-1
src/viewer.cpp
src/viewer.cpp
+2
-2
No files found.
include/agent.h
View file @
a81a5d60
...
...
@@ -11,7 +11,7 @@
// #define SECURED
//#define EXPORTING_AGENT
#define EXPORTING_OBJ
//
#define EXPORTING_OBJ
#define ARASH
...
...
include/moving_obstacle.h
View file @
a81a5d60
...
...
@@ -19,7 +19,7 @@
#endif
#endif
//
#define EXPORTING_BOXES
#define EXPORTING_BOXES
#ifdef EXPORTING_BOXES
#include "Algo/Render/GL2/mapRender.h"
...
...
src/simulator.cpp
View file @
a81a5d60
...
...
@@ -835,9 +835,10 @@ void Simulator::addMovingObstacles(unsigned int nb, unsigned int type, float are
Dart
dCell
;
while
(
!
found
&&
d
!=
tF
.
end
())
{
std
::
vector
<
Obstacle
*>&
obst
=
envMap_
.
obstvect
[
d
];
if
(
!
envMap_
.
buildingMark
.
isMarked
(
d
)
&&
!
envMap_
.
pedWayMark
.
isMarked
(
d
)
//
&&
envMap_.obstvect[d]
.size() == 0
&&
obst
.
size
()
==
0
)
{
float
area
=
Algo
::
Surface
::
Geometry
::
convexFaceArea
<
PFP
>
(
envMap_
.
map
,
d
,
envMap_
.
position
);
...
...
src/viewer.cpp
View file @
a81a5d60
...
...
@@ -801,8 +801,8 @@ void SocialAgents::cb_redraw()
}
// Commente par Arash
for
(
std
::
vector
<
MovingMesh
*>::
iterator
it
=
simulator
.
movingMeshes_
.
begin
()
;
it
!=
simulator
.
movingMeshes_
.
end
()
;
++
it
)
(
*
it
)
->
draw
();
//
for (std::vector<MovingMesh*>::iterator it = simulator.movingMeshes_.begin() ; it != simulator.movingMeshes_.end() ; ++it)
//
(*it)->draw();
}
...
...
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