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
Hurstel
CGoGN
Commits
109bf033
Commit
109bf033
authored
Nov 07, 2011
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug newFace
bug import (newFace !!)
parent
2850fa49
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
6 deletions
+25
-6
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+2
-2
include/Algo/Import/importMesh.hpp
include/Algo/Import/importMesh.hpp
+4
-1
include/Algo/Render/GL2/mapRender.hpp
include/Algo/Render/GL2/mapRender.hpp
+15
-1
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+1
-0
include/Topology/generic/traversorCell.h
include/Topology/generic/traversorCell.h
+1
-1
src/Topology/map/map2.cpp
src/Topology/map/map2.cpp
+2
-1
No files found.
Apps/Tuto/tuto1.cpp
View file @
109bf033
...
...
@@ -168,8 +168,8 @@ int main(int argc, char **argv)
sqt
.
m_positionVBO
->
updateData
(
position
);
// update des primitives du renderer
//
SelectorTrue allDarts;
SelectorNoBoundary
<
PFP
::
MAP
>
allDarts
;
SelectorTrue
allDarts
;
// SelectorNoBoundary<PFP::MAP> allDarts(myMap)
;
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
...
...
include/Algo/Import/importMesh.hpp
View file @
109bf033
...
...
@@ -74,7 +74,7 @@ bool importMesh(typename PFP::MAP& map, MeshTablesSurface<PFP>& mts)
nbe
=
edgesBuffer
.
size
();
if
(
nbe
>
2
)
{
Dart
d
=
map
.
newFace
(
nbe
);
Dart
d
=
map
.
new
Oriented
Face
(
nbe
);
for
(
unsigned
int
j
=
0
;
j
<
nbe
;
++
j
)
{
unsigned
int
em
=
edgesBuffer
[
j
];
// get embedding
...
...
@@ -121,6 +121,9 @@ bool importMesh(typename PFP::MAP& map, MeshTablesSurface<PFP>& mts)
}
if
(
nbnm
>
0
)
{
map
.
closeMap
();
}
CGoGNout
<<
"Warning "
<<
nbnm
<<
" darts with phi2 fix points"
<<
CGoGNendl
;
return
true
;
...
...
include/Algo/Render/GL2/mapRender.hpp
View file @
109bf033
...
...
@@ -30,6 +30,8 @@
#include "Geometry/intersection.h"
#include "Algo/Geometry/normal.h"
#include "Topology/generic/traversorCell.h"
namespace
CGoGN
{
...
...
@@ -330,6 +332,18 @@ void MapRender::initTriangles(typename PFP::MAP& map, const FunctorSelect& good,
m
.
markOrbit
(
FACE
,
dd
);
}
}
// DartMarker m(map, thread);
// tableIndices.reserve(4 * map.getNbDarts() / 3);
//
//// TraversorF<typename PFP::MAP> trav(map);
// TraversorCell<typename PFP::MAP,FACE> trav(map);
//
// for (Dart d = trav.begin(); d!= trav.end(); d = trav.next())
// {
// if (good(d))
// addTri<PFP>(map, d, tableIndices);
// }
}
template
<
typename
PFP
>
...
...
@@ -348,7 +362,7 @@ void MapRender::initTrianglesOptimized(typename PFP::MAP& map, const FunctorSele
{
std
::
list
<
Dart
>
bound
;
if
(
good
(
dd
))
if
(
good
(
dd
))
addTri
<
PFP
>
(
map
,
dd
,
tableIndices
);
m
.
markOrbit
(
FACE
,
dd
);
bound
.
push_back
(
dd
);
...
...
include/Topology/generic/genericmap.h
View file @
109bf033
...
...
@@ -78,6 +78,7 @@ class GenericMap : public MapBrowser
template
<
typename
T
>
friend
class
AttributeHandler
;
template
<
typename
T
>
friend
class
AutoAttributeHandler
;
template
<
typename
T
>
friend
class
SelectorNoBoundary
;
protected:
/**
...
...
include/Topology/generic/traversorCell.h
View file @
109bf033
...
...
@@ -40,7 +40,7 @@ private:
Dart
current
;
public:
TraversorCell
(
MAP
&
map
,
Dart
dart
)
:
m
(
map
),
mark
(
map
)
TraversorCell
(
MAP
&
map
)
:
m
(
map
),
mark
(
map
)
{}
Dart
begin
()
...
...
src/Topology/map/map2.cpp
View file @
109bf033
...
...
@@ -120,6 +120,7 @@ void Map2::deleteOrientedFace(Dart d)
Dart Map2::newFace(unsigned int nbEdges)
{
std::cout << "OUCHHH"<< std::endl;
Dart d = Map1::newFace(nbEdges);
Dart e = Map1::newBoundaryFace(nbEdges);
...
...
@@ -128,7 +129,7 @@ Dart Map2::newFace(unsigned int nbEdges)
{
phi2sew(d,e);
d = phi1(d);
e
=
phi1
(
e
);
e = phi
_
1(e);
} while (d != x);
return x;
}
...
...
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