Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Remove old fallback model texture, fix fallback model .json

Browse source
This commit is contained in:
Nicholas Sherlock 2015-02-16 17:13:43 +13:00
parent 34d72feb69
commit 3c2bb6225d
3 changed files with 42 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

102
resources/models/fallback.json
View file

File diff suppressed because one or more lines are too long

BIN
resources/textures/fallback_texture.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 59 KiB

7
tabs/setup.js
View file

@ -222,12 +222,7 @@ TABS.setup.initialize3D = function (compatibility) {
loader = new THREE.JSONLoader(); loader = new THREE.JSONLoader();
loader.load('./resources/models/' + model_file + '.json', function (geometry, materials) { loader.load('./resources/models/' + model_file + '.json', function (geometry, materials) {
if (useWebGlRenderer & !useLegacyCustomModel) { model = new THREE.Mesh(geometry, new THREE.MeshFaceMaterial(materials));
model = new THREE.Mesh(geometry, new THREE.MeshFaceMaterial(materials));
} else {
materials = THREE.ImageUtils.loadTexture('./resources/textures/fallback_texture.png');
model = new THREE.Mesh(geometry, new THREE.MeshBasicMaterial({map: materials, overdraw: true}));
}
model.scale.set(10, 10, 10); model.scale.set(10, 10, 10);