From ab32cda827ad83eb8ffc043fe5a7ac0eda56b32b Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Mon, 17 Nov 2014 17:23:05 +0000 Subject: [PATCH] no global Render --- libsrc/stlgeom/Makefile.am | 4 ++-- libsrc/stlgeom/meshstlsurface.cpp | 3 +-- libsrc/stlgeom/stlgeommesh.cpp | 6 ++---- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/libsrc/stlgeom/Makefile.am b/libsrc/stlgeom/Makefile.am index 04e598cf..bbe009c1 100644 --- a/libsrc/stlgeom/Makefile.am +++ b/libsrc/stlgeom/Makefile.am @@ -8,14 +8,14 @@ lib_LTLIBRARIES = libstl.la if NGGUI lib_LTLIBRARIES += libstlvis.la +libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp +libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/visualization/libvisual.la endif libstl_la_SOURCES = meshstlsurface.cpp stlgeom.cpp stlgeomchart.cpp \ stlgeommesh.cpp stlline.cpp stltool.cpp stltopology.cpp -libstlvis_la_SOURCES = stlpkg.cpp vsstl.cpp -libstlvis_la_LIBADD = libstl.la libstl_la_LIBADD = $(top_builddir)/libsrc/meshing/libmesh.la # libstlvis_la_LIBADD = libstl.la $(top_builddir)/libsrc/linalg/libla.la diff --git a/libsrc/stlgeom/meshstlsurface.cpp b/libsrc/stlgeom/meshstlsurface.cpp index 0ab58429..98c1567a 100644 --- a/libsrc/stlgeom/meshstlsurface.cpp +++ b/libsrc/stlgeom/meshstlsurface.cpp @@ -730,8 +730,7 @@ void STLSurfaceMeshing1 (STLGeometry & geom, compress[icompress[i]] = 0; - extern void Render(); - Render(); + mparam.Render(); } // NgProfiler::Print(stdout); diff --git a/libsrc/stlgeom/stlgeommesh.cpp b/libsrc/stlgeom/stlgeommesh.cpp index 4232375c..2d3e9084 100644 --- a/libsrc/stlgeom/stlgeommesh.cpp +++ b/libsrc/stlgeom/stlgeommesh.cpp @@ -1459,8 +1459,7 @@ int STLMeshingDummy (STLGeometry* stlgeometry, shared_ptr & mesh, MeshingP (*statout) << GetTime() << " & "; #endif - extern void Render(); - Render(); + mparam.Render(); } stlgeometry->surfaceoptimized = 1; } @@ -1576,8 +1575,7 @@ int STLMeshingDummy (STLGeometry* stlgeometry, shared_ptr & mesh, MeshingP << mesh->GetNP() << " " << '\\' << '\\' << " \\" << "hline" << endl; #endif - extern void Render(); - Render(); + mparam.Render(); } }