Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shader reloading #135

Merged
merged 8 commits into from
Apr 6, 2013
Merged

Shader reloading #135

merged 8 commits into from
Apr 6, 2013

Conversation

johnhaddon
Copy link
Member

No description provided.

RenderManShader::loadShader() may now be called passing keepExistingValues=true, to update the node status when a shader has changed on disk. This is done automatically after loading a script, so that the nodes should always be in sync with what's on disk. Also added support for min and max shader annotations which are supported for float, vector, point, normal and color shader parameters. Still need to add UI elements to expose the reloading to users.
Parameterising VectorTypedParameterHandler on the parameter type rather than on the element type. This allows us to pick up the correct DataType for V3fVectorParameter by using the typedef provided by TypedParameter.
…aderReloading

Conflicts:
	src/Gaffer/VectorTypedParameterHandler.cpp
johnhaddon added a commit that referenced this pull request Apr 6, 2013
@johnhaddon johnhaddon merged commit 74be39d into GafferHQ:master Apr 6, 2013
@johnhaddon johnhaddon deleted the shaderReloading branch April 6, 2013 02:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant