From 70cd3c8f69964595e90719da41e775bf047ca38f Mon Sep 17 00:00:00 2001 From: Allison Reilly Date: Tue, 18 Sep 2018 18:05:57 -0300 Subject: [PATCH] Bring in THREE dependencies for editor page --- .../ui/User/pages/EditorPage/Box/Box.js | 13 ++++---- package-lock.json | 30 +++++++++++++++++++ package.json | 4 +++ 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/imports/plugins/custom/boxycard-reaction-homepage/client/ui/User/pages/EditorPage/Box/Box.js b/imports/plugins/custom/boxycard-reaction-homepage/client/ui/User/pages/EditorPage/Box/Box.js index 2378599aafe..51024a5208d 100644 --- a/imports/plugins/custom/boxycard-reaction-homepage/client/ui/User/pages/EditorPage/Box/Box.js +++ b/imports/plugins/custom/boxycard-reaction-homepage/client/ui/User/pages/EditorPage/Box/Box.js @@ -3,12 +3,11 @@ import './Box.css'; import React, { PureComponent } from 'react'; import PropTypes from 'prop-types'; -/* global THREE */ +import * as THREE from "three"; -// const OrbitControls = require('three-orbit-controls')(THREE); -// onst MTLLoader = require('three-mtl-loader'); - -// require('three-obj-loader')(THREE); +const OrbitControls = require('three-orbit-controls')(THREE); +const MTLLoader = require('three-mtl-loader'); +const OBJLoader = require('three-obj-loader')(THREE); let scene, camera, renderer, controls, cardCopyOutside, canvasOutside, ctxOutside, cardCopyInside, canvasInside, @@ -60,7 +59,7 @@ export default class Box extends PureComponent { camera.position.set(5, 5, 8); camera.translateY(1); - controls = new THREE.OrbitControls(camera, renderer.domElement); + const controls = new OrbitControls(camera, renderer.domElement); controls.enableZoom = false; controls.addEventListener('change', () => renderer.render(scene, camera)); @@ -119,7 +118,7 @@ export default class Box extends PureComponent { const onProgress = () => {}; const onError = () => {}; - const mtlLoader = new THREE.MTLLoader(); + const mtlLoader = new MTLLoader(); const randomNumber = Math.random(); mtlLoader.load(`/images/assets/3d/box.mtl?rnd=${randomNumber}`, (materials) => { materials.preload(); diff --git a/package-lock.json b/package-lock.json index 35ec2b532c6..de43afaf7b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16359,6 +16359,36 @@ "promise": ">=3.2 <8" } }, + "three": { + "version": "0.96.0", + "resolved": "https://registry.npmjs.org/three/-/three-0.96.0.tgz", + "integrity": "sha512-tS+A5kelQgBblElc/E1G5zR3m6wNjbqmrf6OAjijuNJM7yoYQjOktPoa+Lglx73OTiTOJ3+Ff+pgWdOFt7cOhQ==" + }, + "three-mtl-loader": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/three-mtl-loader/-/three-mtl-loader-1.0.2.tgz", + "integrity": "sha512-GqDrWC5rbi+0/gp999S4lpCSHroBEfe9NqmH165orG0QhXeknL/eSNVMJUWBNgg2sBW7vlqVNWD/P0kdHeGC9g==", + "requires": { + "three": "^0.87.1" + }, + "dependencies": { + "three": { + "version": "0.87.1", + "resolved": "https://registry.npmjs.org/three/-/three-0.87.1.tgz", + "integrity": "sha1-Rmo07cRUNFnO2bnX0na2Uhb+K6g=" + } + } + }, + "three-obj-loader": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/three-obj-loader/-/three-obj-loader-1.1.3.tgz", + "integrity": "sha512-usuOOTAqeM7J7dyae/I9ltFnfy1g47Hsr3byTvBTeH9LYz5vb2i8rLd2Hi1HEr0MbB5H4p9YrqFaDGcijXEVNw==" + }, + "three-orbit-controls": { + "version": "82.1.0", + "resolved": "https://registry.npmjs.org/three-orbit-controls/-/three-orbit-controls-82.1.0.tgz", + "integrity": "sha1-EafzPQog7OyY8Jizd4D2U3N0+rQ=" + }, "throat": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz", diff --git a/package.json b/package.json index 95d4ad490f0..be56e312336 100644 --- a/package.json +++ b/package.json @@ -150,6 +150,10 @@ "swiper": "^4.1.0", "tether-drop": "^1.4.2", "tether-tooltip": "^1.2.0", + "three": "^0.96.0", + "three-mtl-loader": "^1.0.2", + "three-obj-loader": "^1.1.3", + "three-orbit-controls": "^82.1.0", "transliteration": "github:reactioncommerce/transliteration", "url": "^0.11.0", "validator": "^10.5.0",