Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-26 09:45:28 +03:00
Code Issues Wiki Activity

Pushed three.js library version to 0.110.0

Browse source
This commit is contained in:
Miguel Angel Mulero Martinez 2020-06-26 13:14:39 +02:00
parent 26418f336a
commit 90e8bad330
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -56,7 +56,7 @@
"object-hash": "^2.0.3", "object-hash": "^2.0.3",
"semver-min": "^0.6.5", "semver-min": "^0.6.5",
"short-unique-id": "^1.1.1", "short-unique-id": "^1.1.1",
"three": "~0.98.0", "three": "~0.110.0",
"universal-ga": "^1.2.0" "universal-ga": "^1.2.0"
}, },
"devDependencies": { "devDependencies": {

8
src/js/model.js
View file

@ -87,11 +87,11 @@ var Model = function (wrapper, canvas) {
}; };
Model.prototype.loadJSON = function (model_file, callback) { Model.prototype.loadJSON = function (model_file, callback) {
var loader = new THREE.JSONLoader(); const loader = new THREE.LegacyJSONLoader();
loader.load('./resources/models/' + model_file + '.json', function (geometry, materials) { loader.load(`./resources/models/${model_file}.json`, function (geometry, materials) {
var modelMaterial = new THREE.MeshFaceMaterial(materials), const modelMaterial = new THREE.MeshFaceMaterial(materials);
model = new THREE.Mesh(geometry, modelMaterial); const model = new THREE.Mesh(geometry, modelMaterial);
model.scale.set(15, 15, 15); model.scale.set(15, 15, 15);

1
src/main.html
View file

@ -54,6 +54,7 @@
<script type="text/javascript" src="./js/libraries/d3.min.js"></script> <script type="text/javascript" src="./js/libraries/d3.min.js"></script>
<script type="text/javascript" src="./js/libraries/jquery.nouislider.all.min.js"></script> <script type="text/javascript" src="./js/libraries/jquery.nouislider.all.min.js"></script>
<script type="text/javascript" src="./node_modules/three/build/three.min.js"></script> <script type="text/javascript" src="./node_modules/three/build/three.min.js"></script>
<script type="text/javascript" src="./node_modules/three/examples/js/loaders/deprecated/LegacyJSONLoader.js"></script>
<script type="text/javascript" src="./js/libraries/jquery.flightindicators.js"></script> <script type="text/javascript" src="./js/libraries/jquery.flightindicators.js"></script>
<script type="text/javascript" src="./node_modules/semver-min/umd/index.js"></script> <script type="text/javascript" src="./node_modules/semver-min/umd/index.js"></script>
<script type="text/javascript" src="./js/libraries/switchery/switchery.js"></script> <script type="text/javascript" src="./js/libraries/switchery/switchery.js"></script>

8
yarn.lock
View file

@ -5311,10 +5311,10 @@ thenify@^3.3.0:
dependencies: dependencies:
any-promise "^1.0.0" any-promise "^1.0.0"
three@~0.98.0: three@~0.110.0:
version "0.98.0" version "0.110.0"
resolved "https://registry.yarnpkg.com/three/-/three-0.98.0.tgz#11d4e3cca4b5d099c7de0ea5afa153b5d20cda84" resolved "https://registry.yarnpkg.com/three/-/three-0.110.0.tgz#8719591de1336269113ee79f4268ba247b2324f8"
integrity sha512-fihjYVjCmQbI03zt1+YCl/m+UrZCcDHFNLexgqBOIdPwnO6PYkQaYUsIbqtvNNse+BiMeu+pQWzZn9/NSnIv6A== integrity sha512-wlurH8XBO9Sd5VIw8nBa+taLR20kqaI4e9FiuMh6tqK8eOS2q2R+ZoUyufbyDTVTHhs8GiTbv0r2CMLkwerFJg==
through2-filter@^3.0.0: through2-filter@^3.0.0:
version "3.0.0" version "3.0.0"