updated waf

This commit is contained in:
zzzzrrr 2011-03-08 09:12:11 -05:00
parent 105c2f16cc
commit 50669c2023
4 changed files with 63 additions and 48 deletions

View File

@ -70,6 +70,40 @@ void Triangle::MarkNeighbor(Triangle& t)
} }
} }
/**
* Clears all references to all other triangles and points
*/
void Triangle::Clear()
{
Triangle *t;
for( int i=0; i<3; i++ )
{
t = neighbors_[i];
if( t != NULL )
{
t->ClearNeighbor( this );
}
}
ClearNeighbors();
points_[0]=points_[1]=points_[2] = NULL;
}
void Triangle::ClearNeighbor(Triangle *triangle )
{
if( neighbors_[0] == triangle )
{
neighbors_[0] = NULL;
}
else if( neighbors_[1] == triangle )
{
neighbors_[1] = NULL;
}
else
{
neighbors_[2] = NULL;
}
}
void Triangle::ClearNeighbors() void Triangle::ClearNeighbors()
{ {
neighbors_[0] = NULL; neighbors_[0] = NULL;

View File

@ -190,6 +190,11 @@ bool Contains(const Edge& e);
bool Contains(Point* p, Point* q); bool Contains(Point* p, Point* q);
void Legalize(Point& point); void Legalize(Point& point);
void Legalize(Point& opoint, Point& npoint); void Legalize(Point& opoint, Point& npoint);
/**
* Clears all references to all other triangles and points
*/
void Clear();
void ClearNeighbor(Triangle *triangle );
void ClearNeighbors(); void ClearNeighbors();
void ClearDelunayEdges(); void ClearDelunayEdges();

BIN
waf vendored

Binary file not shown.

60
wscript
View File

@ -1,16 +1,22 @@
VERSION='0.0.1' #! /usr/bin/env python
# encoding: utf-8
# waf 1.6.2
VERSION='0.3.3'
import sys import sys
APPNAME='p2t' APPNAME='p2t'
srcdir = '.' top = '.'
blddir = 'build' out = 'build'
p2t_source_files = ['poly2tri/common/shapes.cc', CPP_SOURCES = ['poly2tri/common/shapes.cc',
'poly2tri/sweep/cdt.cc', 'poly2tri/sweep/cdt.cc',
'poly2tri/sweep/advancing_front.cc', 'poly2tri/sweep/advancing_front.cc',
'poly2tri/sweep/sweep_context.cc', 'poly2tri/sweep/sweep_context.cc',
'poly2tri/sweep/sweep.cc'] 'poly2tri/sweep/sweep.cc',
'testbed/main.cc']
testbed_source_files = ['testbed/main.cc'] from waflib.Tools.compiler_cxx import cxx_compiler
cxx_compiler['win32'] = ['g++']
#Platform specific libs #Platform specific libs
if sys.platform == 'win32': if sys.platform == 'win32':
@ -23,47 +29,17 @@ else:
# GNU/Linux, BSD, etc # GNU/Linux, BSD, etc
sys_libs = ['glfw', 'GL'] sys_libs = ['glfw', 'GL']
def init(): def options(opt):
print(' init called')
def set_options(opt):
print(' set_options') print(' set_options')
opt.tool_options('g++') opt.load('compiler_cxx')
def configure(conf): def configure(conf):
print(' calling the configuration') print(' calling the configuration')
conf.check_tool('g++') conf.load('compiler_cxx')
#conf.env.CXXFLAGS = ['-O0', '-pg', '-g']
#conf.env.CXXFLAGS = ['-O0', '-g']
conf.env.CXXFLAGS = ['-O3', '-ffast-math'] conf.env.CXXFLAGS = ['-O3', '-ffast-math']
conf.env.DEFINES_P2T = ['P2T']
conf.env.LIB_P2T = sys_libs
def build(bld): def build(bld):
print(' building') print(' building')
bld.program(features = 'cxx cxxprogram', source=CPP_SOURCES, target = 'p2t', uselib = 'P2T')
'''
# A static library
# The extension (.a) is added automatically
bld.new_task_gen(
features = 'cxx cshlib',
source = p2t_source_files,
name = 'poly2tri',
target = 'poly2tri')
# 1. A simple program
bld.new_task_gen(
features = 'cxx cprogram',
source = testbed_source_files,
target = 'p2t',
uselib_local = 'poly2tri',
libs = sys_libs)
'''
bld.new_task_gen(
features = 'cxx cprogram',
source = testbed_source_files + p2t_source_files,
target = 'p2t',
libs = sys_libs)
def shutdown():
print(' shutdown called')