Change loadModel() example

processing · Jul 3, 2018 · 3f34195 · 3f34195
1 parent 0851837
commit 3f34195
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/docs/yuidoc-p5-theme/assets/octahedron.obj b/docs/yuidoc-p5-theme/assets/octahedron.obj
@@ -0,0 +1,16 @@
++v 0.000000E+00 0.000000E+00 40.0000
++v 22.5000 22.5000 0.000000E+00
++v 22.5000 -22.5000 0.000000E+00
++v -22.5000 -22.5000 0.000000E+00
++v -22.5000 22.5000 0.000000E+00
++v 0.000000E+00 0.000000E+00 -40.0000
++
++f     1 2 3
++f     1 3 4
++f     1 4 5
++f     1 5 2
++f     6 5 4
++f     6 4 3
++f     6 3 2
++f     6 2 1
++f     6 1 5
diff --git a/src/webgl/loading.js b/src/webgl/loading.js
@@ -35,11 +35,11 @@ require('./p5.Geometry');
  * @example
  * <div>
  * <code>
- * //draw a spinning teapot
- * var teapot;
+ * //draw a spinning octahedron
+ * var octahedron;
  *
  * function preload() {
- *   teapot = loadModel('assets/teapot.obj');
+ *   octahedron = loadModel('assets/octahedron.obj');
  * }
  *
  * function setup() {
@@ -50,13 +50,13 @@ require('./p5.Geometry');
  *   background(200);
  *   rotateX(frameCount * 0.01);
  *   rotateY(frameCount * 0.01);
- *   model(teapot);
+ *   model(octahedron);
  * }
  * </code>
  * </div>
  *
  * @alt
- * Vertically rotating 3-d teapot with red, green and blue gradient.
+ * Vertically rotating 3-d teapot octahedron.
  */
 /**
  * @method loadModel