manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

minor changes

This commit is contained in:
Nico Pietroni 2004-09-01 12:08:39 +00:00
parent 14a1c4c1e7
commit c3227ae7a0
2 changed files with 58 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
apps/tetra_decimator/main.cpp
View File

@ -7,9 +7,6 @@
#include <vcg/complex/tetramesh/base.h>
#include <vcg/simplex/tetrahedron/with/atavtq.h>
// the trackball
#include <wrap/gui/trackball.h>
// io
#include <wrap/io_tetramesh/import_ply.h>
#include <wrap/io_tetramesh/export_ply.h>
@ -25,28 +22,25 @@ class MyTetrahedron : public vcg::TetraATAVTQ<MyVertex,MyTetrahedron>{};
class MyTMesh: public vcg::tetra::Tetramesh< std::vector<MyVertex>, std::vector<MyTetrahedron > >{};
#include <vcg/complex/local_optimization/base.h>
#include <vcg/complex/local_optimization.h>
#include <vcg/complex/local_optimization/tetra_edge_collapse.h>
vcg::LocalOptimization<MyTMesh> loc;
vcg::tetra::TetraEdgeCollapse<MyTMesh> c;
vcg::LocalOptimization<MyTMesh> *loc;
//vcg::tetra::TetraEdgeCollapse<MyTMesh> c;
MyTMesh mesh;
int main(int,char**argv){
loc.m = & mesh;
int main(int,char**argv,int num_op){
loc=new vcg::LocalOptimization<MyTMesh>(mesh);
vcg::tetra::io::ImporterTS<MyTMesh>::Open(mesh,argv[1]);
//vcg::tetra::io::ImporterTS<MyTMesh>::Open(mesh,"d:/sphere.ts");
printf("mesh loaded %d %d \n",mesh.vn,mesh.tn);
// vcg::tetra::io::ExporterPLY<MyTMesh>::Save(mesh,(string(argv[1])+string(".ply")).c_str());
/*vcg::tetra::TetraEdgeCollapse<MyTMesh> *_ ;
bool res;*/
vcg::tetra::TetraEdgeCollapse<MyTMesh> *_ ;
bool res;
do{
vcg::tetra::UpdateTetraTopology<MyTMesh::VertexContainer,MyTMesh::TetraContainer>
vcg::tetra::UpdateTetraTopology<MyTMesh::VertexContainer,MyTMesh::TetraContainer>
::VTTopology(mesh.vert,mesh.tetra);
vcg::tetra::UpdateTetraTopology<MyTMesh::VertexContainer,MyTMesh::TetraContainer>
@ -55,13 +49,13 @@ int main(int,char**argv){
vcg::tetra::UpdateTetraTopology<MyTMesh::VertexContainer,MyTMesh::TetraContainer>
::setExternalVertices(mesh.vert,mesh.tetra);
_=new vcg::tetra::TetraEdgeCollapse<MyTMesh>();
loc.h.push_back(vcg::LocalOptimization<MyTMesh>::HeapElem(_));
vcg::tetra::TetraEdgeCollapse<MyTMesh>::Init(mesh,loc->h);
loc.Init();
loc.SetTargetSimplices(10);
bool res;
do{
loc->SetTargetOperations(num_op);
res = loc.DoOptimization();
res = loc->DoOptimization();
printf("ood %d\n bor %d\n vol %d \n lkv %d \n lke %d \n lkf %d \n",
FAIL::OFD(),

32
apps/tetra_decimator/tetra_decimator/tetra_decimator.vcproj
View File

@ -20,7 +20,7 @@
Name="VCCLCompilerTool"
Optimization="0"
EnableIntrinsicFunctions="FALSE"
AdditionalIncludeDirectories="d:/sf"
AdditionalIncludeDirectories="d:/sf;d:/;"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
@ -28,15 +28,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="4">
<IntelOptions
Optimization="0"
EnableIntrinsicFunctions="0"
MinimalRebuild="1"
BasicRuntimeChecks="3"
RuntimeLibrary="5"
AllOptions="/c /I &quot;d:/sf&quot; /ZI /nologo /W3 /Wp64 /Od /D &quot;WIN32&quot; /D &quot;_DEBUG&quot; /D &quot;_CONSOLE&quot; /D &quot;_MBCS&quot; /Gm /EHsc /RTC1 /MLd /Fo&quot;Debug/&quot; /Fd&quot;Debug/vc70.pdb&quot; /Gd /TP"/>
</Tool>
DebugInformationFormat="4"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@ -47,10 +39,7 @@
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="$(OutDir)/tetra_decimator.pdb"
SubSystem="1"
TargetMachine="1">
<IntelOptions
AllOptions="/NOLOGO /OUT:&quot;Debug/tetra_decimator.exe&quot; /INCREMENTAL /DEBUG /PDB:&quot;Debug/tetra_decimator.pdb&quot; /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
</Tool>
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@ -85,11 +74,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3">
<IntelOptions
RuntimeLibrary="4"
AllOptions="/c /Zi /nologo /W3 /Wp64 /O2 /D &quot;WIN32&quot; /D &quot;NDEBUG&quot; /D &quot;_CONSOLE&quot; /D &quot;_MBCS&quot; /FD /EHsc /ML /Fo&quot;Release/&quot; /Fd&quot;Release/vc70.pdb&quot; /Gd /TP"/>
</Tool>
DebugInformationFormat="3"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
@ -101,10 +86,7 @@
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1">
<IntelOptions
AllOptions="/NOLOGO /OUT:&quot;Release/tetra_decimator.exe&quot; /INCREMENTAL:NO /DEBUG /PDB:&quot;Release/tetra_decimator.pdb&quot; /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /TLBID:1 /MACHINE:IX86 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib"/>
</Tool>
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"/>
<Tool
@ -145,9 +127,6 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
<File
RelativePath="..\..\..\vcg\complex\local_optimization\base.h">
</File>
<File
RelativePath="..\..\..\vcg\complex\tetramesh\edge_collapse.h">
</File>
@ -164,4 +143,3 @@
<Globals>
</Globals>
</VisualStudioProject>