Remove old fallback model texture, fix fallback model .json

10.3.x-maintenance
Nicholas Sherlock 2015-02-16 17:13:43 +13:00
parent 34d72feb69
commit 3c2bb6225d
3 changed files with 42 additions and 67 deletions

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

View File

@ -222,12 +222,7 @@ TABS.setup.initialize3D = function (compatibility) {
loader = new THREE.JSONLoader();
loader.load('./resources/models/' + model_file + '.json', function (geometry, materials) {
if (useWebGlRenderer & !useLegacyCustomModel) {
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 = new THREE.Mesh(geometry, new THREE.MeshFaceMaterial(materials));
model.scale.set(10, 10, 10);