commit
f1254639d0
|
@ -602,28 +602,28 @@ bool ExportProperties :: HasPropertyInteger(const char* szName) const
|
||||||
bool ExportProperties :: HasPropertyBool(const char* szName) const
|
bool ExportProperties :: HasPropertyBool(const char* szName) const
|
||||||
{
|
{
|
||||||
return HasGenericProperty<int>(mIntProperties, szName);
|
return HasGenericProperty<int>(mIntProperties, szName);
|
||||||
};
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Has a configuration property
|
// Has a configuration property
|
||||||
bool ExportProperties :: HasPropertyFloat(const char* szName) const
|
bool ExportProperties :: HasPropertyFloat(const char* szName) const
|
||||||
{
|
{
|
||||||
return HasGenericProperty<ai_real>(mFloatProperties, szName);
|
return HasGenericProperty<ai_real>(mFloatProperties, szName);
|
||||||
};
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Has a configuration property
|
// Has a configuration property
|
||||||
bool ExportProperties :: HasPropertyString(const char* szName) const
|
bool ExportProperties :: HasPropertyString(const char* szName) const
|
||||||
{
|
{
|
||||||
return HasGenericProperty<std::string>(mStringProperties, szName);
|
return HasGenericProperty<std::string>(mStringProperties, szName);
|
||||||
};
|
}
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
// Has a configuration property
|
// Has a configuration property
|
||||||
bool ExportProperties :: HasPropertyMatrix(const char* szName) const
|
bool ExportProperties :: HasPropertyMatrix(const char* szName) const
|
||||||
{
|
{
|
||||||
return HasGenericProperty<aiMatrix4x4>(mMatrixProperties, szName);
|
return HasGenericProperty<aiMatrix4x4>(mMatrixProperties, szName);
|
||||||
};
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif // !ASSIMP_BUILD_NO_EXPORT
|
#endif // !ASSIMP_BUILD_NO_EXPORT
|
||||||
|
|
|
@ -149,10 +149,10 @@ void ObjFileImporter::InternReadFile( const std::string &file, aiScene* pScene,
|
||||||
// This next stage takes ~ 1/3th of the total readFile task
|
// This next stage takes ~ 1/3th of the total readFile task
|
||||||
// so should amount for 1/3th of the progress
|
// so should amount for 1/3th of the progress
|
||||||
// only update every 100KB or it'll be too slow
|
// only update every 100KB or it'll be too slow
|
||||||
unsigned int progress = 0;
|
/*unsigned int progress = 0;
|
||||||
unsigned int progressCounter = 0;
|
unsigned int progressCounter = 0;
|
||||||
const unsigned int updateProgressEveryBytes = 100 * 1024;
|
const unsigned int updateProgressEveryBytes = 100 * 1024;
|
||||||
const unsigned int progressTotal = (3*m_Buffer.size()/updateProgressEveryBytes);
|
const unsigned int progressTotal = (3*m_Buffer.size()/updateProgressEveryBytes);*/
|
||||||
// process all '\'
|
// process all '\'
|
||||||
/*std::vector<char> ::iterator iter = m_Buffer.begin();
|
/*std::vector<char> ::iterator iter = m_Buffer.begin();
|
||||||
while (iter != m_Buffer.end())
|
while (iter != m_Buffer.end())
|
||||||
|
|
|
@ -102,7 +102,7 @@ ObjFile::Model *ObjFileParser::GetModel() const {
|
||||||
// File parsing method.
|
// File parsing method.
|
||||||
void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
|
void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
|
||||||
// only update every 100KB or it'll be too slow
|
// only update every 100KB or it'll be too slow
|
||||||
const unsigned int updateProgressEveryBytes = 100 * 1024;
|
//const unsigned int updateProgressEveryBytes = 100 * 1024;
|
||||||
unsigned int progressCounter = 0;
|
unsigned int progressCounter = 0;
|
||||||
const unsigned int bytesToProcess = streamBuffer.size();
|
const unsigned int bytesToProcess = streamBuffer.size();
|
||||||
const unsigned int progressTotal = 3 * bytesToProcess;
|
const unsigned int progressTotal = 3 * bytesToProcess;
|
||||||
|
|
|
@ -158,7 +158,7 @@ string tstr;
|
||||||
|
|
||||||
AttrHelper_FloatToString(pValue, tstr);
|
AttrHelper_FloatToString(pValue, tstr);
|
||||||
pList.push_back({pName, tstr});
|
pList.push_back({pName, tstr});
|
||||||
};
|
}
|
||||||
|
|
||||||
void X3DExporter::NodeHelper_OpenNode(const string& pNodeName, const size_t pTabLevel, const bool pEmptyElement, const list<SAttribute>& pAttrList)
|
void X3DExporter::NodeHelper_OpenNode(const string& pNodeName, const size_t pTabLevel, const bool pEmptyElement, const list<SAttribute>& pAttrList)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue