Skip to content

GitLab

Commit 2d082a87 authored by untereiner's avatar untereiner
Browse files

Merge cgogn:~cgogn/CGoGN

parents bbd5a6b3 9416a673
Hide whitespace changes
Inline Side-by-side
Apps/Examples/Tests/Algo_Geom_inclusion.cpp
View file @ 2d082a87
......@@ -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 @ 2d082a87
......@@ -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/Examples/clipping.h
View file @ 2d082a87
......@@ -35,8 +35,7 @@
#include "Utils/qtui.h"
#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"
#include "Geometry/matrix.h"
......@@ -66,7 +65,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition of the map
typedef EmbeddedMap3<Map3> MAP;
typedef EmbeddedMap3 MAP;
};
......
Apps/Examples/extrusionView.cpp
View file @ 2d082a87
......@@ -27,8 +27,7 @@
#include "extrusionView.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"
......@@ -51,7 +50,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD
{
// definition de la carte
typedef EmbeddedMap2<Map2> MAP;
typedef EmbeddedMap2 MAP;
};
......
Apps/Examples/frame_manip.cpp
View file @ 2d082a87
......@@ -27,8 +27,7 @@
#include "frame_manip.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"
......@@ -42,7 +41,6 @@
#include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "glm/gtc/matrix_transform.hpp"
#include "glm/gtc/type_precision.hpp"
#include "glm/gtc/type_ptr.hpp"
......@@ -52,7 +50,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD
{
// definition de la carte
typedef EmbeddedMap2<Map2> MAP;
typedef EmbeddedMap2 MAP;
};
PFP::MAP myMap;
......
Apps/Examples/miniTest.cpp
View file @ 2d082a87
......@@ -27,8 +27,7 @@
#include "Utils/glutwin_atb.h"
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
#include "Geometry/matrix.h"
#include "Geometry/vector_gen.h"
......@@ -51,7 +50,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition of the map
typedef EmbeddedMap2<Map2> MAP;
typedef EmbeddedMap2 MAP;
};
typedef PFP::MAP MAP;
......
Apps/Examples/polyhedronsView.cpp
View file @ 2d082a87
......@@ -27,8 +27,7 @@
#include "polyhedronsView.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"
......@@ -47,7 +46,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD
{
// definition de la carte
typedef EmbeddedMap2<Map2> MAP;
typedef EmbeddedMap2 MAP;
};
PFP::MAP myMap;
......
Apps/Examples/scene.cpp
View file @ 2d082a87
......@@ -27,8 +27,7 @@
#include "Utils/glutwin.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"
......@@ -49,7 +48,7 @@ using namespace CGoGN;
struct PFP: public PFP_STANDARD
{
// definition de la carte
typedef EmbeddedMap2<Map2> MAP;
typedef EmbeddedMap2 MAP;
};
......
Apps/Examples/simpleGMap2.cpp
View file @ 2d082a87
......@@ -27,7 +27,6 @@
#include "Algo/Geometry/boundingbox.h"
#include "Algo/Modelisation/polyhedron.h"
SimpleGMap2::SimpleGMap2()
{
position = myMap.addAttribute<PFP::VEC3>(VERTEX, "position");
......
Apps/Examples/simpleGMap2.h
View file @ 2d082a87
......@@ -27,8 +27,7 @@
#include "Utils/qtSimple.h"
#include "Topology/generic/parameters.h"
#include "Topology/gmap/gmap2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/gmap/embeddedGMap2.h"
#include "Geometry/vector_gen.h"
......@@ -39,7 +38,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition of the map
typedef EmbeddedMap2<GMap2> MAP ;
typedef EmbeddedGMap2 MAP ;
};
typedef PFP::MAP MAP ;
......
Apps/Examples/simpleGMap3.h
View file @ 2d082a87
......@@ -27,8 +27,7 @@
#include "Utils/qtSimple.h"
#include "Topology/generic/parameters.h"
#include "Topology/gmap/gmap3.h"
#include "Topology/generic/embeddedMap3.h"
#include "Topology/gmap/embeddedGMap3.h"
#include "Geometry/vector_gen.h"
......@@ -39,7 +38,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition of the map
typedef EmbeddedMap3<GMap3> MAP ;
typedef EmbeddedGMap3 MAP ;
};
typedef PFP::MAP MAP ;
......
Apps/Examples/ter_meshes.cpp
View file @ 2d082a87
......@@ -27,8 +27,7 @@
#include "Utils/glutwin.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"
......@@ -47,7 +46,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition of the map
typedef EmbeddedMap2<Map2> MAP;
typedef EmbeddedMap2 MAP;
};
/**
......
Apps/Examples/texturesExample.h
View file @ 2d082a87
......@@ -32,8 +32,7 @@
#include "Utils/Shaders/shaderSimpleTexture.h"
#include "Utils/Shaders/shaderTextureMask.h"
#include "Topology/generic/parameters.h"
#include "Topology/map/map2.h"
#include "Topology/generic/embeddedMap2.h"
#include "Topology/map/embeddedMap2.h"
#include "Algo/Render/GL2/mapRender.h"
......@@ -47,7 +46,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition of the map
typedef EmbeddedMap2<Map2> MAP ;
typedef EmbeddedMap2 MAP ;
};
typedef PFP::MAP MAP ;
......
Apps/Examples/triangulation.cpp
View file @ 2d082a87
......@@ -28,8 +28,7 @@
#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"
......@@ -48,7 +47,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition of the map
typedef EmbeddedMap2<Map2> MAP;
typedef EmbeddedMap2 MAP;
};
/**
......
Apps/Examples/viewer.h
View file @ 2d082a87
......@@ -29,8 +29,7 @@
#include "Utils/qtui.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"
......@@ -53,7 +52,7 @@ using namespace CGoGN ;
struct PFP: public PFP_STANDARD
{
// definition of the map
typedef EmbeddedMap2<Map2> MAP ;
typedef EmbeddedMap2 MAP ;
};
typedef PFP::MAP MAP ;
......
Apps/Tuto/tp_master.cpp
View file @ 2d082a87
......@@ -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 @ 2d082a87
......@@ -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 @ 2d082a87
......@@ -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 @ 2d082a87
......@@ -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 @ 2d082a87
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment