MarkTraceur has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/358905 )
Change subject: Fix in response to new three-stl-loader version ...................................................................... Fix in response to new three-stl-loader version In 1.0.5, three-stl-loader will no longer export an STLLoader object, but it will add it to THREE. See https://github.com/enspiral-cherubi/three-stl-loader/commit/144cedb5ceb7422f79295c101b3e35abeff2c76c Meanwhile also set fixed dependency versions. Change-Id: I3a25c4209eee09ebd1811831576786f71888df20 --- M 3d2png.js M package.json 2 files changed, 9 insertions(+), 8 deletions(-) Approvals: MarkTraceur: Verified; Looks good to me, approved diff --git a/3d2png.js b/3d2png.js index 1d99f4d..6cebb2a 100755 --- a/3d2png.js +++ b/3d2png.js @@ -3,10 +3,11 @@ var Canvas = require( 'canvas' ), THREE = require( 'three' ), GL = require( 'gl' ), - ThreeSTLLoader = require( 'three-stl-loader' ), - STLLoader = ThreeSTLLoader( THREE ), fs = require( 'fs' ), yargs = require( 'yargs' ); + +// Add THREE.STLLoader +require( 'three-stl-loader' )( THREE ); /** * Converts 3D files to PNG images @@ -57,7 +58,7 @@ */ ThreeDtoPNG.prototype.getLoader = function( filePath ) { if ( filePath.toLowerCase().endsWith( '.stl' ) ) { - return new STLLoader(); + return new THREE.STLLoader(); } throw 'Unexpected model file extension, only STL is supported'; diff --git a/package.json b/package.json index a778ad4..d3d3814 100644 --- a/package.json +++ b/package.json @@ -11,11 +11,11 @@ ], "name": "3d2png", "dependencies": { - "canvas": "latest", - "gl": "latest", - "three": "latest", - "three-stl-loader": "latest", - "yargs": "latest" + "canvas": "1.6.5", + "gl": "4.0.3", + "three": "0.85.2", + "three-stl-loader": "1.0.5", + "yargs": "8.0.2" }, "devDependencies": { "image-ms-ssim": "latest", -- To view, visit https://gerrit.wikimedia.org/r/358905 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3a25c4209eee09ebd1811831576786f71888df20 Gerrit-PatchSet: 2 Gerrit-Project: 3d2png Gerrit-Branch: master Gerrit-Owner: Matthias Mullie <[email protected]> Gerrit-Reviewer: MarkTraceur <[email protected]> Gerrit-Reviewer: Matthias Mullie <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
