RenderMan coshaders

[johnhaddon]

This pull request implements support for building networks of RenderMan coshaders, addressing issue #39. Coshader parameters are represented simply as the base Plug class, because conceptually they're just a connection which doesn't provide data directly. RenderManShader::acceptsInput() is implemented to ensure that only other RenderManShaders are connected as coshader inputs, and that shaders cannot be connected to inputs other than those representing coshader parameters.

Also took the opportunity to tidy up existing shader ui registrations while defining the ui for the RenderManShader.

[andrewkaufman]

So I looked it over and don't see a problem, but I also know almost
nothing about shaders... how do we want to handle that? Should I still
be the one to merge it?

Also, any chance we can get pull request emails to differentiate
themselves in the subject? This one looks identical to a new issue.

Andrew

On 04/01/2013 06:40 PM, John Haddon wrote:

This pull request implements support for building networks of
RenderMan coshaders, addressing issue #39
#39. Coshader parameters
are represented simply as the base Plug class, because conceptually
they're just a connection which doesn't provide data directly.
RenderManShader::acceptsInput() is implemented to ensure that only
other RenderManShaders are connected as coshader inputs, and that
shaders cannot be connected to inputs other than those representing
coshader parameters.

Also took the opportunity to tidy up existing shader ui registrations
while defining the ui for the RenderManShader.

---

    You can merge this Pull Request by running

git pull https://github.com/johnhaddon/gaffer renderManCoshaders

Or view, comment on, or merge it at:

#72

    Commit Summary

• Adding support for coshader parameters in RenderManShader.

• Rationalising shader ui by moving as many registrations as
  possible onto the GafferScene::Shader base class. Registering an
  appropriate Nodule creator for RenderManShader so that only
  coshader parameters appear in the node graph.

  File Changes
  

• M SConstruct
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-0 (4)

• M include/GafferRenderMan/RenderManShader.h
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-1 (2)

• M python/GafferArnoldUI/ArnoldShaderUI.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-2 (14)

• M python/GafferRenderManTest/RenderManShaderTest.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-3 (49)

• A python/GafferRenderManTest/RenderManTestCase.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-4 (66)

• M python/GafferRenderManTest/init.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-5 (1)

• A python/GafferRenderManTest/shaders/coshader.sl
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-6 (50)

• A python/GafferRenderManTest/shaders/coshaderParameter.sl
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-7 (45)

• A python/GafferRenderManUI/RenderManShaderUI.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-8 (57)

• M python/GafferRenderManUI/init.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-9 (1)

• M python/GafferSceneUI/OpenGLShaderUI.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-10 (2)

• M python/GafferSceneUI/SceneNodeUI.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-11 (5)

• A python/GafferSceneUI/ShaderUI.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-12 (64)

• M python/GafferSceneUI/init.py
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-13 (2)

• M src/GafferRenderMan/RenderManShader.cpp
  https://github.com/ImageEngine/gaffer/pull/72/files#diff-14 (75)

  Patch Links:
  

• https://github.com/ImageEngine/gaffer/pull/72.patch

• https://github.com/ImageEngine/gaffer/pull/72.diff

[johnhaddon]

I'm pretty happy with this one so we can just merge it. I'll come over and go through it with you though because I want to see what this "cannot be automatically merged" thing is all about.

I've had a look around, and can't see anything to differentiate pull request emails from issues...if you find something feel free to activate it...

[andrewkaufman]

I've merged the changes manually.