From 361d9a57ddc21961b28bafa1f4f083183ad7335b Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Tue, 27 Jan 2015 21:14:44 +0100 Subject: [PATCH] Temporarily use 'fallback' model instead of 'custom'. Revert this commit when a custom.json model file is available. --- tabs/setup.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tabs/setup.js b/tabs/setup.js index 7fcedd3286..be9974efae 100644 --- a/tabs/setup.js +++ b/tabs/setup.js @@ -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');