TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 01:44:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add some OSG shader inputs for GLSL

Browse Source
This commit is contained in:
rdb 2013-08-25 19:50:08 +00:00
parent c0ddb63e88
commit fd3fb16ec1
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
panda/src/glstuff/glShaderContext_src.cxx
View File

@ -390,10 +390,47 @@ CLP(ShaderContext)(Shader *s, GSG *gsg) : ShaderContext(s) {
} }
GLCAT.error() << "Unrecognized uniform name '" << param_name_cstr << "'!\n"; GLCAT.error() << "Unrecognized uniform name '" << param_name_cstr << "'!\n";
continue; continue;
} else if (param_name.substr(0, 4) == "osg_") {
// These inputs are supported by OpenSceneGraph. We can support
// them as well, to increase compatibility.
// Other inputs we may support in the future:
// int osg_FrameNumber
// float osg_FrameTime
// float osg_DeltaFrameTime
if (param_name == "osg_ViewMatrix") {
Shader::ShaderMatSpec bind;
bind._id = arg_id;
bind._piece = Shader::SMP_whole;
bind._arg[0] = NULL;
bind._arg[1] = NULL;
bind._func = Shader::SMF_first;
bind._part[0] = Shader::SMO_world_to_view;
bind._part[1] = Shader::SMO_identity;
bind._dep[0] = Shader::SSD_general | Shader::SSD_transform;
bind._dep[1] = Shader::SSD_NONE;
s->_mat_spec.push_back(bind);
continue;
} else if (param_name == "osg_InverseViewMatrix") {
Shader::ShaderMatSpec bind;
bind._id = arg_id;
bind._piece = Shader::SMP_whole;
bind._arg[0] = NULL;
bind._arg[1] = NULL;
bind._func = Shader::SMF_first;
bind._part[0] = Shader::SMO_view_to_world;
bind._part[1] = Shader::SMO_identity;
bind._dep[0] = Shader::SSD_general | Shader::SSD_transform;
bind._dep[1] = Shader::SSD_NONE;
s->_mat_spec.push_back(bind);
continue;
}
} }
//Tries to parse shorthand notations like mspos_XXX and trans_model_to_clip_of_XXX //Tries to parse shorthand notations like mspos_XXX and trans_model_to_clip_of_XXX
if (parse_and_set_short_hand_shader_vars( arg_id, s )) { if (parse_and_set_short_hand_shader_vars(arg_id, s)) {
continue; continue;
} }
@ -1194,6 +1231,7 @@ disable_shader_texture_bindings(GSG *gsg) {
void CLP(ShaderContext):: void CLP(ShaderContext)::
update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg) { update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg) {
_last_gsg = gsg; _last_gsg = gsg;
if (prev) { if (prev) {
prev->disable_shader_texture_bindings(gsg); prev->disable_shader_texture_bindings(gsg);
} }