RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug with losing the color in certain normal/color combinations

This commit is contained in:
David Rose 2005-09-26 19:02:49 +00:00
parent 97c877ad3b
commit 2d5ecf1cab
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
panda/src/egg/eggPrimitive.cxx
View File

@ -352,9 +352,23 @@ unify_attributes(EggPrimitive::Shading shading) {
shading = get_shading();
}
// Not having a color is implicitly white.
// Does the primitive have an explicit color?
if (!has_color() && shading != S_overall) {
set_color(Colorf(1.0f, 1.0f, 1.0f, 1.0f));
if (shading != S_per_vertex) {
// If there is no color set, first we check the vertices. If the
// vertices have a color, we inherit the color from there.
iterator pi;
for (pi = begin(); pi != end() && !has_color(); ++pi) {
EggVertex *vertex = (*pi);
if (vertex->has_color()) {
set_color(vertex->get_color());
}
}
}
if (!has_color()) {
// If we still don't have a color, the implicit color is white.
set_color(Colorf(1.0f, 1.0f, 1.0f, 1.0f));
}
}
switch (shading) {