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

Fixed inline stuff not building under windows

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@63 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2009-02-09 17:55:42 +00:00
parent 9b66c2d22e
commit 090796f746
3 changed files with 11 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Apps/Subdivider/MeshViewerWidget.cc
View File

@@ -1,63 +0,0 @@
//=============================================================================
//
// OpenMesh
// Copyright (C) 2003 by Computer Graphics Group, RWTH Aachen
// www.openmesh.org
//
//-----------------------------------------------------------------------------
//
// License
//
// 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 Free Software Foundation, version 2.1.
//
// This library is distributed in the hope that it will be useful, but
// WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
//-----------------------------------------------------------------------------
//
// $Revision: 1800 $
// $Date: 2008-05-19 11:51:23 +0200 (Mo, 19. Mai 2008) $
//
//=============================================================================
//== INCLUDES =================================================================
#ifdef _MSC_VER
# pragma warning(disable: 4267 4311)
#endif
#include <OpenMesh/Core/IO/MeshIO.hh>
#include <OpenMesh/Apps/Subdivider/MeshViewerWidget.hh>
using namespace OpenMesh;
//== IMPLEMENTATION ==========================================================
inline bool
MeshViewerWidget::open_mesh(const char* _filename, IO::Options _opt)
{
if ( Base::open_mesh( _filename, _opt ) )
{
orig_mesh_ = mesh_;
return true;
}
return false;
}
//=============================================================================

11
Apps/Subdivider/MeshViewerWidget.hh
View File

@@ -39,6 +39,7 @@
// -------------------- OpenMesh // -------------------- OpenMesh
#include <OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh> #include <OpenMesh/Apps/QtViewer/MeshViewerWidgetT.hh>
#include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh> #include <OpenMesh/Core/Mesh/TriMesh_ArrayKernelT.hh>
#include <OpenMesh/Core/IO/MeshIO.hh>
#include <OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh> #include <OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeTraits.hh>
// //
@@ -66,7 +67,15 @@ public:
~MeshViewerWidget() {} ~MeshViewerWidget() {}
/// open mesh /// open mesh
bool open_mesh(const char* _filename, OpenMesh::IO::Options); inline bool open_mesh(const char* _filename, OpenMesh::IO::Options _opt)
{
if ( Base::open_mesh( _filename, _opt ) )
{
orig_mesh_ = mesh_;
return true;
}
return false;
}
Mesh& orig_mesh() { return orig_mesh_; } Mesh& orig_mesh() { return orig_mesh_; }
const Mesh& orig_mesh() const { return orig_mesh_; } const Mesh& orig_mesh() const { return orig_mesh_; }

2
Apps/Subdivider/SubdividerGui/SubdividerGui.pro
View File

@@ -19,7 +19,7 @@ DIRECTORIES = .. ../../QtViewer
# Input # Input
HEADERS += $$getFilesFromDir($$DIRECTORIES,*.hh) HEADERS += $$getFilesFromDir($$DIRECTORIES,*.hh)
SOURCES += ../../QtViewer/QGLViewerWidget.cc ../../QtViewer/MeshViewerWidgetT.cc ../MeshViewerWidget.cc ../SubdivideWidget.cc SOURCES += ../../QtViewer/QGLViewerWidget.cc ../../QtViewer/MeshViewerWidgetT.cc ../SubdivideWidget.cc
SOURCES += ../qtsubdivider.cc SOURCES += ../qtsubdivider.cc
################################################################################ ################################################################################