foster/liabru-matter-js
0
0
Fork 0
mirror of https://github.com/liabru/matter-js.git synced 2024-12-24 13:29:01 -05:00
Code Issues Wiki Activity

add poly-decamp require shim

Browse source
This commit is contained in:
liabru 2016-12-02 00:29:08 +00:00
parent 793d1ee2bc
commit c72a9d017f
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Gulpfile.js
View file

@ -105,7 +105,8 @@ gulp.task('watch', function() {
var b = browserify({ var b = browserify({
entries: ['src/module/main.js'], entries: ['src/module/main.js'],
standalone: 'Matter', standalone: 'Matter',
plugin: [watchify] plugin: [watchify],
transform: ['browserify-shim']
}); });
var bundle = function() { var bundle = function() {
@ -249,7 +250,7 @@ var build = function(options) {
var compiled = gulp.src(['src/module/main.js']) var compiled = gulp.src(['src/module/main.js'])
.pipe(through2.obj(function(file, enc, next){ .pipe(through2.obj(function(file, enc, next){
browserify(file.path, { standalone: 'Matter' }) browserify(file.path, { standalone: 'Matter', transform: ['browserify-shim'] })
.bundle(function(err, res){ .bundle(function(err, res){
file.contents = res; file.contents = res;
next(null, file); next(null, file);

6
package.json
View file

@ -21,6 +21,7 @@
], ],
"devDependencies": { "devDependencies": {
"browserify": "^12.0.1", "browserify": "^12.0.1",
"browserify-shim": "^3.8.12",
"cheerio": "^0.19.0", "cheerio": "^0.19.0",
"connect-livereload": "^0.5.4", "connect-livereload": "^0.5.4",
"event-stream": "^3.3.2", "event-stream": "^3.3.2",
@ -58,5 +59,8 @@
"src", "src",
"build", "build",
"CHANGELOG.md" "CHANGELOG.md"
] ],
"browserify-shim": {
"poly-decomp": "global:decomp"
}
} }

3
src/factory/Bodies.js
View file

@ -18,6 +18,7 @@ var Common = require('../core/Common');
var Body = require('../body/Body'); var Body = require('../body/Body');
var Bounds = require('../geometry/Bounds'); var Bounds = require('../geometry/Bounds');
var Vector = require('../geometry/Vector'); var Vector = require('../geometry/Vector');
var decomp = require('poly-decomp');
(function() { (function() {
@ -213,8 +214,6 @@ var Vector = require('../geometry/Vector');
removeCollinear = typeof removeCollinear !== 'undefined' ? removeCollinear : 0.01; removeCollinear = typeof removeCollinear !== 'undefined' ? removeCollinear : 0.01;
minimumArea = typeof minimumArea !== 'undefined' ? minimumArea : 10; minimumArea = typeof minimumArea !== 'undefined' ? minimumArea : 10;
var decomp = window.decomp;
if (!decomp) { if (!decomp) {
Common.warn('Bodies.fromVertices: poly-decomp.js required. Could not decompose vertices. Fallback to convex hull.'); Common.warn('Bodies.fromVertices: poly-decomp.js required. Could not decompose vertices. Fallback to convex hull.');
} }