search

openFrameworks-RaspberryPi / openFrameworks

This repo has migrated into the openFramworks core! Please go to http://github.com/openFrameworks/openFrameworks for the latest!
http://github.com/openFrameworks/openFrameworks
Other
104 stars 11 forks source link

merge develop #78

Closed bakercp closed 11 years ago

danzeeeman commented 11 years ago

only a minor conflict in the svgExample addon.make.

On Sun, Dec 9, 2012 at 10:44 PM, Christopher Baker <notifications@github.com

wrote:

You can merge this Pull Request by running:

git pull https://github.com/openframeworks/openFrameworks develop

Or view, comment on, or merge it at:

https://github.com/openFrameworks-RaspberryPi/openFrameworks/pull/78 Commit Summary

  • Add ofCurveVertex(x, y, z) overload
  • ofxSVG: set winding mode to non-zero (the default for svg)
  • ofxSvg: fixed capitalization of file names
  • ofxSvg: fix copy semantics, using internal pointers makes a copy of a…
  • ofxSvg: remove dependencies with tinyxml
  • ofxSvg: use ofLog
  • svgExample: remove ofxXmlSettings, not needed
  • svgExample: create outlines in setup with correct winding
  • changed to GL_NEAREST filtering to stop values bleeding from linear i…
  • changed to using texture coordinates instead of vertex position as it…
  • changed to simpler draw routine for updating position and velocity pi…
  • fix issue 532 ofEasyCam setPosition doesn't work as ofCamera's does, …
  • Merge pull request #1724https://github.com/openframeworks/openFrameworks/issues/1724from roymacdonald/fix-ofEasyCam
  • Merge pull request #1677https://github.com/openframeworks/openFrameworks/issues/1677from timscaffidi/bugfix-gpuParticleExample
  • Merge pull request #1661https://github.com/openframeworks/openFrameworks/issues/1661from nasser/ofCurveVertex_xyz
  • Merge pull request #1667https://github.com/openframeworks/openFrameworks/issues/1667from arturoc/bugfix-ofxSVG

File Changes

  • M addons/ofxSvg/libs/svgTiny/src/svgtiny.cpp (1)
  • R addons/ofxSvg/src/ofxSvg.cpp (61)
  • R addons/ofxSvg/src/ofxSvg.h (9)
  • M examples/addons/svgExample/addons.make (3)
  • M examples/addons/svgExample/src/testApp.cpp (80)
  • M examples/addons/svgExample/src/testApp.h (4)
  • _M_examples/gl/GPUparticleSystemExample/bin/data/shaders/render.vert (16)
  • M examples/gl/GPUparticleSystemExample/src/testApp.cpp (21)
  • M examples/gl/GPUparticleSystemExample/src/testApp.h (1)
  • M libs/openFrameworks/3d/ofEasyCam.cpp (24)
  • M libs/openFrameworks/3d/ofEasyCam.h (3)
  • M libs/openFrameworks/graphics/ofGraphics.cpp (5)
  • M libs/openFrameworks/graphics/ofGraphics.h (1)

Patch Links

- https://github.com/openFrameworks-RaspberryPi/openFrameworks/pull/78.patch

https://github.com/openFrameworks-RaspberryPi/openFrameworks/pull/78.diff

— Reply to this email directly or view it on GitHubhttps://github.com/openFrameworks-RaspberryPi/openFrameworks/pull/78.

"I believe in science. Unlike mathematical theorems, scientific results can't be proved. They can only be tested again and again, until only a fool would not believe them.

I cannot prove that electrons exist, but I believe fervently in their existence. And if you don't believe in them, I have a high voltage cattle prod I'm willing to apply as an argument on their behalf. Electrons speak for themselves."

-- Seth Lloyd: Quantum Mechanical Engineer, MIT

/.

bakercp commented 11 years ago

just fixed it. am going to merge it momentarily.