Commit 2d082a87 authored by untereiner's avatar untereiner

Merge cgogn:~cgogn/CGoGN

parents bbd5a6b3 9416a673
...@@ -24,8 +24,7 @@ ...@@ -24,8 +24,7 @@
#include <iostream> #include <iostream>
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include <Algo/Geometry/inclusion.h> #include <Algo/Geometry/inclusion.h>
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -34,7 +33,7 @@ using namespace CGoGN; ...@@ -34,7 +33,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the type of the map // definition of the type of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
int main() int main()
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include <iostream> #include <iostream>
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Algo/Import/import.h" #include "Algo/Import/import.h"
...@@ -125,7 +124,7 @@ float Gfont[174*2]={ ...@@ -125,7 +124,7 @@ float Gfont[174*2]={
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the type of the map // definition of the type of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
// declaration of the map // declaration of the map
......
...@@ -35,8 +35,7 @@ ...@@ -35,8 +35,7 @@
#include "Utils/qtui.h" #include "Utils/qtui.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map3.h" #include "Topology/map/embeddedMap3.h"
#include "Topology/generic/embeddedMap3.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Geometry/matrix.h" #include "Geometry/matrix.h"
...@@ -66,7 +65,7 @@ using namespace CGoGN ; ...@@ -66,7 +65,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap3<Map3> MAP; typedef EmbeddedMap3 MAP;
}; };
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "extrusionView.h" #include "extrusionView.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Geometry/matrix.h" #include "Geometry/matrix.h"
...@@ -51,7 +50,7 @@ using namespace CGoGN; ...@@ -51,7 +50,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition de la carte // definition de la carte
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "frame_manip.h" #include "frame_manip.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Geometry/matrix.h" #include "Geometry/matrix.h"
...@@ -42,7 +41,6 @@ ...@@ -42,7 +41,6 @@
#include "Utils/Shaders/shaderFlat.h" #include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shaderSimpleColor.h" #include "Utils/Shaders/shaderSimpleColor.h"
#include "glm/gtc/matrix_transform.hpp" #include "glm/gtc/matrix_transform.hpp"
#include "glm/gtc/type_precision.hpp" #include "glm/gtc/type_precision.hpp"
#include "glm/gtc/type_ptr.hpp" #include "glm/gtc/type_ptr.hpp"
...@@ -52,7 +50,7 @@ using namespace CGoGN; ...@@ -52,7 +50,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition de la carte // definition de la carte
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
PFP::MAP myMap; PFP::MAP myMap;
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "Utils/glutwin_atb.h" #include "Utils/glutwin_atb.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/matrix.h" #include "Geometry/matrix.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -51,7 +50,7 @@ using namespace CGoGN ; ...@@ -51,7 +50,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
typedef PFP::MAP MAP; typedef PFP::MAP MAP;
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "polyhedronsView.h" #include "polyhedronsView.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Geometry/matrix.h" #include "Geometry/matrix.h"
...@@ -47,7 +46,7 @@ using namespace CGoGN; ...@@ -47,7 +46,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition de la carte // definition de la carte
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
PFP::MAP myMap; PFP::MAP myMap;
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "Utils/glutwin.h" #include "Utils/glutwin.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Geometry/matrix.h" #include "Geometry/matrix.h"
...@@ -49,7 +48,7 @@ using namespace CGoGN; ...@@ -49,7 +48,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition de la carte // definition de la carte
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Algo/Modelisation/polyhedron.h" #include "Algo/Modelisation/polyhedron.h"
SimpleGMap2::SimpleGMap2() SimpleGMap2::SimpleGMap2()
{ {
position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position"); position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position");
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "Utils/qtSimple.h" #include "Utils/qtSimple.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/gmap/gmap2.h" #include "Topology/gmap/embeddedGMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -39,7 +38,7 @@ using namespace CGoGN ; ...@@ -39,7 +38,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap2<GMap2> MAP ; typedef EmbeddedGMap2 MAP ;
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "Utils/qtSimple.h" #include "Utils/qtSimple.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/gmap/gmap3.h" #include "Topology/gmap/embeddedGMap3.h"
#include "Topology/generic/embeddedMap3.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -39,7 +38,7 @@ using namespace CGoGN ; ...@@ -39,7 +38,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap3<GMap3> MAP ; typedef EmbeddedGMap3 MAP ;
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "Utils/glutwin.h" #include "Utils/glutwin.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -47,7 +46,7 @@ using namespace CGoGN ; ...@@ -47,7 +46,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
/** /**
......
...@@ -32,8 +32,7 @@ ...@@ -32,8 +32,7 @@
#include "Utils/Shaders/shaderSimpleTexture.h" #include "Utils/Shaders/shaderSimpleTexture.h"
#include "Utils/Shaders/shaderTextureMask.h" #include "Utils/Shaders/shaderTextureMask.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Algo/Render/GL2/mapRender.h" #include "Algo/Render/GL2/mapRender.h"
...@@ -47,7 +46,7 @@ using namespace CGoGN ; ...@@ -47,7 +46,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap2<Map2> MAP ; typedef EmbeddedMap2 MAP ;
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
......
...@@ -28,8 +28,7 @@ ...@@ -28,8 +28,7 @@
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -48,7 +47,7 @@ using namespace CGoGN ; ...@@ -48,7 +47,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
/** /**
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
#include "Utils/qtui.h" #include "Utils/qtui.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Geometry/matrix.h" #include "Geometry/matrix.h"
...@@ -53,7 +52,7 @@ using namespace CGoGN ; ...@@ -53,7 +52,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap2<Map2> MAP ; typedef EmbeddedMap2 MAP ;
}; };
typedef PFP::MAP MAP ; typedef PFP::MAP MAP ;
......
...@@ -29,8 +29,7 @@ ...@@ -29,8 +29,7 @@
#include "tp_master.h" #include "tp_master.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Geometry/matrix.h" #include "Geometry/matrix.h"
...@@ -57,7 +56,7 @@ using namespace CGoGN; ...@@ -57,7 +56,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include <iostream> #include <iostream>
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -52,7 +51,7 @@ using namespace CGoGN ; ...@@ -52,7 +51,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the type of the map // definition of the type of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
// declaration of the map // declaration of the map
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include <iostream> #include <iostream>
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map3.h" #include "Topology/map/embeddedMap3.h"
#include "Topology/generic/embeddedMap3.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -56,7 +55,7 @@ using namespace CGoGN ; ...@@ -56,7 +55,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition de la carte // definition de la carte
typedef EmbeddedMap3<Map3> MAP; typedef EmbeddedMap3 MAP;
//typedef Map3 MAP; //typedef Map3 MAP;
}; };
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include "tuto_mt.h" #include "tuto_mt.h"
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -54,7 +53,7 @@ using namespace CGoGN ; ...@@ -54,7 +53,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
// declaration of the map // declaration of the map
......
...@@ -28,8 +28,7 @@ ...@@ -28,8 +28,7 @@
#include <iostream> #include <iostream>
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
#include "Algo/Geometry/boundingbox.h" #include "Algo/Geometry/boundingbox.h"
#include "Algo/Modelisation/polyhedron.h" #include "Algo/Modelisation/polyhedron.h"
...@@ -53,7 +52,7 @@ using namespace CGoGN; ...@@ -53,7 +52,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the type of the map // definition of the type of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
class MyQT: public Utils::QT::SimpleQT class MyQT: public Utils::QT::SimpleQT
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
#include <iostream> #include <iostream>
#include "Topology/generic/parameters.h" #include "Topology/generic/parameters.h"
#include "Topology/map/map2.h" #include "Topology/map/embeddedMap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Geometry/vector_gen.h" #include "Geometry/vector_gen.h"
...@@ -44,7 +43,7 @@ using namespace CGoGN ; ...@@ -44,7 +43,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD struct PFP: public PFP_STANDARD
{ {
// definition of the map // definition of the map
typedef EmbeddedMap2<Map2> MAP; typedef EmbeddedMap2 MAP;
}; };
int main(int argc, char **argv) int main(int argc, char **argv)
......
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-2011, IGG Team, LSIIT, University of Strasbourg *
* *
* This library is free software; you can redistribute it and/or modify it *
* under the terms of the GNU Lesser General Public License as published by the *
* Free Software Foundation; either version 2.1 of the License, or (at your *
* option) any later version. *
* *
* This library is distributed in the hope that it will be useful, but WITHOUT *
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License *
* for more details. *
* *
* You should have received a copy of the GNU Lesser General Public License *
* along with this library; if not, write to the Free Software Foundation, *
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. *
* *
* Web site: http://cgogn.u-strasbg.fr/ *
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
#ifndef __EMBEDDED_GMAP2_H__
#define __EMBEDDED_GMAP2_H__
#include "Topology/gmap/gmap2.h"
namespace CGoGN
{
/**
* Class of 2-dimensional G-maps
* with managed embeddings
*/
class EmbeddedGMap2 : public GMap2
{
public:
typedef GMap2 TOPO_MAP;
/**
* The attributes attached to the old vertex are duplicated on both resulting vertices
* No attribute is attached to the new edge
*/
virtual void splitVertex(Dart d, Dart e) ;
/**
* The attributes attached to the face of d are kept on the resulting face
*/
virtual bool deleteVertex(Dart d) ;
// /**
// * No attribute is attached to the new edge
// * The attributes attached to the face of dart d are kept on the resulting face
// */
// virtual void linkVertices(Dart d, Dart e) ;
/**
* No attribute is attached to the new vertex
* The attributes attached to the old edge are duplicated on both resulting edges
*/
virtual void cutEdge(Dart d) ;
// /**
// * The attributes attached to the edge of d are kept on the resulting edge