Merge pull request mrdoob#7841 from mkkellogg/dev

Added general purpose particle system example: campfire.
jonnenauha · Dec 31, 2015 · e900614 · e900614
2 parents 5a81b6e + 9413be9
commit e900614
Show file tree

Hide file tree

Showing 20 changed files with 6,507 additions and 0 deletions.
diff --git a/examples/files.js b/examples/files.js
@@ -157,6 +157,7 @@ var files = {
 		"webgl_octree",
 		"webgl_octree_raycasting",
 		"webgl_panorama_equirectangular",
+		"webgl_particles_general",
 		"webgl_performance",
 		"webgl_performance_doublesided",
 		"webgl_performance_static",

diff --git a/examples/js/GeneralParticleSystem.min.js b/examples/js/GeneralParticleSystem.min.js
diff --git a/examples/models/campfire/brownrock.mtl b/examples/models/campfire/brownrock.mtl
@@ -0,0 +1,12 @@
+# Blender MTL File: 'None'
+# Material Count: 1
+
+newmtl brownrock
+Ns 19.607843
+Ka 0.000000 0.000000 0.000000
+Kd 0.470588 0.470588 0.470588
+Ks 0.000000 0.000000 0.000000
+Ke 0.000000 0.000000 0.000000
+Ni 1.000000
+d 1.000000
+illum 1