Commit abad6c04 authored by Sylvain Thery's avatar Sylvain Thery

windows...

parent bf75ed6c
......@@ -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)
{
......
......@@ -34,7 +34,7 @@ ENDIF()
# choose same Qt version than in CGoGN
file(STRINGS ${CGoGN_ROOT_DIR}/CGoGN/include/cgogn_qt.h CGoGN_DESIRED_QT_VERSION)
file(READ ${CGoGN_SRC_DIR}/include/cgogn_qt.h CGoGN_DESIRED_QT_VERSION)
ADD_DEFINITIONS("-DCGOGN_QT_DESIRED_VERSION=${CGoGN_DESIRED_QT_VERSION}")
IF(CGoGN_DESIRED_QT_VERSION STREQUAL 5)
include(${CGoGN_ROOT_DIR}/cmake_modules/Qt_5x.cmake)
......@@ -54,7 +54,7 @@ find_package(PythonLibs 2.7 REQUIRED)
# CGoGN compiled in one or several libs
file(STRINGS ${CGoGN_SRC_DIR}/include/cgogn_onelib.h ONELIB_STR)
file(READ ${CGoGN_SRC_DIR}/include/cgogn_onelib.h ONELIB_STR)
IF (ONELIB_STR EQUAL 1)
SET(CGoGN_LIBS cgogn)
ELSE()
......
......@@ -4,7 +4,7 @@ project(SCHNAppsLib)
IF(WIN32 AND (NOT (CGoGN_WITH_QTCREATOR)))
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/plugins_default_directory.h
\#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${SCHNApps_ROOT_DIR}/lib/${ConfigurationName}\" )
\#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${CGoGN_ROOT_DIR}/bin/\" ) # NOT POSSIBLE TO KNOW IF WE ARE IN DEBUG OR RELEASE
ELSE()
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/plugins_default_directory.h
\#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${SCHNApps_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}\" )
......@@ -68,7 +68,7 @@ qt_add_resources( RCC_FILES
${SCHNApps_ROOT_DIR}/resources/resources.qrc
)
ADD_DEFINITIONS(-DSCHNAPPSLIB_DLL_EXPORT -DQ_DECL_EXPORT)
ADD_DEFINITIONS(-DSCHNAPPSLIB_DLL_EXPORT)
ADD_LIBRARY( SCHNAppsLib SHARED
${SCHNAppsLib_FILES}
......
......@@ -240,7 +240,7 @@ void Surface_Modelisation_Plugin::createNewFace(MapHandlerGen* mhg)
VertexAttribute<PFP2::VEC3, PFP2::MAP>& position = h_parameterSet[mhg].positionAttribute;
if (collectedVertices.size() >= 3)
{
Dart d = map->newFace(collectedVertices.size());
Dart d = map->newFace((unsigned int)(collectedVertices.size()));
int i = 0;
Traversor2FV<PFP2::MAP> t(*map, d);
......
......@@ -431,9 +431,9 @@ void Surface_Radiance_Plugin::exportPLY(
const QString& normalAttributeName,
const QString& filename)
{
typedef typename PFP2::MAP MAP;
typedef typename PFP2::REAL REAL;
typedef typename PFP2::VEC3 VEC3;
typedef PFP2::MAP MAP;
typedef PFP2::REAL REAL;
typedef PFP2::VEC3 VEC3;
MapHandler<PFP2>* mh = static_cast<MapHandler<PFP2>*>(m_schnapps->getMap(mapName));
if(mh == NULL)
......
......@@ -33,9 +33,9 @@ struct MapParameters
renderEdges(false),
renderFaces(true),
faceStyle(FLAT),
diffuseColor(0.8,0.9,0.7,0.0),
simpleColor(0.0,0.0,0.0,0.0),
vertexColor(0.0,0.0,1.0,0.0)
diffuseColor(0.8f,0.9f,0.7f,0.0f),
simpleColor(0.0f,0.0f,0.0f,0.0f),
vertexColor(0.0f,0.0f,1.0f,0.0f)
{}
......
......@@ -377,7 +377,11 @@ void SCHNApps::registerPluginsDirectory(const QString& path)
foreach(QString pluginFile, pluginFiles)
{
QFileInfo pfi(pluginFile);
#ifdef WIN32
QString pluginName = pfi.baseName();
#else
QString pluginName = pfi.baseName().remove(0, 3);
#endif
QString pluginFilePath = directory.absoluteFilePath(pluginFile);
if(!m_availablePlugins.contains(pluginName))
......
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