Skip to content

GitLab

Création d'un compte pour un collaborateur extérieur au laboratoire depuis l'intranet ICube : https://intranet.icube.unistra.fr/fr/labs/member/profile

Commit 4676994c authored by Sylvain Thery's avatar Sylvain Thery
Browse files

Merge branch 'develop' into 'develop' 

Develop

See merge request !49
parents 2205b655 e8571f58
Hide whitespace changes
Inline Side-by-side
Apps/CMakeLists.txt
View file @ 4676994c
project(Apps)
IF (CGoGN_ONELIB)
SET(CGoGN_LIBS cgogn)
ELSE ()
......
Apps/Examples/CMakeLists.txt
View file @ 4676994c
......@@ -9,54 +9,56 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
#define exec to compile
QT4_WRAP_CPP( frame_manip_moc frame_manip.h )
qt_wrap_cpp( frame_manip_moc frame_manip.h )
add_executable( frame_manip frame_manip.cpp ${frame_manip_moc} )
target_link_libraries( frame_manip ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
#need to define that we use Qt (only once per cmake directory!)
qt_use_cgogn_modules(frame_manip)
QT4_WRAP_CPP( texturesExample_moc texturesExample.h )
qt_wrap_cpp( texturesExample_moc texturesExample.h )
add_executable( texturesExample texturesExample.cpp ${texturesExample_moc} )
target_link_libraries( texturesExample ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(simpleMap3_moc simpleMap3.h)
qt_wrap_cpp(simpleMap3_moc simpleMap3.h)
add_executable( simpleMap3 simpleMap3.cpp ${simpleMap3_moc} )
target_link_libraries( simpleMap3 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( simpleGMap2_moc simpleGMap2.h )
qt_wrap_cpp( simpleGMap2_moc simpleGMap2.h )
add_executable( simpleGMap2 simpleGMap2.cpp ${simpleGMap2_moc} )
target_link_libraries( simpleGMap2 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( simpleGMap3_moc simpleGMap3.h )
qt_wrap_cpp( simpleGMap3_moc simpleGMap3.h )
add_executable( simpleGMap3 simpleGMap3.cpp ${simpleGMap3_moc} )
target_link_libraries( simpleGMap3 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( extrusionView_moc extrusionView.h )
qt_wrap_cpp( extrusionView_moc extrusionView.h )
add_executable( extrusionView extrusionView.cpp ${extrusionView_moc} )
target_link_libraries( extrusionView ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( viewer_ui viewer.ui )
QT4_WRAP_CPP( viewer_moc viewer.h )
qt_wrap_ui( viewer_ui viewer.ui )
qt_wrap_cpp( viewer_moc viewer.h )
add_executable( viewer viewer.cpp ${viewer_moc} ${viewer_ui} )
target_link_libraries( viewer ${CGoGN_LIBS} ${NUMERICAL_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( clipping_ui clipping.ui )
QT4_WRAP_CPP( clipping_moc clipping.h )
qt_wrap_ui( clipping_ui clipping.ui )
qt_wrap_cpp( clipping_moc clipping.h )
add_executable( clipping clipping.cpp ${clipping_ui} ${clipping_moc} )
target_link_libraries( clipping ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( volumeExplorer_ui volumeExplorer.ui )
QT4_WRAP_CPP( volumeExplorer_moc volumeExplorer.h )
qt_wrap_ui( volumeExplorer_ui volumeExplorer.ui )
qt_wrap_cpp( volumeExplorer_moc volumeExplorer.h )
add_executable( volumeExplorer volumeExplorer.cpp ${volumeExplorer_ui} ${volumeExplorer_moc} )
target_link_libraries( volumeExplorer ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( mcmesh_ui mcmesh.ui )
QT4_WRAP_CPP( mcmesh_moc mcmesh.h )
qt_wrap_ui( mcmesh_ui mcmesh.ui )
qt_wrap_cpp( mcmesh_moc mcmesh.h )
add_executable( mcmesh mcmesh.cpp ${mcmesh_moc} ${mcmesh_ui} )
target_link_libraries( mcmesh ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( concave_rendering_moc concave_rendering.h )
qt_wrap_cpp( concave_rendering_moc concave_rendering.h )
add_executable( concave_rendering concave_rendering.cpp ${concave_rendering_moc} ${concave_rendering_ui} )
target_link_libraries( concave_rendering ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP( viewerOBJ_moc viewerOBJ.h )
qt_wrap_cpp( viewerOBJ_moc viewerOBJ.h )
add_executable( viewerOBJ viewerOBJ.cpp ${viewerOBJ_moc} )
target_link_libraries( viewerOBJ ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
Apps/Examples/clipping.cpp
View file @ 4676994c
......@@ -26,6 +26,10 @@
#include "Utils/vbo.h"
#include "Utils/static_assert.h"
#include <QColorDialog>
#include <QTimer>
/*******************************************************************************
* MISCELLANOUS
*******************************************************************************/
......
Apps/SandBox/CMakeLists.txt
View file @ 4676994c
......@@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 2.8)
project(SandBox)
add_executable(multi_att multi_att.cpp)
target_link_libraries(multi_att ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
......@@ -14,22 +12,23 @@ IF (CGoGN_WITH_QT)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
QT4_WRAP_CPP(tilings_moc tilings.h)
qt_wrap_cpp(tilings_moc tilings.h)
add_executable(tilings tilings.cpp ${tilings_moc})
target_link_libraries(tilings ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
qt_use_cgogn_modules(tilings)
QT4_WRAP_UI( test_traversor2_ui test_traversor2.ui )
QT4_WRAP_CPP(test_traversor2_moc test_traversor2.h)
qt_wrap_ui( test_traversor2_ui test_traversor2.ui )
qt_wrap_cpp(test_traversor2_moc test_traversor2.h)
add_executable(test_traversor2 test_traversor2.cpp ${test_traversor2_ui} ${test_traversor2_moc})
target_link_libraries(test_traversor2 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
QT4_WRAP_UI( testPlaneCutting_ui testPlaneCutting.ui )
QT4_WRAP_CPP(testPlaneCutting_moc testPlaneCutting.h)
qt_wrap_ui( testPlaneCutting_ui testPlaneCutting.ui )
qt_wrap_cpp(testPlaneCutting_moc testPlaneCutting.h)
add_executable(testPlaneCutting testPlaneCutting.cpp ${testPlaneCutting_ui} ${testPlaneCutting_moc})
target_link_libraries(testPlaneCutting ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
QT4_WRAP_CPP(wallPaper_moc wallPaper.h)
qt_wrap_cpp(wallPaper_moc wallPaper.h)
add_executable(wallPaper wallPaper.cpp ${wallPaper_moc})
target_link_libraries(wallPaper ${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
......@@ -37,13 +36,7 @@ ENDIF()
# Example with Qt
#
#QT4_WRAP_CPP(tuto1_moc tuto1.h)
#qt_wrap_cpp(tuto1_moc tuto1.h)
#add_executable( tuto1 tuto1.cpp ${tuto1_moc})
#target_link_libraries( tuto1 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
#QT4_WRAP_CPP(tuto_mt_moc tuto_mt.h)
#add_executable( tuto_mt tuto_mt.cpp ${tuto_mt_moc})
#target_link_libraries( tuto_mt
# ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} ${Boost_THREAD_LIBRARY})
Apps/Tests/CMakeLists.txt
View file @ 4676994c
......@@ -9,6 +9,7 @@ project(testing)
add_executable( Geom_orientation ./Geom_orientation.cpp)
target_link_libraries( Geom_orientation
${CGoGN_LIBS} ${CGoGN_EXT_LIBS})
qt_use_modules(Geom_orientation Gui OpenGL Xml Svg)
add_executable( Geom_inclusion ./Geom_inclusion.cpp)
target_link_libraries( Geom_inclusion
......
Apps/Tuto/Attributes/CMakeLists.txt
View file @ 4676994c
......@@ -15,8 +15,8 @@ IF(CGoGN_WITH_QT)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
QT4_WRAP_UI(vbo_attribs_ui vbo_attribs.ui)
QT4_WRAP_CPP(vbo_attribs_moc vbo_attribs.h)
qt_wrap_ui(vbo_attribs_ui vbo_attribs.ui)
qt_wrap_cpp(vbo_attribs_moc vbo_attribs.h)
add_executable( vbo_attribs vbo_attribs.cpp ${vbo_attribs_ui} ${vbo_attribs_moc})
target_link_libraries( vbo_attribs ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
......
Apps/Tuto/CMakeLists.txt
View file @ 4676994c
......@@ -2,63 +2,53 @@ cmake_minimum_required(VERSION 2.8)
project(Tutos)
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-overloaded-virtual")
endif()
add_subdirectory(Boundary)
add_subdirectory(Modelling)
add_subdirectory(Markers)
add_subdirectory(Traversals)
add_subdirectory(Attributes)
#define exec to compile
IF (CGoGN_WITH_QT)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
QT4_WRAP_CPP(tuto1_moc tuto1.h)
qt_wrap_cpp(tuto1_moc tuto1.h)
add_executable( tuto1 tuto1.cpp ${tuto1_moc})
target_link_libraries( tuto1
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
qt_use_cgogn_modules(tuto1)
QT4_WRAP_UI( tuto2_ui tuto2.ui )
QT4_WRAP_CPP(tuto2_moc tuto2.h)
qt_wrap_ui( tuto2_ui tuto2.ui )
qt_wrap_cpp(tuto2_moc tuto2.h)
add_executable( tuto2 tuto2.cpp tuto2.h ${tuto2_ui} ${tuto2_moc})
target_link_libraries( tuto2
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_CPP(tuto3_moc tuto3.h)
qt_wrap_cpp(tuto3_moc tuto3.h)
add_executable( tuto3 tuto3.cpp ${tuto3_moc})
target_link_libraries( tuto3
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( tuto4_ui tuto4.ui )
QT4_WRAP_CPP(tuto4_moc tuto4.h)
qt_wrap_ui( tuto4_ui tuto4.ui )
qt_wrap_cpp(tuto4_moc tuto4.h)
add_executable( tuto4 tuto4.cpp ${tuto4_ui} ${tuto4_moc})
target_link_libraries( tuto4
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( tuto5_ui tuto5.ui )
QT4_WRAP_CPP(tuto5_moc tuto5.h)
qt_wrap_ui( tuto5_ui tuto5.ui )
qt_wrap_cpp(tuto5_moc tuto5.h)
add_executable( tuto5 tuto5.cpp ${tuto5_ui} ${tuto5_moc})
target_link_libraries( tuto5
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( tuto_orbits_ui tuto_orbits.ui )
QT4_WRAP_CPP(tuto_orbits_moc tuto_orbits.h)
qt_wrap_ui( tuto_orbits_ui tuto_orbits.ui )
qt_wrap_cpp(tuto_orbits_moc tuto_orbits.h)
add_executable( tuto_orbits tuto_orbits.cpp ${tuto_orbits_ui} ${tuto_orbits_moc})
target_link_libraries( tuto_orbits
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
# QT4_WRAP_CPP(tuto_histo_moc tuto_histo.h)
# qt_wrap_cpp(tuto_histo_moc tuto_histo.h)
# add_executable( tuto_histo tuto_histo.cpp tuto_histo.h ${tuto_histo_ui} ${tuto_histo_moc})
# target_link_libraries( tuto_histo
# ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
# QT4_WRAP_CPP(tp_master_moc tp_master.h)
# qt_wrap_cpp(tp_master_moc tp_master.h)
# add_executable( tp_master tp_master.cpp ${tp_master_moc})
# target_link_libraries( tp_master ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
......@@ -77,3 +67,8 @@ add_executable( tuto_dual3 tuto_dual3.cpp)
target_link_libraries( tuto_dual3
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
add_subdirectory(Boundary)
add_subdirectory(Modelling)
add_subdirectory(Markers)
add_subdirectory(Traversals)
add_subdirectory(Attributes)
\ No newline at end of file
Apps/Tuto/Modelling/CMakeLists.txt
View file @ 4676994c
......@@ -10,15 +10,16 @@ IF (CGoGN_WITH_QT)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
QT4_WRAP_UI( tuto_oper2_ui tuto_oper2.ui )
QT4_WRAP_CPP(tuto_oper2_moc tuto_oper2.h)
qt_wrap_ui( tuto_oper2_ui tuto_oper2.ui )
qt_wrap_cpp(tuto_oper2_moc tuto_oper2.h)
add_executable( tuto_oper2 tuto_oper2.cpp ${tuto_oper2_ui} ${tuto_oper2_moc})
target_link_libraries( tuto_oper2
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( tuto_oper3_ui tuto_oper3.ui )
QT4_WRAP_CPP(tuto_oper3_moc tuto_oper3.h)
qt_wrap_ui( tuto_oper3_ui tuto_oper3.ui )
qt_wrap_cpp(tuto_oper3_moc tuto_oper3.h)
add_executable( tuto_oper3 tuto_oper3.cpp ${tuto_oper3_ui} ${tuto_oper3_moc})
target_link_libraries( tuto_oper3
${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
ENDIF()
\ No newline at end of file
ENDIF()
Apps/Tuto/Traversals/CMakeLists.txt
View file @ 4676994c
......@@ -16,13 +16,13 @@ IF (CGoGN_WITH_QT)
add_executable( traverse_attributes traverse_attributes.cpp)
target_link_libraries( traverse_attributes ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( show_traversors_ui2 show_traversors2.ui )
QT4_WRAP_CPP(show_traversors_moc2 show_traversors2.h)
qt_wrap_ui( show_traversors_ui2 show_traversors2.ui )
qt_wrap_cpp(show_traversors_moc2 show_traversors2.h)
add_executable( show_traversors2 show_traversors2.cpp ${show_traversors_ui2} ${show_traversors_moc2})
target_link_libraries( show_traversors2 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
QT4_WRAP_UI( show_traversors_ui3 show_traversors3.ui )
QT4_WRAP_CPP(show_traversors_moc3 show_traversors3.h)
qt_wrap_ui( show_traversors_ui3 show_traversors3.ui )
qt_wrap_cpp(show_traversors_moc3 show_traversors3.h)
add_executable( show_traversors3 show_traversors3.cpp ${show_traversors_ui3} ${show_traversors_moc3})
target_link_libraries( show_traversors3 ${CGoGN_LIBS} ${CGoGN_EXT_LIBS} )
ENDIF()
Apps/Tuto/tuto5.cpp
View file @ 4676994c
......@@ -33,6 +33,8 @@
#include "Algo/Render/GL2/topo3Render.h"
#include "Algo/Render/SVG/mapSVGRender.h"
#include <QTimer>
MAP myMap;
VertexAttribute<VEC3, MAP> position ;
......
CGoGN/CMakeLists.txt
View file @ 4676994c
......@@ -87,7 +87,7 @@ IF(CGoGN_WITH_QT)
${CGoGN_SRC_DIR}/include/Utils/Qt/qtcolorschooser.h
)
QT4_WRAP_CPP(UTILS_QT_HEADERS_MOC ${utils_qt_headers})
qt_wrap_cpp(UTILS_QT_HEADERS_MOC ${utils_qt_headers})
SET (files_utils_withQt ${files_utils} ${files_utils_qt} ${UTILS_QT_HEADERS_MOC})
ENDIF()
......@@ -108,6 +108,10 @@ link_directories( ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE} )
IF (CGoGN_ONELIB)
IF(CGoGN_WITH_QT)
add_library( cgogn ${files_topology} ${files_container} ${files_algo} ${files_utils_withQt})
qt_use_modules(cgogn Gui OpenGL Xml Svg)
IF(${CGoGN_DESIRED_QT_VERSION} STREQUAL "5")
qt_use_modules(cgogn Widgets)
ENDIF()
ELSE()
add_library( cgogn ${files_topology} ${files_container} ${files_algo} ${files_utils} )
ENDIF()
......@@ -118,6 +122,7 @@ ELSE()
IF (CGoGN_WITH_QT)
add_definitions(-DCGoGN_QT_DLL_EXPORT)
add_library( utils ${files_utils_withQt} )
qt_use_modules(utils Gui OpenGL Xml Svg)
ELSE()
add_library( utils ${files_utils} )
ENDIF()
......
CGoGN/include/Algo/Modelisation/extrusion.hpp
View file @ 4676994c
......@@ -453,9 +453,9 @@ Dart extrudeRegion(
dist = dist + (position[contours[i][contours[i].size()-1]] - position[contours[i][0]]).norm();
}
int size = 0;
for (unsigned int i = 0; i < contours.size(); i++)
for (size_t i = 0; i < contours.size(); i++)
{
size = size + contours[i].size();
size = size + int(contours[i].size());
}
dist = dist / size; // height
......
CGoGN/include/Algo/Selection/raySelector.hpp
View file @ 4676994c
......@@ -106,7 +106,7 @@ void facesRaySelection(
typedef std::pair<typename PFP::REAL, FaceInter<PFP> > faceInterDist;
std::vector<faceInterDist> dist;
unsigned int nbi = vecFaces.size();
unsigned int nbi = (unsigned int)(vecFaces.size());
dist.resize(nbi);
for (unsigned int i = 0; i < nbi; ++i)
{
......
CGoGN/include/Utils/GLSLShader.h
View file @ 4676994c
......@@ -36,7 +36,7 @@
#include "Utils/cgognStream.h"
#include "glm/glm.hpp"
#include <GL/glew.h>
//#include <GL/glew.h>
#include <stdlib.h>
#include <string>
......
CGoGN/include/Utils/Qt/qtInputs.h
View file @ 4676994c
......@@ -29,7 +29,7 @@
#include <QDesktopWidget>
//#include <QMainWindow>
#include <QWidget>
#include <QtGui>
//#include <QtGui>
#include <QDialog>
#include <QLabel>
......
CGoGN/include/Utils/Qt/qtQGLV.h
View file @ 4676994c
......@@ -25,13 +25,20 @@
#ifndef __QTQGLVIEWER_H
#define __QTQGLVIEWER_H
#include "Utils/Qt/qtQGLV_glw.h"
#include <QApplication>
#include <QDesktopWidget>
#include <QMainWindow>
#include <QWidget>
#include <QtGui>
//#include <QtGui>
#include <QTextEdit>
#include <QMenu>
#include <QAction>
#include <QDockWidget>
#include <QMenuBar>
#include "Utils/Qt/qtQGLV_glw.h"
#include <set>
#include <string>
......
CGoGN/include/Utils/Qt/qtQGLV_glw.h
View file @ 4676994c
......@@ -25,12 +25,13 @@
#ifndef __QTQGLVIEWER_GLW_H
#define __QTQGLVIEWER_GLW_H
#include <GL/glew.h>
#include <QApplication>
#include <QDesktopWidget>
#include <QMainWindow>
#include <QWidget>
#include <QtGui>
#include <GL/glew.h>
//#include <QtGui>
#include <QGLViewer/qglviewer.h>
#include <set>
......
CGoGN/include/Utils/Qt/qtSimple.h
View file @ 4676994c
......@@ -25,12 +25,15 @@
#ifndef __SIMPLE_QT_GL2__
#define __SIMPLE_QT_GL2__
#include "Utils/Qt/qtgl.h"
#include <QApplication>
#include <QDesktopWidget>
#include <QMainWindow>
#include <QWidget>
#include <QtGui>
#include "Utils/Qt/qtgl.h"
//#include <QtGui>
#include <QTextEdit>
#include <set>
#include <string>
......
CGoGN/include/Utils/Shaders/shaderRadiancePerVertex.h
View file @ 4676994c
......@@ -30,13 +30,15 @@
#include "Utils/textures.h"
#include "Geometry/vector_gen.h"
#include "Utils/dll.h"
namespace CGoGN
{
namespace Utils
{
class ShaderRadiancePerVertex : public ClippingShader
class CGoGN_UTILS_API ShaderRadiancePerVertex : public ClippingShader
{
protected:
// shader sources
......@@ -74,7 +76,7 @@ public:
void compile();
void setCamera(Geom::Vec3f& camera);
void setCamera(const Geom::Vec3f& camera);
void setFragInterp(bool fraginterp);
bool getFragInterp() { return m_fragInterp; }
......
CGoGN/include/Utils/vbo_base.h
View file @ 4676994c
......@@ -30,6 +30,7 @@
#include "Utils/gl_def.h"
#include "Container/convert.h"
#include "Topology/generic/attributeHandler.h"
#include <GL/glew.h>
#include "Utils/dll.h"
......
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