提交 c9213ab5 编写于 作者: M Mr.doob

Added default material to Mesh, Line and ParticleSystem. Fixes #1373.

上级 927a8980
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
......@@ -7,8 +7,7 @@ THREE.Line = function ( geometry, material, type ) {
THREE.Object3D.call( this );
this.geometry = geometry;
this.material = material;
this.material = ( material !== undefined ) ? material : new THREE.LineBasicMaterial( { color: Math.random() * 0xffffff } );
this.type = ( type !== undefined ) ? type : THREE.LineStrip;
if ( this.geometry ) {
......
......@@ -9,7 +9,7 @@ THREE.Mesh = function ( geometry, material ) {
THREE.Object3D.call( this );
this.geometry = geometry;
this.material = material;
this.material = ( material !== undefined ) ? material : new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, wireframe: true } );
if ( this.geometry ) {
......
......@@ -2,7 +2,7 @@
* @author alteredq / http://alteredqualia.com/
*/
THREE.MorphAnimMesh = function( geometry, material ) {
THREE.MorphAnimMesh = function ( geometry, material ) {
THREE.Mesh.call( this, geometry, material );
......
......@@ -7,7 +7,7 @@ THREE.ParticleSystem = function ( geometry, material ) {
THREE.Object3D.call( this );
this.geometry = geometry;
this.material = material;
this.material = ( material !== undefined ) ? material : new THREE.ParticleBasicMaterial( { color: Math.random() * 0xffffff } );
this.sortParticles = false;
......
......@@ -3,7 +3,7 @@
* @author alteredq / http://alteredqualia.com/
*/
THREE.SkinnedMesh = function( geometry, material ) {
THREE.SkinnedMesh = function ( geometry, material ) {
THREE.Mesh.call( this, geometry, material );
......
......@@ -191,8 +191,7 @@ CANVAS_FILES = [
'renderers/renderables/RenderableFace4.js',
'renderers/renderables/RenderableObject.js',
'renderers/renderables/RenderableParticle.js',
'renderers/renderables/RenderableLine.js',
'extras/ImageUtils.js'
'renderers/renderables/RenderableLine.js'
]
DOM_FILES = [
......@@ -219,6 +218,9 @@ DOM_FILES = [
'cameras/PerspectiveCamera.js',
'lights/Light.js',
'materials/Material.js',
'materials/LineBasicMaterial.js',
'materials/MeshBasicMaterial.js',
'materials/ParticleBasicMaterial.js',
'materials/ParticleDOMMaterial.js',
'textures/Texture.js',
'textures/DataTexture.js',
......@@ -235,8 +237,7 @@ DOM_FILES = [
'renderers/renderables/RenderableFace4.js',
'renderers/renderables/RenderableObject.js',
'renderers/renderables/RenderableParticle.js',
'renderers/renderables/RenderableLine.js',
'extras/ImageUtils.js'
'renderers/renderables/RenderableLine.js'
]
SVG_FILES = [
......@@ -289,8 +290,7 @@ SVG_FILES = [
'renderers/renderables/RenderableFace4.js',
'renderers/renderables/RenderableObject.js',
'renderers/renderables/RenderableParticle.js',
'renderers/renderables/RenderableLine.js',
'extras/ImageUtils.js'
'renderers/renderables/RenderableLine.js'
]
WEBGL_FILES = [
......@@ -365,8 +365,7 @@ WEBGL_FILES = [
'extras/renderers/plugins/ShadowMapPlugin.js',
'extras/renderers/plugins/SpritePlugin.js',
'extras/shaders/ShaderFlares.js',
'extras/shaders/ShaderSprite.js',
'extras/ImageUtils.js'
'extras/shaders/ShaderSprite.js'
]
def merge(files):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册