Skip to content

Commit c9213ab

Browse files
mrdoobmrdoob
committed
Added default material to Mesh, Line and ParticleSystem. Fixes mrdoob#1373.
1 parent 927a898 commit c9213ab

File tree

12 files changed

+407
-416
lines changed

12 files changed

+407
-416
lines changed

‎build/Three.js

Lines changed: 36 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeCanvas.js

Lines changed: 84 additions & 87 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeDOM.js

Lines changed: 58 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeExtras.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeSVG.js

Lines changed: 70 additions & 73 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/custom/ThreeWebGL.js

Lines changed: 140 additions & 143 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/objects/Line.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ THREE.Line = function ( geometry, material, type ) {
77
THREE.Object3D.call( this );
88

99
this.geometry = geometry;
10-
this.material = material;
11-
10+
this.material = ( material !== undefined ) ? material : new THREE.LineBasicMaterial( { color: Math.random() * 0xffffff } );
1211
this.type = ( type !== undefined ) ? type : THREE.LineStrip;
1312

1413
if ( this.geometry ) {

‎src/objects/Mesh.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ THREE.Mesh = function ( geometry, material ) {
99
THREE.Object3D.call( this );
1010

1111
this.geometry = geometry;
12-
this.material = material;
12+
this.material = ( material !== undefined ) ? material : new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, wireframe: true } );
1313

1414
if ( this.geometry ) {
1515

‎src/objects/MorphAnimMesh.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @author alteredq / http://alteredqualia.com/
33
*/
44

5-
THREE.MorphAnimMesh = function( geometry, material ) {
5+
THREE.MorphAnimMesh = function ( geometry, material ) {
66

77
THREE.Mesh.call( this, geometry, material );
88

‎src/objects/ParticleSystem.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ THREE.ParticleSystem = function ( geometry, material ) {
77
THREE.Object3D.call( this );
88

99
this.geometry = geometry;
10-
this.material = material;
10+
this.material = ( material !== undefined ) ? material : new THREE.ParticleBasicMaterial( { color: Math.random() * 0xffffff } );
1111

1212
this.sortParticles = false;
1313

‎src/objects/SkinnedMesh.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @author alteredq / http://alteredqualia.com/
44
*/
55

6-
THREE.SkinnedMesh = function( geometry, material ) {
6+
THREE.SkinnedMesh = function ( geometry, material ) {
77

88
THREE.Mesh.call( this, geometry, material );
99

‎utils/build.py

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,7 @@
191191
'renderers/renderables/RenderableFace4.js',
192192
'renderers/renderables/RenderableObject.js',
193193
'renderers/renderables/RenderableParticle.js',
194-
'renderers/renderables/RenderableLine.js',
195-
'extras/ImageUtils.js'
194+
'renderers/renderables/RenderableLine.js'
196195
]
197196

198197
DOM_FILES = [
@@ -219,6 +218,9 @@
219218
'cameras/PerspectiveCamera.js',
220219
'lights/Light.js',
221220
'materials/Material.js',
221+
'materials/LineBasicMaterial.js',
222+
'materials/MeshBasicMaterial.js',
223+
'materials/ParticleBasicMaterial.js',
222224
'materials/ParticleDOMMaterial.js',
223225
'textures/Texture.js',
224226
'textures/DataTexture.js',
@@ -235,8 +237,7 @@
235237
'renderers/renderables/RenderableFace4.js',
236238
'renderers/renderables/RenderableObject.js',
237239
'renderers/renderables/RenderableParticle.js',
238-
'renderers/renderables/RenderableLine.js',
239-
'extras/ImageUtils.js'
240+
'renderers/renderables/RenderableLine.js'
240241
]
241242

242243
SVG_FILES = [
@@ -289,8 +290,7 @@
289290
'renderers/renderables/RenderableFace4.js',
290291
'renderers/renderables/RenderableObject.js',
291292
'renderers/renderables/RenderableParticle.js',
292-
'renderers/renderables/RenderableLine.js',
293-
'extras/ImageUtils.js'
293+
'renderers/renderables/RenderableLine.js'
294294
]
295295

296296
WEBGL_FILES = [
@@ -365,8 +365,7 @@
365365
'extras/renderers/plugins/ShadowMapPlugin.js',
366366
'extras/renderers/plugins/SpritePlugin.js',
367367
'extras/shaders/ShaderFlares.js',
368-
'extras/shaders/ShaderSprite.js',
369-
'extras/ImageUtils.js'
368+
'extras/shaders/ShaderSprite.js'
370369
]
371370

372371
def merge(files):

0 commit comments

Comments
 (0)