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

Changed model extensions from `.js.` to `.json` fitting with export from 

latest three.js exporter.
	725819c98d

Updated texture on new models.
10.3.x-maintenance
jeff 2014-11-02 19:04:32 +11:00
parent cbc4684935
commit 5cff317208
10 changed files with 1280 additions and 1344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
resources/models/fallback.js → resources/models/fallback.json
View File

509
resources/models/hex_plus.js
View File

File diff suppressed because one or more lines are too long

477
resources/models/hex_plus.json Normal file
View File

File diff suppressed because one or more lines are too long

509
resources/models/hex_x.js
View File

File diff suppressed because one or more lines are too long

477
resources/models/hex_x.json Normal file
View File

File diff suppressed because one or more lines are too long

0
resources/models/quad_x.js → resources/models/quad_x.json
View File

182
resources/models/tricopter.js → resources/models/tricopter.json
View File

File diff suppressed because one or more lines are too long

208
resources/models/y4.js → resources/models/y4.json
View File

File diff suppressed because one or more lines are too long

260
resources/models/y6.js → resources/models/y6.json
View File

File diff suppressed because one or more lines are too long

2
tabs/setup.js
View File

@ -222,7 +222,7 @@ TABS.setup.initialize3D = function (compatibility) {
} }
loader = new THREE.JSONLoader(); loader = new THREE.JSONLoader();
loader.load('./resources/models/' + model_file + '.js', function (geometry, materials) { loader.load('./resources/models/' + model_file + '.json', function (geometry, materials) {
if (!fallback) { if (!fallback) {
model = new THREE.Mesh(geometry, new THREE.MeshFaceMaterial(materials)); model = new THREE.Mesh(geometry, new THREE.MeshFaceMaterial(materials));
} else { } else {