From bed30a9b92d25bd214734e24596f6374f72c94bf Mon Sep 17 00:00:00 2001 From: ulfjorensen Date: Thu, 30 Oct 2008 20:41:01 +0000 Subject: [PATCH] - 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 | 12 +- workspaces/vc9_ATMNotUpToDate/assimp.sln | 2 - workspaces/vc9_ATMNotUpToDate/assimp.suo | Bin 36864 -> 36864 bytes workspaces/vc9_ATMNotUpToDate/assimp.vcproj | 170 +++++++++++++++++- .../vc9_ATMNotUpToDate/assimp_view.vcproj | 28 ++- 5 files changed, 191 insertions(+), 21 deletions(-) diff --git a/tools/assimp_view/Display.cpp b/tools/assimp_view/Display.cpp index b49f90cb0..2a8a23a1d 100644 --- a/tools/assimp_view/Display.cpp +++ b/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); } diff --git a/workspaces/vc9_ATMNotUpToDate/assimp.sln b/workspaces/vc9_ATMNotUpToDate/assimp.sln index a935f72b4..1216bafce 100644 --- a/workspaces/vc9_ATMNotUpToDate/assimp.sln +++ b/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 diff --git a/workspaces/vc9_ATMNotUpToDate/assimp.suo b/workspaces/vc9_ATMNotUpToDate/assimp.suo index 7c5e59335f9b4f797922b98661fe7ae6aa1fa073..60d5e4c18edc66d255df4771d226474a8a219818 100644 GIT binary patch delta 2546 zcma)8O>k3H6uvjf3+Z17No-SSk|sha7CT8>1S!R&iO5eVKNewzIt5zfFQlanTGCQp zK`APN^yrKmXDSOfut46zjY<~G=mHp+VWF%Y1~-7pFv>WM-+ApT1=>!}n=kL&bI-l^ z-1GOM4x7|r(v^u&?Ro9klU6#jECTXAb4a*r!(nV{fCB@9I)@#YL zte(r|4D?~#0dxX~fG(gLNCSs~_W{=J!TSi10eZ(|NAd0ljsYrg@DHN$7O~w`=v&8JEn2bAQc}R;qT7y;(vC%O`g3tdQEevai|%@X1&Q2m^I2gc{<$FiTz{gYjD-Za;wftZWFK9E1;i|h8d4SOi<+gRwr z#%v`MZL-a`egJ_@(i30CdJybV3uXLkl{&CaV`0fF7$pFv{QwL{^d@ot4D2f8kb{B< zT1vEuByy!)4^0e#LKq=WV$9jZRP%yfBlJ2D^t5OdTfudS0|;*yxWm|y6NAYC4VHA_ zjNN)(veYNKYn~CeVEZmS+mJKH6>FYb+Ct%A$xAKREUg>I8!??4b%DYe7^H!~9=g}) zxg1ny`Qb;*vzv-pag12TeitNb=TWNGO4&u~P_s(G6|2cswMdE|azS^WkdLxn|VU^Ur$mN=96FoR!*H*+Xnq-OwZ1X0R!FTS33*Odmox;td z@Cla(7XbUJ8Z(`G&HCwR-U-^f^e#26yG;ERKJqoChL-o3Qcf+ie2uhb64Cp%Uv%T;f>?qZXA`w;YTJMT#h}OS-)Ytc2SvJpBz;7 zGn+ihrNtUODcE$@;0x@<`T&~Jm3OvMJn|Q1qi#|g)mh1vqsHxwEoASk5yB&^dijZa zW}b41wdQ;-+g$DslaL+P^xOQ?V%29^j6t{}j7aO=}sl#8?Z5QDD$Z|7FTJUzwbeZm0>_M-2f# zweBf<`Kj$w<{91TNNgLx;^V*x;6vae;3O~zoB}=uJ^?-hP6NiLkl&wUd=3}_Xl(9F zyno{Hw$;OOg#KNfvvC7pqTxe<`k5xAc$$#djj4jv&a)G83`Jk`Ouf;LL)#l>p7JlA zP=ga9Ly36d5*#;b^XMl-OD8PS6tq)j{YlDpZg|#;(kWXHEUKhzlS+=ZTFUKL+mkW6sf%5O~XgaX>I5+MH&}VU5!ub&7y4vL7bvlH1u5mo1MlD*$MF1m}w!v zG6zrz2s*auD#Z%Il-}GdD~!&kJ=%QQu4VgF)A@EZ;$!Vrtv&g>P0krtNFPo(slV6y zRutc>RpL#w|2q7J#jB!G=WD@*@x(<4TvVTnf(zk^0x|JAepl&FOw`gh>H>P$YoY95 znYjRVdDRkAz0gvp?kKX*IJV#kOuo-{LnD{xm$h_D2~gHqr+fj?F#bfXqpN3r_#aZD BY~}y} delta 1379 zcmah}ZA@EL7(VB=w_G+TrF5)7fk766fK6H2GP+s{mdN-Rw-pUP05#x{frT#JhQ#1y zCX-|=us(nMVU*0o#JC@1*B^ciZ8qcnI3<2$?vEx$muU=34QgBr_?{N9CMJ7t-rRGZ z_kGWK-j5t@S<;rJ6~!QLZjtEuhNrk`=?&KztyVv2{Dbog7&EmPg%OucwVB1Yrq6N( zlGcmi$1QKK-*SHy8f{%#`Jwabt>527YQd!kl{+%tvXtsU^Kl6^=29drAwz^QJX2MM z10Fj+MR;X%=EWHh``2b~%qux9wbuc!io*Lr6APlc*{c>3+qGX_IU@ z3^SFT@*Y}RcLMj;(auOpf|TcBQAu2Tw86kwG@FDxz)rAMxS}P32%pNfVYa;vXB$d+ zCFZI|Vf5IqRBJg1jt7x^NQ1B10W~m!WSxd<9;^Oo;5DuvY_;-BP6=lNUL>2$IApQm z^WM7%HfosiSL6?~Df$?b)5N%U-<3n;y%;s;WN-_rT93l%w&~064hdSWhGSs`KQ?`b zzQ76m^0d_`I)z}(05{{~!)FK{O8BOwzYFyl-%)Pjxny?imcdE8JDHwgu%J>;_}2_X zvV$Y3n&4Lt;LBc0A;Xj_Sj~I6B+ZS=k{LHDSf)En#Y=5-usq_@UGDd?xv9|FYLRHN z=k$Ley1?*CTh;z)7H6l}N%kyrvgZg?NN3pyest}&sV?Se%bfU@T-4Lm#2fQ z<*q^zo<2e#LXc{zr{)!33^(uv6dLN$-?7ZM@K?uHk(dJ^r`a%TW)JG*Z%w6WiPh;t zhl_clJA}|)mmcpna_QGR%=DbYY)u6c%~4TfSpC&V9@APT0vQ&J4Q?-v(_hq6=qPC| zsmM<3MH*wILZYM`u|SWm`QPQx!q;)#*ob(fj~DKAN8gAnnD>~{{_L)Sq4As-+W1dM zsBU}|Q1G?Kg0WZx_o9Bu%dtM*Ex))uug*&&5@PBT;z + + @@ -594,6 +602,10 @@ RelativePath="..\..\include\aiFileIO.h" > + + @@ -689,14 +701,34 @@ - - - - + + + + + + + + + + + + + + + + + @@ -758,6 +798,14 @@ RelativePath="..\..\code\FileLogStream.h" > + + + + @@ -798,6 +846,14 @@ RelativePath="..\..\code\RemoveComments.h" > + + + + @@ -806,6 +862,14 @@ RelativePath="..\..\code\SGSpatialSort.h" > + + + + @@ -830,6 +894,10 @@ RelativePath="..\..\code\StandardShapes.h" > + + @@ -873,6 +941,46 @@ + + + + + + + + + + + + + + + + + + + + @@ -1253,6 +1361,14 @@ RelativePath="..\..\code\ConvertToLHProcess.h" > + + + + @@ -1386,6 +1502,46 @@ > + + + + + + + + + + + + + + + + + + + + + + + + @@ -764,6 +776,14 @@ RelativePath="..\..\tools\assimp_view\Resource.h" > + + + +