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

Assimp loader now handles aiLightSource_AMBIENT lights

Browse Source
This commit is contained in:
rdb 2015-06-19 21:57:29 +02:00
parent 945d3c4035
commit 179b10ca83
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandatool/src/assimp/assimpLoader.cxx
View File

@ -569,12 +569,10 @@ load_light(const aiLight &light) {
aiColor3D col; aiColor3D col;
aiVector3D vec; aiVector3D vec;
PT(PandaNode) lnode;
switch (light.mType) { switch (light.mType) {
case aiLightSource_DIRECTIONAL: { case aiLightSource_DIRECTIONAL: {
PT(DirectionalLight) dlight = new DirectionalLight(name); PT(DirectionalLight) dlight = new DirectionalLight(name);
lnode = DCAST(PandaNode, dlight); _root->add_child(dlight);
col = light.mColorDiffuse; col = light.mColorDiffuse;
dlight->set_color(LColor(col.r, col.g, col.b, 1)); dlight->set_color(LColor(col.r, col.g, col.b, 1));
@ -591,7 +589,7 @@ load_light(const aiLight &light) {
case aiLightSource_POINT: { case aiLightSource_POINT: {
PT(PointLight) plight = new PointLight(name); PT(PointLight) plight = new PointLight(name);
lnode = DCAST(PandaNode, plight); _root->add_child(plight);
col = light.mColorDiffuse; col = light.mColorDiffuse;
plight->set_color(LColor(col.r, col.g, col.b, 1)); plight->set_color(LColor(col.r, col.g, col.b, 1));
@ -609,7 +607,7 @@ load_light(const aiLight &light) {
case aiLightSource_SPOT: { case aiLightSource_SPOT: {
PT(Spotlight) plight = new Spotlight(name); PT(Spotlight) plight = new Spotlight(name);
lnode = DCAST(PandaNode, plight); _root->add_child(plight);
col = light.mColorDiffuse; col = light.mColorDiffuse;
plight->set_color(LColor(col.r, col.g, col.b, 1)); plight->set_color(LColor(col.r, col.g, col.b, 1));
@ -632,6 +630,10 @@ load_light(const aiLight &light) {
plight->set_transform(TransformState::make_pos_quat_scale(pos, quat, LVecBase3(1, 1, 1))); plight->set_transform(TransformState::make_pos_quat_scale(pos, quat, LVecBase3(1, 1, 1)));
break; } break; }
case aiLightSource_AMBIENT:
// This is handled below.
break;
default: default:
assimp_cat.warning() << "Light '" << name << "' has an unknown type!\n"; assimp_cat.warning() << "Light '" << name << "' has an unknown type!\n";
return; return;
@ -645,6 +647,4 @@ load_light(const aiLight &light) {
alight->set_color(ambient); alight->set_color(ambient);
_root->add_child(alight); _root->add_child(alight);
} }
_root->add_child(lnode);
} }