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
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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
CGoGN
Commits
61fbdd93
Commit
61fbdd93
authored
Feb 25, 2015
by
Thomas Pitiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reparé
parent
b352639d
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
10 deletions
+24
-10
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
+3
-3
include/Algo/MovingObjects/particle_cell_3D.h
include/Algo/MovingObjects/particle_cell_3D.h
+1
-1
include/Algo/MovingObjects/particle_cell_3D.hpp
include/Algo/MovingObjects/particle_cell_3D.hpp
+17
-3
include/Algo/MovingObjects/particle_cell_3D_memo.hpp
include/Algo/MovingObjects/particle_cell_3D_memo.hpp
+1
-1
include/Geometry/plane_3d.h
include/Geometry/plane_3d.h
+2
-2
No files found.
include/Algo/ImplicitHierarchicalMesh/subdivision3.hpp
View file @
61fbdd93
...
...
@@ -215,9 +215,9 @@ Dart subdivideVolumeClassic(typename PFP::MAP& map, Dart d, VertexAttribute<type
if(OneLevelDifference)
{
Traversor3WF<typename PFP::MAP> traF(map, old);
for(Dart dit = traF.begin(); dit != traF.end(); dit = traF.next())
{
Traversor3WF<typename PFP::MAP> traF(map, old);
for(Dart dit = traF.begin(); dit != traF.end(); dit = traF.next())
{
Dart nv = map.phi3(dit);
if(!map.isBoundaryMarked(3, nv))
if(map.volumeLevel(nv) == vLevel - 1)
...
...
include/Algo/MovingObjects/particle_cell_3D.h
View file @
61fbdd93
...
...
@@ -107,7 +107,7 @@ public :
void
volumeSpecialCase
(
const
VEC3
&
current
);
void
reset_positionFace
();
void
move
(
const
VEC3
&
newCurrent
)
{
...
...
include/Algo/MovingObjects/particle_cell_3D.hpp
View file @
61fbdd93
...
...
@@ -39,6 +39,7 @@ namespace MovingObjects
#define DELTA 0.00001
//static const float DELTA=0.00001;
template
<
typename
PFP
>
void
ParticleCell3D
<
PFP
>::
display
()
{
...
...
@@ -65,6 +66,12 @@ typename PFP::VEC3 ParticleCell3D<PFP>::pointInFace(Dart d)
// return (p1+p3)*0.5f;
}
template
<
typename
PFP
>
void
ParticleCell3D
<
PFP
>::
reset_positionFace
()
{
this
->
m_positionFace
=
pointInFace
(
this
->
d
);
}
template
<
typename
PFP
>
Geom
::
Orientation3D
ParticleCell3D
<
PFP
>::
isLeftENextVertex
(
VEC3
c
,
Dart
d
,
VEC3
base
)
{
...
...
@@ -683,7 +690,7 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current)
#endif
CellMarkerStore
<
MAP
,
FACE
>
mark
(
m
);
bool
above
;
bool
above
;
Geom
::
Orientation3D
testRight
=
Geom
::
OVER
;
...
...
@@ -693,7 +700,9 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current)
Dart
dd
=
d
;
bool
particularcase
=
false
;
Geom
::
Orientation3D
testLeft
=
isLeftL1DVol
(
current
,
d
,
this
->
m_positionFace
,
this
->
m_position
);
#ifdef DEBUG
std
::
cout
<<
"isLEft1DVOl (current,d,m_positionFace,m_position) "
<<
current
<<
" | "
<<
d
<<
" | "
<<
this
->
m_positionFace
<<
" | "
<<
this
->
m_position
<<
std
::
endl
<<
" et renvoie : "
<<
testLeft
<<
std
::
endl
;
#endif
if
(
testLeft
!=
Geom
::
UNDER
)
{
d
=
m
.
phi_1
(
d
);
...
...
@@ -728,7 +737,9 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current)
this
->
m_position
=
current
;
return
;
}
#ifdef DEBUG
std
::
cout
<<
"volumeState va dans special case cas 1 "
<<
d
<<
std
::
endl
;
#endif
volumeSpecialCase
(
current
);
return
;
}
...
...
@@ -750,6 +761,9 @@ void ParticleCell3D<PFP>::volumeState(const VEC3& current)
mark
.
mark
(
d
);
if
(
d
==
dd
)
{
#ifdef DEBUG
std
::
cout
<<
"volumeState va dans special case cas 2 "
<<
d
<<
std
::
endl
;
#endif
volumeSpecialCase
(
current
);
return
;
}
...
...
include/Algo/MovingObjects/particle_cell_3D_memo.hpp
View file @
61fbdd93
...
...
@@ -22,7 +22,7 @@
* *
*******************************************************************************/
#define DEBUG
//
#define DEBUG
namespace
CGoGN
{
...
...
include/Geometry/plane_3d.h
View file @
61fbdd93
...
...
@@ -108,8 +108,8 @@ class Plane3D
friend
std
::
istream
&
operator
>>
(
std
::
istream
&
in
,
Plane3D
<
TT
>&
p
);
private:
Vector
<
3
,
T
>
m_normal
;
T
m_d
;
Vector
<
3
,
T
>
m_normal
;
// normale au plan
T
m_d
;
//distance a l'origine
}
;
}
// namespace Geom
...
...
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