Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Thomas Pitiot
SocialAgents3D
Commits
19f808c6
Commit
19f808c6
authored
Feb 23, 2015
by
Thomas Pitiot
Browse files
pb particules mauvais enregistrement
parent
bc52f045
Changes
4
Hide whitespace changes
Inline
Side-by-side
include/env_map.h
View file @
19f808c6
...
...
@@ -3,7 +3,7 @@
#define DEBUG_affichage
//
#define DEBUG
#define DEBUG
#include
<iostream>
#include
<algorithm>
...
...
src/env_map.cpp
View file @
19f808c6
...
...
@@ -539,9 +539,12 @@ bool EnvMap::subdivideVolume(Dart dglobal)
{
Dart
nv
=
map
.
phi3
(
dit
);
if
(
!
map
.
isBoundaryMarked
(
3
,
nv
))
{
if
(
map
.
volumeLevel
(
nv
)
==
vLevel
-
1
)
{
subdivideVolume
(
nv
);
}
}
}
// on commence ensuite a subdiviser
...
...
@@ -590,7 +593,7 @@ bool EnvMap::subdivideVolume(Dart dglobal)
}
map
.
setCurrentLevel
(
map
.
getMaxLevel
())
;
map
.
check
();
//
map.check();
#ifdef DEBUG_affichage
std
::
cout
<<
"after level = "
<<
map
.
getMaxLevel
()
<<
std
::
endl
;
#endif
...
...
src/simulator.cpp
View file @
19f808c6
...
...
@@ -45,15 +45,15 @@ void Simulator::initFixedObjects()
std
::
pair
<
unsigned
int
,
unsigned
int
>
ind
;
VEC3
pos
;
pos
=
VEC3
(
2.21
,
3.02
,
3.53
);
p
.
first
=
pos
;
p
.
second
=
envMap_
.
getBelongingCell
(
pos
);
startingPoints
.
push_back
(
p
);
//
pos=VEC3(2.21,3.02,3.53);
//
p.first=pos;
//
p.second=envMap_.getBelongingCell(pos);
//
startingPoints.push_back(p);
pos
=
VEC3
(
-
4.68
,
1.36
,
2.15
);
p
.
first
=
pos
;
p
.
second
=
envMap_
.
getBelongingCell
(
pos
);
startingPoints
.
push_back
(
p
);
//
pos=VEC3(-4.68,1.36,2.15);
//
p.first=pos;
//
p.second=envMap_.getBelongingCell(pos);
//
startingPoints.push_back(p);
pos
=
VEC3
(
4
,
-
2
,
3
);
p
.
first
=
pos
;
...
...
@@ -65,25 +65,25 @@ void Simulator::initFixedObjects()
p
.
second
=
envMap_
.
getBelongingCell
(
pos
);
startingPoints
.
push_back
(
p
);
pos
=
VEC3
(
2
,
-
2.5
f
,
0.5
f
);
p
.
first
=
pos
;
p
.
second
=
envMap_
.
getBelongingCell
(
pos
);
startingPoints
.
push_back
(
p
);
//
pos=VEC3(2,-2.5f,0.5f);
//
p.first=pos;
//
p.second=envMap_.getBelongingCell(pos);
//
startingPoints.push_back(p);
ind
.
first
=
0
;
ind
.
second
=
1
;
segmentParts
.
push_back
(
ind
);
ind
.
first
=
2
;
ind
.
second
=
3
;
segmentParts
.
push_back
(
ind
);
//
ind.first=2;
//
ind.second=3;
//
segmentParts.push_back(ind);
ind
.
first
=
0
;
ind
.
second
=
2
;
segmentParts
.
push_back
(
ind
);
ind
.
first
=
0
;
ind
.
second
=
4
;
segmentParts
.
push_back
(
ind
);
//
ind.first=0;
//
ind.second=2;
//
segmentParts.push_back(ind);
//
ind.first=0;
//
ind.second=4;
//
segmentParts.push_back(ind);
ArticulatedObject
*
obj
=
new
Tree
(
this
,
startingPoints
,
segmentParts
);
...
...
src/viewer.cpp
View file @
19f808c6
...
...
@@ -416,7 +416,7 @@ void Volusion::cb_redraw()
{
for
(
Edge
d
:
edgesIncidentToVolume3
(
simul
.
envMap_
.
map
,(
*
it
)))
{
m_topo_render
->
overdrawDart
(
d
,
5.0
f
,
0.5
f
,
1.0
f
,
0
);
m_topo_render
->
overdrawDart
(
d
,
5.0
f
,
0.5
f
,
0
,
0.4
f
);
}
...
...
@@ -427,7 +427,7 @@ void Volusion::cb_redraw()
if
(
dock
.
comboBoxEdge
->
count
()
<
simul
.
aiguille
->
nbEdges
)
if
(
(
unsigned
int
)
dock
.
comboBoxEdge
->
count
()
<
simul
.
aiguille
->
nbEdges
)
{
dock
.
comboBoxEdge
->
clear
();
dock
.
comboBoxEdge
->
addItem
(
"Aiguille entiere"
,
2
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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