Skip to content

Conversation

@indefinit
Copy link
Contributor

No description provided.

Karen and others added 28 commits August 24, 2015 15:49
* karenpeng-master: (25 commits)
  follow p5 inline doc convention
  adapt texture update from f89a81b
  add inline doc for material and light
  add inline doc for lights
  camera now works as state machine
  3d value update(mvmatrix and stack) is now called by draw() function
  recover core.js
  further simplify examples
  fix bug in valid param and modify getShader function
  update inline documentation for 3d primitives
  valid parameter for camera
  differentiate 2d/3d  funct parameter validation
  add validParameter for transform functions
  add _validateParameters to light and material
  add camera examples
  camera is optional now and modify examples
  ...

Conflicts:
	src/3d/material.js
* 'master' of https://github.com/processing/p5.js:
  Add unit test for blendMode()
  v0.4.9
  Add the final two parameters of the second curve example
  fix for https://github.com/processing/p5.js-sound/issues/72
  migrating travis
  closes processing#784, adding this._requestAnimId and canvas to this._elements
  Address PR comments
  Code review of the Perlin noise generator.
  Extract numbers into points for curve example.
  Change bezierPoint example to extract numbers into variables.
  Line wrap everything to 75 columns.
  Improve {curve, bezier}{Tangent, Point} docs.
  Rewrite the docs for bezier.
  Rewrite the docs for curve.
  Improve noise docs to reference noiseSeed().
  Indicate point is colored by stroke.
  fix to preload to default to p5
  fixes preload bug and adds outside library compatability
…tcontrol from camera examples temporarily; modifies example text in lights examples for clarity
lmccart pushed a commit that referenced this pull request Sep 4, 2015
Webgl bug fixes and updates: texture, light, Renderer3D, examples
@lmccart lmccart merged commit 1bfb2dd into processing:master Sep 4, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants