Commit bb0fe15d authored by amandaghassaei's avatar amandaghassaei
Browse files

textures loading

parent c32a5492
...@@ -520,12 +520,13 @@ define(['underscore', 'appState', 'three'], function(_, appState, THREE){ ...@@ -520,12 +520,13 @@ define(['underscore', 'appState', 'three'], function(_, appState, THREE){
DMAMaterial.prototype._makeMaterialObject = function(color, transparent){ DMAMaterial.prototype._makeMaterialObject = function(color, transparent){
if (transparent) return new THREE.MeshLambertMaterial({color:color, transparent:true, opacity:0.4}); if (transparent) return new THREE.MeshLambertMaterial({color:color, transparent:true, opacity:0.4});
var json = {color: color}; var json = {color: color};
var material = new THREE.MeshLambertMaterial(json);
if (this.texture) { if (this.texture) {
textureLoader.load("assets/textures/"+this.texture+".png", function(texture){ textureLoader.load("assets/textures/"+this.texture+".png", function(texture){
json.map = texture;//todo not sure if this loades on time material.map = texture;
}); });
} }
return new THREE.MeshLambertMaterial(json); return material;
}; };
DMAMaterial.prototype.getThreeMaterial = function(){ DMAMaterial.prototype.getThreeMaterial = function(){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment