first test example with ofShader allowing #pragma includes - check devApps/ShaderIncludeDev/ to see the example. currently only allows includes in shaders loaded as a file
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes, currenlty working only with shaders loading from files, includes from inside shaders keep the same path logic as ofShader::load and ofShader::setupShaderFromFile, i.e. it uses the OF data path..
ofShader support for #pragma includes is working with setupShaderFromSource and setupShaderFromFile
ofShader support for #pragma includes supports duplicate inclusion
ofShader support for #pragma includes supports duplicate inclusion
Merge branch 'develop' of https://github.com/openframeworks/openFrameworks
Merge pull request #1795 from chparsons/feature-shader-include

Feature shader include
Fix EOL - LF
ofSystemLoadDialog title on Win32
Fix arguments ofSystemLoadDialog in projectGenerator
modify vboMeshDrawInstanced example to allow renderer selection

This change allows the example to run using either the fixed function pipeline / OpenGL 2.0 + GLSL 1.20 or OpenGL 3.2 + GLSL 150, depending on an #ifdef set in testApp.h

By default, this example will run using the fixed function GL renderer. (OpenGL 2.0)

Bonus: Two shader pairs (one GLSL 1.20 one GLSL 150 ) allow you to compare syntax differences between the two shader language versions.
Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
Merge pull request #2430 from tgfrerer/fix-vboMeshDrawInstanced-Example

Fix vbo mesh draw instanced example
special case for ofDrawBox with ofNoFill active. Uses GL_LINES to render, so the triangles are not visible
fix for vboMeshDrawInstancedExample - detect if glDrawElementsInstanced is available and if not, exists the app with fatal error. closes #2427
Merge pull request #2431 from NickHardeman/feature-drawBox-wireframe

ofDrawBox uses GL Lines, instead of triangles
makefiles: remove debug traces + more comprehensive errors for missing packages and wrong architecture
Merge branch 'develop' of github.com:openframeworks/openFrameworks into develop