Răsfoiți Sursa

FIX: (aiMesh::mNumTextureCoords[n] == 0) is now propagated to 2.
Removed ATMNotUptoDate tag from SCons dir. The SCons script is generic.
Updated list of contributors.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@275 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

aramis_acg 16 ani în urmă
părinte
comite
62a8f43ffe
4 a modificat fișierele cu 10 adăugiri și 4 ștergeri
  1. 3 0
      CREDITS
  2. 3 3
      code/ProcessHelper.h
  3. 4 1
      code/ScenePreprocessor.cpp
  4. 0 0
      workspaces/SCons/SConstruct

+ 3 - 0
CREDITS

@@ -47,3 +47,6 @@ supplied various XFiles for testing purposes.
 
 - Tizian Wieland
 searched the web for several thousands of test models for internal use
+
+- John Connors
+supplied patches for linux and SCons.

+ 3 - 3
code/ProcessHelper.h

@@ -116,7 +116,7 @@ inline const char* TextureTypeToString(aiTextureType in)
 	case aiTextureType_SHININESS:
 		return "Shininess";
     default:
-        return "LARGE ERROR, please leave the room immediately and call the police";        
+        return "HUGE ERROR, please leave the room immediately and call the police";        
 	}
 }
 
@@ -139,7 +139,7 @@ inline const char* MappingTypeToString(aiTextureMapping in)
 	case aiTextureMapping_OTHER:
 		return "Other";
     default:
-        return "LARGE ERROR, please leave the room immediately and call the police";        
+        return "HUGE ERROR, please leave the room immediately and call the police";        
 	}
 }
 
@@ -187,5 +187,5 @@ class DestroySpatialSortProcess : public BaseProcess
 	}
 };
 
-} // !! Assimp
+} // ! namespace Assimp
 #endif // !! AI_PROCESS_HELPER_H_INCLUDED

+ 4 - 1
code/ScenePreprocessor.cpp

@@ -69,7 +69,10 @@ void ScenePreprocessor::ProcessMesh (aiMesh* mesh)
 	// If aiMesh::mNumUVComponents is *not* set assign the default value of 2
 	for (unsigned int i = 0; i < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++i)
 	{
-		if (!mesh->mNumUVComponents[i])
+		if (!mesh->mTextureCoords[i])
+			mesh->mNumUVComponents[i] = 0;
+
+		else if( !mesh->mNumUVComponents[i])
 			mesh->mNumUVComponents[i] = 2;
 	}
 

+ 0 - 0
workspaces/scons_ATMNotUpToDate/SConstruct → workspaces/SCons/SConstruct