new version of C++/FFL interface macros
merge with Krista's changes to isomap