sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2122 from mikeller/re_add_canvas_renderer 

Reverted THREE library to 0.97.0 to get CanvasRenderer back.
10.8-maintenance
Michael Keller 2020-07-14 01:07:02 +12:00 committed by GitHub
parent 691afd0f84 a2f4660397
commit 63e5e9f119
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -59,7 +59,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.110.0", "three": "~0.97.0",
"universal-ga": "^1.2.0" "universal-ga": "^1.2.0"
}, },
"devDependencies": { "devDependencies": {

2
src/js/model.js
View File

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

3
src/main.html
View File

@ -58,7 +58,8 @@
<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="./node_modules/three/examples/js/renderers/CanvasRenderer.js"></script>
<script type="text/javascript" src="./node_modules/three/examples/js/renderers/Projector.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

@ -6063,10 +6063,10 @@ thenify@^3.3.0:
dependencies: dependencies:
any-promise "^1.0.0" any-promise "^1.0.0"
three@~0.110.0: three@~0.97.0:
version "0.110.0" version "0.97.0"
resolved "https://registry.yarnpkg.com/three/-/three-0.110.0.tgz#8719591de1336269113ee79f4268ba247b2324f8" resolved "https://registry.yarnpkg.com/three/-/three-0.97.0.tgz#76141e1b0ace14246fe9198a458fefddc98a4e30"
integrity sha512-wlurH8XBO9Sd5VIw8nBa+taLR20kqaI4e9FiuMh6tqK8eOS2q2R+ZoUyufbyDTVTHhs8GiTbv0r2CMLkwerFJg== integrity sha512-ctZF79O1R2aMIDnz9cV5GUIONyFnYvfQKg4+EAwEVaEr1mgy99rglstH6hhRdIThu3SOa4Ns5da/Ee5fTbWc9A==
through2-filter@^3.0.0: through2-filter@^3.0.0:
version "3.0.0" version "3.0.0"