- fixed upload of skinning matrices to the shader.

- VC9 project files updated.

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

tools/assimp_view/Display.cpp

@@ -1985,14 +1985,10 @@ int CDisplay::RenderNode (aiNode* piNode,const aiMatrix4x4& piMatrix,
 				for( unsigned int a = 0; a < mesh->mNumBones; a++)
 				{
 					const aiMatrix4x4& mat = boneMats[a];
-					*tempmat++ = mat.a1; *tempmat++ = mat.a2; *tempmat++ = mat.a3;
-					tempmat++;  
-					*tempmat++ = mat.a4; *tempmat++ = mat.b1; *tempmat++ = mat.b2;
-					tempmat++; 
-					*tempmat++ = mat.b3; *tempmat++ = mat.b4; *tempmat++ = mat.c1; 
-					tempmat++;
-					*tempmat++ = mat.c2; *tempmat++ = mat.c3; *tempmat++ = mat.c4; 
-					tempmat++;
+					*tempmat++ = mat.a1; *tempmat++ = mat.a2; *tempmat++ = mat.a3; *tempmat++ = mat.a4;  
+					*tempmat++ = mat.b1; *tempmat++ = mat.b2; *tempmat++ = mat.b3; *tempmat++ = mat.b4;
+					*tempmat++ = mat.c1; *tempmat++ = mat.c2; *tempmat++ = mat.c3; *tempmat++ = mat.c4; 
+					*tempmat++ = mat.d1; *tempmat++ = mat.d2; *tempmat++ = mat.d3; *tempmat++ = mat.d4; 
 				}
 				helper->piEffect->SetMatrixArray( "gBoneMatrix", (D3DXMATRIX*)matrices, 60);
 			}

workspaces/vc9_ATMNotUpToDate/assimp.sln

@@ -64,7 +64,6 @@ Global
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug_DLL|x64.ActiveCfg = Debug_DLL|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug_DLL|x64.Build.0 = Debug_DLL|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug|Win32.Build.0 = Debug|Win32
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug|x64.ActiveCfg = Debug|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Debug|x64.Build.0 = Debug|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release_DLL|Win32.ActiveCfg = Release_DLL|Win32
@@ -72,7 +71,6 @@ Global
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release_DLL|x64.ActiveCfg = Release_DLL|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release_DLL|x64.Build.0 = Release_DLL|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|Win32.ActiveCfg = Release|Win32
-		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|Win32.Build.0 = Release|Win32
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|x64.ActiveCfg = Release|x64
 		{9B9D1C90-8A03-409A-B547-AE7B48B90F1A}.Release|x64.Build.0 = Release|x64
 		{FE78BFBA-4BA5-457D-8602-B800D498102D}.Debug_DLL|Win32.ActiveCfg = Debug|Win32

workspaces/vc9_ATMNotUpToDate/assimp.vcproj

@@ -41,6 +41,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
@@ -166,6 +167,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
@@ -293,6 +295,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
@@ -443,6 +446,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="DEBUG;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;WIN32;ASSIMP_BUILD_DLL_EXPORT"
@@ -582,6 +586,10 @@
 				RelativePath="..\..\include\aiAssert.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\aiCamera.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\aiConfig.h"
 				>
@@ -594,6 +602,10 @@
 				RelativePath="..\..\include\aiFileIO.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\aiLight.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\aiMaterial.h"
 				>
@@ -689,14 +701,34 @@
 			<Filter
 				Name="Compiler"
 				>
-				<Filter
-					Name="MSVC"
+				<File
+					RelativePath="..\..\include\Compiler\poppack1.h"
 					>
-					<File
-						RelativePath="..\..\include\Compiler\MSVC\stdint.h"
-						>
-					</File>
-				</Filter>
+				</File>
+				<File
+					RelativePath="..\..\include\Compiler\pstdint.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\Compiler\pushpack1.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Boost_Workaround"
+				>
+				<File
+					RelativePath="..\..\include\BoostWorkaround\boost\format.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\BoostWorkaround\boost\multi_array.hpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\include\BoostWorkaround\boost\scoped_ptr.hpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -710,6 +742,14 @@
 				RelativePath="..\..\code\Assimp.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\AssimpPCH.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\AssimpPCH.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\BaseImporter.cpp"
 				>
@@ -758,6 +798,14 @@
 				RelativePath="..\..\code\FileLogStream.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\FindDegenerates.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\FindDegenerates.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\GenericProperty.h"
 				>
@@ -798,6 +846,14 @@
 				RelativePath="..\..\code\RemoveComments.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\SceneCombiner.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\SceneCombiner.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\SGSpatialSort.cpp"
 				>
@@ -806,6 +862,14 @@
 				RelativePath="..\..\code\SGSpatialSort.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\SkeletonMeshBuilder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\code\SkeletonMeshBuilder.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\SmoothingGroups.h"
 				>
@@ -830,6 +894,10 @@
 				RelativePath="..\..\code\StandardShapes.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\code\StreamReader.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\code\StringComparison.h"
 				>
@@ -873,6 +941,46 @@
 			<Filter
 				Name="Loaders"
 				>
+				<File
+					RelativePath="..\..\code\ACLoader.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\ACLoader.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\BVHLoader.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\BVHLoader.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\IRRLoader.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\IRRLoader.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\IRRMeshLoader.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\IRRMeshLoader.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\LWSLoader.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\LWSLoader.h"
+					>
+				</File>
 				<Filter
 					Name="3DS"
 					>
@@ -1253,6 +1361,14 @@
 					RelativePath="..\..\code\ConvertToLHProcess.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\code\FindInvalidDataProcess.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\FindInvalidDataProcess.h"
+					>
+				</File>
 				<File
 					RelativePath="..\..\code\FixNormalsStep.cpp"
 					>
@@ -1386,6 +1502,46 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="irrXML"
+				>
+				<File
+					RelativePath="..\..\code\irrXML\CXMLReaderImpl.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\irrXML\fast_atof.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\irrXML\heapsort.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\irrXML\irrArray.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\irrXML\irrString.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\irrXML\irrTypes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\irrXML\irrXML.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\irrXML\irrXML.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\code\irrXML\irrXMLWrapper.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="doc"

workspaces/vc9_ATMNotUpToDate/assimp_view.vcproj

@@ -43,6 +43,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
@@ -53,7 +54,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -205,12 +206,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -366,12 +368,13 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
 				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool
@@ -526,6 +529,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions="/MP"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(DXSDK_DIR)include&quot;;..\..\include;..\..\code"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS"
@@ -536,7 +540,7 @@
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -672,6 +676,14 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\tools\assimp_view\AnimEvaluator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\AnimEvaluator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\AssetHelper.h"
 				>
@@ -764,6 +776,14 @@
 				RelativePath="..\..\tools\assimp_view\Resource.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\SceneAnimator.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\tools\assimp_view\SceneAnimator.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\tools\assimp_view\Shaders.cpp"
 				>