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

Allow the .dae file to specify 3-channel colours

Browse Source
This commit is contained in:
rdb 2010-08-23 08:08:01 +00:00
parent 17535c41a6
commit 50150dc9f9
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandatool/src/daeegg/daeToEggConverter.cxx
View File

@ -416,9 +416,14 @@ void DAEToEggConverter::process_mesh(PT(EggGroup) parent, const FCDGeometryMesh*
}
// Process the color
if (csource != NULL && cinput != NULL) {
assert(csource->GetStride() == 4);
data = &csource->GetData()[cindices[ix]*4];
vertex->set_color(Colorf(data[0], data[1], data[2], data[3]));
assert(csource->GetStride() == 3 || csource->GetStride() == 4);
if (csource->GetStride() == 3) {
data = &csource->GetData()[cindices[ix]*3];
vertex->set_color(Colorf(data[0], data[1], data[2], 1.0f));
} else {
data = &csource->GetData()[cindices[ix]*4];
vertex->set_color(Colorf(data[0], data[1], data[2], data[3]));
}
}
// Possibly add a UV object
if ((bsource != NULL && binput != NULL) || (tsource != NULL && tinput != NULL)) {