Merge branch 'develop' of https://github.com/openframeworks/openFrameworks
bind defaultShader in setup() for RPi/GLProgrammable

This fixes an issue in the Programmable GL Renderer where RPi would not have the default shader bound when a drawing call was issued in update().

Fixes issue #2593

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
fixes a speed issue with programmable gl and ofDrawAxis()

this addresses issue #2607

Is there a more elegant way to keep a static version of the axis vbo around?

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
applies size parameter upon axis mesh creation

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
change cachedAxisVbo to singleton =)

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
further cleanup

uses cleaner syntax for cachedAxisVbo.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge branch 'master' of github.com:openframeworks/openFrameworks
osx makefile: fix typo, point CFBundleExecutable at the actual exe, and update the display names to reflect just the app name and not its path in the build tree.

With this patch, apps can be run successfully via double click in the Finder (or with `open mydemo.app`), whereas previously it was required to invoke the internal exe directly via command line or other.
Assign allocated flag to true after allocating offscreenGWorldPixels. fixes #2220
update to heap-allocated axes mesh

* made cached axes heap-allocated following @arturoc's advice
* fixed typo (correct plural of axis is 'axes')
* added brief doxygen description

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge pull request #2608 from tgfrerer/fix-GLProgrammableRenderer-ofDrawAxis

Fix gl programmable renderer of draw axis
Merge pull request #2597 from tgfrerer/fix-RPi-ProgrammableGL-defaultshader

bind defaultShader in setup() for RPi/GLProgrammable
Merge pull request #2645 from tuwuhs/bugfix-ofQuickTimePlayer-allocated

Assign allocated flag to true after allocating offscreenGWorldPixels.
Merge pull request #2641 from liamstask/osx-makefile-fix

osx makefile: fix typo, point CFBundleExecutable at the actual exe, and ...
update shaderY to work on non-intel cards
update shader to work on non-intel cards
ofxiOSUIImageToPixels is referenced in the header did not exist in the implementation file, so ive removed it.
ofxiOSUIImageToOFTexture did exist in the implementation file but not in the header, so ive added it to the header.
Merge branch 'master' of https://github.com/julapy/openFrameworks
Merge pull request #2691 from julapy/master

ofxiOSUIImageToOFTexture fix inside ofxiOSExtras
fix issue with uninitialised modelview matrix if fbo did not begin() with setupScreen==true

by default an ofFbo begins with setupScreen==true, which means it's setupscreen method will be called when the fbo begins. This method will also initialise the modelview matrix uniforms for the default shader for that fbo.

if the ofFbo is started with begin(false) the modelview matrix values will remain un-initialised. This can lead to difficult to debug issues, since as soon as the internal matrix stack gets touched through any matrix operation, anything will look like normal.

This issue will only appear if you do the following:

myFbo.begin(false);
ofPushMatrix();
// the following line will not draw as expected, since modelView Matrix not yet submitted to shader
ofDrawGridPlane(1000, 20, false);
ofTranslate(10,10,10);
// from here on, anything draws as expected.
ofRotate(0,1,0,0);
ofDrawSphere();
ofPopMatrix();

This PR fixes this issue by submitting the matrix stack initially, when we set the fbo as our current render target.

This PR might have a positive impact on #2593

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>