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
Hurstel
CGoGN
Commits
9416a673
Commit
9416a673
authored
Nov 04, 2011
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction tutos
parent
691f92c8
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
20 additions
and
47 deletions
+20
-47
Apps/Examples/Tests/Algo_Geom_inclusion.cpp
Apps/Examples/Tests/Algo_Geom_inclusion.cpp
+2
-3
Apps/Examples/Tests/concave_rendering.cpp
Apps/Examples/Tests/concave_rendering.cpp
+2
-3
Apps/Tuto/tp_master.cpp
Apps/Tuto/tp_master.cpp
+2
-3
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+2
-3
Apps/Tuto/tuto5.cpp
Apps/Tuto/tuto5.cpp
+2
-3
Apps/Tuto/tuto_mt.cpp
Apps/Tuto/tuto_mt.cpp
+2
-3
Apps/Tuto/tuto_ogl3.h
Apps/Tuto/tuto_ogl3.h
+2
-3
Apps/Tuto/tuto_subdivision.cpp
Apps/Tuto/tuto_subdivision.cpp
+2
-3
include/Topology/map/map2.h
include/Topology/map/map2.h
+0
-18
src/Topology/map/map2.cpp
src/Topology/map/map2.cpp
+4
-5
No files found.
Apps/Examples/Tests/Algo_Geom_inclusion.cpp
View file @
9416a673
...
...
@@ -24,8 +24,7 @@
#include <iostream>
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
#include <Algo/Geometry/inclusion.h>
#include "Geometry/vector_gen.h"
...
...
@@ -34,7 +33,7 @@ using namespace CGoGN;
struct
PFP
:
public
PFP_STANDARD
{
// definition of the type of the map
typedef
EmbeddedMap2
<
Map2
>
MAP
;
typedef
EmbeddedMap2
MAP
;
};
int
main
()
...
...
Apps/Examples/Tests/concave_rendering.cpp
View file @
9416a673
...
...
@@ -27,8 +27,7 @@
#include <iostream>
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
#include "Geometry/vector_gen.h"
#include "Algo/Import/import.h"
...
...
@@ -125,7 +124,7 @@ float Gfont[174*2]={
struct
PFP
:
public
PFP_STANDARD
{
// definition of the type of the map
typedef
EmbeddedMap2
<
Map2
>
MAP
;
typedef
EmbeddedMap2
MAP
;
};
// declaration of the map
...
...
Apps/Tuto/tp_master.cpp
View file @
9416a673
...
...
@@ -29,8 +29,7 @@
#include "tp_master.h"
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
#include "Geometry/vector_gen.h"
#include "Geometry/matrix.h"
...
...
@@ -57,7 +56,7 @@ using namespace CGoGN;
struct
PFP
:
public
PFP_STANDARD
{
// definition of the map
typedef
EmbeddedMap2
<
Map2
>
MAP
;
typedef
EmbeddedMap2
MAP
;
};
...
...
Apps/Tuto/tuto1.cpp
View file @
9416a673
...
...
@@ -27,8 +27,7 @@
#include <iostream>
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
#include "Geometry/vector_gen.h"
...
...
@@ -52,7 +51,7 @@ using namespace CGoGN ;
struct
PFP
:
public
PFP_STANDARD
{
// definition of the type of the map
typedef
EmbeddedMap2
<
Map2
>
MAP
;
typedef
EmbeddedMap2
MAP
;
};
// declaration of the map
...
...
Apps/Tuto/tuto5.cpp
View file @
9416a673
...
...
@@ -27,8 +27,7 @@
#include <iostream>
#include "Topology/generic/parameters.h"
#include "Topology/map/map3.h"
#include "Topology/generic/embeddedMap3.h"
#include "Topology/map/embeddedMap3.h"
#include "Geometry/vector_gen.h"
...
...
@@ -56,7 +55,7 @@ using namespace CGoGN ;
struct
PFP
:
public
PFP_STANDARD
{
// definition de la carte
typedef
EmbeddedMap3
<
Map3
>
MAP
;
typedef
EmbeddedMap3
MAP
;
//typedef Map3 MAP;
};
...
...
Apps/Tuto/tuto_mt.cpp
View file @
9416a673
...
...
@@ -27,8 +27,7 @@
#include "tuto_mt.h"
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
#include "Geometry/vector_gen.h"
...
...
@@ -54,7 +53,7 @@ using namespace CGoGN ;
struct
PFP
:
public
PFP_STANDARD
{
// definition of the map
typedef
EmbeddedMap2
<
Map2
>
MAP
;
typedef
EmbeddedMap2
MAP
;
};
// declaration of the map
...
...
Apps/Tuto/tuto_ogl3.h
View file @
9416a673
...
...
@@ -28,8 +28,7 @@
#include <iostream>
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
#include "Geometry/vector_gen.h"
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Modelisation/polyhedron.h"
...
...
@@ -53,7 +52,7 @@ using namespace CGoGN;
struct
PFP
:
public
PFP_STANDARD
{
// definition of the type of the map
typedef
EmbeddedMap2
<
Map2
>
MAP
;
typedef
EmbeddedMap2
MAP
;
};
class
MyQT
:
public
Utils
::
QT
::
SimpleQT
...
...
Apps/Tuto/tuto_subdivision.cpp
View file @
9416a673
...
...
@@ -25,8 +25,7 @@
#include <iostream>
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
#include "Geometry/vector_gen.h"
...
...
@@ -44,7 +43,7 @@ using namespace CGoGN ;
struct
PFP
:
public
PFP_STANDARD
{
// definition of the map
typedef
EmbeddedMap2
<
Map2
>
MAP
;
typedef
EmbeddedMap2
MAP
;
};
int
main
(
int
argc
,
char
**
argv
)
...
...
include/Topology/map/map2.h
View file @
9416a673
...
...
@@ -106,7 +106,6 @@ protected:
*/
void
deleteOrientedFace
(
Dart
d
)
;
public:
virtual
void
deleteFace
(
Dart
d
)
;
//@}
...
...
@@ -123,7 +122,6 @@ public:
*/
virtual
void
splitVertex
(
Dart
d
,
Dart
e
);
//! Delete the vertex of d (works only for internal vertices)
/*! All the faces around the vertex are merged into one face
* @param d a dart of the vertex to delete
...
...
@@ -131,7 +129,6 @@ public:
*/
virtual
bool
deleteVertex
(
Dart
d
)
;
//! Link two vertices belonging to distinct faces (add an edge between the two vertices)
/*! \pre Dart d and e MUST be different and belong to distinct face
* @param d first dart in the face
...
...
@@ -139,19 +136,16 @@ public:
*/
virtual
void
linkVertices
(
Dart
d
,
Dart
e
);
//! Cut the edge of d and its opposite edge if it exists
/*! @param d a dart of the edge to cut
*/
virtual
void
cutEdge
(
Dart
d
);
//! Undo the cut of the edge of d and its opposite edge if it exists
/*! @param d a dart of the edge to uncut
*/
virtual
void
uncutEdge
(
Dart
d
);
//! Collapse an edge (that is deleted) possibly merging its vertices
/*! If delDegenerateFaces is true, the method checks that no degenerate
* faces are built (faces with less than 3 edges). If it occurs the faces
...
...
@@ -164,7 +158,6 @@ public:
*/
virtual
Dart
collapseEdge
(
Dart
d
,
bool
delDegenerateFaces
=
true
);
/**
* Flip the edge of d (rotation in phi1 order)
* WARNING : Works only for non-border edges.
...
...
@@ -189,14 +182,12 @@ public:
*/
virtual
void
insertEdgeInVertex
(
Dart
d
,
Dart
e
);
//! Remove an edge from a vertex orbit
/*! \pre Dart d must be phi2 sewn
* @param d the dart of the edge to remove from the vertex
*/
virtual
void
removeEdgeFromVertex
(
Dart
d
);
//! Sew two oriented faces along oriented edges
/*! \pre Darts d & e MUST be fixed point of phi2 relation
* @param d a dart of the first face
...
...
@@ -204,13 +195,11 @@ public:
*/
virtual
void
sewFaces
(
Dart
d
,
Dart
e
);
//! Unsew two oriented faces along oriented edges
/*! @param d a dart of one face
*/
virtual
void
unsewFaces
(
Dart
d
);
//! Delete an oriented face if and only if it has one or two edges
/*! If the face is phi2-linked to two distinct adjacent faces,
* then those two faces are phi2-linked
...
...
@@ -219,7 +208,6 @@ public:
*/
virtual
bool
collapseDegeneratedFace
(
Dart
d
);
//! Split a face f between d and e inserting an edge between vertices d & e
/*! \pre Darts d & e MUST belong to the same face
* @param d first dart in face f
...
...
@@ -241,7 +229,6 @@ public:
*/
void
extractTrianglePair
(
Dart
d
)
;
/**
* Insert a pair of sewed triangles in a vertex by exploding the edges of v1 and v2
* v1 and v2 belong to the same vertex
...
...
@@ -249,7 +236,6 @@ public:
*/
void
insertTrianglePair
(
Dart
d
,
Dart
v1
,
Dart
v2
)
;
/**
* Unsew the faces consisting of the umbrella of a vertex
* \warning Darts may have
...
...
@@ -257,7 +243,6 @@ public:
*/
void
unsewAroundVertex
(
Dart
d
)
;
/**
* Unsew the Umbrella aroud a vertex, close the hole and then
* create a symetric to construct a polyedron
...
...
@@ -265,7 +250,6 @@ public:
*/
void
explodPolyhedron
(
Dart
d
);
//! Merge two volumes along two faces.
/*! Works only if the two faces have the same number of edges.
* The faces adjacent to the two given faces are pairwise phi2-linked
...
...
@@ -278,7 +262,6 @@ public:
*/
virtual
bool
mergeVolumes
(
Dart
d
,
Dart
e
);
//! Close a topological hole (a sequence of connected fixed point of phi2).
/*! \pre dart d MUST be fixed point of phi2 relation
* Add a face to the map that closes the hole.
...
...
@@ -288,7 +271,6 @@ public:
*/
virtual
unsigned
int
closeHole
(
Dart
d
);
//TODO a mettre en algo
//! Close the map removing topological holes.
/*! Add faces to the map that close every existing hole.
...
...
src/Topology/map/map2.cpp
View file @
9416a673
...
...
@@ -430,14 +430,13 @@ bool Map2::sameOrientedVertex(Dart d, Dart e)
bool
Map2
::
sameOrientedFace
(
Dart
d
,
Dart
e
)
{
Dart
dNext
=
d
;
do
//Foreach dart dNext
of
the face
do
//
Foreach dart dNext
in
the face
of d
{
if
(
dNext
==
e
)
//Test equality with e
if
(
dNext
==
e
)
//
Test equality with e
return
true
;
dNext
=
phi1
(
dNext
);
}
while
(
dNext
!=
d
);
return
false
;
// None is equal to e => Faces are distinct
}
while
(
dNext
!=
d
);
return
false
;
// None is equal to e => faces are distinct
}
unsigned
int
Map2
::
vertexDegree
(
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