home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-17 17:05:57 +10:00
Code Issues Packages Projects Releases Wiki Activity

merging with r29

Browse Source
This commit is contained in:
George Profenza
2010-11-30 13:45:00 +00:00
parent 774b5e843d
commit caf2c2000f
14 changed files with 146 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/obj/nano/.DS_Store
Vendored
BIN
View File
Binary file not shown.
examples/obj/nano/Nano.js
+21 -24
View File
@@ -912,44 +912,41 @@ var Nano = function ( urlbase ) {
function create_material( m ) {
var material;
/*
if( m.map_diffuse && urlbase ) {
var texture = document.createElement( 'canvas' );
material = new THREE.MeshBitmapMaterial( texture );
var image = new Image();
// material = new THREE.MeshBitmapMaterial( texture );
material = new THREE.MeshBasicMaterial( { map: loadImage( urlbase ) }
function loadImage( path ) {
var image = document.createElement( 'img' );
var texture = new THREE.Texture( image, THREE.UVMapping )
image.onload = function () { texture.loaded = true; };
image.src = path;
return texture;
}
image.onload = function () {
if ( !is_pow2(this.width) || !is_pow2(this.height) ) {
var w = nearest_pow2( this.width );
var h = nearest_pow2( this.height );
material.bitmap.width = w;
material.bitmap.height = h;
material.bitmap.getContext("2d").drawImage( this, 0, 0, w, h );
}
else {
material.bitmap = this;
}
material.loaded = 1;
};
image.src = urlbase + "/" + m.map_diffuse;
}
else if( m.col_diffuse ) {
else */
if( m.col_diffuse ) {
var color = (m.col_diffuse[0]*255 << 16) + (m.col_diffuse[1]*255 << 8) + m.col_diffuse[2]*255;
material = new THREE.MeshColorFillMaterial( color, m.transparency );
material = new THREE.MeshBasicMaterial( {color:color, opacity:m.transparency} );
}
else if( m.a_dbg_color ) {
material = new THREE.MeshColorFillMaterial( m.a_dbg_color );
material = new THREE.MeshBasicMaterial( {color:m.a_dbg_color} );
}
else {
material = new THREE.MeshColorFillMaterial( 0xffeeeeee );
material = new THREE.MeshBasicMaterial( {color:0xffeeeeee} );
}
return material;
}
}
Nano.prototype = new THREE.Geometry();