diff options
| -rw-r--r-- | src/jsifier.js | 7 | ||||
| -rw-r--r-- | src/parseTools.js | 2 | ||||
| -rw-r--r-- | tests/bullet/libBullet.namespace | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/jsifier.js b/src/jsifier.js index 15c5bbba..329c263d 100644 --- a/src/jsifier.js +++ b/src/jsifier.js @@ -13,10 +13,11 @@ function JSify(data) { substrate.addZyme('Type', { processItem: function(item) { var type = TYPES[item.name_]; + var niceName = toNiceIdent(item.name_) + // We might export all of TYPES, cleaner that way, but do not want slowdowns in accessing flatteners + item.JS = 'var ' + niceName + '___SIZE = ' + TYPES[item.name_].flatSize + '; // ' + item.name_ + '\n'; if (type.needsFlattening && !type.flatFactor) { - item.JS = 'var ' + toNiceIdent(item.name_) + '___FLATTENER = ' + JSON.stringify(TYPES[item.name_].flatIndexes) + ';'; - } else { - item.JS = '// type: ' + item.name_; + item.JS += 'var ' + niceName + '___FLATTENER = ' + JSON.stringify(TYPES[item.name_].flatIndexes) + ';'; } item.__result__ = true; return [item]; diff --git a/src/parseTools.js b/src/parseTools.js index 6e8f8b47..7e941ef5 100644 --- a/src/parseTools.js +++ b/src/parseTools.js @@ -56,7 +56,7 @@ function toNiceIdent(ident) { assert(ident); if (parseFloat(ident) == ident) return ident; if (ident == 'null') return '0'; // see parseNumerical - return ident.replace(/[" \.@%:<>,\*\[\]]/g, '_'); + return ident.replace(/[" \.@%:<>,\*\[\]-]/g, '_'); } INT_TYPES = searchable('i1', 'i8', 'i16', 'i32', 'i64'); diff --git a/tests/bullet/libBullet.namespace b/tests/bullet/libBullet.namespace index 5918f4eb..e8e3f435 100644 --- a/tests/bullet/libBullet.namespace +++ b/tests/bullet/libBullet.namespace @@ -1,5 +1,5 @@ { - "Namespace": { + "Bullet": { "BT_BOX_BOX_TRANSFORM_CACHE": { "calc_from_homogenic": __ZN26BT_BOX_BOX_TRANSFORM_CACHE19calc_from_homogenicERK11btTransformS2_ }, |