Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Thomas Pitiot
CGoGN
Commits
89922763
Commit
89922763
authored
Feb 01, 2011
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SocialAgents -> debut simplif faces
parent
90704e8e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
73 additions
and
46 deletions
+73
-46
Apps/Examples/SocialAgents/src/env_map.cpp
Apps/Examples/SocialAgents/src/env_map.cpp
+73
-46
No files found.
Apps/Examples/SocialAgents/src/env_map.cpp
View file @
89922763
...
...
@@ -338,7 +338,7 @@ void EnvMap::addNeighborAgents(PFP::AGENTS agentsFrom,PFP::AGENTS agentsTo)
void
EnvMap
::
updateMap
()
{
//
simplifyFaces();
simplifyFaces
()
;
subdivideFaces
()
;
map
.
setCurrentLevel
(
map
.
getMaxLevel
())
;
}
...
...
@@ -416,55 +416,82 @@ void EnvMap::subdivideFaces()
void
EnvMap
::
simplifyFaces
()
{
// map.check();
// for(Dart d = map.begin(); d!= map.end() ; map.next(d)) {
for
(
unsigned
int
i
=
0
;
i
<
2
;
++
i
)
{
// std::cout << "subdividedDarts size " << subdividedDarts.size() << std::endl;
// for(std::vector<Dart>::iterator it = subdividedDarts.begin(); it != subdividedDarts.end() ; ++it) {
// Dart d=*it;
// if(map.phi1(d)!=map.phi_1(d))
// do {
// Dart dNext = dSimplify;
// map.next(dNext);
if
(
!
closeMark
.
isMarked
(
dSimplify
)
&&
!
closeMark
.
isMarked
(
map
.
phi2
(
dSimplify
))
&&
agentvect
[
dSimplify
].
size
()
==
0
)
{
// if(noAgentSurroundingVertex(dSimplify) && simplifyVertex(dSimplify)) {
// std::cout << "erase some darts 1" << std::endl;
// // subdividedDarts.erase(it);
// map.next(dSimplify);
// return;
// }
// else {
if
(
agentvect
[
map
.
phi2
(
dSimplify
)].
size
()
==
0
)
{
if
(
simplifyEdge
(
dSimplify
))
{
std
::
cout
<<
"erase some darts 2"
<<
std
::
endl
;
// subdividedDarts.erase(it);
// dSimplify = dNext;
map
.
next
(
dSimplify
);
return
;
}
else
if
(
simplifiable
(
dSimplify
))
{
std
::
cout
<<
"erase some darts 3"
<<
std
::
endl
;
map
.
mergeFaces
(
dSimplify
);
// subdividedDarts.erase(it);
// dSimplify = dNext;
map
.
next
(
dSimplify
);
return
;
}
}
// }
}
// d=map.phi1(d);
// }while(d!=*it);
map
.
next
(
dSimplify
);
// dSimplify = dNext;
assert
(
map
.
getCurrentLevel
()
==
map
.
getMaxLevel
())
;
unsigned
int
cur
=
map
.
getCurrentLevel
()
;
if
(
cur
==
0
)
return
;
CellMarker
m
(
map
,
FACE_CELL
)
;
for
(
Dart
d
=
map
.
begin
();
d
!=
map
.
end
();
map
.
next
(
d
))
{
if
(
!
m
.
isMarked
(
d
))
{
m
.
mark
(
d
)
;
unsigned
int
fLevel
=
map
.
faceLevel
(
d
)
;
if
(
!
closeMark
.
isMarked
(
d
)
&&
fLevel
>
0
)
{
Dart
old
=
map
.
faceOldestDart
(
d
)
;
map
.
setCurrentLevel
(
cur
-
1
)
;
Dart
fit
=
old
;
do
{
map
.
setCurrentLevel
(
cur
)
;
if
(
dSimplify
==
map
.
end
())
{
dSimplify
=
map
.
begin
();
map
.
setCurrentLevel
(
cur
-
1
)
;
fit
=
phi1
(
fit
)
;
}
while
(
fit
!=
d
)
;
map
.
setCurrentLevel
(
cur
)
;
}
}
}
// std::cout << "say what ?" << std::endl;
//// for(Dart d = map.begin(); d!= map.end() ; map.next(d)) {
// for(unsigned int i=0;i<2;++i) {
//// std::cout << "subdividedDarts size " << subdividedDarts.size() << std::endl;
//// for(std::vector<Dart>::iterator it = subdividedDarts.begin(); it != subdividedDarts.end() ; ++it) {
//// Dart d=*it;
//// if(map.phi1(d)!=map.phi_1(d))
//// do {
//// Dart dNext = dSimplify;
//// map.next(dNext);
//
// if(!closeMark.isMarked(dSimplify) && !closeMark.isMarked(map.phi2(dSimplify)) && agentvect[dSimplify].size()==0) {
//// if(noAgentSurroundingVertex(dSimplify) && simplifyVertex(dSimplify)) {
//// std::cout << "erase some darts 1" << std::endl;
//// // subdividedDarts.erase(it);
//// map.next(dSimplify);
//// return;
//// }
//// else {
// if(agentvect[map.phi2(dSimplify)].size()==0) {
// if(simplifyEdge(dSimplify)) {
// std::cout << "erase some darts 2" << std::endl;
//// subdividedDarts.erase(it);
//// dSimplify = dNext;
// map.next(dSimplify);
// return;
// }
// else if(simplifiable(dSimplify)) {
// std::cout << "erase some darts 3" << std::endl;
// map.mergeFaces(dSimplify);
//// subdividedDarts.erase(it);
//// dSimplify = dNext;
// map.next(dSimplify);
// return;
// }
// }
//// }
// }
//// d=map.phi1(d);
//// }while(d!=*it);
// map.next(dSimplify);
//// dSimplify = dNext;
//
// if(dSimplify==map.end()) {
// dSimplify = map.begin();
// }
// }
}
bool
EnvMap
::
checkForSubdivision
(
Dart
d
)
...
...
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