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
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
ed1d2878
Commit
ed1d2878
authored
Feb 25, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dll compiling
parent
7f6ebf00
Changes
142
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
142 changed files
with
4146 additions
and
2404 deletions
+4146
-2404
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+2
-0
CGoGN/CMakeLists.txt
CGoGN/CMakeLists.txt
+4
-3
CGoGN/include/Algo/Histogram/histogram.h
CGoGN/include/Algo/Histogram/histogram.h
+16
-6
CGoGN/include/Algo/ImplicitHierarchicalMesh/ihm3.h
CGoGN/include/Algo/ImplicitHierarchicalMesh/ihm3.h
+13
-1
CGoGN/include/Algo/Import/importPlyData.h
CGoGN/include/Algo/Import/importPlyData.h
+11
-1
CGoGN/include/Algo/MC/marchingcube.hpp
CGoGN/include/Algo/MC/marchingcube.hpp
+1
-1
CGoGN/include/Algo/MC/tables.h
CGoGN/include/Algo/MC/tables.h
+13
-1
CGoGN/include/Algo/Render/GL2/mapRender.h
CGoGN/include/Algo/Render/GL2/mapRender.h
+11
-1
CGoGN/include/Algo/Render/GL2/topoPrimalRender.hpp
CGoGN/include/Algo/Render/GL2/topoPrimalRender.hpp
+2
-2
CGoGN/include/Algo/Render/GL2/topoRender.h
CGoGN/include/Algo/Render/GL2/topoRender.h
+11
-4
CGoGN/include/Container/attributeContainer.h
CGoGN/include/Container/attributeContainer.h
+517
-12
CGoGN/include/Container/attributeContainer.hpp
CGoGN/include/Container/attributeContainer.hpp
+11
-0
CGoGN/include/Container/holeblockref.h
CGoGN/include/Container/holeblockref.h
+1
-0
CGoGN/include/Topology/generic/cells_macros.h
CGoGN/include/Topology/generic/cells_macros.h
+115
-115
CGoGN/include/Topology/generic/genericmap.h
CGoGN/include/Topology/generic/genericmap.h
+13
-2
CGoGN/include/Topology/generic/genericmap.hpp
CGoGN/include/Topology/generic/genericmap.hpp
+0
-2
CGoGN/include/Topology/generic/mapImpl/mapMono.h
CGoGN/include/Topology/generic/mapImpl/mapMono.h
+11
-1
CGoGN/include/Topology/generic/mapImpl/mapMulti.h
CGoGN/include/Topology/generic/mapImpl/mapMulti.h
+11
-1
CGoGN/include/Topology/generic/traversor/traversor3.h
CGoGN/include/Topology/generic/traversor/traversor3.h
+1
-1
CGoGN/include/Topology/gmap/embeddedGMap2.h
CGoGN/include/Topology/gmap/embeddedGMap2.h
+11
-1
CGoGN/include/Topology/gmap/embeddedGMap3.h
CGoGN/include/Topology/gmap/embeddedGMap3.h
+11
-1
CGoGN/include/Topology/gmap/gmap2.hpp
CGoGN/include/Topology/gmap/gmap2.hpp
+4
-4
CGoGN/include/Topology/gmap/gmap3.hpp
CGoGN/include/Topology/gmap/gmap3.hpp
+1
-1
CGoGN/include/Topology/ihmap/ihm2.h
CGoGN/include/Topology/ihmap/ihm2.h
+11
-1
CGoGN/include/Topology/ihmap/ihm3.h
CGoGN/include/Topology/ihmap/ihm3.h
+11
-1
CGoGN/include/Topology/map/embeddedMap2.h
CGoGN/include/Topology/map/embeddedMap2.h
+11
-1
CGoGN/include/Topology/map/embeddedMap2_MR.h
CGoGN/include/Topology/map/embeddedMap2_MR.h
+10
-1
CGoGN/include/Topology/map/embeddedMap3.h
CGoGN/include/Topology/map/embeddedMap3.h
+11
-1
CGoGN/include/Topology/map/map2.hpp
CGoGN/include/Topology/map/map2.hpp
+4
-4
CGoGN/include/Topology/map/map3.hpp
CGoGN/include/Topology/map/map3.hpp
+237
-237
CGoGN/include/Utils/GLSLShader.h
CGoGN/include/Utils/GLSLShader.h
+2
-1
CGoGN/include/Utils/Qt/qtInputs.h
CGoGN/include/Utils/Qt/qtInputs.h
+9
-7
CGoGN/include/Utils/Qt/qtQGLV.h
CGoGN/include/Utils/Qt/qtQGLV.h
+9
-1
CGoGN/include/Utils/Qt/qtQGLV_glw.h
CGoGN/include/Utils/Qt/qtQGLV_glw.h
+9
-1
CGoGN/include/Utils/Qt/qtSimple.h
CGoGN/include/Utils/Qt/qtSimple.h
+9
-1
CGoGN/include/Utils/Qt/qtcolorschooser.h
CGoGN/include/Utils/Qt/qtcolorschooser.h
+9
-1
CGoGN/include/Utils/Qt/qtgl.h
CGoGN/include/Utils/Qt/qtgl.h
+10
-2
CGoGN/include/Utils/Qt/qthistodraw.h
CGoGN/include/Utils/Qt/qthistodraw.h
+185
-177
CGoGN/include/Utils/Qt/qtpopup.h
CGoGN/include/Utils/Qt/qtpopup.h
+10
-1
CGoGN/include/Utils/Shaders/shaderColorPerVertex.h
CGoGN/include/Utils/Shaders/shaderColorPerVertex.h
+3
-1
CGoGN/include/Utils/Shaders/shaderCustom.h
CGoGN/include/Utils/Shaders/shaderCustom.h
+3
-1
CGoGN/include/Utils/Shaders/shaderCustomTex.h
CGoGN/include/Utils/Shaders/shaderCustomTex.h
+3
-1
CGoGN/include/Utils/Shaders/shaderEnvMap.h
CGoGN/include/Utils/Shaders/shaderEnvMap.h
+3
-1
CGoGN/include/Utils/Shaders/shaderExplodeSmoothVolumes.h
CGoGN/include/Utils/Shaders/shaderExplodeSmoothVolumes.h
+3
-1
CGoGN/include/Utils/Shaders/shaderExplodeVolumes.h
CGoGN/include/Utils/Shaders/shaderExplodeVolumes.h
+3
-1
CGoGN/include/Utils/Shaders/shaderExplodeVolumesLines.h
CGoGN/include/Utils/Shaders/shaderExplodeVolumesLines.h
+3
-1
CGoGN/include/Utils/Shaders/shaderFlat.h
CGoGN/include/Utils/Shaders/shaderFlat.h
+3
-1
CGoGN/include/Utils/Shaders/shaderFlatColor.h
CGoGN/include/Utils/Shaders/shaderFlatColor.h
+3
-1
CGoGN/include/Utils/Shaders/shaderIsoLines.h
CGoGN/include/Utils/Shaders/shaderIsoLines.h
+3
-1
CGoGN/include/Utils/Shaders/shaderMatCustom.h
CGoGN/include/Utils/Shaders/shaderMatCustom.h
+3
-1
CGoGN/include/Utils/Shaders/shaderPhong.h
CGoGN/include/Utils/Shaders/shaderPhong.h
+3
-1
CGoGN/include/Utils/Shaders/shaderPhongTexture.h
CGoGN/include/Utils/Shaders/shaderPhongTexture.h
+3
-1
CGoGN/include/Utils/Shaders/shaderScalarField.h
CGoGN/include/Utils/Shaders/shaderScalarField.h
+3
-1
CGoGN/include/Utils/Shaders/shaderSimpleColor.h
CGoGN/include/Utils/Shaders/shaderSimpleColor.h
+3
-1
CGoGN/include/Utils/Shaders/shaderSimpleFlat.h
CGoGN/include/Utils/Shaders/shaderSimpleFlat.h
+3
-1
CGoGN/include/Utils/Shaders/shaderSimpleTexture.h
CGoGN/include/Utils/Shaders/shaderSimpleTexture.h
+3
-1
CGoGN/include/Utils/Shaders/shaderTextureDepth.h
CGoGN/include/Utils/Shaders/shaderTextureDepth.h
+3
-1
CGoGN/include/Utils/Shaders/shaderTextureMask.h
CGoGN/include/Utils/Shaders/shaderTextureMask.h
+3
-1
CGoGN/include/Utils/Shaders/shaderVectorPerVertex.h
CGoGN/include/Utils/Shaders/shaderVectorPerVertex.h
+3
-1
CGoGN/include/Utils/Shaders/shaderWallPaper.h
CGoGN/include/Utils/Shaders/shaderWallPaper.h
+3
-1
CGoGN/include/Utils/cgognStream.h
CGoGN/include/Utils/cgognStream.h
+16
-14
CGoGN/include/Utils/clippingPresets.h
CGoGN/include/Utils/clippingPresets.h
+3
-1
CGoGN/include/Utils/clippingPresetsAnimated.h
CGoGN/include/Utils/clippingPresetsAnimated.h
+9
-7
CGoGN/include/Utils/clippingShader.h
CGoGN/include/Utils/clippingShader.h
+3
-1
CGoGN/include/Utils/dll.h
CGoGN/include/Utils/dll.h
+34
-0
CGoGN/include/Utils/drawer.h
CGoGN/include/Utils/drawer.h
+3
-1
CGoGN/include/Utils/fbo.h
CGoGN/include/Utils/fbo.h
+3
-1
CGoGN/include/Utils/frameManipulator.h
CGoGN/include/Utils/frameManipulator.h
+8
-8
CGoGN/include/Utils/gzstream.h
CGoGN/include/Utils/gzstream.h
+5
-4
CGoGN/include/Utils/img3D_IO.h
CGoGN/include/Utils/img3D_IO.h
+105
-6
CGoGN/include/Utils/pickables.h
CGoGN/include/Utils/pickables.h
+10
-8
CGoGN/include/Utils/pointSprite.h
CGoGN/include/Utils/pointSprite.h
+3
-1
CGoGN/include/Utils/shaderMutator.h
CGoGN/include/Utils/shaderMutator.h
+3
-1
CGoGN/include/Utils/svg.h
CGoGN/include/Utils/svg.h
+8
-7
CGoGN/include/Utils/text3d.h
CGoGN/include/Utils/text3d.h
+3
-1
CGoGN/include/Utils/textureSticker.h
CGoGN/include/Utils/textureSticker.h
+3
-1
CGoGN/include/Utils/vboRender.h
CGoGN/include/Utils/vboRender.h
+3
-1
CGoGN/include/Utils/vbo_base.h
CGoGN/include/Utils/vbo_base.h
+10
-8
CGoGN/src/Algo/Histogram/histogram.cpp
CGoGN/src/Algo/Histogram/histogram.cpp
+4
-2
CGoGN/src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
CGoGN/src/Algo/ImplicitHierarchicalMesh/ihm3.cpp
+2
-0
CGoGN/src/Algo/Import/importPlyData.cpp
CGoGN/src/Algo/Import/importPlyData.cpp
+2
-0
CGoGN/src/Algo/MC/tables.cpp
CGoGN/src/Algo/MC/tables.cpp
+1
-0
CGoGN/src/Algo/Render/mapRender.cpp
CGoGN/src/Algo/Render/mapRender.cpp
+2
-0
CGoGN/src/Algo/Render/topoGenRender.cpp
CGoGN/src/Algo/Render/topoGenRender.cpp
+2
-0
CGoGN/src/Container/attributeContainer.cpp
CGoGN/src/Container/attributeContainer.cpp
+871
-32
CGoGN/src/Topology/generic/genericmap.cpp
CGoGN/src/Topology/generic/genericmap.cpp
+3
-2
CGoGN/src/Topology/generic/mapMono.cpp
CGoGN/src/Topology/generic/mapMono.cpp
+2
-0
CGoGN/src/Topology/generic/mapMulti.cpp
CGoGN/src/Topology/generic/mapMulti.cpp
+2
-0
CGoGN/src/Topology/gmap/embeddedGMap2.cpp
CGoGN/src/Topology/gmap/embeddedGMap2.cpp
+2
-0
CGoGN/src/Topology/gmap/embeddedGMap3.cpp
CGoGN/src/Topology/gmap/embeddedGMap3.cpp
+2
-0
CGoGN/src/Topology/ihmap/ihm2.cpp
CGoGN/src/Topology/ihmap/ihm2.cpp
+309
-306
CGoGN/src/Topology/ihmap/ihm3.cpp
CGoGN/src/Topology/ihmap/ihm3.cpp
+136
-134
CGoGN/src/Topology/map/embeddedMap2.cpp
CGoGN/src/Topology/map/embeddedMap2.cpp
+2
-0
CGoGN/src/Topology/map/embeddedMap2_MR.cpp
CGoGN/src/Topology/map/embeddedMap2_MR.cpp
+690
-689
CGoGN/src/Topology/map/embeddedMap3.cpp
CGoGN/src/Topology/map/embeddedMap3.cpp
+2
-0
CGoGN/src/Utils/GLSLShader.cpp
CGoGN/src/Utils/GLSLShader.cpp
+1
-1
CGoGN/src/Utils/Qt/qtQGLV.cpp
CGoGN/src/Utils/Qt/qtQGLV.cpp
+1
-1
CGoGN/src/Utils/Qt/qtSimple.cpp
CGoGN/src/Utils/Qt/qtSimple.cpp
+1
-0
CGoGN/src/Utils/Qt/qtcolorschooser.cpp
CGoGN/src/Utils/Qt/qtcolorschooser.cpp
+1
-1
CGoGN/src/Utils/Qt/qthistodraw.cpp
CGoGN/src/Utils/Qt/qthistodraw.cpp
+397
-396
CGoGN/src/Utils/Qt/qtinputs.cpp
CGoGN/src/Utils/Qt/qtinputs.cpp
+1
-1
CGoGN/src/Utils/Qt/qtpopup.cpp
CGoGN/src/Utils/Qt/qtpopup.cpp
+1
-0
CGoGN/src/Utils/Shaders/shaderColorPerVertex.cpp
CGoGN/src/Utils/Shaders/shaderColorPerVertex.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderCustom.cpp
CGoGN/src/Utils/Shaders/shaderCustom.cpp
+3
-0
CGoGN/src/Utils/Shaders/shaderCustomTex.cpp
CGoGN/src/Utils/Shaders/shaderCustomTex.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderEnvMap.cpp
CGoGN/src/Utils/Shaders/shaderEnvMap.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderExplodeSmoothVolumes.cpp
CGoGN/src/Utils/Shaders/shaderExplodeSmoothVolumes.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderExplodeVolumes.cpp
CGoGN/src/Utils/Shaders/shaderExplodeVolumes.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderExplodeVolumesLines.cpp
CGoGN/src/Utils/Shaders/shaderExplodeVolumesLines.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderFlat.cpp
CGoGN/src/Utils/Shaders/shaderFlat.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderFlatColor.cpp
CGoGN/src/Utils/Shaders/shaderFlatColor.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderIsoLines.cpp
CGoGN/src/Utils/Shaders/shaderIsoLines.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderMatCustom.cpp
CGoGN/src/Utils/Shaders/shaderMatCustom.cpp
+2
-0
CGoGN/src/Utils/Shaders/shaderPhong.cpp
CGoGN/src/Utils/Shaders/shaderPhong.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderPhongTexture.cpp
CGoGN/src/Utils/Shaders/shaderPhongTexture.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderScalarField.cpp
CGoGN/src/Utils/Shaders/shaderScalarField.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderSimpleColor.cpp
CGoGN/src/Utils/Shaders/shaderSimpleColor.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderSimpleFlat.cpp
CGoGN/src/Utils/Shaders/shaderSimpleFlat.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderSimpleTexture.cpp
CGoGN/src/Utils/Shaders/shaderSimpleTexture.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderTextureDepth.cpp
CGoGN/src/Utils/Shaders/shaderTextureDepth.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderTextureMask.cpp
CGoGN/src/Utils/Shaders/shaderTextureMask.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderVectorPerVertex.cpp
CGoGN/src/Utils/Shaders/shaderVectorPerVertex.cpp
+1
-1
CGoGN/src/Utils/Shaders/shaderWallPaper.cpp
CGoGN/src/Utils/Shaders/shaderWallPaper.cpp
+1
-1
CGoGN/src/Utils/cgognStream.cpp
CGoGN/src/Utils/cgognStream.cpp
+17
-12
CGoGN/src/Utils/clippingPresets.cpp
CGoGN/src/Utils/clippingPresets.cpp
+1
-0
CGoGN/src/Utils/clippingPresetsAnimated.cpp
CGoGN/src/Utils/clippingPresetsAnimated.cpp
+1
-1
CGoGN/src/Utils/clippingShader.cpp
CGoGN/src/Utils/clippingShader.cpp
+1
-1
CGoGN/src/Utils/drawer.cpp
CGoGN/src/Utils/drawer.cpp
+2
-0
CGoGN/src/Utils/fbo.cpp
CGoGN/src/Utils/fbo.cpp
+1
-0
CGoGN/src/Utils/frameManipulator.cpp
CGoGN/src/Utils/frameManipulator.cpp
+2
-0
CGoGN/src/Utils/gzstream.cpp
CGoGN/src/Utils/gzstream.cpp
+1
-1
CGoGN/src/Utils/img3D_IO.cpp
CGoGN/src/Utils/img3D_IO.cpp
+7
-100
CGoGN/src/Utils/pickables.cpp
CGoGN/src/Utils/pickables.cpp
+1
-1
CGoGN/src/Utils/pointSprite.cpp
CGoGN/src/Utils/pointSprite.cpp
+1
-1
CGoGN/src/Utils/shaderMutator.cpp
CGoGN/src/Utils/shaderMutator.cpp
+1
-1
CGoGN/src/Utils/svg.cpp
CGoGN/src/Utils/svg.cpp
+2
-0
CGoGN/src/Utils/text3d.cpp
CGoGN/src/Utils/text3d.cpp
+1
-1
CGoGN/src/Utils/textureSticker.cpp
CGoGN/src/Utils/textureSticker.cpp
+1
-1
CGoGN/src/Utils/vbo.cpp
CGoGN/src/Utils/vbo.cpp
+1
-1
CGoGN/src/Utils/vboRender.cpp
CGoGN/src/Utils/vboRender.cpp
+1
-1
CMakeLists.txt
CMakeLists.txt
+3
-4
ThirdParty/tetgen/tetgen.cxx
ThirdParty/tetgen/tetgen.cxx
+7
-3
No files found.
Apps/Tuto/tuto1.cpp
View file @
ed1d2878
...
...
@@ -94,6 +94,8 @@ void MyQT::createMap()
// render the topo of the map without boundary darts
m_render_topo
->
setInitialBoundaryDartsColor
(
0
,
1
,
0
);
m_render_topo
->
updateDataGMap
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
CGoGNout
<<
"hopla"
<<
CGoGNendl
;
}
// initialization GL callback
...
...
CGoGN/CMakeLists.txt
View file @
ed1d2878
...
...
@@ -116,19 +116,20 @@ IF (CGoGN_ONELIB)
ELSE
()
IF
(
CGoGN_WITH_QT
)
add_definitions
(
-DCGoGN_QT_DLL_EXPORT
)
add_library
(
utils
${
files_utils_withQt
}
)
ELSE
()
add_library
(
utils
${
files_utils
}
)
ENDIF
()
target_link_libraries
(
utils
${
CGoGN_EXT_LIBS
}
)
add_library
(
container
${
files_container
}
)
add_library
(
container
${
files_container
}
)
target_link_libraries
(
container utils
)
add_library
(
topology
${
files_topology
}
)
add_library
(
topology
${
files_topology
}
)
target_link_libraries
(
topology container
)
add_library
(
algo
${
files_algo
}
)
add_library
(
algo
${
files_algo
}
)
target_link_libraries
(
algo utils topology
)
...
...
CGoGN/include/Algo/Histogram/histogram.h
View file @
ed1d2878
...
...
@@ -33,6 +33,16 @@
#include "Utils/colorMaps.h"
#include "Utils/vbo_base.h"
#ifdef WIN32
#ifndef CGoGN_ALGO_API
#if defined CGoGN_ALGO_DLL_EXPORT
#define CGoGN_ALGO_API __declspec(dllexport)
#else
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#endif
namespace
CGoGN
{
...
...
@@ -42,7 +52,7 @@ namespace Algo
namespace
Histogram
{
class
HistoColorMap
class
CGoGN_ALGO_API
HistoColorMap
{
protected:
double
m_min
;
...
...
@@ -121,7 +131,7 @@ public:
* Histogram class
* T must have operators -, / ,< ,>
*/
class
Histogram
class
CGoGN_ALGO_API
Histogram
{
// std::vector<double> m_data;
...
...
@@ -196,22 +206,22 @@ public:
/**
* get min value of attribute (perhaps modified by user)
*/
double
getMin
()
const
;
inline
double
getMin
()
const
;
/**
* get max value of attribute (perhaps modified by user)
*/
double
getMax
()
const
;
inline
double
getMax
()
const
;
/**
* get real min value of attribute
*/
double
getQMin
()
const
;
inline
double
getQMin
()
const
;
/**
* get real max value of attribute
*/
double
getQMax
()
const
;
inline
double
getQMax
()
const
;
/**
...
...
CGoGN/include/Algo/ImplicitHierarchicalMesh/ihm3.h
View file @
ed1d2878
...
...
@@ -28,6 +28,18 @@
#include "Topology/map/embeddedMap3.h"
#include "Algo/Multiresolution/filter.h"
#ifdef WIN32
#ifndef CGoGN_ALGO_API
#if defined CGoGN_ALGO_DLL_EXPORT
#define CGoGN_ALGO_API __declspec(dllexport)
#else
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#endif
namespace
CGoGN
{
...
...
@@ -42,7 +54,7 @@ namespace IHM
template
<
typename
T
,
unsigned
int
ORBIT
>
class
AttributeHandler_IHM
;
class
ImplicitHierarchicalMap3
:
public
EmbeddedMap3
CGoGN_ALGO_API
class
ImplicitHierarchicalMap3
:
public
EmbeddedMap3
{
template
<
typename
T
,
unsigned
int
ORBIT
>
friend
class
AttributeHandler_IHM
;
...
...
CGoGN/include/Algo/Import/importPlyData.h
View file @
ed1d2878
...
...
@@ -31,10 +31,20 @@
#include "Algo/Import/ply.h"
#ifdef WIN32
#ifndef CGoGN_ALGO_API
#if defined CGoGN_ALGO_DLL_EXPORT
#define CGoGN_ALGO_API __declspec(dllexport)
#else
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#endif
namespace
CGoGN
{
class
PlyImportData
class
CGoGN_ALGO_API
PlyImportData
{
public:
...
...
CGoGN/include/Algo/MC/marchingcube.hpp
View file @
ed1d2878
...
...
@@ -1182,7 +1182,7 @@ void MarchingCube<DataType, Windowing, PFP>::removeFacesOfBoundary(VertexAttribu
DartMarker
<
L_MAP
>
mf
(
*
m_map
);
for
(
Dart
d
=
m_map
->
begin
();
d
!=
m_map
->
end
();)
// next done inside loop because of deleteFace
{
if
(
!
mf
.
isMarked
(
d
)
&&
!
m_map
->
isBoundaryMarked
2
(
d
))
if
(
!
mf
.
isMarked
(
d
)
&&
!
m_map
->
isBoundaryMarked
<
2
>
(
d
))
{
Dart
dd
=
d
;
Dart
e
=
m_map
->
phi1
(
d
);
...
...
CGoGN/include/Algo/MC/tables.h
View file @
ed1d2878
...
...
@@ -26,6 +26,18 @@
#define __MC_TABLE__
#include "type.h"
#ifdef WIN32
#ifndef CGoGN_ALGO_API
#if defined CGoGN_ALGO_DLL_EXPORT
#define CGoGN_ALGO_API __declspec(dllexport)
#else
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#endif
namespace
CGoGN
{
...
...
@@ -47,7 +59,7 @@ namespace MC
* file. It can not be included in the marching-cube files
* because it is template
*/
class
accelMCTable
class
CGoGN_ALGO_API
accelMCTable
{
public:
/**
...
...
CGoGN/include/Algo/Render/GL2/mapRender.h
View file @
ed1d2878
...
...
@@ -42,6 +42,16 @@
// forward definition
namespace
CGoGN
{
namespace
Utils
{
class
GLSLShader
;
}
}
#ifdef WIN32
#ifndef CGoGN_ALGO_API
#if defined CGoGN_ALGO_DLL_EXPORT
#define CGoGN_ALGO_API __declspec(dllexport)
#else
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#endif
namespace
CGoGN
{
...
...
@@ -65,7 +75,7 @@ enum drawingType
SIZE_BUFFER
}
;
class
MapRender
class
CGoGN_ALGO_API
MapRender
{
protected:
/**
...
...
CGoGN/include/Algo/Render/GL2/topoPrimalRender.hpp
View file @
ed1d2878
...
...
@@ -469,7 +469,7 @@ void TopoPrimalRender<PFP>::updateData(MAP& map, const VertexAttribute<VEC3, MAP
*
positionDartBuf
++
=
P
;
*
positionDartBuf
++
=
PP
;
if
(
map
.
isBoundaryMarked
2
(
d
))
if
(
map
.
isBoundaryMarked
<
2
>
(
d
))
{
*
colorDartBuf
++
=
m_boundaryDartsColor
;
*
colorDartBuf
++
=
m_boundaryDartsColor
;
...
...
@@ -488,7 +488,7 @@ void TopoPrimalRender<PFP>::updateData(MAP& map, const VertexAttribute<VEC3, MAP
*
positionDartBuf
++
=
QQ
;
Dart
dx
=
map
.
phi2
(
d
);
if
(
map
.
isBoundaryMarked
2
(
dx
))
if
(
map
.
isBoundaryMarked
<
2
>
(
dx
))
{
*
colorDartBuf
++
=
m_boundaryDartsColor
;
*
colorDartBuf
++
=
m_boundaryDartsColor
;
...
...
CGoGN/include/Algo/Render/GL2/topoRender.h
View file @
ed1d2878
...
...
@@ -39,6 +39,16 @@
#include "Utils/Shaders/shaderSimpleColor.h"
#ifdef WIN32
#ifndef CGoGN_ALGO_API
#if defined CGoGN_ALGO_DLL_EXPORT
#define CGoGN_ALGO_API __declspec(dllexport)
#else
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#endif
namespace
CGoGN
{
...
...
@@ -52,10 +62,7 @@ namespace GL2
{
class
TopoGenRender
class
CGoGN_ALGO_API
TopoGenRender
{
protected:
/**
...
...
CGoGN/include/Container/attributeContainer.h
View file @
ed1d2878
...
...
@@ -32,6 +32,14 @@
#include <vector>
#include <map>
#ifdef WIN32
#if defined CGoGN_CONTAINER_DLL_EXPORT
#define CGoGN_CONTAINER_API __declspec(dllexport)
#else
#define CGoGN_CONTAINER_API __declspec(dllimport)
#endif
#endif
namespace
CGoGN
{
...
...
@@ -53,7 +61,8 @@ public:
* All the attributes always have the same size and
* the management of holes is shared by all attributes
*/
class
AttributeContainer
class
CGoGN_CONTAINER_API
AttributeContainer
{
public:
/**
...
...
@@ -389,44 +398,44 @@ public:
/**
* initialize a line of the container (an element of each attribute)
*/
void
initLine
(
unsigned
int
index
);
inline
void
initLine
(
unsigned
int
index
);
/**
* initialize all markers of a line of the container
*/
void
initMarkersOfLine
(
unsigned
int
index
);
inline
void
initMarkersOfLine
(
unsigned
int
index
);
/**
* copy the content of line src in line dst
*/
void
copyLine
(
unsigned
int
dstIndex
,
unsigned
int
srcIndex
);
inline
void
copyLine
(
unsigned
int
dstIndex
,
unsigned
int
srcIndex
);
/**
* increment the ref counter of the given line
* @param index index of the line
*/
void
refLine
(
unsigned
int
index
);
inline
void
refLine
(
unsigned
int
index
);
/**
* decrement the ref counter of the given line
* @param index index of the line
* @return true if the line was removed
*/
bool
unrefLine
(
unsigned
int
eltIdx
);
inline
bool
unrefLine
(
unsigned
int
eltIdx
);
/**
* get the number of refs of the given line
* @param index index of the line
* @return number of refs of the line
*/
unsigned
int
getNbRefs
(
unsigned
int
index
)
const
;
inline
unsigned
int
getNbRefs
(
unsigned
int
index
)
const
;
/**
* set the number of refs of the given line
* @param index index of the line
* @param nb number of refs
*/
void
setNbRefs
(
unsigned
int
eltIdx
,
unsigned
int
nb
);
inline
void
setNbRefs
(
unsigned
int
eltIdx
,
unsigned
int
nb
);
/**************************************
* ATTRIBUTES MANAGEMENT *
...
...
@@ -435,12 +444,12 @@ public:
/**
* copy the data of attribute src in attribute dst (type has to be the same)
*/
bool
copyAttribute
(
unsigned
int
dstIndex
,
unsigned
int
srcIndex
);
inline
bool
copyAttribute
(
unsigned
int
dstIndex
,
unsigned
int
srcIndex
);
/**
* swap the data of attribute 1 with attribute 2 (type has to be the same)
*/
bool
swapAttributes
(
unsigned
int
index1
,
unsigned
int
index2
);
inline
bool
swapAttributes
(
unsigned
int
index1
,
unsigned
int
index2
);
/**************************************
* ATTRIBUTES DATA ACCESS *
...
...
@@ -455,7 +464,7 @@ public:
template
<
typename
T
>
AttributeMultiVector
<
T
>*
getDataVector
(
unsigned
int
attrIndex
);
AttributeMultiVectorGen
*
getVirtualDataVector
(
unsigned
int
attrIndex
);
inline
AttributeMultiVectorGen
*
getVirtualDataVector
(
unsigned
int
attrIndex
);
/**
...
...
@@ -465,7 +474,7 @@ public:
template
<
typename
T
>
AttributeMultiVector
<
T
>*
getDataVector
(
const
std
::
string
&
attribName
);
AttributeMultiVectorGen
*
getVirtualDataVector
(
const
std
::
string
&
attribName
);
inline
AttributeMultiVectorGen
*
getVirtualDataVector
(
const
std
::
string
&
attribName
);
/**
* get a given element of a given attribute
...
...
@@ -541,8 +550,504 @@ public:
};
}
// namespace CGoGN
#include "attributeContainer.hpp"
#endif
///**
//* Container for AttributeMultiVectors
//* All the attributes always have the same size and
//* the management of holes is shared by all attributes
//*/
//class CGoGN_CONTAINTER_API AttributeContainer
//{
//public:
// /**
// * constante d'attribut inconnu
// */
// static const unsigned int UNKNOWN = 0xffffffff;
//
// /**
// * Taille du bloc
// */
// // static const unsigned int BlockSize = _BLOCKSIZE_;
//
//protected:
// /**
// * vector of pointers to AttributeMultiVectors
// */
// std::vector<AttributeMultiVectorGen*> m_tableAttribs;
//
// /**
// * vector of pointers to AttributeMultiVectors of MarkerBool
// */
// std::vector<AttributeMultiVector<MarkerBool>*> m_tableMarkerAttribs;
//
// /**
// * vector of free indices in the vector of AttributeMultiVectors
// */
// std::vector<unsigned int> m_freeIndices;
//
// /**
// * vector of pointers to HoleBlockRef -> structure that manages holes and refs
// */
// std::vector<HoleBlockRef*> m_holesBlocks;
//
// /**
// * vector of indices of blocks that have free space
// */
// std::vector<unsigned int> m_tableBlocksWithFree;
//
// /**
// * vector of indices of blocks that are empty
// */
// std::vector<unsigned int> m_tableBlocksEmpty;
//
// ContainerBrowser* m_currentBrowser;
//
// /**
// * orbit of the container
// */
// unsigned int m_orbit;
//
// /**
// * number of attributes
// */
// unsigned int m_nbAttributes;
//
// /**
// * counter for attributes without name
// */
// unsigned int m_nbUnknown;
//
// /**
// * size (number of elts) of the container
// */
// unsigned int m_size;
//
// /**
// * size of the container with holes
// */
// unsigned int m_maxSize;
//
// /**
// * memory cost of each line
// */
// unsigned int m_lineCost;
//
// /**
// * map pointer (shared for all container of the same map) for attribute registration
// */
// std::map<std::string, RegisteredBaseAttribute*>* m_attributes_registry_map;
//
//public:
// CGoGN_XX_API AttributeContainer();
//
// CGoGN_XX_API ~AttributeContainer();
//
// unsigned int getOrbit() const;
//
// void setOrbit(unsigned int orbit);
//
// void setRegistry(std::map<std::string, RegisteredBaseAttribute*>* re);
//
// void setContainerBrowser(ContainerBrowser* bro) { m_currentBrowser = bro; }
//
// bool hasBrowser() { return m_currentBrowser != NULL; }
//
// /**************************************
// * BASIC FEATURES *
// **************************************/
//
// /**
// * add a new attribute to the container
// * @param T (template) type of the new attribute
// * @param attribName name of the new attribute
// * @return pointer to the new AttributeMultiVector
// */
// template <typename T>
// AttributeMultiVector<T>* addAttribute(const std::string& attribName);
//
// /// special version for marker
// CGoGN_XX_API AttributeMultiVector<MarkerBool>* addMarkerAttribute(const std::string& attribName);
//
//
// /**
// * add a new attribute to the container
// * @param typeName type of the new attribute in a string
// * @param attribName name of the new attribute
// * @return pointer to the new AttributeMultiVectorGen (unknown type inside)
// */
// CGoGN_XX_API AttributeMultiVectorGen* addAttribute(const std::string& typeName, const std::string& attribName);
//
//
//protected:
// /**
// * add a new attribute with a given index (for load only)
// * @param T (template) type of the new attribute
// * @param attribName name of the new attribute
// * @param typeName name of the new attribute's type
// * @param index index of the new attribute
// */
// template <typename T>
// void addAttribute(const std::string& attribName, const std::string& typeName, unsigned int index);
//
//public:
// /**
// * Remove an attribute (destroys data)
// * @param attribName name of the attribute to remove
// * @return removed or not
// */
// template <typename T>
// bool removeAttribute(const std::string& attribName);
//
// CGoGN_XX_API bool removeMarkerAttribute(const std::string& attribName);
//
// /**
// * Remove an attribute (destroys data)
// * @param index index of the attribute to remove
// * @return removed or not
// */
// template <typename T>
// bool removeAttribute(unsigned int index);
//
// /**************************************
// * INFO ABOUT THE CONTAINER *
// **************************************/
//
// /**
// * Number of attributes of the container
// */
// unsigned int getNbAttributes() const;
//
// /**
// * Size of the container (number of lines)
// */
// unsigned int size() const;
//
// /**
// * Capacity of the container (number of lines including holes)
// */
// unsigned int capacity() const;
//
// /**
// * Total memory cost of container
// */
// unsigned int memoryTotalSize() const;
//
// /**
// * Memory cost of every used line
// */
// unsigned int memorySize() const;
//
// /**
// * is the line used in the container
// */
// inline bool used(unsigned int index) const;
//
// /**
// * @brief check if container contain marker attribute
// */
// CGoGN_XX_API bool hasMarkerAttribute() const;
//
// /**************************************
// * CONTAINER TRAVERSAL *
// **************************************/
//
// /**
// * return the index of the first line of the container
// */
// unsigned int begin() const;
//
// /**
// * return the index after the last line of the container
// */
// unsigned int end() const;
//
// /**
// * get the index of the line after it in the container
// * MUST BE USED INSTEAD OF ++ !
// */
// void next(unsigned int &it) const;
//
//