From a7bcb2b6e6fb0d568adf0da258f800e35e521822 Mon Sep 17 00:00:00 2001 From: "Sha..rd" Date: Sat, 15 Sep 2012 20:07:42 +0000 Subject: [PATCH] * Buggy model no longer has embedded lights * Buggy model now uses J3M file by default * Enabled specular for buggy - since specular color is set to black by default git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9734 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- engine/test-data/Models/Buggy/Buggy.j3m | 7 ++++++- engine/test-data/Models/Buggy/Buggy.j3o | Bin 227203 -> 227088 bytes 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/engine/test-data/Models/Buggy/Buggy.j3m b/engine/test-data/Models/Buggy/Buggy.j3m index 65a96a1d3..1cde6ed2b 100644 --- a/engine/test-data/Models/Buggy/Buggy.j3m +++ b/engine/test-data/Models/Buggy/Buggy.j3m @@ -3,7 +3,12 @@ Material My Material : Common/MatDefs/Light/Lighting.j3md { DiffuseMap : Models/Buggy/buggy_diffuse.jpg GlowMap : Models/Buggy/buggy_glow.jpg SpecularMap : Models/Buggy/buggy_specular.jpg - Shininess : 10 NormalMap : Models/Buggy/buggy_normals.png + Shininess : 10 + + UseMaterialColors : true + Ambient : 0.5 0.5 0.5 1 + Diffuse : 1 1 1 1 + Specular : 1 1 1 1 } } diff --git a/engine/test-data/Models/Buggy/Buggy.j3o b/engine/test-data/Models/Buggy/Buggy.j3o index 20f09b81830c23cdee4635c5409704277dcb317c..3dd7764432659bdcad0fd020462ad156baeba9ef 100644 GIT binary patch delta 4078 zcmchZdr;KZ702(ncX!!cSWv_V$V*XC6cEw)0C^~45`_9Th>8m?u(0d`3%;VF;xi#W zvN6B-z_-yDX*H&^)0nC0v`*v1Ol>DgJJWPb(st5hrb(wsr)ei?`#rlCDVfIqEHmf# zx%d3;@BGgB-gEay*XNEypE+V5FQ1nygpjb9D8f}7Hs@I)!=tWIoffqcKF4~er^8k4 zcdmEVcwFW$?I%(nezEgcxjE#=Mj7-V!g9% z>82K!gWuZsH>%dxoYmOu%FSwaw!7NgPES_3vptX}D=jLV%{Nocp+O*rQtfsg^79FS zB$*Isp>Y;l_^v@a?DBr(z!6!gANx#B(4*mMl0Bw>Nr@`3Si=u@sY-iv|DE5d3S0kd zqN&v$!PD^C9#e9PH6)M4Z2uug>fn&fLaIEN*&b=692wAfZoCqER$AjEx z6F}~wEFo)$f!SaNI0^orf|=mI!Cd&)f>XdLU=EBG<78OD=|XP%A^3=pt;4}-ShoS3 z+KB-N&J*%#4>(K6i~GQtLLU7qI77(2?}CM>gcT?NS(({dv3!uFEYTIt(+QUfd94!u z`5+fmq!lUFip;@!R;+U_2CTpWEaW{b2U+q8kbB~LLcW6i6_4uqW8f{!ABS;eWiYOE znUH^CC6)^LQ5(2IC%9ZExJbxb+zShZyzvuoiIBg+mUoK9LcaAm9IJIAt8`}7x{@`R z^WIfz1)k6fROw1qg1pytLVlVJ)`P1+-cC-CjT5YapOvcx)4{buesTlv7fuYmhQlkA z=SlxY#>jY58z1~v)#%`d?Q9ncN>G2fsISg#A{&;L~~w zp3?E3(Ft_x1P+3od^`?dz!L62;19v=AfMAN@GEd9$O-HgYQl1GmryB}z`a6czX$Ho zO7R*_{3whIIVM!`Oz=2Z2c7_vz#ecbcv7g&vP=w43AOaM;2{z2%EKTx<+C8~eLz?G zoKQu#Fh7C-7VvqH0~%ls_%hb>bC*Hx?w3#)7kEh**sJ4Q!F`TN$Jgek=!MQUr^n;m_^6A&U&ibdmDy>h;S^6JDTz{P6pf~_G>#_lS7@T3 zh~=)@c3<06=-BsGNrU>L_PG>|;Ej(Hh1>Bl;)~>q;tL0YlKp}Dl9m(`in9zKeqD#6 z1RVztQ6VmpFW(VIm)aKxVYEk4qQhA9noNmER>DNd(MD3EOpi{HWLw(i_PD(+XIqTn zZITIwr%^f{;}lbo;vD?D;&OWFe<)`nUX(1zT+09c(6^N|&t7onZHMvU7c$YBrU*@v z7H!;pO^%5kGw`i<8|9c>j+NOT%eJJ!?L}68zofzUwe9nni&ODWfbm9(O17peQYK0d z6_jA?Ym$!W@dM+ds&sM~XUbHnHA9g!QAV`!<0d&icH)4A$Y6}I|Arh>!Ut!%Ap86d z@BKrQDJfe~4j-B+4>&Y=y79A&`5u{Jo2*YwuCdu8N2X7sM`$|DpqVsFubWB*H~+Cn z7F@2{s0zn^a1IB;aXfTDg713dP6wY5$I;LU3Hmo{hiznF^1b-rkbP3xa7Kn5mWi=o z?m2lR^nh(p_^f!^Tq>b?tYE%z^M)Kf;=6udj1O+e zX;#)}yr6QUB~>LD(_fdP$!7GXs+8cS*X1EpXROXpNx_@{l5eQs$G7EO{L&Z;t+@Z| zU&yr!n6ZltHQK{CR-5A_XAc3eb>vXgqkg5s^VtjCL0<&Jxhi3Lz8v? zA5?mZo~CYkh7Qm{Iz)%*SqgkhrT(ruBFRv6lvO(R0F}<^>Yq2hDuYTdXqAqKRqCOW zbc#;X89J-iofz0vztUZ`cR^SPNVS`SJuB3BYoB0$to|>-s_H`PLZ>o_Q@QG4t2We5 V=jj5yNEhi6y+oJkWx7JW{{ij0cAfwL delta 3788 zcma)-dr;KZ702&6mt9y`KoB2*3JQpT;0xc%N+f8jXyY3-!itNm>;refM~qpGN@64m zuKH6WzMpMUlh}5r)rlrEnKnr?buzYfrk%#xPTKTg?2K*Fhi$+2w^s)82l~hTeeSu> zbH3;Ne!up6i95bXvrxmd;HF3s>DEy&*^mu)r;NW z3@qB*vEXR|Bd zc6v&xbSJmt{z~F-D_4hq&jsOBIgXUj552)D^C}=-IyU18+OLb zCTn=AC4(-7mslo-HsJg?v=`8nNCsLw+G(@|w5w=#w4b3RqWuF6K9TAtgG0d-umJ3X z=0fWWdli@pjt2XIEg*C=_YDx@mO8h;5TV9&bkYS~1jIl=nd87r!8JHUWC%_<3J!+- zIyeYy1+xU#Drbkl{w+8R_D(PdRE}qZ#o$n|1{^NfnFr>BRbVd0e*)%-5Z69Lrw|h= z!Xof9a0IvmECAKTCGcEDI7;wp21jE2U!b}~MLbTh{}13;%+CVH=yOKHRtiiMe0~`? zLGa=C!101x&w-^O!CQBsGgU`2Mev(e*pmfcz5`AIy`V!!QigdI(R6SsI1S?}@(RIk zsj_@pJ6;LK~s z7z58@;g7(T+QS;ycVVx>g(|XY*iGOv9q|g-2VgJ9dZkFc;6JSc*Mh1j*J#IFu&2Xb z4UPxv(3In~u;X#RaOw>{A=CC_!Y^b$3+NFtMjh-GGD+F%1V8)~Y}5`nVBdDwZov=6 zfE%@=8?awhdy5XF8TNeGLG5S&b`k9LDiGW+nlPcH3JKXi4}1X&z5=)E2%bk@dAtSV z_rd4DUxS;$_rXn|O37}0&dWm1xB+_)_!;<$R_s+F%j03UX-D?K4yo$givd*>+u^`8 zaGSnhhmZy8^?OmsEL9`BgdCj#?$iprgbUQ`)GFlU8{lCacn3TJ8sJgzOYk)z=Uf1f z3AuPN*s1p)7c#Ws=NLF4q-zV7zMj;B)k8YAML(uiLGeThdJP6i&9HiyYot&g(d&Ib zoY*|;OiL<`Mt$sh!UBSC8eaq2n(fJDN}uhQn4-^N+_JyN7WBT z5`Y3heTm~fVz%FvWFWJk4U2#ye6F;7urhXjGDAO`<43% zXWSM$O1smz_g@}x<#J1_X;%h~p`|kY%EC{VSCT#Q-8}kf8@T0dI%3XOH5=3a%EKd$ zK|HU@k_cyf#{4XqpJT!0@fGg+`j()p%GpG=g$-_>+vf@fDR!2}zY$}`->!1H-9m#X zi-u7S4No%S8aXR=uoN*gIN2y^6C_mXK^74qJ5j~G^ zVysBj!4TBXtQKEa4HPnslvJWhV3d_6>HHNLAA7mbR;-gh`jC$^bH>s*Dy8u>fhOu@ zW2o%X)3WA)l->b0?_UJEL_^xDj{MbcKK*9%s9N$c>OF+W=t z+Md^Xg`#?Grx$4l?WA4Qs@H9!vNzv&ogF!Q|05ka`(o@7)ZS$!1j_CWMW_@~0(DL? z1yWTtIufjqE1yKAm+2MSL$A_4tg$**HmfmV^wN5RcepEUF~yZ z+JOB`2P7R*x)@eEspAbBx8^{XgIbrvQC*JGYjlh{={TLx>yGrSqfc}l)y