Commit d1132c64 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'featurePickingShderGenerator' into 'master'

use the shadergenerator for picking sahder

See merge request !2
parents d1d385ec 6d244e58
...@@ -406,7 +406,10 @@ void CameraNode::pick(GLState& _state, PickTarget /*_target*/) ...@@ -406,7 +406,10 @@ void CameraNode::pick(GLState& _state, PickTarget /*_target*/)
ibo_.bind(); ibo_.bind();
GLSL::Program* pickShader = ShaderCache::getInstance()->getProgram("Picking/vertex.glsl", "Picking/single_color_fs.glsl"); static ShaderGenDesc desc;
desc.vertexTemplateFile = "Picking/vertex.glsl";
desc.fragmentTemplateFile = "Picking/single_color_fs.glsl";
GLSL::Program* pickShader = ACG::ShaderCache::getInstance()->getProgram(&desc, nullptr);
if (pickShader && pickShader->isLinked()) if (pickShader && pickShader->isLinked())
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment