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 #106 from sherlockflight/development 

Fix custom model
10.3.x-maintenance
Dominic Clifton 2015-02-20 20:02:08 +00:00
parent 34d72feb69 3c2bb6225d
commit ebb2601d83
3 changed files with 42 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
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

5
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);