Browse Source

Editor: temporary hack to make textures working.

Just till we don't come up with something better ;)
alteredq 13 years ago
parent
commit
1f959d4283
2 changed files with 13 additions and 2 deletions
  1. 3 1
      editor/index.html
  2. 10 1
      editor/js/ui/Sidebar.Properties.Material.js

+ 3 - 1
editor/index.html

@@ -291,8 +291,10 @@
 
 
 			}
 			}
 
 
+			var dummyTexture = THREE.ImageUtils.generateDataTexture( 1, 1, new THREE.Color( 0xffffff ) );
+
 			var geometry = new THREE.SphereGeometry( 75, 25, 15 );
 			var geometry = new THREE.SphereGeometry( 75, 25, 15 );
-			var material = new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff } );
+			var material = new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff, map: dummyTexture } );
 			var mesh = new THREE.Mesh( geometry, material );
 			var mesh = new THREE.Mesh( geometry, material );
 
 
 			signals.objectAdded.dispatch( mesh );
 			signals.objectAdded.dispatch( mesh );

+ 10 - 1
editor/js/ui/Sidebar.Properties.Material.js

@@ -214,6 +214,8 @@ Sidebar.Properties.Material = function ( signals ) {
 
 
 	var selected = null;
 	var selected = null;
 
 
+	var dummyTexture = THREE.ImageUtils.generateDataTexture( 1, 1, new THREE.Color( 0xffffff ) );
+
 	function update() {
 	function update() {
 
 
 		var material = selected.material;
 		var material = selected.material;
@@ -227,6 +229,8 @@ Sidebar.Properties.Material = function ( signals ) {
 				material = new materials[ materialClass.getValue() ]();
 				material = new materials[ materialClass.getValue() ]();
 				selected.material = material;
 				selected.material = material;
 
 
+				material.map = dummyTexture;
+
 			}
 			}
 
 
 			if ( material.color !== undefined ) {
 			if ( material.color !== undefined ) {
@@ -261,7 +265,12 @@ Sidebar.Properties.Material = function ( signals ) {
 
 
 			if ( material.map !== undefined ) {
 			if ( material.map !== undefined ) {
 
 
-				material.map = materialMapEnabled.getValue() === true ? materialMap.getValue() : null;
+				if ( materialMapEnabled.getValue() === true ) {
+
+					material.map = materialMap.getValue();
+
+				}
+				//material.map = materialMapEnabled.getValue() === true ? materialMap.getValue() : null;
 				material.needsUpdate = true;
 				material.needsUpdate = true;
 
 
 			}
 			}