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

Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix

Browse Source 
# Conflicts:
#	code/ObjFileImporter.cpp
This commit is contained in:
Jared Mulconry
2016-11-27 13:00:33 +11:00
parent f206249fbf 56e9bce73f
commit 98e7eb476d
16 changed files with 267 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/ObjFileParser.cpp
View File

@@ -102,7 +102,7 @@ ObjFile::Model *ObjFileParser::GetModel() const {
// File parsing method.
void ObjFileParser::parseFile( IOStreamBuffer<char> &streamBuffer ) {
// 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;
const unsigned int bytesToProcess = static_cast<unsigned int>(streamBuffer.size());
const unsigned int progressTotal = 3 * bytesToProcess;