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
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
1b3808a2
Commit
1b3808a2
authored
Feb 07, 2011
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ImplicitHierarchicalMap -> correction gestion plongement face dans simplif face
parent
efef8888
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
10 deletions
+5
-10
include/Algo/ImplicitHierarchicalMesh/subdivision.hpp
include/Algo/ImplicitHierarchicalMesh/subdivision.hpp
+1
-1
include/Algo/MovingObjects/particle_cell_2D.h
include/Algo/MovingObjects/particle_cell_2D.h
+0
-1
include/Algo/MovingObjects/particle_cell_2D.hpp
include/Algo/MovingObjects/particle_cell_2D.hpp
+4
-8
No files found.
include/Algo/ImplicitHierarchicalMesh/subdivision.hpp
View file @
1b3808a2
...
...
@@ -164,7 +164,7 @@ void coarsenFace(typename PFP::MAP& map, Dart d, typename PFP::TVEC3& position)
assert
(
map
.
faceIsSubdividedOnce
(
d
)
||
!
"Trying to coarsen a non-subdivided face or a more than once subdivided face"
)
;
unsigned
int
cur
=
map
.
getCurrentLevel
()
;
map
.
setCurrentLevel
(
cur
+
1
)
;
map
.
setCurrentLevel
(
map
.
getMaxLevel
()
)
;
map
.
deleteVertex
(
map
.
phi1
(
map
.
phi1
(
d
)))
;
map
.
setCurrentLevel
(
cur
)
;
Dart
fit
=
d
;
...
...
include/Algo/MovingObjects/particle_cell_2D.h
View file @
1b3808a2
...
...
@@ -91,7 +91,6 @@ class ParticleCell2D : public ParticleBase
};
#include "particle_cell_2D.hpp"
//namespace
}
...
...
include/Algo/MovingObjects/particle_cell_2D.hpp
View file @
1b3808a2
...
...
@@ -89,23 +89,20 @@ void ParticleCell2D<PFP>::vertexState(const VEC3& current)
if
(
dd_vert
==
d
)
{
//orbit with 2 edges : point on one edge
if
(
m
.
alpha1
(
m
.
alpha1
(
d
))
==
d
)
{
if
(
!
Algo
::
Geometry
::
isPointOnHalfEdge
<
PFP
>
(
m
,
d
,
m_positions
,
current
))
{
d
=
m
.
alpha1
(
d
);
}
if
(
!
Algo
::
Geometry
::
isPointOnHalfEdge
<
PFP
>
(
m
,
d
,
m_positions
,
current
))
{
d
=
m
.
alpha1
(
d
);
}
}
else
{
state
=
VERTEX_ORBIT
;
state
=
VERTEX_ORBIT
;
return
;
}
}
}
else
{
std
::
cout
<<
"ploc"
<<
std
::
endl
;
Dart
dd_vert
=
m
.
alpha1
(
d
);
while
(
getOrientationEdge
(
current
,
d
)
==
Geom
::
RIGHT
&&
dd_vert
!=
d
)
{
std
::
cout
<<
"tourne"
<<
std
::
endl
;
d
=
m
.
alpha_1
(
d
);
if
(
m_positions
[
d
][
0
]
==
m_positions
[
m
.
phi1
(
d
)][
0
]
&&
m_positions
[
d
][
1
]
==
m_positions
[
m
.
phi1
(
d
)][
1
])
{
d
=
m
.
alpha_1
(
d
);
}
...
...
@@ -115,7 +112,6 @@ void ParticleCell2D<PFP>::vertexState(const VEC3& current)
//displacement step
// if(!obstacle.isMarked(d)) {
if
(
getOrientationEdge
(
current
,
d
)
==
Geom
::
ALIGNED
&&
Algo
::
Geometry
::
isPointOnHalfEdge
<
PFP
>
(
m
,
d
,
m_positions
,
current
))
{
std
::
cout
<<
m
.
vertexDegree
(
d
)
<<
std
::
endl
;
edgeState
(
current
);
}
else
{
...
...
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