Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor: Trim trailing whitespace

Browse Source
This commit is contained in:
Richard
2015-05-18 21:52:10 -06:00
parent 4c1a0507fe
commit a96a595a7a
313 changed files with 7022 additions and 7022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/OpenGEXImporter.cpp
View File

@@ -84,7 +84,7 @@ namespace Grammar {
static const std::string DiffuseColorToken = "diffuse";
static const std::string SpecularColorToken = "specular";
static const std::string EmissionColorToken = "emission";
static const std::string DiffuseTextureToken = "diffuse";
static const std::string DiffuseSpecularTextureToken = "specular";
static const std::string SpecularPowerTextureToken = "specular_power";
@@ -146,7 +146,7 @@ namespace Grammar {
return ObjectRefToken;
}
else if( 0 == strncmp( MaterialRefType, tokenType, strlen( MaterialRefType ) ) ) {
return MaterialRefToken;
return MaterialRefToken;
}
else if( 0 == strncmp( MetricKeyType, tokenType, strlen( MetricKeyType ) ) ) {
return MetricKeyToken;
@@ -222,7 +222,7 @@ OpenGEXImporter::RefInfo::~RefInfo() {
}
//------------------------------------------------------------------------------------------------
OpenGEXImporter::OpenGEXImporter()
OpenGEXImporter::OpenGEXImporter()
: m_root( NULL )
, m_nodeChildMap()
, m_meshCache()
@@ -357,7 +357,7 @@ void OpenGEXImporter::handleNodes( DDLNode *node, aiScene *pScene ) {
case Grammar::TextureToken:
handleTextureNode( *it, pScene );
break;
default:
break;
}
@@ -418,7 +418,7 @@ void OpenGEXImporter::handleNameNode( DDLNode *node, aiScene *pScene ) {
if( m_tokenType == Grammar::GeometryNodeToken ) {
m_currentNode->mName.Set( name.c_str() );
} else if( m_tokenType == Grammar::MaterialToken ) {
}
}
@@ -479,7 +479,7 @@ void OpenGEXImporter::handleGeometryNode( DDLNode *node, aiScene *pScene ) {
m_tokenType = Grammar::GeometryNodeToken;
m_currentNode = newNode;
handleNodes( node, pScene );
popNode();
}
@@ -502,7 +502,7 @@ static void setMatrix( aiNode *node, DataArrayList *transformData ) {
next = next->m_next;
i++;
}
node->mTransformation.a1 = m[ 0 ];
node->mTransformation.a2 = m[ 4 ];
node->mTransformation.a3 = m[ 8 ];
@@ -540,7 +540,7 @@ void OpenGEXImporter::handleTransformNode( ODDLParser::DDLNode *node, aiScene *p
return;
}
setMatrix( m_currentNode, transformData );
}
}
}
//------------------------------------------------------------------------------------------------
@@ -563,7 +563,7 @@ void OpenGEXImporter::handleMeshNode( ODDLParser::DDLNode *node, aiScene *pScene
m_currentMesh = new aiMesh;
const size_t meshidx( m_meshCache.size() );
m_meshCache.push_back( m_currentMesh );
Property *prop = node->getProperties();
if( NULL != prop ) {
std::string propName, propKey;
@@ -736,7 +736,7 @@ void OpenGEXImporter::handleIndexArrayNode( ODDLParser::DDLNode *node, aiScene *
m_currentMesh->mTextureCoords[0][ index ].Set( tex.x, tex.y, tex.z );
current.mIndices[ indices ] = index;
index++;
next = next->m_next;
}
vaList = vaList->m_next;
@@ -748,7 +748,7 @@ static void getColorRGB( aiColor3D *pColor, DataArrayList *colList ) {
if( NULL == pColor || NULL == colList ) {
return;
}
ai_assert( 3 == colList->m_numItems );
Value *val( colList->m_dataList );
pColor->r = val->getFloat();
@@ -858,7 +858,7 @@ void OpenGEXImporter::copyMeshes( aiScene *pScene ) {
if( m_meshCache.empty() ) {
return;
}
pScene->mNumMeshes = m_meshCache.size();
pScene->mMeshes = new aiMesh*[ pScene->mNumMeshes ];
std::copy( m_meshCache.begin(), m_meshCache.end(), pScene->mMeshes );
@@ -947,10 +947,10 @@ aiNode *OpenGEXImporter::popNode() {
if( m_nodeStack.empty() ) {
return NULL;
}
aiNode *node( top() );
m_nodeStack.pop_back();
return node;
}