Skip to content

Commit

Permalink
fix: downgrade three to r135
Browse files Browse the repository at this point in the history
  • Loading branch information
fand committed Mar 23, 2022
1 parent 475c6c9 commit 69c9e93
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 14 deletions.
5 changes: 3 additions & 2 deletions package.json
Expand Up @@ -6,14 +6,15 @@
"bugs": "https://github.com/fand/vedajs/issues",
"dependencies": {
"@fand/gifuct-js": "^1.0.0",
"three": "^0.138.3"
"three": "0.135"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^21.0.2",
"@rollup/plugin-node-resolve": "^13.1.3",
"@rollup/plugin-typescript": "^8.3.1",
"@types/node": "^17.0.21",
"@types/three": "^0.138.0",
"@types/offscreencanvas": "^2019.6.4",
"@types/three": "0.135",
"@types/webmidi": "2.0.6",
"@typescript-eslint/eslint-plugin": "^5.15.0",
"@typescript-eslint/parser": "^5.15.0",
Expand Down
2 changes: 1 addition & 1 deletion src/model-loader.ts
@@ -1,7 +1,7 @@
import * as THREE from 'three';
import { IPassModel } from './constants';
import { MTLLoader } from 'three/examples/jsm/loaders/MTLLoader.js';
import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader.js';
import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader';

interface ICache {
url: string;
Expand Down
6 changes: 3 additions & 3 deletions src/veda.ts
@@ -1,5 +1,5 @@
import * as THREE from 'three';
import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils.js';
import * as BufferGeometryUtils from 'three/examples/jsm/utils/BufferGeometryUtils';
import AudioLoader from './audio-loader';
import CameraLoader from './camera-loader';
import GamepadLoader from './gamepad-loader';
Expand Down Expand Up @@ -447,8 +447,8 @@ export default class Veda {
const mesh = this.createMesh(o, materialId, vertexId, pass);
scene.add(mesh);

if (o.material && o.material.map) {
materials[materialId] = o.material.map;
if (o.material && (o.material as any).map) {
materials[materialId] = (o.material as any).map;
}

materialId++;
Expand Down
21 changes: 13 additions & 8 deletions yarn.lock
Expand Up @@ -119,17 +119,22 @@
resolved "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"
integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==

"@types/offscreencanvas@^2019.6.4":
version "2019.6.4"
resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.6.4.tgz#64f6d120b53925028299c744fcdd32d2cd525963"
integrity sha512-u8SAgdZ8ROtkTF+mfZGOscl0or6BSj9A4g37e6nvxDc+YB/oDut0wHkK2PBBiC2bNR8TS0CPV+1gAk4fNisr1Q==

"@types/resolve@1.17.1":
version "1.17.1"
resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"
integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
dependencies:
"@types/node" "*"

"@types/three@^0.138.0":
version "0.138.0"
resolved "https://registry.npmjs.org/@types/three/-/three-0.138.0.tgz"
integrity sha512-D8AoV7h2kbCfrv/DcebHOFh1WDwyus3HdooBkAwcBikXArdqnsQ38PQ85JCunnvun160oA9jz53GszF3zch3tg==
"@types/three@0.135":
version "0.135.0"
resolved "https://registry.yarnpkg.com/@types/three/-/three-0.135.0.tgz#db7f9d9699b60aba844fc5b2893adf6dd6811665"
integrity sha512-l7WLhIHjhHMtlpyTSltPPAKLpiMwgMD1hXHj59AVUpYRoZP7Fd9NNOSRSvZBCPLpTHPYojgQvSJCoza9zoL7bg==

"@types/webmidi@2.0.6":
version "2.0.6"
Expand Down Expand Up @@ -1724,10 +1729,10 @@ text-table@^0.2.0:
resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=

three@^0.138.3:
version "0.138.3"
resolved "https://registry.npmjs.org/three/-/three-0.138.3.tgz"
integrity sha512-4t1cKC8gimNyJChJbaklg8W/qj3PpsLJUIFm5LIuAy/hVxxNm1ru2FGTSfbTSsuHmC/7ipsyuGKqrSAKLNtkzg==
three@0.135:
version "0.135.0"
resolved "https://registry.yarnpkg.com/three/-/three-0.135.0.tgz#cff4ec8edd3c51ce9bc7e88d13e8eafed4d0ddfc"
integrity sha512-kuEpuuxRzLv0MDsXai9huCxOSQPZ4vje6y0gn80SRmQvgz6/+rI0NAvCRAw56zYaWKMGMfqKWsxF9Qa2Z9xymQ==

through@^2.3.8:
version "2.3.8"
Expand Down

0 comments on commit 69c9e93

Please sign in to comment.