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
005e0485
Commit
005e0485
authored
Feb 23, 2015
by
Thomas Pitiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug de particule volume into volumeSpecialCase et particule memo ...
parent
19f808c6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
10 deletions
+13
-10
src/env_map.cpp
src/env_map.cpp
+13
-10
No files found.
src/env_map.cpp
View file @
005e0485
...
...
@@ -389,11 +389,9 @@ void EnvMap::FirstRegistrationSegment(Segment * o)// réenregistre l'Segment en
VEC3
p1
=
o
->
p1
;
VEC3
p2
=
o
->
p2
;
Dart
d1
=
NIL
;
Dart
d2
=
NIL
;
Dart
d1
=
mo
->
parts_
[
n1
]
->
d
;
Dart
d2
=
mo
->
parts_
[
n2
]
->
d
;
std
::
vector
<
Dart
>
memo
;
d1
=
mo
->
parts_
[
n1
]
->
d
;
d2
=
mo
->
parts_
[
n2
]
->
d
;
memo
=
getMemoCross
(
p1
,
p2
,
d1
);
...
...
@@ -462,7 +460,7 @@ void EnvMap::pushSegmentInSetOfCells(Segment* o, const std::vector<Dart>& memo_c
#ifdef DEBUG_affichage
CGoGNout
<<
"Push in set of cells segment arete "
<<
n
<<
CGoGNendl
;
#endif
assert
(
!
memo_cross
.
empty
());
assert
(
!
memo_cross
.
empty
()
&&
memo_cross
.
size
()
>
1
);
ArticulatedObject
*
mo
=
o
->
nid
;
mo
->
belonging_cells
[
n
]
=
memo_cross
;
...
...
@@ -526,9 +524,11 @@ void EnvMap::popSegment(Segment* o)
bool
EnvMap
::
subdivideVolume
(
Dart
dglobal
)
{
bool
res
=
false
;
#ifdef IHMap
unsigned
int
max
=
map
.
getMaxLevel
()
;
map
.
setCurrentLevel
(
max
)
;
map
.
setCurrentLevel
(
map
.
getMaxLevel
())
;
unsigned
int
vLevel
=
map
.
volumeLevel
(
dglobal
);
Dart
old
=
map
.
volumeOldestDart
(
dglobal
);
...
...
@@ -542,6 +542,9 @@ bool EnvMap::subdivideVolume(Dart dglobal)
{
if
(
map
.
volumeLevel
(
nv
)
==
vLevel
-
1
)
{
#ifdef DEBUG_affichage
std
::
cout
<<
"cascade en : "
<<
nv
<<
std
::
endl
;
#endif
subdivideVolume
(
nv
);
}
}
...
...
@@ -550,10 +553,10 @@ bool EnvMap::subdivideVolume(Dart dglobal)
// on commence ensuite a subdiviser
bool
res
=
false
;
#ifdef IHMap
CGoGNout
<<
"debut refine"
<<
CGoGNendl
;
map
.
setCurrentLevel
(
ma
x
)
;
map
.
setCurrentLevel
(
ma
p
.
getMaxLevel
()
)
;
#ifdef DEBUG_affichage
std
::
cout
<<
"dglobal = "
<<
dglobal
<<
"level = "
<<
map
.
getDartLevel
(
dglobal
)
<<
std
::
endl
;
...
...
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