we have a working circle draw method for GL3

something is still fishy with how the orientation matrices are calculated on desktop, need to check against reference GL2.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Removed superfluous comment
vbo implementations for GLES/GL+ agnostic rendering

#updated render methods for

* circle
* ellipse
* triangle
* sphere
* ofMesh
* ofMesh with polymode
* rectangle
* path
* polyline
* vector of points

this seems to work on desktop, and doesn't break the iPad example.

further tests necessary.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
fixes GL / GLES specific rendering of wireframes

GLES2 does not have a glPolygonmode, but we want to use it with GL3+, so we #ifdef

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

GLES2 -> programmableGL

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
adds default shader for GLSL 150

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
moving defaultVAO to a more 'default' position

we bind to the default VAO upon start rendering. it is the client's responsibility to restore to the default VAO if she / he wishes to bind their own VAO,
but it is guaranteed that we have the default VAO upon start rendering.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
adds getter methods for vbo index count / vertex count

this is useful if you want to render the vbo but don't have access to it's generator and therefore don't know how many indices / vertices it contains in the GPU

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
uses ofVbo.draw() methods to draw ofMesh()

* this mvoes the draw method to the class affected, and reduces code duplication.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
vbo from mesh - mods

* only apply color, normals, texcoords, indices to the vbo if the mesh has them.

* promises for has*() getter functions in ofMesh not to modify the underlying object, so that we can query ofMeshes passed as const ofMesh&, too.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge pull request #1903 from SoylentGraham/develop-pullrequest

Fixed ofxTSCPServer being thread-unsafe
Merge branch 'feature-3dGraphics' of github.com:NickHardeman/openFrameworks into gles2

Conflicts:
	examples/android/androidPolygonExample/src/testApp.cpp
	libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj
	libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj
Merge branch 'develop' into gles2

Conflicts:
	libs/openFrameworks/gl/ofGLRenderer.cpp
	libs/openFrameworks/graphics/ofGraphics.cpp
	libs/openFrameworks/graphics/ofGraphics.h
Merge pull request #10 from arturoc/gles2

Gles2 merge with 3dprimitives and develop
Merge branch 'develop' into 3dprimitives

Conflicts:
	libs/openFrameworks/gl/ofGLRenderer.cpp
Merge pull request #1397 from arturoc/feature-ofParameter

Feature ofParameter
addons: remove JSON addon used for testing in ofParameter branch
ofxGui: remove json from examples
Merge branch 'ios-feature-es2' of git://github.com/julapy/openFrameworks into ios-feature-es2

manually resolved renaming (GLES2 -> ofProgrammableRenderer) issues w / project file

and ofMesh const additions

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

Conflicts:
	libs/openFrameworks/3d/ofMesh.cpp
	libs/openFrameworksCompiled/project/ios/iOS+OFLib.xcodeproj/project.pbxproj
	libs/openFrameworksCompiled/project/osx/openFrameworksLib.xcodeproj/project.pbxproj
updates ofProgrammableRenderer to use new primitives

* there's still a bug in how ofNode is rendered. probably something with how ofProgrammableRenderer handles the matrix stack. I'm on it.

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