v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes https://github.com/assimp/assimp/issues/1262: fix .

pull/1272/head
Kim Kulling 2017-05-16 21:07:20 +02:00
parent 428a4cdd71
commit 542fe31a94
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/OpenGEXImporter.cpp
View File

@ -196,7 +196,6 @@ namespace Grammar {
return NoneType; return NoneType;
} }
} // Namespace Grammar } // Namespace Grammar
namespace Assimp { namespace Assimp {
@ -523,6 +522,10 @@ void OpenGEXImporter::handleObjectRefNode( DDLNode *node, aiScene *pScene ) {
if ( !objRefNames.empty() ) { if ( !objRefNames.empty() ) {
m_unresolvedRefStack.push_back( new RefInfo( m_currentNode, RefInfo::MeshRef, objRefNames ) ); m_unresolvedRefStack.push_back( new RefInfo( m_currentNode, RefInfo::MeshRef, objRefNames ) );
} }
} else if ( m_tokenType == Grammar::LightNodeToken ) {
// TODO!
} else if ( m_tokenType == Grammar::CameraNodeToken ) {
// TODO!
} }
} }
@ -602,6 +605,13 @@ void OpenGEXImporter::handleCameraObject( ODDLParser::DDLNode *node, aiScene *pS
//------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------
void OpenGEXImporter::handleLightObject( ODDLParser::DDLNode *node, aiScene *pScene ) { void OpenGEXImporter::handleLightObject( ODDLParser::DDLNode *node, aiScene *pScene ) {
aiLight *light( new aiLight );
m_lightCache.push_back( light );
std::string objName = node->getName();
if ( !objName.empty() ) {
light->mName.Set( objName );
}
m_currentLight = light;
Property *prop( node->findPropertyByName( "type" ) ); Property *prop( node->findPropertyByName( "type" ) );
if ( nullptr != prop ) { if ( nullptr != prop ) {

1
code/OpenGEXImporter.h
View File

@ -132,7 +132,6 @@ protected:
void copyMeshes( aiScene *pScene ); void copyMeshes( aiScene *pScene );
void copyCameras( aiScene *pScene ); void copyCameras( aiScene *pScene );
void copyLights( aiScene *pScene ); void copyLights( aiScene *pScene );
void resolveReferences(); void resolveReferences();
void pushNode( aiNode *node, aiScene *pScene ); void pushNode( aiNode *node, aiScene *pScene );
aiNode *popNode(); aiNode *popNode();