Skip to content

Commit

Permalink
Merge pull request #306 from procedural/shader-correction
Browse files Browse the repository at this point in the history
Shader markdown correction
  • Loading branch information
arturoc committed Oct 24, 2014
2 parents 0af9ee6 1a8cacf commit d5e1f25
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion _tutorials/03_graphics/shaders.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 66,7 @@ In OF we load our shaders into ofShader objects and I'm going to drive-by lay ou

*end()* - stop using your shader to alter all the drawing that your application is doing

You can load shader programs into your ofShader object using shader.*load()* or just use strings your application with shader.*loadFromString()*. Either way is a-ok.
You can load shader programs into your ofShader object using *shader.load()* or just use strings your application with *shader.setupShaderFromSource()*, passing body of your shader in a string as a second parameter using STRINGIFY macro and linking it with *shader.linkProgram()*. Either way is a-ok.

Before we go get into trouble, there's something that I want to explain that might not make sense right at first but is fairly important to acknoweldge and is not so important to deeply grok at first: our examples use OpenGL3 mostly and to use OpenGL3 in OF you need to alter your main.cpp file. The main files in the tutorial download all look like this:

Expand Down

0 comments on commit d5e1f25

Please sign in to comment.