Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
056eeaea
Commit
056eeaea
authored
Mar 22, 2012
by
julien
Browse files
Merge cgogn.unistra.fr:CGoGN
Conflicts: include/Algo/Geometry/feature.h include/Algo/Geometry/feature.hpp
parents
5a28152a
93451db0
Changes
433
Hide whitespace changes
Inline
Side-by-side
Apps/CMakeLists.txt
View file @
056eeaea
...
...
@@ -5,12 +5,26 @@ SET(EXECUTABLE_OUTPUT_PATH ${CGoGN_ROOT_DIR}/bin)
#INCLUDE(${QT_USE_FILE})
#ADD_DEFINITIONS(${QT_DEFINITIONS})
SET
(
CGoGN_LIBS_R topology algo container utils
)
IF
(
ONELIB
)
SET
(
CGoGN_LIBS_R cgogn
)
ELSE
(
ONELIB
)
SET
(
CGoGN_LIBS_R topology algo container utils
)
ENDIF
(
ONELIB
)
IF
(
WIN32
)
SET
(
CGoGN_LIBS_D topology algo container utils
)
# libs have same name but in different place in Visual
# libs have same name but in different place in Visual
IF
(
ONELIB
)
SET
(
CGoGN_LIBS_D cgogn
)
ELSE
(
ONELIB
)
SET
(
CGoGN_LIBS_D topology algo container utils
)
ENDIF
(
ONELIB
)
ELSE
(
WIN32
)
SET
(
CGoGN_LIBS_D topologyD algoD containerD utilsD
)
IF
(
ONELIB
)
SET
(
CGoGN_LIBS_D cgognD
)
ELSE
(
ONELIB
)
SET
(
CGoGN_LIBS_D topologyD algoD containerD utilsD
)
ENDIF
(
ONELIB
)
IF
(
WITH_QT
)
add_subdirectory
(
Examples/Debug
)
ENDIF
(
WITH_QT
)
...
...
@@ -20,5 +34,6 @@ IF (WITH_QT)
add_subdirectory
(
Tuto
)
add_subdirectory
(
Examples/Release
)
ENDIF
(
WITH_QT
)
add_subdirectory
(
Examples/Tests
)
Apps/Examples/Debug/CMakeLists.txt
View file @
056eeaea
...
...
@@ -72,3 +72,9 @@ QT4_WRAP_CPP( clipping_moc ../clipping.h )
add_executable
(
clippingD ../clipping.cpp
${
clipping_ui
}
${
clipping_moc
}
)
target_link_libraries
(
clippingD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
volumeExplorer_ui ../volumeExplorer.ui
)
QT4_WRAP_CPP
(
volumeExplorer_moc ../volumeExplorer.h
)
add_executable
(
volumeExplorerD ../volumeExplorer.cpp
${
volumeExplorer_ui
}
${
volumeExplorer_moc
}
)
target_link_libraries
(
volumeExplorerD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
\ No newline at end of file
Apps/Examples/Release/CMakeLists.txt
View file @
056eeaea
...
...
@@ -64,3 +64,10 @@ QT4_WRAP_CPP( clipping_moc ../clipping.h )
add_executable
(
clipping ../clipping.cpp
${
clipping_ui
}
${
clipping_moc
}
)
target_link_libraries
(
clipping
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
volumeExplorer_ui ../volumeExplorer.ui
)
QT4_WRAP_CPP
(
volumeExplorer_moc ../volumeExplorer.h
)
add_executable
(
volumeExplorer ../volumeExplorer.cpp
${
volumeExplorer_ui
}
${
volumeExplorer_moc
}
)
target_link_libraries
(
volumeExplorer
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
\ No newline at end of file
Apps/Examples/Tests/Algo_Geom_inclusion.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/Tests/Geom_inclusion.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/Tests/concave_rendering.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/Tests/concave_rendering.h
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/Tests/test_compact.cpp
View file @
056eeaea
...
...
@@ -103,7 +103,7 @@ void test_compact_map(const std::string& name)
do
// mark all edges incident to vertex;
{
dm
.
markOrbit
(
EDGE
,
e
);
e
=
myMap
.
alpha
1
(
e
);
e
=
myMap
.
phi2_
1
(
e
);
}
while
(
e
!=
d
);
}
i
++
;
...
...
Apps/Examples/clipping.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/clipping.h
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
@@ -99,9 +99,6 @@ public:
Utils
::
ShaderSimpleColor
*
m_shader
;
Utils
::
Drawer
*
influence_area
;
Utils
::
Drawer
*
chips_area
;
Geom
::
Vec3f
m_coeffTopoExplod
;
Geom
::
Vec3f
gPosObj
;
float
gWidthObj
;
...
...
Apps/Examples/decimationVolumique.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/decimationVolumique.h
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/extrusionView.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/extrusionView.h
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/frame_manip.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/frame_manip.h
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/miniTest.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/polyhedronsView.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/polyhedronsView.h
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Apps/Examples/scene.cpp
View file @
056eeaea
/*******************************************************************************
* CGoGN: Combinatorial and Geometric modeling with Generic N-dimensional Maps *
* version 0.1 *
* Copyright (C) 2009-201
1
, IGG Team, LSIIT, University of Strasbourg *
* Copyright (C) 2009-201
2
, 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 *
...
...
@@ -17,7 +17,7 @@
* 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
-
stra
sbg
.fr/ *
* Web site: http://cgogn.u
ni
stra.fr/
*
* Contact information: cgogn@unistra.fr *
* *
*******************************************************************************/
...
...
Prev
1
2
3
4
5
…
22
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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