Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14195 from liamcindy/v3.9_light 

fix light3D reader error
This commit is contained in:
pandamicro 2015-10-21 13:45:37 +08:00
parent c318db94dd 7280a963b3
commit d8baf75748
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cocos/editor-support/cocostudio/WidgetReader/GameNode3DReader/GameNode3DReader.cpp
View File

@ -426,14 +426,6 @@ namespace cocostudio
node->removeComponent(ComExtensionData::COMPONENT_NAME);
}
node->addComponent(extensionData);
bool useDefaultLight = options->useDefaultLight();
if (useDefaultLight)
{
AmbientLight* defaultLight = AmbientLight::create(Color3B::WHITE);
defaultLight->setIntensity(0.5f);
node->addChild(defaultLight);
}
}
Node* GameNode3DReader::createNodeWithFlatBuffers(const flatbuffers::Table *node3DOptions)

2
cocos/editor-support/cocostudio/WidgetReader/Light3DReader/Light3DReader.cpp
View File

@ -78,7 +78,7 @@ namespace cocostudio
auto temp = Node3DReader::getInstance()->createOptionsWithFlatBuffers(objectData, builder);
auto node3DOptions = *(Offset<Node3DOption>*)(&temp);
bool enabled = false;
bool enabled = true;
int type = 0;
int flag = 0;
float intensity = 1.0f;