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

Next WIP version of the LWO loader. LWO2 is still unfinished and crashes every time.

Browse Source 
Added NFF test model.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@123 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-09-08 16:48:21 +00:00
parent d38e83766b
commit af18307f95
9 changed files with 790 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/NFFLoader.cpp
View File

@@ -140,6 +140,8 @@ void NFFImporter::InternReadFile( const std::string& pFile,
MeshInfo* currentMeshWithNormals = NULL;
MeshInfo* currentMesh = NULL;
ShadingInfo s; // current material info
char line[4096];
const char* sz;
unsigned int sphere = 0,cylinder = 0,cone = 0,numNamed = 0;
@@ -197,8 +199,6 @@ void NFFImporter::InternReadFile( const std::string& pFile,
{
SkipSpaces(&line[1],&sz);
ShadingInfo s; // color;
// read just the RGB colors, the rest is ignored for the moment
sz = fast_atof_move(sz, s.color.r);
SkipSpaces(&sz);
@@ -241,6 +241,7 @@ void NFFImporter::InternReadFile( const std::string& pFile,
{
meshesLocked.push_back(MeshInfo(false,true));
MeshInfo& currentMesh = meshesLocked.back();
currentMesh.shader = s;
sz = &line[1];
aiVector3D center; float radius;
@@ -261,6 +262,7 @@ void NFFImporter::InternReadFile( const std::string& pFile,
{
meshesLocked.push_back(MeshInfo(false,true));
MeshInfo& currentMesh = meshes.back();
currentMesh.shader = s;
sz = &line[1];
aiVector3D center1, center2; float radius1, radius2;
@@ -286,7 +288,8 @@ void NFFImporter::InternReadFile( const std::string& pFile,
// '#' - comment
else if ('#' == line[0])
{
DefaultLogger::get()->info(line);
const char* sz;SkipSpaces(&line[1],&sz);
if (!IsLineEnd(*sz))DefaultLogger::get()->info(sz);
}
}