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

Temporarily use 'fallback' model instead of 'custom'. 

Revert this commit when a custom.json model file is available.
10.3.x-maintenance
Dominic Clifton 2015-01-27 21:14:44 +01:00
parent b3424eadcb
commit 361d9a57dd
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tabs/setup.js
View File

@ -212,10 +212,17 @@ TABS.setup.initialize3D = function (compatibility) {
} else {
model_file = 'fallback'
}
// Temporary workaround for 'custom' model until akfreak's custom model is merged.
var useLegacyCustomModel = false;
if (model_file = 'custom') {
model_file = 'fallback';
useLegacyCustomModel = true;
}
loader = new THREE.JSONLoader();
loader.load('./resources/models/' + model_file + '.json', function (geometry, materials) {
if (useWebGlRenderer) {
if (useWebGlRenderer & !useLegacyCustomModel) {
model = new THREE.Mesh(geometry, new THREE.MeshFaceMaterial(materials));
} else {
materials = THREE.ImageUtils.loadTexture('./resources/textures/fallback_texture.png');