From 5e239095e0998b4eb397f24e81484ef0c98969e3 Mon Sep 17 00:00:00 2001 From: Elliot Woods Date: Fri, 4 May 2012 15:35:01 +0100 Subject: [PATCH] lots of tidying --- 1. Projector node.v4p | 376 ++++++++++---- Media/.gitignore | 3 + Media/cross.pdn | Bin 0 -> 9649 bytes Modules/3d big cursor (EX9).v4p | 224 ++++----- Modules/LoadViewProjection.v4p | 295 +++++++++++ Modules/Mouse Cursor (DX9).v4p | 106 ++-- Modules/SaveViewProjection (Transform).v4p | 209 ++++++++ Modules/Spin cursor mesh (EX9).v4p | 20 +- Modules/cross.png | Bin 0 -> 1300 bytes Subpatches/Keyboard.v4p | 104 +++- Subpatches/Mesh.SelectPoints.Markers.v4p | 422 +++++++++------- Subpatches/Mesh.SelectPoints.v4p | 390 +++++++++++++-- Subpatches/Mesh.Viewer.RandomLight.v4p | 22 +- .../Projection.SelectPoints.Markers.v4p | 468 +++++++++++++----- Subpatches/Projection.SelectPoints.v4p | 174 ++----- Subpatches/Renderer World.v4p | 414 +++++++++++++--- Subpatches/Renderer.Projection.v4p | 112 +++-- Subpatches/effects/Billboard.fx | 106 ++++ mapping.xml | 60 +-- 19 files changed, 2567 insertions(+), 938 deletions(-) create mode 100644 Media/.gitignore create mode 100644 Media/cross.pdn create mode 100644 Modules/LoadViewProjection.v4p create mode 100644 Modules/SaveViewProjection (Transform).v4p create mode 100644 Modules/cross.png create mode 100644 Subpatches/effects/Billboard.fx diff --git a/1. Projector node.v4p b/1. Projector node.v4p index e7dbcfb..33f3e6a 100644 --- a/1. Projector node.v4p +++ b/1. Projector node.v4p @@ -1,6 +1,6 @@ - + @@ -37,7 +37,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -65,6 +65,8 @@ + + @@ -81,9 +83,9 @@ - + - + @@ -97,7 +99,7 @@ - + @@ -181,7 +183,7 @@ - + @@ -197,13 +199,13 @@ - + - + @@ -214,12 +216,6 @@ - - - - - - @@ -255,11 +251,13 @@ - + + + - + @@ -271,13 +269,11 @@ - + - + - - @@ -307,10 +303,12 @@ - + + + @@ -318,38 +316,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -487,7 +459,7 @@ - + @@ -584,7 +556,7 @@ - + @@ -595,6 +567,12 @@ + + + + + + @@ -617,7 +595,7 @@ - + @@ -635,9 +613,9 @@ - + - + @@ -841,7 +819,7 @@ - + @@ -860,36 +838,28 @@ - - - - - - - - - + - + - + - + - + - + @@ -909,25 +879,23 @@ - + - + - - - + - + - + @@ -935,7 +903,11 @@ - + + + + + @@ -953,13 +925,13 @@ - + - + - + @@ -967,21 +939,21 @@ - + - + - - + + - + - + - + @@ -989,7 +961,7 @@ - + @@ -1005,7 +977,7 @@ - + @@ -1019,7 +991,7 @@ - + @@ -1032,4 +1004,230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Media/.gitignore b/Media/.gitignore new file mode 100644 index 0000000..f607887 --- /dev/null +++ b/Media/.gitignore @@ -0,0 +1,3 @@ +*.3ds +*.stl +*.x diff --git a/Media/cross.pdn b/Media/cross.pdn new file mode 100644 index 0000000000000000000000000000000000000000..af1da1e2a9793233f16b39f3913debcb5099869f GIT binary patch literal 9649 zcmeHMd0bOh_D_l|QCqQ2-D-t0ZPlVAWFbTa`mzv0Hj)ssxTINLUiO5%tXN?>c3SIF zrkxJ9+Dcp3(ORoW-Kx})f^~t>Dx#vauGJ#Af*{E6-hdSy=hvC}{N}IuJXDjHGl*QlbU5VisRt+o2DmUOXd-mXwI=1E@)5 z^;rtQh}G=^gDH$uN(!CIVx~~jS!wj7%;`oy?sGdcr~52^ryWom;V14|j?iOmMLTvW(nYwQvq zlane{`?3{2j>d22$!JDrwpFhZSwmulAc*I4LSkz!FIQm5L43(Pn=t zr%4UrT&=XwoQsFZOh=KOnQU|Uf|P85je=kl#GQ%=ScpJ^2qiL3o{Yl@tAe?F3OUOTw zDQ35sZDtAs+FWKfm7~bU@{8QzTq}d6vEhDc5tT~|P%K(Ukeg-?hGjCbET5w?aZq^y z>KEF1yj(V2;Li~|#Wo)9E)3xuEfUB@LUxTaTP)Rtw9Gt;%z#j3ViDbDvS<+&R-}^B zwMfuq$wTN=j3>^|mxki!;R)p=H-$ELQp1#AYEZU~!m zTr?a*++=fDZ49zaY>nEj#I+8$z7SE$M0T;vo6cvlH5{i$lP$xzG@BZ8h1lMZQHzI* ze4=!3UJhH1i2P`>2r>Aq1-MAh37Ppgk0T7^Xk6rcT#a&aFsY5Krb>{UJWard(Qp;U zwxI z%E1-sEQdDFEVe6rCaNnel7q|OxvX@qNG7CXdSP~6*o)+1JfoYN@3%489)YDGXcn*) zlKdPd)twfky2WNYQ^qg_4E(fotJ>zq7z`v&;?4IeC4Rbul9MJ?XVU^4g-4Vw#9r7-9-xwwb|X1O@cIypZr^7`RYO@7=X0{2l+j&7eSj3Q1)fOJ6QQ{h&H9HW}U|?aP)2q)h zXt9V~gzm{^xS4rQG}|o~2(v|0sa9g4BR15Q?_=dr(iCBa-V@NWG)S_NUuZHqC{~+R zkLhJXE$R;Pjf%n|0WAo8j;G;-{6ZGpA2iDJe7@aTgzG7`5HCl`3^HUYf3VOZkSWBD zd_BSi-iV2E=oTBw_9$$*A#WN#Ta?ZbO7&KQ#bi@kT|uWuZRa5(z5>f}dz@)`2v_C} z8}-Q+i=0+qFw+1c<#xMRz~}f<3k;}3q)rw3g?@!W8VV?Kcr;UiPhXJc#R|z}mxk<= zGDJBtx06W|8hsXpODGVA>|QpSt1@tm{IJkf$nrRqLPe@lk#C?%(iC*LiGnIU1{N#e z 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 literal 0 HcmV?d00001 diff --git a/Modules/3d big cursor (EX9).v4p b/Modules/3d big cursor (EX9).v4p index db6932e..4fd8cf0 100644 --- a/Modules/3d big cursor (EX9).v4p +++ b/Modules/3d big cursor (EX9).v4p @@ -1,25 +1,11 @@ - - - + + + - - - - - - - - - - - - - - - + - + @@ -35,7 +21,7 @@ - + @@ -45,189 +31,153 @@ - + - + - - - - - - - - - - - - - - - + - + - + - + - + - - + + - + - + - + - + - + - + + + - - - - - - + + - - - - - + - + - + - + - - - - + + - - - + - + - + - + - + + + + + + + + + - + - - + + + + - + - - - - - - + + + + - + - - - - - - - + - + - + + + - - - + - + - - + + - + + + - + - - - - - - - + - + - + + + - - - + - - + + - + - + - + - + + + + + + + - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Modules/LoadViewProjection.v4p b/Modules/LoadViewProjection.v4p new file mode 100644 index 0000000..d41162c --- /dev/null +++ b/Modules/LoadViewProjection.v4p @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Modules/Mouse Cursor (DX9).v4p b/Modules/Mouse Cursor (DX9).v4p index 6e7076b..920e902 100644 --- a/Modules/Mouse Cursor (DX9).v4p +++ b/Modules/Mouse Cursor (DX9).v4p @@ -1,6 +1,6 @@ - + @@ -15,7 +15,7 @@ - + @@ -37,37 +37,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - @@ -81,6 +57,8 @@ + + @@ -170,28 +148,14 @@ - - - - - - - - - - - - - - - - - + + + @@ -200,38 +164,54 @@ - - - - + + - - - + - + - - + + - + - - + + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/Modules/SaveViewProjection (Transform).v4p b/Modules/SaveViewProjection (Transform).v4p new file mode 100644 index 0000000..e11ffc3 --- /dev/null +++ b/Modules/SaveViewProjection (Transform).v4p @@ -0,0 +1,209 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Modules/Spin cursor mesh (EX9).v4p b/Modules/Spin cursor mesh (EX9).v4p index 72ba803..757ee4b 100644 --- a/Modules/Spin cursor mesh (EX9).v4p +++ b/Modules/Spin cursor mesh (EX9).v4p @@ -1,6 +1,6 @@ - + - + @@ -19,6 +19,8 @@ + + @@ -31,6 +33,8 @@ + + @@ -153,6 +157,8 @@ + + @@ -300,4 +306,14 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Modules/cross.png b/Modules/cross.png new file mode 100644 index 0000000000000000000000000000000000000000..54fc647c43e70826d9da034c2998b877360524f0 GIT binary patch literal 1300 zcmV+v1?&2WP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv000DoNkllo{5Xal066*98BsSi{ z)aC6JD?(!F1VeWw7ABT1EKEp@EKDp+h>-~)vB0c z{^ib2{*HTa&{8AN2s8qXKqJryGy;u4BhUyemcWs;{8((`Xw*l&>r97-hnL zdnNWfc_SgsxVZRq)Ccf#M(V3a=zJIZD)ve2U4lqh6V8l@i=SAI%Z|@r_rFM4mjL>c z43I#?6A5QRc@#*8G+RqI5jZ=Rl7(rdK}RoBfssJQ_As$6W(RJCpd}w=@t1&;l=)jc8j^ zaQv1AA{yxdFA8Fk!Q7Sx++=tyw7z*xTXt%`8cPGNGW@;{Y90`#0@CDQ=T`pyogY;?=Yh!id)^ZW*Ix@j z;PITtu`fN9lixB#t#@hiEgoRr!15W7s29hCH2gn5@Qy;yk z>kX(e`8z|GZ)|S7iFoLPo)2%~p;N1u4<;C9clBB;3fL4eR@InBJOP@qF))LAQ zZ7RaoXAA_O7@x`Vxh&ckYpz{4SN~mh+7sa1HjR`se=59@3$RAYG9N2dEViK1s-boB zE)bwuk!E$Cw*$5cuw{U)1L$M3yl`OvUA9Z`83&tGb}5Y60mLR2AaZxOh}v!e;4f+4 zk11_Td0jW`biI)6Q$WNM31`McV5+P#K;Y%wOP{rEOnq`&7nb_2(ngH2kWgkqA)FZ# znOOJ|USk&(0cLn#5)h(>o33eR*rr7wZpC&9BohlT&y;pv5g=hp7!o0G#fTbix~8q6 z+hz%8#za8kk$I!D=6G5WAfZdx=1qryBYHIL^!++ZE?TDceP9oi8mC;BNTX$_8bGFA zqXC>stjOO0Hh@L~#^Sx=>>NR%hLUXTYe?}Bbvwh97P|_eAq0$-Hh>MFk$|!IhBtww zD9OgYh7`X7DCVMW7h_&2@S2t65CXD|J=3 zr7e9*xT}(E>~BbMH+5TDSE}Hv|L0@*j^we>qHgyo%VA1#h$|T@1>#n0CkDu=>h_tG zDJ@hF1pWc4PPx6ql0g^%0000< KMNUMnLSTaXY)b3^ literal 0 HcmV?d00001 diff --git a/Subpatches/Keyboard.v4p b/Subpatches/Keyboard.v4p index cdb924b..85b35c0 100644 --- a/Subpatches/Keyboard.v4p +++ b/Subpatches/Keyboard.v4p @@ -1,6 +1,6 @@ - - - + + + @@ -9,11 +9,11 @@ - + - + @@ -25,13 +25,15 @@ + + - + - + @@ -47,9 +49,9 @@ - + - + @@ -65,9 +67,9 @@ - + - + @@ -101,9 +103,9 @@ - + - + @@ -113,9 +115,9 @@ - + - + @@ -125,7 +127,7 @@ - + @@ -135,9 +137,9 @@ - + - + @@ -147,9 +149,9 @@ - + - + @@ -157,7 +159,7 @@ - + @@ -172,14 +174,66 @@ - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Subpatches/Mesh.SelectPoints.Markers.v4p b/Subpatches/Mesh.SelectPoints.Markers.v4p index 3182a1e..65bab05 100644 --- a/Subpatches/Mesh.SelectPoints.Markers.v4p +++ b/Subpatches/Mesh.SelectPoints.Markers.v4p @@ -1,23 +1,9 @@ - + - - - - - - - - - - - - - - - + @@ -31,9 +17,9 @@ - + - + @@ -41,9 +27,9 @@ - + - + @@ -61,7 +47,7 @@ - + @@ -69,13 +55,13 @@ - + - + - + @@ -87,119 +73,23 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - + - + - + @@ -213,7 +103,7 @@ - + @@ -223,19 +113,19 @@ - + - + - + - + @@ -251,11 +141,11 @@ - + - + @@ -264,44 +154,20 @@ - - - - - - - - - - - - - - - - - - - - - - - + - + - - - + - + @@ -311,13 +177,13 @@ - + - + @@ -331,17 +197,17 @@ - + - + - + @@ -349,43 +215,35 @@ - + - + - + - + - - - - - - - - - + - + - + - + @@ -398,28 +256,212 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Subpatches/Mesh.SelectPoints.v4p b/Subpatches/Mesh.SelectPoints.v4p index d0ebc06..6dd95b3 100644 --- a/Subpatches/Mesh.SelectPoints.v4p +++ b/Subpatches/Mesh.SelectPoints.v4p @@ -1,6 +1,6 @@ - + @@ -73,7 +73,7 @@ - + @@ -94,18 +94,6 @@ - - - - - - - - - - - - @@ -135,9 +123,9 @@ - + - + @@ -149,15 +137,15 @@ - + - + - + - + @@ -177,7 +165,7 @@ - + @@ -191,16 +179,22 @@ - + - + + + + + + + @@ -235,7 +229,7 @@ - + @@ -265,9 +259,9 @@ - + - + @@ -383,7 +377,7 @@ - + @@ -393,6 +387,8 @@ + + @@ -413,9 +409,9 @@ - + - + @@ -431,9 +427,13 @@ - + + + + + - + @@ -487,6 +487,10 @@ + + + + @@ -516,12 +520,10 @@ - - - + - + @@ -529,17 +531,15 @@ - + - + - - @@ -573,9 +573,9 @@ - + - + @@ -630,12 +630,6 @@ - - - - - - @@ -661,9 +655,9 @@ - + - + @@ -706,4 +700,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Subpatches/Mesh.Viewer.RandomLight.v4p b/Subpatches/Mesh.Viewer.RandomLight.v4p index 27d7858..8fdead1 100644 --- a/Subpatches/Mesh.Viewer.RandomLight.v4p +++ b/Subpatches/Mesh.Viewer.RandomLight.v4p @@ -1,4 +1,4 @@ - + @@ -89,6 +89,8 @@ + + @@ -125,13 +127,27 @@ - + - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Subpatches/Projection.SelectPoints.Markers.v4p b/Subpatches/Projection.SelectPoints.Markers.v4p index d79625a..9631731 100644 --- a/Subpatches/Projection.SelectPoints.Markers.v4p +++ b/Subpatches/Projection.SelectPoints.Markers.v4p @@ -1,257 +1,459 @@ - - + + - - + + - + + + + + + + + + + + + + - + - - - + - + - - + + - + + + - + - + - + - + + + + + - - + + - + - + - + + + + + - - + + - + + + + + + + + + + + - + - + - - + + + + - + - + - + - + - - - + - - + + - + - + - + - - + + + + + + + + + + - + - + - + - - - - - - - + - + + + - + - + - + - - - - + + - + - + + + - - + + + + + + + + - + + + + + - - + + + + + + - + + + + + + + + + - + - - - - - - - - - - - - - + - - + + - + - - + + + + + + + + + + - + - - + + - + - + - + - - - + + + + + + + + + + + - - + + + + + + + + - + + + + + - + - - + + - + + + + + + + + + - + - + - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - - - - - + + + + + + + - - + + + + - + - - + + + + + + + + + + - + + + + + + + + + + + + + + + - + - + - + - - + + + + + + + + + + - + + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + - + - + + + + + \ No newline at end of file diff --git a/Subpatches/Projection.SelectPoints.v4p b/Subpatches/Projection.SelectPoints.v4p index ff5aef4..978052d 100644 --- a/Subpatches/Projection.SelectPoints.v4p +++ b/Subpatches/Projection.SelectPoints.v4p @@ -1,6 +1,6 @@ - + @@ -113,7 +113,7 @@ - + @@ -171,9 +171,11 @@ + + - + @@ -201,7 +203,7 @@ - + @@ -250,22 +252,8 @@ - - - - - - - - - - - - - - - + @@ -273,19 +261,17 @@ - + - + - + - - - + - + @@ -298,38 +284,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -337,95 +293,75 @@ - + - - - - - - - - - + - + - - + + - - - + + + - - - - - + - - + + + + + + - + - + - + - - - - - - + + - - - - - - - + - - - - - + - + - + + + - - + + - + - - - - - - + + - + + + + + + + + + - + - - - - - + \ No newline at end of file diff --git a/Subpatches/Renderer World.v4p b/Subpatches/Renderer World.v4p index be774a7..c87a64d 100644 --- a/Subpatches/Renderer World.v4p +++ b/Subpatches/Renderer World.v4p @@ -1,13 +1,13 @@ - + - + - + - + @@ -31,43 +31,49 @@ + + + + + + - + - + + + + + + + - - - - - - - + - + + + - - - + @@ -80,24 +86,18 @@ - - - - - - - + - + + + - - - + @@ -113,10 +113,12 @@ - + + + @@ -133,7 +135,7 @@ - + @@ -153,15 +155,15 @@ - + - + - + - + @@ -178,46 +180,26 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + - + - + - + @@ -225,9 +207,9 @@ - + - + @@ -247,7 +229,7 @@ - + @@ -255,9 +237,9 @@ - + - + @@ -279,15 +261,307 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Subpatches/Renderer.Projection.v4p b/Subpatches/Renderer.Projection.v4p index 2460b97..4fc4219 100644 --- a/Subpatches/Renderer.Projection.v4p +++ b/Subpatches/Renderer.Projection.v4p @@ -1,13 +1,13 @@ - + - + - + - + @@ -33,9 +33,11 @@ + + - + @@ -47,13 +49,13 @@ - + - + - + @@ -63,7 +65,7 @@ - + @@ -79,7 +81,7 @@ - + @@ -91,7 +93,7 @@ - + @@ -101,15 +103,15 @@ - + - + - + - + @@ -121,7 +123,7 @@ - + @@ -133,21 +135,21 @@ - + - + - + - + - + - + @@ -163,9 +165,9 @@ - + - + @@ -183,7 +185,7 @@ - + @@ -223,9 +225,9 @@ - + - + @@ -238,6 +240,60 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Subpatches/effects/Billboard.fx b/Subpatches/effects/Billboard.fx new file mode 100644 index 0000000..925de07 --- /dev/null +++ b/Subpatches/effects/Billboard.fx @@ -0,0 +1,106 @@ +//@author: vvvv group +//@help: draws a mesh with a constant color +//@tags: template, basic +//@credits: + +// -------------------------------------------------------------------------------------------------- +// PARAMETERS: +// -------------------------------------------------------------------------------------------------- + +//transforms +float4x4 tW: WORLD; //the models world matrix +float4x4 tV: VIEW; //view matrix as set via Renderer (EX9) +float4x4 tP: PROJECTION; //projection matrix as set via Renderer (EX9) +float4x4 tWVP: WORLDVIEWPROJECTION; + +//material properties +float4 cAmb : COLOR = {1, 1, 1, 1}; +float Alpha = 1; + +//texture +texture Tex ; +sampler Samp = sampler_state //sampler for doing the texture-lookup +{ + Texture = (Tex); //apply a texture to the sampler + MipFilter = LINEAR; //sampler states + MinFilter = LINEAR; + MagFilter = LINEAR; +}; + +float4x4 tTex: TEXTUREMATRIX ; + +//the data structure: vertexshader to pixelshader +//used as output data with the VS function +//and as input data with the PS function +struct vs2ps +{ + float4 Pos : POSITION; + float4 TexCd : TEXCOORD0; +}; + +// -------------------------------------------------------------------------------------------------- +// VERTEXSHADERS +// -------------------------------------------------------------------------------------------------- + +float3 PositionW; +float4x4 TransformInP; +bool OnTop = true; +bool ApplyViewProjection = true; + +vs2ps VS( + float4 Pos : POSITION, + float4 TexCd : TEXCOORD0) +{ + //inititalize all fields of output struct with 0 + vs2ps Out = (vs2ps)0; + + float4 PosW; + PosW.xyz = PositionW; + PosW.w = 1.0f; + + float4 PosP; + if (ApplyViewProjection) + PosP = mul(PosW, tWVP); + + PosP /= PosP.w; + PosP.xy *= 2.0f; + + //transform position + Pos = mul(Pos, TransformInP); + Out.Pos = Pos + PosP; + + if (OnTop) + Out.Pos.z /= 100.0f; + + //transform texturecoordinates + Out.TexCd = mul(TexCd, tTex); + + return Out; +} + +// -------------------------------------------------------------------------------------------------- +// PIXELSHADERS: +// -------------------------------------------------------------------------------------------------- + +float4 PS(vs2ps In): COLOR +{ + //In.TexCd = In.TexCd / In.TexCd.w; // for perpective texture projections (e.g. shadow maps) ps_2_0 + + float4 col = tex2D(Samp, In.TexCd) * cAmb; + col.a *= Alpha; + return col; +} + +// -------------------------------------------------------------------------------------------------- +// TECHNIQUES: +// -------------------------------------------------------------------------------------------------- + +technique TBillboard +{ + pass P0 + { + //Wrap0 = U; // useful when mesh is round like a sphere + VertexShader = compile vs_2_0 VS(); + PixelShader = compile ps_2_0 PS(); + } +} diff --git a/mapping.xml b/mapping.xml index 1b0228d..5f13498 100644 --- a/mapping.xml +++ b/mapping.xml @@ -1,45 +1,45 @@ - 0.044963598251342773 - 0.0471813790500164 - 0.046865321695804596 - -0.1466760744541922 - 0.25540687320198247 + -0.043987937271595 + -0.0435321182012558 + -0.048409551382064819 + -0.084766268730163574 + -0.11549311131238937 - -0.046396855264902115 - -0.046245075762271881 - -0.047271586954593658 - -0.72625502219609184 - -0.7643370119619195 + 0.046315465122461319 + 0.045873574912548065 + -0.04678950086236 + 0.050729133188724518 + -0.0094743920490145683 - 0.04279053583741188 - -0.042458463460206985 - -0.048616755753755569 - -0.085281909181993062 - -0.748425050572379 + 0.046482197940349579 + -0.047052793204784393 + -0.046643614768981934 + 0.047553203999996185 + -0.15807551145553589 - -0.04413045197725296 - 0.044246498495340347 - -0.048193302005529404 - -0.720973918988896 - 0.051406403029946555 + 0.045418404042720795 + 0.048261627554893494 + 0.034549564123153687 + 0.11906117390072536 + 0.16030400689285049 - 0.045368149876594543 - 0.045103296637535095 - -0.047499928623437881 - -0.057866002775410638 - 0.043671315730613856 + -0.04637625440955162 + 0.045100290328264236 + -0.047490630298852921 + -0.093720756471157074 + 0.02845439687371254 - 0.047658856958150864 - -0.042766310274600983 - 0.046697605401277542 - -0.17381092670625437 - -0.44785568253415003 + -0.046353582292795181 + 0.047663521021604538 + 0.044497102499008179 + -0.016161961498714635 + 0.1322282498953743 \ No newline at end of file