Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 16:25:31 +03:00
Code Issues Wiki Activity

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

Browse source 
latest three.js exporter.
	725819c98d

Updated texture on new models.
This commit is contained in:
jeff 2014-11-02 19:04:32 +11:00
parent cbc4684935
commit 5cff317208
10 changed files with 1280 additions and 1344 deletions
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 {