Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into compile-time-connectivity-type

Browse Source
This commit is contained in:
Jan Möbius
2019-01-15 14:36:58 +01:00
parent 05292e103c 4363a1cbce
commit 34c44c9188
329 changed files with 2680 additions and 4701 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/OpenMesh/Apps/CMakeLists.txt
View File

@@ -41,27 +41,17 @@ if ( BUILD_APPS )
find_package (OpenGL)
find_package (GLUT)
# try to use QT5 if possible otherwise stick to QT4
set (FORCE_QT4 OFF CACHE BOOL "Use Qt4 even if Qt5 was found")
# For the apps, we need qt and opengl to build them
if (NOT QT5_FOUND AND NOT FORCE_QT4)
if (NOT QT5_FOUND)
acg_qt5 ()
endif()
if (NOT QT5_FOUND AND NOT QT4_FOUND)
find_package (Qt4 COMPONENTS QtCore QtGui )
set (QT_USE_QTOPENGL 1)
include (${QT_USE_FILE})
endif ()
if ("${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles")
message(WARNING "GUI Apps are not build with mingw. (TODO)")
endif()
# check for OpenGL and GLUT as our required dependencies
if ((QT5_FOUND OR QT4_FOUND) AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
if (( QT5_FOUND ) AND OPENGL_FOUND AND GLUT_FOUND AND NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
add_subdirectory (Decimating/DecimaterGui)
add_subdirectory (QtViewer)
@@ -99,8 +89,8 @@ if ( BUILD_APPS )
else () # QT ,Opengl or glut not found
if (NOT QT4_FOUND AND NOT QT5_FOUND)
message ("QT 4 and 5 not found! Skipping some apps.")
if (NOT QT5_FOUND)
message ("QT5 not found! Skipping some apps.")
endif ()
if (NOT OPENGL_FOUND)

7
src/OpenMesh/Apps/Decimating/CmdOption.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef CMDOPTION
#define CMDOPTION

95
src/OpenMesh/Apps/Decimating/DecimaterGui/CMakeLists.txt
View File

@@ -1,54 +1,41 @@
include (ACGCommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
set (targetName DecimaterGui)
# source code directories
set (directories
../../QtViewer
../
)
# collect all header and source files
acg_append_files (headers "*.hh" ${directories})
set (sources
../../QtViewer/QGLViewerWidget.cc
../../QtViewer/MeshViewerWidgetT.cc
../DecimaterViewerWidget.cc
../decimaterviewer.cc
)
# remove template cc files from source file list
acg_drop_templates (sources)
# genereate uic and moc targets
if(QT5_FOUND)
acg_qt5_automoc (moc_targets ${headers})
else()
acg_qt4_automoc (moc_targets ${headers})
endif()
if (WIN32)
acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
else ()
acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
endif ()
target_link_libraries (${targetName}
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)
include (ACGCommon)
include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
)
# source code directories
set (directories
../../QtViewer
../
)
# collect all header and source files
acg_append_files (headers "*.hh" ${directories})
set (sources
../../QtViewer/QGLViewerWidget.cc
../../QtViewer/MeshViewerWidgetT.cc
../DecimaterViewerWidget.cc
../decimaterviewer.cc
)
# remove template cc files from source file list
acg_drop_templates (sources)
if (WIN32)
acg_add_executable (DecimaterGui WIN32 ${sources} ${headers})
else ()
acg_add_executable (DecimaterGui ${sources} ${headers} )
endif ()
target_link_libraries (DecimaterGui
OpenMeshCore
OpenMeshTools
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

7
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//== INCLUDES =================================================================

7
src/OpenMesh/Apps/Decimating/DecimaterViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_DECIMATERVIEWERWIDGET_HH

6
src/OpenMesh/Apps/Decimating/commandlineDecimater/CMakeLists.txt
View File

@@ -5,16 +5,14 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
set (targetName commandlineDecimater)
# collect all header and source files
set (sources
../decimater.cc
)
acg_add_executable (${targetName} ${sources})
acg_add_executable (commandlineDecimater ${sources})
target_link_libraries (${targetName}
target_link_libraries (commandlineDecimater
OpenMeshCore
OpenMeshTools
)

9
src/OpenMesh/Apps/Decimating/decimater.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#if !defined(OM_USE_OSG)
# define OM_USE_OSG 0
@@ -464,7 +459,7 @@ int main(int argc, char* argv[])
{
case 'D': opt.decorate_name = true; break;
case 'd': gdebug = true; break;
case 'h': usage_and_exit(0);
case 'h': usage_and_exit(0); break;
case 'i': ifname = optarg; break;
case 'M': opt.parse_argument( optarg ); break;
case 'n': opt.n_collapses = float(atof(optarg)); break;

8
src/OpenMesh/Apps/Decimating/decimaterviewer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifdef _MSC_VER
# pragma warning(disable: 4267 4311)
@@ -98,6 +93,7 @@ int main(int argc, char **argv)
case 's': opt += OpenMesh::IO::Options::Swap; break;
case 'h':
usage_and_exit(0);
break;
default:
usage_and_exit(1);
}

6
src/OpenMesh/Apps/Dualizer/CMakeLists.txt
View File

@@ -5,15 +5,13 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
set (targetName Dualizer)
# collect all header and source files
acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .)
acg_add_executable (${targetName} ${headers} ${sources})
acg_add_executable (Dualizer ${headers} ${sources})
target_link_libraries (${targetName}
target_link_libraries (Dualizer
OpenMeshCore
OpenMeshTools
)

7
src/OpenMesh/Apps/Dualizer/dualizer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <iostream>

36
src/OpenMesh/Apps/ProgViewer/CMakeLists.txt
View File

@@ -4,11 +4,8 @@ include_directories (
../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
set (targetName ProgViewer)
# collect all header and source files
acg_append_files (headers "*.hh" .)
@@ -20,44 +17,19 @@ list (APPEND sources "../QtViewer/MeshViewerWidgetT.cc")
list (APPEND headers "../QtViewer/QGLViewerWidget.hh")
list (APPEND headers "../QtViewer/MeshViewerWidgetT.hh")
# # source code directories
# set (directories
# .
# ../QtViewer
# )
# # collect all header and source files
# acg_append_files (headers "*.hh" ${directories})
# set (sources
# ../../QtViewer/QGLViewerWidget.cc
# ../../QtViewer/MeshViewerWidgetT.cc
# ./ProgViewerWidget.cc
# )
# remove template cc files from source file list
acg_drop_templates (sources)
# genereate uic and moc targets
if(QT5_FOUND)
acg_qt5_automoc (moc_targets ${headers})
else()
acg_qt4_automoc (moc_targets ${headers})
endif()
if (WIN32)
acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
acg_add_executable( ProgViewer WIN32 ${sources} ${headers})
else ()
acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
acg_add_executable( ProgViewer ${sources} ${headers})
endif ()
target_link_libraries (${targetName}
target_link_libraries ( ProgViewer
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

274
src/OpenMesh/Apps/ProgViewer/OpenMesh_Apps_ProgViewer.vcproj
View File

@@ -1,274 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="OpenMesh_Apps_ProgViewer"
ProjectGUID="{6CC92D44-A0AC-47D0-9482-D983B1F27E63}"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="Debug"
IntermediateDirectory="Debug"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="c:\glut\include;C:\glew\include;..\..\..;&quot;$(QTDIR)/include&quot;;&quot;$(QTDIR)/include/QtCore&quot;;&quot;$(QTDIR)/inlcude/Qt&quot;;&quot;$(QTDIR)/include/QtGUI&quot;;&quot;$(QTDIR)/include/QtOpenGL&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES;QT_DLL"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
DisableLanguageExtensions="false"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
ProgramDataBaseFileName="$(IntDir)/vc70.pdb"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="QtCore4.lib QtGUI4.lib QtOpenGL4.lib opengl32.lib"
OutputFile="..\..\bin\progviewer_dbg.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="$(QTDIR)/lib;C:\glut\lib;C:\glew\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)\$(TargetName).pdb"
SubSystem="1"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="1"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="c:\glut\include;C:\glew\include;..\..\..;&quot;$(QTDIR)/include&quot;;&quot;$(QTDIR)/include/QtCore&quot;;&quot;$(QTDIR)/inlcude/Qt&quot;;&quot;$(QTDIR)/include/QtGUI&quot;;&quot;$(QTDIR)/include/QtOpenGL&quot;"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_MATH_DEFINES;QT_DLL"
RuntimeLibrary="2"
DisableLanguageExtensions="false"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="QtCore4.lib QtGUI4.lib QtOpenGL4.lib opengl32.lib"
OutputFile="..\..\bin\progviewer.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="$(QTDIR)/lib;C:\glut\lib;C:\glew\lib"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Generated Files"
>
<File
RelativePath=".\moc_ProgViewerWidget.cpp"
>
</File>
<File
RelativePath=".\moc_QGLViewerWidget.cpp"
>
</File>
</Filter>
<File
RelativePath="..\QtViewer\MeshViewerWidgetT.cc"
>
</File>
<File
RelativePath="..\QtViewer\QGLViewerWidget.cc"
>
</File>
<File
RelativePath="..\QtViewer\MeshViewerWidgetT.hh"
>
</File>
<File
RelativePath=".\progviewer.cc"
>
</File>
<File
RelativePath=".\ProgViewerWidget.cc"
>
</File>
<File
RelativePath=".\ProgViewerWidget.hh"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC $(InputFileName)"
CommandLine="$(QTDIR)\bin\moc.exe $(InputFileName) -o moc_$(InputName).cpp&#x0D;&#x0A;"
Outputs="moc_$(InputName).cpp"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC $(InputFileName)"
CommandLine="$(QTDIR)\bin\moc.exe $(InputFileName) -o moc_$(InputName).cpp&#x0D;&#x0A;"
Outputs="moc_$(InputName).cpp"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\QtViewer\QGLViewerWidget.hh"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC $(InputFileName)"
CommandLine="$(QTDIR)\bin\moc.exe ..\QtViewer\$(InputFileName) -o moc_$(InputName).cpp&#x0D;&#x0A;"
Outputs="moc_$(InputName).cpp"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCustomBuildTool"
Description="MOC $(InputFileName)"
CommandLine="$(QTDIR)\bin\moc.exe ..\QtViewer\$(InputFileName) -o moc_$(InputName).cpp&#x0D;&#x0A;"
Outputs="moc_$(InputName).cpp"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\..\test1.cpp"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

7
src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//== INCLUDES =================================================================

7
src/OpenMesh/Apps/ProgViewer/ProgViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_PROGVIEWERWIDGET_HH

7
src/OpenMesh/Apps/ProgViewer/progviewer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifdef _MSC_VER
# pragma warning(disable: 4267 4311)

24
src/OpenMesh/Apps/QtViewer/CMakeLists.txt
View File

@@ -4,11 +4,8 @@ include_directories (
../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
set (targetName QtViewer)
# source code directories
set (directories
.
@@ -17,33 +14,20 @@ set (directories
# collect all header and source files
acg_append_files (headers "*.hh" ${directories})
acg_append_files (sources "*.cc" ${directories})
acg_append_files (ui "*.ui" ${directories})
# remove template cc files from source file list
acg_drop_templates (sources)
# genereate uic and moc targets
if(QT5_FOUND)
acg_qt5_autouic (uic_targets ${ui})
acg_qt5_automoc (moc_targets ${headers})
else()
acg_qt4_autouic (uic_targets ${ui})
acg_qt4_automoc (moc_targets ${headers})
endif()
if (WIN32)
acg_add_executable (${targetName} WIN32 ${uic_targets} ${sources} ${headers} ${moc_targets})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
acg_add_executable (QtViewer WIN32 ${sources} ${headers})
else ()
acg_add_executable (${targetName} ${uic_targets} ${sources} ${headers} ${moc_targets})
acg_add_executable (QtViewer ${sources} ${headers})
endif ()
target_link_libraries (${targetName}
target_link_libraries (QtViewer
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

114
src/OpenMesh/Apps/QtViewer/MeshViewerWidget.cc Normal file
View File

@@ -0,0 +1,114 @@
/* ========================================================================= *
* *
* OpenMesh *
* Copyright (c) 2001-2015, RWTH-Aachen University *
* Department of Computer Graphics and Multimedia *
* All rights reserved. *
* www.openmesh.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenMesh. *
*---------------------------------------------------------------------------*
* *
* Redistribution and use in source and binary forms, with or without *
* modification, are permitted provided that the following conditions *
* are met: *
* *
* 1. Redistributions of source code must retain the above copyright notice, *
* this list of conditions and the following disclaimer. *
* *
* 2. Redistributions in binary form must reproduce the above copyright *
* notice, this list of conditions and the following disclaimer in the *
* documentation and/or other materials provided with the distribution. *
* *
* 3. Neither the name of the copyright holder nor the names of its *
* contributors may be used to endorse or promote products derived from *
* this software without specific prior written permission. *
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS *
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED *
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
* PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER *
* OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, *
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, *
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR *
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF *
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING *
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS *
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
* *
* ========================================================================= */
#define OPENMESHAPPS_MESHVIEWERWIDGET_CC
//== INCLUDES =================================================================
#include <OpenMesh/Apps/QtViewer/MeshViewerWidget.hh>
//== IMPLEMENTATION ==========================================================
/// default constructor
MeshViewerWidget::MeshViewerWidget(QWidget* parent) : MeshViewerWidgetT<MyMesh>(parent)
{}
void MeshViewerWidget::open_mesh_gui(QString fname)
{
OpenMesh::Utils::Timer t;
t.start();
if ( fname.isEmpty() || !open_mesh(fname.toLocal8Bit(), _options) )
{
QString msg = "Cannot read mesh from file:\n '";
msg += fname;
msg += "'";
QMessageBox::critical( NULL, windowTitle(), msg);
}
t.stop();
std::cout << "Loaded mesh in ~" << t.as_string() << std::endl;
}
void MeshViewerWidget::open_texture_gui(QString fname)
{
if ( fname.isEmpty() || !open_texture( fname.toLocal8Bit() ) )
{
QString msg = "Cannot load texture image from file:\n '";
msg += fname;
msg += "'\n\nPossible reasons:\n";
msg += "- Mesh file didn't provide texture coordinates\n";
msg += "- Texture file does not exist\n";
msg += "- Texture file is not accessible.\n";
QMessageBox::warning( NULL, windowTitle(), msg );
}
}
void MeshViewerWidget::query_open_mesh_file() {
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open mesh file"),
tr(""),
tr("OBJ Files (*.obj);;"
"OFF Files (*.off);;"
"STL Files (*.stl);;"
"All Files (*)"));
if (!fileName.isEmpty())
open_mesh_gui(fileName);
}
void MeshViewerWidget::query_open_texture_file() {
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open texture file"),
tr(""),
tr("PNG Files (*.png);;"
"BMP Files (*.bmp);;"
"GIF Files (*.gif);;"
"JPEG Files (*.jpg);;"
"TIFF Files (*.tif);;"
"All Files (*)"));
if (!fileName.isEmpty())
open_texture_gui(fileName);
}
//=============================================================================

75
src/OpenMesh/Apps/QtViewer/MeshViewerWidget.hh
View File

@@ -39,15 +39,9 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_VIEWERWIDGET_HH
#define OPENMESHAPPS_VIEWERWIDGET_HH
#pragma once
//== INCLUDES =================================================================
@@ -55,6 +49,7 @@
#include <QString>
#include <QMessageBox>
#include <QFileDialog>
#include <iostream>
#include <OpenMesh/Tools/Utils/getopt.h>
#include <OpenMesh/Tools/Utils/Timer.hh>
#include <OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh>
@@ -80,70 +75,24 @@ typedef OpenMesh::TriMesh_ArrayKernelT<MyTraits> MyMesh;
class MeshViewerWidget : public MeshViewerWidgetT<MyMesh>
{
Q_OBJECT
public:
/// default constructor
explicit MeshViewerWidget(QWidget* parent=0) : MeshViewerWidgetT<MyMesh>(parent)
{}
explicit MeshViewerWidget(QWidget* parent=0);
OpenMesh::IO::Options& options() { return _options; }
const OpenMesh::IO::Options& options() const { return _options; }
void setOptions(const OpenMesh::IO::Options& opts) { _options = opts; }
void open_mesh_gui(QString fname)
{
OpenMesh::Utils::Timer t;
t.start();
if ( fname.isEmpty() || !open_mesh(fname.toLocal8Bit(), _options) )
{
QString msg = "Cannot read mesh from file:\n '";
msg += fname;
msg += "'";
QMessageBox::critical( NULL, windowTitle(), msg);
}
t.stop();
std::cout << "Loaded mesh in ~" << t.as_string() << std::endl;
}
void open_texture_gui(QString fname)
{
if ( fname.isEmpty() || !open_texture( fname.toLocal8Bit() ) )
{
QString msg = "Cannot load texture image from file:\n '";
msg += fname;
msg += "'\n\nPossible reasons:\n";
msg += "- Mesh file didn't provide texture coordinates\n";
msg += "- Texture file does not exist\n";
msg += "- Texture file is not accessible.\n";
QMessageBox::warning( NULL, windowTitle(), msg );
}
}
void open_mesh_gui(QString fname);
void open_texture_gui(QString fname);
public slots:
void query_open_mesh_file() {
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open mesh file"),
tr(""),
tr("OBJ Files (*.obj);;"
"OFF Files (*.off);;"
"STL Files (*.stl);;"
"All Files (*)"));
if (!fileName.isEmpty())
open_mesh_gui(fileName);
}
void query_open_texture_file() {
QString fileName = QFileDialog::getOpenFileName(this,
tr("Open texture file"),
tr(""),
tr("PNG Files (*.png);;"
"BMP Files (*.bmp);;"
"GIF Files (*.gif);;"
"JPEG Files (*.jpg);;"
"TIFF Files (*.tif);;"
"All Files (*)"));
if (!fileName.isEmpty())
open_texture_gui(fileName);
}
void query_open_mesh_file();
void query_open_texture_file();
private:
OpenMesh::IO::Options _options;
};
#endif

7
src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#define OPENMESHAPPS_MESHVIEWERWIDGET_CC

13
src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh
View File

@@ -39,16 +39,10 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_MESHVIEWERWIDGETT_HH
#define OPENMESHAPPS_MESHVIEWERWIDGETT_HH
#pragma once
//== INCLUDES =================================================================
@@ -75,6 +69,7 @@ class QImage;
template <typename M>
class MeshViewerWidgetT : public QGLViewerWidget
{
public:
typedef M Mesh;
@@ -200,6 +195,4 @@ protected:
# include "MeshViewerWidgetT.cc"
#endif
//=============================================================================
#endif // OPENMESHAPPS_MESHVIEWERWIDGETT_HH defined
//=============================================================================

7
src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//== INCLUDES =================================================================

7
src/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_QGLVIEWERWIDGET_HH

8
src/OpenMesh/Apps/QtViewer/meshviewer.cc
View File

@@ -39,13 +39,6 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifdef _MSC_VER
# pragma warning(disable: 4267 4311)
#endif
@@ -95,6 +88,7 @@ int main(int argc, char **argv)
case 'b': opt += OpenMesh::IO::Options::Binary; break;
case 'h':
usage_and_exit(0);
break;
case 's': opt += OpenMesh::IO::Options::Swap; break;
default:
usage_and_exit(1);

6
src/OpenMesh/Apps/Smoothing/CMakeLists.txt
View File

@@ -5,15 +5,13 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
set (targetName Smoothing)
# collect all header and source files
acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .)
acg_add_executable (${targetName} ${headers} ${sources})
acg_add_executable (Smoothing ${headers} ${sources})
target_link_libraries (${targetName}
target_link_libraries (Smoothing
OpenMeshCore
OpenMeshTools
)

9
src/OpenMesh/Apps/Smoothing/smooth.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <iostream>
@@ -136,7 +131,7 @@ int main(int argc, char **argv)
: SmootherT<MyMesh>::Normal;
break;
case 'h': usage_and_exit(0);
case 'h': usage_and_exit(0); break;
case '?':
default: usage_and_exit(1);
}

7
src/OpenMesh/Apps/Subdivider/MeshViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_MESHVIEWERWIDGET_HH

7
src/OpenMesh/Apps/Subdivider/SubdivideWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//

7
src/OpenMesh/Apps/Subdivider/SubdivideWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//

20
src/OpenMesh/Apps/Subdivider/SubdividerGui/CMakeLists.txt
View File

@@ -4,11 +4,8 @@ include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
set (targetName SubdividerGui)
# source code directories
set (directories
../../QtViewer
@@ -28,25 +25,16 @@ set (sources
# remove template cc files from source file list
acg_drop_templates (sources)
# genereate uic and moc targets
if(QT5_FOUND)
acg_qt5_automoc (moc_targets ${headers})
else()
acg_qt4_automoc (moc_targets ${headers})
endif()
if (WIN32)
acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
acg_add_executable (SubdividerGui WIN32 ${sources} ${headers})
else ()
acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
acg_add_executable (SubdividerGui ${sources} ${headers})
endif ()
target_link_libraries (${targetName}
target_link_libraries (SubdividerGui
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

9
src/OpenMesh/Apps/Subdivider/adaptive_subdivider.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
// -------------------------------------------------------------- includes ----
@@ -170,7 +165,7 @@ int main(int argc, char **argv)
case 'm': { std::stringstream s; s << optarg; s >> max_nv; } break;
case 'r': rule_sequence = optarg; break;
case 'U': uniform = true; break;
case 'h': usage_and_exit(argv[0],0);
case 'h': usage_and_exit(argv[0],0); break;
case '?':
default: usage_and_exit(argv[0],1);
}

6
src/OpenMesh/Apps/Subdivider/commandlineAdaptiveSubdivider/CMakeLists.txt
View File

@@ -5,16 +5,14 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
set (targetName commandlineAdaptiveSubdivider)
# collect all header and source files
set (sources
../adaptive_subdivider.cc
)
acg_add_executable (${targetName} ${sources})
acg_add_executable (commandlineAdaptiveSubdivider ${sources})
target_link_libraries (${targetName}
target_link_libraries (commandlineAdaptiveSubdivider
OpenMeshCore
OpenMeshTools
)

6
src/OpenMesh/Apps/Subdivider/commandlineSubdivider/CMakeLists.txt
View File

@@ -5,16 +5,14 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
set (targetName commandlineSubdivider)
# collect all header and source files
set (sources
../subdivider.cc
)
acg_add_executable (${targetName} ${sources})
acg_add_executable (commandlineSubdivider ${sources})
target_link_libraries (${targetName}
target_link_libraries (commandlineSubdivider
OpenMeshCore
OpenMeshTools
)

7
src/OpenMesh/Apps/Subdivider/qtsubdivider.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifdef _MSC_VER
# pragma warning(disable: 4267 4311)

9
src/OpenMesh/Apps/Subdivider/subdivider.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <iostream>
#include <sstream>
@@ -234,7 +229,7 @@ int main(int argc, char **argv)
}
break;
}
case 'h': usage_and_exit(0);
case 'h': usage_and_exit(0); break;
case '?':
default: usage_and_exit(1);
}

7
src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//

7
src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshNodeT.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//

7
src/OpenMesh/Apps/Unsupported/IvViewer/SoOpenMeshSupport.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef SOOPENMESHSUPPORT_H
#define SOOPENMESHSUPPORT_H

7
src/OpenMesh/Apps/Unsupported/IvViewer/ivviewer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#if !defined(USE_SOQT)

7
src/OpenMesh/Apps/Unsupported/OsgViewer/meshviewer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifdef _MSC_VER
# pragma warning(disable: 4267 4311)

7
src/OpenMesh/Apps/Unsupported/OsgViewer/osgviewer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
// -------------------- STL
#include <memory>

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#define OPENMESHAPPS_MESHVIEWERWIDGET_CC

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MeshViewerWidgetT.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_MESHVIEWERWIDGETT_HH

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/MyMesh.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APPS_VDPMSTREAMING_CLIENT_MYMESH_HH
#define OPENMESH_APPS_VDPMSTREAMING_CLIENT_MYMESH_HH

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//== INCLUDES =================================================================

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/QGLViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_QGLVIEWERWIDGET_HH

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//== INCLUDES =================================================================

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMClientViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APPS_VDPMSTREAMING_CLIENT_VDPMCLIENTVIEWERWIDGET_HH
#define OPENMESH_APPS_VDPMSTREAMING_CLIENT_VDPMCLIENTVIEWERWIDGET_HH

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Client/VDPMStreamingClient.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
// #ifdef _MSC_VER
// # pragma warning(disable: 4267 4311)

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <iostream>
#include <fstream>

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/ServerSideVDPM.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_SERVERSIDEVDPM_HH
#define OPENMESH_APP_SERVERSIDEVDPM_HH

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <OpenMesh/Apps/VDProgMesh/Streaming/Server/VDPMServerSession.hh>
#include <OpenMesh/Apps/VDProgMesh/Streaming/Server/VDPMServerViewerWidget.hh>

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSERVERSESSION_HH
#define OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSERVERSESSION_HH

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSocket.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSERVERSOCKET_HH
#define OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSERVERSOCKET_HH

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <QKeyEvent>
#include <iterator>

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSTREAMINGSERVERWIDGET_HH
#define OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSTREAMINGSERVERWIDGET_HH

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <iostream>

7
src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMStreamingServer.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_VDPMSTREAMINGSERVER_HH
#define OPENMESH_APP_VDPMSTREAMINGSERVER_HH

7
src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#define OPENMESHAPPS_MESHVIEWERWIDGET_CC

7
src/OpenMesh/Apps/Unsupported/Streaming/Client/MeshViewerWidgetT.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_MESHVIEWERWIDGETT_HH

7
src/OpenMesh/Apps/Unsupported/Streaming/Client/MyMesh.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APPS_VDPMSTREAMING_CLIENT_MYMESH_HH
#define OPENMESH_APPS_VDPMSTREAMING_CLIENT_MYMESH_HH

7
src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//== INCLUDES =================================================================

7
src/OpenMesh/Apps/Unsupported/Streaming/Client/QGLViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESHAPPS_QGLVIEWERWIDGET_HH

7
src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//== INCLUDES =================================================================

7
src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMClientViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APPS_VDPMSTREAMING_CLIENT_VDPMCLIENTVIEWERWIDGET_HH
#define OPENMESH_APPS_VDPMSTREAMING_CLIENT_VDPMCLIENTVIEWERWIDGET_HH

7
src/OpenMesh/Apps/Unsupported/Streaming/Client/VDPMStreamingClient.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
// #ifdef _MSC_VER
// # pragma warning(disable: 4267 4311)

7
src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <iostream>
#include <fstream>

7
src/OpenMesh/Apps/Unsupported/Streaming/Server/ServerSideVDPM.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_SERVERSIDEVDPM_HH
#define OPENMESH_APP_SERVERSIDEVDPM_HH

7
src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <OpenMesh/Apps/VDProgMesh/Streaming/Server/VDPMServerSession.hh>
#include <OpenMesh/Apps/VDProgMesh/Streaming/Server/VDPMServerViewerWidget.hh>

7
src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSERVERSESSION_HH
#define OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSERVERSESSION_HH

7
src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSocket.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSERVERSOCKET_HH
#define OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSERVERSOCKET_HH

7
src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <iterator>
#include <OpenMesh/Apps/VDProgMesh/Streaming/Server/VDPMServerViewerWidget.hh>

7
src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSTREAMINGSERVERWIDGET_HH
#define OPENMESH_APP_VDPMSTREAMING_SERVER_VDPMSTREAMINGSERVERWIDGET_HH

7
src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMStreamingServer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <iostream>

7
src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMStreamingServer.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OPENMESH_APP_VDPMSTREAMINGSERVER_HH
#define OPENMESH_APP_VDPMSTREAMINGSERVER_HH

6
src/OpenMesh/Apps/VDProgMesh/Analyzer/CMakeLists.txt
View File

@@ -5,16 +5,14 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
set (targetName Analyzer)
# collect all header and source files
set (sources
./vdpmanalyzer.cc
)
acg_add_executable (${targetName} ${sources})
acg_add_executable (Analyzer ${sources})
target_link_libraries (${targetName}
target_link_libraries (Analyzer
OpenMeshCore
OpenMeshTools
)

9
src/OpenMesh/Apps/VDProgMesh/Analyzer/vdpmanalyzer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
// -------------------------------------------------------------- includes ----
@@ -276,7 +271,7 @@ int main(int argc, char **argv)
{
case 'v': verbose = true; break;
case 'o': ofname = optarg; break;
case 'h': usage_and_exit(0);
case 'h': usage_and_exit(0); break;
default: usage_and_exit(1);
}
}

20
src/OpenMesh/Apps/VDProgMesh/Synthesizer/CMakeLists.txt
View File

@@ -4,11 +4,8 @@ include_directories (
../../../..
${CMAKE_CURRENT_SOURCE_DIR}
${GLUT_INCLUDE_DIR}
${QT_INCLUDE_DIR}
)
set (targetName Synthesizer)
# collect all header and source files
acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .)
@@ -22,25 +19,16 @@ list (APPEND headers "../../QtViewer/MeshViewerWidgetT.hh")
# remove template cc files from source file list
acg_drop_templates (sources)
# genereate uic and moc targets
if(QT5_FOUND)
acg_qt5_automoc (moc_targets ${headers})
else()
acg_qt4_automoc (moc_targets ${headers})
endif()
if (WIN32)
acg_add_executable (${targetName} WIN32 ${sources} ${headers} ${moc_targets})
# link to qtmain library to get WinMain function for a non terminal app
target_link_libraries (${targetName} ${QT_QTMAIN_LIBRARY})
acg_add_executable (Synthesizer WIN32 ${sources} ${headers})
else ()
acg_add_executable (${targetName} ${sources} ${headers} ${moc_targets})
acg_add_executable (Synthesizer ${sources} ${headers})
endif ()
target_link_libraries (${targetName}
target_link_libraries (Synthesizer
OpenMeshCore
OpenMeshTools
${QT_LIBRARIES}
Qt5::OpenGL
${OPENGL_LIBRARIES}
${GLUT_LIBRARIES}
)

7
src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//

7
src/OpenMesh/Apps/VDProgMesh/Synthesizer/VDPMSynthesizerViewerWidget.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//

7
src/OpenMesh/Apps/VDProgMesh/Synthesizer/vdpmsynthesizer.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifdef _MSC_VER
# pragma warning(disable: 4267 4311)

6
src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/CMakeLists.txt
View File

@@ -5,16 +5,14 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
set (targetName mkbalancedpm)
# collect all header and source files
set (sources
./mkbalancedpm.cc
)
acg_add_executable (${targetName} ${sources})
acg_add_executable (mkbalancedpm ${sources})
target_link_libraries (${targetName}
target_link_libraries (mkbalancedpm
OpenMeshCore
OpenMeshTools
)

8
src/OpenMesh/Apps/VDProgMesh/mkbalancedpm/mkbalancedpm.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
// -------------------- STL
#include <iostream>
@@ -259,6 +254,7 @@ int main(int argc, char **argv)
case 'I': enable_modIS = true; break;
case 'h':
usage_and_exit(0);
break;
default:
usage_and_exit(1);
}

6
src/OpenMesh/Apps/mconvert/CMakeLists.txt
View File

@@ -5,15 +5,13 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
set (targetName mconvert)
# collect all header and source files
acg_append_files (headers "*.hh" .)
acg_append_files (sources "*.cc" .)
acg_add_executable (${targetName} ${headers} ${sources})
acg_add_executable (mconvert ${headers} ${sources})
target_link_libraries (${targetName}
target_link_libraries (mconvert
OpenMeshCore
OpenMeshTools
)

195
src/OpenMesh/Apps/mconvert/VS2008mconvert.vcproj
View File

@@ -1,195 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="VS2008MConvert"
ProjectGUID="{C2F9DF8D-9293-4B6C-839C-57A38D1C873B}"
RootNamespace="VS2008MConvert"
Keyword="Win32Proj"
TargetFrameworkVersion="196613"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="../../../"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_USE_MATH_DEFINES"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="../../../"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_USE_MATH_DEFINES"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\mconvert.cc"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

8
src/OpenMesh/Apps/mconvert/mconvert.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#include <iostream>
#include <iterator>
@@ -183,6 +178,7 @@ int main(int argc, char *argv[] )
case 'o': ofname = optarg; break;
case 'h':
usage_and_exit(0);
break;
case '?':
default:
usage_and_exit(1);

7
src/OpenMesh/Core/Geometry/Config.hh
View File

@@ -40,12 +40,7 @@
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================

7
src/OpenMesh/Core/Geometry/LoopSchemeMaskT.hh
View File

@@ -40,12 +40,7 @@
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef LOOPSCHEMEMASKT_HH
#define LOOPSCHEMEMASKT_HH

7
src/OpenMesh/Core/Geometry/MathDefs.hh
View File

@@ -40,12 +40,7 @@
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef MATHDEFS_HH
#define MATHDEFS_HH

10
src/OpenMesh/Core/Geometry/NormalConeT.cc
View File

@@ -40,16 +40,6 @@
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//
// CLASS NormalConeT - IMPLEMENTATION

7
src/OpenMesh/Core/Geometry/NormalConeT.hh
View File

@@ -40,12 +40,7 @@
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/

7
src/OpenMesh/Core/Geometry/Plane3d.hh
View File

@@ -41,12 +41,7 @@
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//

7
src/OpenMesh/Core/Geometry/QuadricT.hh
View File

@@ -41,12 +41,7 @@
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
/** \file Core/Geometry/QuadricT.hh

7
src/OpenMesh/Core/Geometry/VectorT.hh
View File

@@ -40,12 +40,7 @@
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================

7
src/OpenMesh/Core/Geometry/VectorT_inc.hh
View File

@@ -41,12 +41,7 @@
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
// Set template keywords and class names properly when
// parsing with doxygen. This only seems to work this way since

7
src/OpenMesh/Core/IO/BinaryHelper.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================

7
src/OpenMesh/Core/IO/BinaryHelper.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================

7
src/OpenMesh/Core/IO/IOInstances.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================

7
src/OpenMesh/Core/IO/IOManager.cc
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================

7
src/OpenMesh/Core/IO/IOManager.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
//=============================================================================
//

7
src/OpenMesh/Core/IO/MeshIO.hh
View File

@@ -39,12 +39,7 @@
* *
* ========================================================================= */
/*===========================================================================*\
* *
* $Revision$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef OM_MESHIO_HH

Some files were not shown because too many files have changed in this diff Show More