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
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
01480434
Commit
01480434
authored
Feb 28, 2015
by
Thery Sylvain
Committed by
Sylvain Thery
Mar 03, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
back to mac osX
parent
236ada28
Changes
39
Hide whitespace changes
Inline
Side-by-side
Showing
39 changed files
with
77 additions
and
154 deletions
+77
-154
CGoGN/include/Algo/Histogram/histogram.h
CGoGN/include/Algo/Histogram/histogram.h
+2
-0
CGoGN/include/Algo/ImplicitHierarchicalMesh/ihm3.h
CGoGN/include/Algo/ImplicitHierarchicalMesh/ihm3.h
+2
-0
CGoGN/include/Algo/Import/importPlyData.h
CGoGN/include/Algo/Import/importPlyData.h
+2
-0
CGoGN/include/Algo/MC/tables.h
CGoGN/include/Algo/MC/tables.h
+2
-0
CGoGN/include/Algo/Render/GL2/mapRender.h
CGoGN/include/Algo/Render/GL2/mapRender.h
+2
-0
CGoGN/include/Algo/Render/GL2/topoRender.h
CGoGN/include/Algo/Render/GL2/topoRender.h
+2
-0
CGoGN/include/Container/attributeContainer.h
CGoGN/include/Container/attributeContainer.h
+3
-1
CGoGN/include/Geometry/basic.h
CGoGN/include/Geometry/basic.h
+1
-1
CGoGN/include/Geometry/vector_gen.hpp
CGoGN/include/Geometry/vector_gen.hpp
+1
-1
CGoGN/include/Topology/dll.h
CGoGN/include/Topology/dll.h
+3
-1
CGoGN/include/Topology/generic/attributeHandler.hpp
CGoGN/include/Topology/generic/attributeHandler.hpp
+2
-1
CGoGN/include/Topology/generic/mapCommon.hpp
CGoGN/include/Topology/generic/mapCommon.hpp
+1
-0
CGoGN/include/Topology/generic/traversor/traversorFactory.h
CGoGN/include/Topology/generic/traversor/traversorFactory.h
+6
-0
CGoGN/include/Topology/generic/traversor/traversorFactory.hpp
...N/include/Topology/generic/traversor/traversorFactory.hpp
+0
-6
CGoGN/include/Topology/gmap/gmap3.hpp
CGoGN/include/Topology/gmap/gmap3.hpp
+1
-1
CGoGN/include/Utils/Qt/qtQGLV.h
CGoGN/include/Utils/Qt/qtQGLV.h
+2
-0
CGoGN/include/Utils/Qt/qtQGLV_glw.h
CGoGN/include/Utils/Qt/qtQGLV_glw.h
+2
-0
CGoGN/include/Utils/Qt/qtSimple.h
CGoGN/include/Utils/Qt/qtSimple.h
+2
-0
CGoGN/include/Utils/Qt/qtcolorschooser.h
CGoGN/include/Utils/Qt/qtcolorschooser.h
+2
-0
CGoGN/include/Utils/Qt/qtgl.h
CGoGN/include/Utils/Qt/qtgl.h
+2
-0
CGoGN/include/Utils/Qt/qtpopup.h
CGoGN/include/Utils/Qt/qtpopup.h
+2
-0
CGoGN/include/Utils/dll.h
CGoGN/include/Utils/dll.h
+3
-1
CGoGN/src/Utils/svg.cpp
CGoGN/src/Utils/svg.cpp
+1
-1
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+3
-2
SCHNApps/Plugins/schnapps/CMakeLists.txt
SCHNApps/Plugins/schnapps/CMakeLists.txt
+0
-43
SCHNApps/include/camera.h
SCHNApps/include/camera.h
+1
-7
SCHNApps/include/cellSelector.h
SCHNApps/include/cellSelector.h
+2
-8
SCHNApps/include/colorComboBox.h
SCHNApps/include/colorComboBox.h
+1
-8
SCHNApps/include/controlDock_cameraTab.h
SCHNApps/include/controlDock_cameraTab.h
+1
-7
SCHNApps/include/controlDock_mapTab.h
SCHNApps/include/controlDock_mapTab.h
+1
-8
SCHNApps/include/controlDock_pluginTab.h
SCHNApps/include/controlDock_pluginTab.h
+1
-8
SCHNApps/include/dialogList.h
SCHNApps/include/dialogList.h
+1
-7
SCHNApps/include/dll.h
SCHNApps/include/dll.h
+9
-0
SCHNApps/include/mapHandler.h
SCHNApps/include/mapHandler.h
+1
-7
SCHNApps/include/plugin.h
SCHNApps/include/plugin.h
+1
-8
SCHNApps/include/plugin_interaction.h
SCHNApps/include/plugin_interaction.h
+6
-6
SCHNApps/include/schnapps.h
SCHNApps/include/schnapps.h
+1
-7
SCHNApps/include/slot_debug.h
SCHNApps/include/slot_debug.h
+1
-7
SCHNApps/include/view.h
SCHNApps/include/view.h
+1
-7
No files found.
CGoGN/include/Algo/Histogram/histogram.h
View file @
01480434
...
...
@@ -41,6 +41,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Algo/ImplicitHierarchicalMesh/ihm3.h
View file @
01480434
...
...
@@ -38,6 +38,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Algo/Import/importPlyData.h
View file @
01480434
...
...
@@ -39,6 +39,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Algo/MC/tables.h
View file @
01480434
...
...
@@ -35,6 +35,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
...
...
CGoGN/include/Algo/Render/GL2/mapRender.h
View file @
01480434
...
...
@@ -50,6 +50,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Algo/Render/GL2/topoRender.h
View file @
01480434
...
...
@@ -47,6 +47,8 @@
#define CGoGN_ALGO_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_ALGO_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Container/attributeContainer.h
View file @
01480434
...
...
@@ -38,6 +38,8 @@
#else
#define CGoGN_CONTAINER_API __declspec(dllimport)
#endif
#else
#define CGoGN_CONTAINER_API
#endif
namespace
CGoGN
...
...
@@ -1050,4 +1052,4 @@ public:
// CGoGN_XX_API void dumpByLines() const;
//
//
//};
\ No newline at end of file
//};
CGoGN/include/Geometry/basic.h
View file @
01480434
...
...
@@ -94,7 +94,7 @@ typename VEC::DATA_TYPE angle(const VEC& a, const VEC& b)
template
<
typename
VEC3
>
typename
VEC3
::
DATA_TYPE
triangleArea
(
const
VEC3
&
p1
,
const
VEC3
&
p2
,
const
VEC3
&
p3
)
{
return
VEC3
::
DATA_TYPE
(
0.5
*
((
p2
-
p1
)
^
(
p3
-
p1
)).
norm
());
return
typename
VEC3
::
DATA_TYPE
(
0.5
*
((
p2
-
p1
)
^
(
p3
-
p1
)).
norm
());
}
// normal of the plane spanned by 3 points in 3D
...
...
CGoGN/include/Geometry/vector_gen.hpp
View file @
01480434
...
...
@@ -273,7 +273,7 @@ inline Vector<DIM, T> Vector<DIM, T>::operator/(T2 a) const
Vector
<
DIM
,
T
>
res
;
T
aa
=
T
(
a
);
for
(
unsigned
int
i
=
0
;
i
<
DIM
;
++
i
)
res
[
i
]
=
m_data
[
i
]
/
T
(
a
)
;
res
[
i
]
=
m_data
[
i
]
/
aa
;
return
res
;
}
...
...
CGoGN/include/Topology/dll.h
View file @
01480434
...
...
@@ -31,4 +31,6 @@
#define CGoGN_TOPO_API __declspec(dllimport)
#endif
#endif
#endif
\ No newline at end of file
#else
#define CGoGN_TOPO_API
#endif
CGoGN/include/Topology/generic/attributeHandler.hpp
View file @
01480434
...
...
@@ -23,6 +23,8 @@
*******************************************************************************/
#include "Utils/threadbarrier.h"
#include "Algo/Topo/embedding.h"
#include <vector>
...
...
@@ -196,7 +198,6 @@ inline T& AttributeHandler<T, ORB, MAP>::operator[](Cell<ORB> c)
if
(
a
==
EMBNULL
)
a
=
Algo
::
Topo
::
setOrbitEmbeddingOnNewCell
(
*
m_map
,
c
)
;
return
m_attrib
->
operator
[](
a
)
;
}
...
...
CGoGN/include/Topology/generic/mapCommon.hpp
View file @
01480434
...
...
@@ -22,6 +22,7 @@
* *
*******************************************************************************/
#include "Topology/generic/traversor/traversorFactory.h"
namespace
CGoGN
{
...
...
CGoGN/include/Topology/generic/traversor/traversorFactory.h
View file @
01480434
...
...
@@ -25,6 +25,12 @@
#ifndef __TRAVERSORFACTORY_H__
#define __TRAVERSORFACTORY_H__
#include "Topology/generic/traversor/traversor1Virt.h"
#include "Topology/generic/traversor/traversor2Virt.h"
#include "Topology/generic/traversor/traversor3Virt.h"
#include "Topology/generic/traversor/traversorCellVirt.h"
#include "Topology/generic/traversor/traversorDoO.h"
namespace
CGoGN
{
...
...
CGoGN/include/Topology/generic/traversor/traversorFactory.hpp
View file @
01480434
...
...
@@ -22,12 +22,6 @@
* *
*******************************************************************************/
#include "Topology/generic/traversor/traversor1Virt.h"
#include "Topology/generic/traversor/traversor2Virt.h"
#include "Topology/generic/traversor/traversor3Virt.h"
#include "Topology/generic/traversor/traversorCellVirt.h"
#include "Topology/generic/traversor/traversorDoO.h"
namespace
CGoGN
{
...
...
CGoGN/include/Topology/gmap/gmap3.hpp
View file @
01480434
...
...
@@ -857,7 +857,7 @@ bool GMap3<MAP_IMPL>::isBoundaryAdjacentVolume(Dart d) const
for
(
unsigned
int
i
=
0
;
i
<
visitedFaces
.
size
();
++
i
)
{
if
(
isBoundaryMarked
<
3
>
(
beta3
(
visitedFaces
[
i
])))
if
(
this
->
isBoundaryMarked
<
3
>
(
beta3
(
visitedFaces
[
i
])))
return
true
;
Dart
e
=
visitedFaces
[
i
]
;
...
...
CGoGN/include/Utils/Qt/qtQGLV.h
View file @
01480434
...
...
@@ -46,6 +46,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#else
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Utils/Qt/qtQGLV_glw.h
View file @
01480434
...
...
@@ -46,6 +46,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#else
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Utils/Qt/qtSimple.h
View file @
01480434
...
...
@@ -47,6 +47,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Utils/Qt/qtcolorschooser.h
View file @
01480434
...
...
@@ -39,6 +39,8 @@
#else
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Utils/Qt/qtgl.h
View file @
01480434
...
...
@@ -43,6 +43,8 @@
#else
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Utils/Qt/qtpopup.h
View file @
01480434
...
...
@@ -37,6 +37,8 @@
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#endif
#else
#define CGoGN_UTILS_API
#endif
namespace
CGoGN
...
...
CGoGN/include/Utils/dll.h
View file @
01480434
...
...
@@ -31,4 +31,6 @@
#define CGoGN_UTILS_API __declspec(dllimport)
#endif
#endif
#endif
\ No newline at end of file
#else
#define CGoGN_UTILS_API
#endif
CGoGN/src/Utils/svg.cpp
View file @
01480434
...
...
@@ -39,7 +39,7 @@ namespace Utils
namespace
SVG
{
#define uint32 unsigned int
typedef
unsigned
int
uint32
;
const
std
::
vector
<
Geom
::
Vec3f
>&
SvgObj
::
vertices
()
const
{
...
...
SCHNApps/CMakeLists.txt
View file @
01480434
...
...
@@ -95,9 +95,10 @@ endif()
if
(
WIN32
)
LIST
(
APPEND CMAKE_CXX_FLAGS
"/W3"
)
else
()
LIST
(
APPEND CMAKE_CXX_FLAGS
"-Wall -fPIC -std=c++11"
)
if
(
APPLE
)
LIST
(
APPEND CMAKE_CXX_FLAGS
"-Wno-deprecated -Wno-overloaded-virtual"
)
LIST
(
APPEND CMAKE_CXX_FLAGS
"-Wall -fPIC -std=c++11 -Wno-deprecated -Wno-overloaded-virtual"
)
else
()
LIST
(
APPEND CMAKE_CXX_FLAGS
"-Wall -fPIC -std=c++11"
)
endif
()
endif
()
...
...
SCHNApps/Plugins/schnapps/CMakeLists.txt
View file @
01480434
...
...
@@ -80,46 +80,3 @@ TARGET_LINK_LIBRARIES( SCHNAppsLib
${
CGoGN_LIBS
}
${
EXT_LIBS
}
)
INCLUDE_DIRECTORIES
(
${
PLUGIN_ROOT_DIR
}
/include
${
CMAKE_CURRENT_BINARY_DIR
}
)
file
(
GLOB_RECURSE
PLUGIN_FILES
${
PLUGIN_ROOT_DIR
}
/src/*.cpp
${
PLUGIN_ROOT_DIR
}
/include/*.h
${
PLUGIN_ROOT_DIR
}
/include/*.hpp
)
file
(
GLOB_RECURSE
PLUGIN_UI_FILES
${
PLUGIN_ROOT_DIR
}
/forms/*.ui
)
SET
(
PLUGIN_QOBJECT_FILES
${
PLUGIN_ROOT_DIR
}
/include/surface_selection.h
${
PLUGIN_ROOT_DIR
}
/include/surface_selection_dockTab.h
)
include
(
${
SCHNApps_ROOT_DIR
}
/Plugins/plugins_cmake.txt
)
SCHNApps/include/camera.h
View file @
01480434
...
...
@@ -6,13 +6,7 @@
#include <QGLViewer/manipulatedCameraFrame.h>
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
{
...
...
SCHNApps/include/cellSelector.h
View file @
01480434
...
...
@@ -8,17 +8,11 @@
#include "Topology/generic/dart.h"
#include "Topology/generic/genericmap.h"
#include "Topology/generic/cellmarker.h"
#include "Topology/generic/traversor/traversorCell.h"
#include "slot_debug.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
{
...
...
SCHNApps/include/colorComboBox.h
View file @
01480434
...
...
@@ -3,14 +3,7 @@
#include <QComboBox>
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
class
QColor
;
class
QWidget
;
...
...
SCHNApps/include/controlDock_cameraTab.h
View file @
01480434
...
...
@@ -3,13 +3,7 @@
#include "ui_controlDock_CameraTabWidget.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
{
...
...
SCHNApps/include/controlDock_mapTab.h
View file @
01480434
...
...
@@ -6,14 +6,7 @@
#include "mapHandler.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
{
...
...
SCHNApps/include/controlDock_pluginTab.h
View file @
01480434
...
...
@@ -3,14 +3,7 @@
#include "ui_controlDock_PluginTabWidget.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
{
...
...
SCHNApps/include/dialogList.h
View file @
01480434
...
...
@@ -7,13 +7,7 @@
#include <QListWidget>
#include <QListWidgetItem>
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
{
...
...
SCHNApps/include/dll.h
0 → 100644
View file @
01480434
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#else
#define SCHNAPPS_API
#endif
SCHNApps/include/mapHandler.h
View file @
01480434
...
...
@@ -22,13 +22,7 @@
#include "Utils/vbo.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
{
...
...
SCHNApps/include/plugin.h
View file @
01480434
...
...
@@ -8,14 +8,7 @@
#include "types.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
{
...
...
SCHNApps/include/plugin_interaction.h
View file @
01480434
...
...
@@ -19,8 +19,8 @@ class SCHNAPPS_API PluginInteraction : public Plugin
friend
class
View
;
public:
inline
PluginInteraction
();
inline
virtual
~
PluginInteraction
();
PluginInteraction
();
virtual
~
PluginInteraction
();
public
slots
:
inline
const
QList
<
View
*>&
getLinkedViews
()
const
{
return
l_views
;
}
...
...
@@ -47,16 +47,16 @@ private:
* MANAGE LINKED VIEWS
*********************************************************/
inline
void
linkView
(
View
*
view
);
inline
void
unlinkView
(
View
*
view
);
void
linkView
(
View
*
view
);
void
unlinkView
(
View
*
view
);
/*********************************************************
* MANAGE SHADERS
*********************************************************/
protected:
inline
void
registerShader
(
Utils
::
GLSLShader
*
shader
);
inline
void
unregisterShader
(
Utils
::
GLSLShader
*
shader
);
void
registerShader
(
Utils
::
GLSLShader
*
shader
);
void
unregisterShader
(
Utils
::
GLSLShader
*
shader
);
protected:
QList
<
View
*>
l_views
;
...
...
SCHNApps/include/schnapps.h
View file @
01480434
...
...
@@ -2,13 +2,7 @@
#define _SCHNAPPS_H_
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
#include "ui_schnapps.h"
...
...
SCHNApps/include/slot_debug.h
View file @
01480434
...
...
@@ -4,13 +4,7 @@
#include <iostream>
#include <string>
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
{
...
...
SCHNApps/include/view.h
View file @
01480434
...
...
@@ -14,13 +14,7 @@
#include "Utils/drawer.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "dll.h"
namespace
CGoGN
...
...
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