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

Support structs in Cg shaders

Browse Source
This commit is contained in:
rdb 2009-07-31 06:17:25 +00:00
parent acbb2966ad
commit 9278348147
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panda/src/gobj/shader.cxx
View File

@ -433,8 +433,18 @@ compile_parameter(const ShaderArgId &arg_id,
if (p._id._name.size() == 0) return true; if (p._id._name.size() == 0) return true;
if (p._id._name[0] == '$') return true; if (p._id._name[0] == '$') return true;
// It could be inside a struct, strip off
// everything before the last dot.
size_t loc = p._id._name.find_last_of('.');
string basename (p._id._name);
if (loc < string::npos) {
basename = p._id._name.substr(loc + 1);
}
// Split it at the underscores.
vector_string pieces; vector_string pieces;
tokenize(p._id._name, pieces, "_"); tokenize(basename, pieces, "_");
if (pieces.size() < 2) { if (pieces.size() < 2) {
cp_report_error(p, "invalid parameter name"); cp_report_error(p, "invalid parameter name");
@ -910,7 +920,7 @@ compile_parameter(const ShaderArgId &arg_id,
(!cp_errchk_parameter_uniform(p))) (!cp_errchk_parameter_uniform(p)))
return false; return false;
// In the case of k-parameters, we allow underscores in the name. // In the case of k-parameters, we allow underscores in the name.
PT(InternalName) kinputname = InternalName::make(p._id._name.substr(2)); PT(InternalName) kinputname = InternalName::make(basename.substr(2));
switch (p._type) { switch (p._type) {
case SAT_float1: case SAT_float1:
case SAT_float2: case SAT_float2: