MarkTraceur has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/394997 )
Change subject: Fix in response to new three-stl-loader version ...................................................................... Fix in response to new three-stl-loader version In 1.0.6, STLLoader (again) changed how it should init: https://github.com/enspiral-cherubi/three-stl-loader/commit/58233f71ddbc93ecb1cd47c33ff3edba67ba6a16 It used to be like this in <=1.0.4, then changed in 1.0.5 (see I3a25c4209eee09ebd1811831576786f71888df20), and now again in 1.0.6. Bug: T181992 Change-Id: Ia82f9ebf3a3b2294dbc644fff1beb0007fcd9a5a --- M 3d2png.js 1 file changed, 3 insertions(+), 5 deletions(-) Approvals: MarkTraceur: Verified; Looks good to me, approved Cparle: Looks good to me, but someone else must approve diff --git a/3d2png.js b/3d2png.js index 66c999f..b816ad6 100755 --- a/3d2png.js +++ b/3d2png.js @@ -4,10 +4,8 @@ THREE = require( 'three' ), GL = require( 'gl' ), fs = require( 'fs' ), - yargs = require( 'yargs' ); - -// Add THREE.STLLoader -require( 'three-stl-loader' )( THREE ); + yargs = require( 'yargs' ), + STLLoader = require( 'three-stl-loader' )( THREE ); /** * Converts 3D files to PNG images @@ -69,7 +67,7 @@ ThreeDtoPNG.prototype.getLoader = function() { // TODO XXX if more file formats are supported later, need a command line option // to signify the expected format of the input file. - return new THREE.STLLoader(); + return new STLLoader(); }; /** -- To view, visit https://gerrit.wikimedia.org/r/394997 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia82f9ebf3a3b2294dbc644fff1beb0007fcd9a5a Gerrit-PatchSet: 2 Gerrit-Project: 3d2png Gerrit-Branch: master Gerrit-Owner: Matthias Mullie <[email protected]> Gerrit-Reviewer: Cparle <[email protected]> Gerrit-Reviewer: MarkTraceur <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
