Skip to content

Commit

Permalink
Merge pull request #488 from pixiv/bump-three-0.120.1
Browse files Browse the repository at this point in the history 
bump three.js to 0.120.1
  • Loading branch information
Yutaka "FMS_Cat" Obuchi authored Sep 17, 2020
2 parents a87c428 + fadd664 commit 5f8471b
Show file tree
Hide file tree
Showing 16 changed files with 48 additions and 48 deletions.
6 changes: 3 additions & 3 deletions examples/animations.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/basic.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/blendshapes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/bones.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/debug.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/dnd.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/encoding.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/envmap.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/firstperson.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/lookat-advanced.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
const _v3A = new THREE.Vector3();
Expand Down
6 changes: 3 additions & 3 deletions examples/lookat.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/materials-debug.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/meta.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
<body>
<span id="meta"></span>
<img id="thumbnail" alt="thumbnail" />
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
6 changes: 3 additions & 3 deletions examples/mouse.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
</head>

<body>
<script src="https://unpkg.com/three@0.118.3/build/three.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.118.3/examples/js/controls/OrbitControls.js"></script>
<script src="https://unpkg.com/three@0.120.1/build/three.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/loaders/GLTFLoader.js"></script>
<script src="https://unpkg.com/three@0.120.1/examples/js/controls/OrbitControls.js"></script>
<script src="../lib/three-vrm.js"></script>
<script>
// renderer
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"quicktype": "^15.0.199",
"raw-loader": "^4.0.1",
"rimraf": "^3.0.0",
"three": "^0.118.3",
"three": "^0.120.1",
"ts-loader": "^6.1.0",
"ts-node": "^8.4.1",
"typedoc": "^0.17.7",
Expand All @@ -88,6 +88,6 @@
"worker-loader": "^2.0.0"
},
"peerDependencies": {
"three": "^0.118.3"
"three": "^0.120.1"
}
}
8 changes: 4 additions & 4 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5412,10 +5412,10 @@ text-table@^0.2.0:
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=

three@^0.118.3:
version "0.118.3"
resolved "https://registry.yarnpkg.com/three/-/three-0.118.3.tgz#c0bf8c10a68155478f12f4ccac2ff979526a4a0a"
integrity sha512-ijECXrNzDkHieoeh2H69kgawTGH8DiamhR4uBN8jEM7VHSKvfTdEvOoHsA8Aq7dh7PHAxhlqBsN5arBI3KixSw==
three@^0.120.1:
version "0.120.1"
resolved "https://registry.yarnpkg.com/three/-/three-0.120.1.tgz#dbd8894f8ab87c109f1602933e7c740c98137377"
integrity sha512-ktaCRFUR7JUZcKec+cBRz+oBex5pOVaJhrtxvFF2T7on53o9UkEux+/Nh1g/4zeb4t/pbxIFcADbn/ACu3LC1g==

through2@^2.0.0, through2@~2.0.3:
version "2.0.5"
Expand Down

0 comments on commit 5f8471b

Please sign in to comment.