From 2f6a22c46af3e826dbc178a8d3e1e00c6de13717 Mon Sep 17 00:00:00 2001 From: Johxz Date: Mon, 10 Jul 2017 19:44:00 -0500 Subject: [PATCH 1/4] moving editor shapes into tools folder --- .../BaseGame/game/tools/shapes/noshape.dts | Bin 0 -> 18389 bytes Templates/BaseGame/game/tools/shapes/noshape.mb | Bin 0 -> 61648 bytes .../BaseGame/game/tools/shapes/unit_capsule.dts | Bin 0 -> 2709 bytes .../BaseGame/game/tools/shapes/unit_cube.dts | Bin 0 -> 1881 bytes .../BaseGame/game/tools/shapes/unit_sphere.dts | Bin 0 -> 5345 bytes 5 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Templates/BaseGame/game/tools/shapes/noshape.dts create mode 100644 Templates/BaseGame/game/tools/shapes/noshape.mb create mode 100644 Templates/BaseGame/game/tools/shapes/unit_capsule.dts create mode 100644 Templates/BaseGame/game/tools/shapes/unit_cube.dts create mode 100644 Templates/BaseGame/game/tools/shapes/unit_sphere.dts diff --git a/Templates/BaseGame/game/tools/shapes/noshape.dts b/Templates/BaseGame/game/tools/shapes/noshape.dts new file mode 100644 index 0000000000000000000000000000000000000000..a7a64cf1099e4247aecded23bec3923eb6e3a198 GIT binary patch literal 18389 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 literal 0 HcmV?d00001 diff --git a/Templates/BaseGame/game/tools/shapes/noshape.mb b/Templates/BaseGame/game/tools/shapes/noshape.mb new file mode 100644 index 0000000000000000000000000000000000000000..24330c1dbf43dd76c8a82d87d4d398e6393c7922 GIT binary patch literal 61648 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 literal 0 HcmV?d00001 diff --git a/Templates/BaseGame/game/tools/shapes/unit_capsule.dts b/Templates/BaseGame/game/tools/shapes/unit_capsule.dts new file mode 100644 index 0000000000000000000000000000000000000000..bc9483fac22763bc20aacffa4573ce44e04499a7 GIT binary patch literal 2709 zcmZ{mPiT}^6vdy(Of<$Alcs-+e=@dO+hD~6imS}~s-V_|E))c@ML`$R=t8?`#deH} zi)N#cjZg~huB+_2Y3B`!%fXE`E33i8{sN=@afVQC?Z}psOVMC03K@3`)X)z#54`iE=+lE737;67t$-t#yV3eSgl7 z*Xnukh;nub@Wq3ELQ}1$zmByROcUWtwU5y!(759MuRju9P(R~|b)pem*28Tb=LqU4 zI@OrJ>yxcjkHS9{{%E54J6C-q4eYQm{!tYW)8qWz52^?P7g#cQ*Rs?A8hj4H1GZ+;rDjJjSd9NCND zIT;`SJ3q}FAoYw5MfT6RukAF++1KkCgXZj)b3KoqZ(7fKGG?p{8;bbny3ViX%6X^h z^^8Gt{4Lk%|L(gK>%Sjpll;`Z9IHR-d`97JYf|grXZLo-BPXsm!7Uf(rqH0h`OVxE zYw-|Wf}1|MUUbPlMW-6`cYP9H*Qdfi75=H12ffde%9+cv{Jd{&Qr?%oqkFZd&2wYB zBiMWSV7&3;My(&7?M%X{Nv~aK5_S5o__(GmYnC;KXR9gmNyT1hmiIEB#M!N`-1NH6 z=1IjoTDQGYF^~H&gVt?+^lh65AD>6-<-Yzuyu&~t?CQuL?h~*3-7;=e`{YH-(cOx~{G7mYNJCZ&83(lQe z-oNy=S)Kcr9yn(FeL>csfrDEm(5#n0N5J2a*e-z%4V<;)^fySL0m<=zZc?V>^LGd1vHN&Fs zcEgIE-deqH<*NSG18WA?4jmnRbaiI@;nvUpdHUyr`~Tk=J=%J*@aq><>-(yHYhlOI pZ-*upcP#Gz^p~Y|!+XD)IeY%}nG50cnJ-VBotX+F;-?eHpXdCcKQjOT literal 0 HcmV?d00001 diff --git a/Templates/BaseGame/game/tools/shapes/unit_cube.dts b/Templates/BaseGame/game/tools/shapes/unit_cube.dts new file mode 100644 index 0000000000000000000000000000000000000000..feee7cf94be34c173bcd5d2e91afe3168dccfc44 GIT binary patch literal 1881 zcmd5-NlpS$5dA~vwg0483+ttJ{-n6T8feJ2jkCm?a>ap1k`Urpr)G{VLg zAN6YZ^^2BN_uX{*m2++aCLsQVFqx%Z2G%O{Tpj^Z@jZDQlInY#z$%#&YQGu4I$A>e zXd;SoKaJC;R$p~!6H})-8w+*l^9*AexArF;=IDnU zn!c;_vNNo;)EdTCX-PsOrT%xezSbQ$U<>DNXt|Fy&b=Ff z+{4_d+_T)h+@svB+_Bt=+^5`|U9bakKW>9tU=Q2_cflR74<3N~;4ydv9)f4!DR=^2 zf*0U9Ncj1rH}7CiPMODK5#A1^>91y6!l(COZPyo}uI=>7R^e4Ab?&t?u<*~FFr literal 0 HcmV?d00001 diff --git a/Templates/BaseGame/game/tools/shapes/unit_sphere.dts b/Templates/BaseGame/game/tools/shapes/unit_sphere.dts new file mode 100644 index 0000000000000000000000000000000000000000..4d435438e87ac499a1a5171f3fb5e7077b735a08 GIT binary patch literal 5345 zcma)AO>9(E6uv+yr7cjPqWn0HwJ5@1DAhqxtKiR|RQVGqpaO}>BTWj4 z3*%Cg8k0s7-4NJm!n{e-g^6v_7&LL`#$7i?Hw_E?zWdI3oEaGDO+L=g{m!}foO^G{ zyj5;;vU|RB*BhK`ft=$KKzN<9-XK?p#?6I;(DB9j-$O!e$^)lQ#%BQMq8NGz9rIDB z`L1J-N6Df2bYABsG3LR*)*ZH9H5y^*o;b0fYSy_X*b9MX?~l^`wZLu#76EoWn0fA( zfKqoXmYF4xx;|@Q&5UK;tQor0eIph5XH%1FIoEz>MR;X((d%uKR|D#l2`$;T_(MwJ zBfpL$4=u)WKAE{uGyEa_Hji+0-Ey6E>GyGx-{-Nh$Qv`Z=i0ZOc3ts@^kdzsJV~FO z6F=)M+gQUd+dOt%>RgxeHdg%Hr_U?<*Zf+q_F4VDXIPhh*6aP$O@1E>J3TMEuJ~`t z!@F>H^VdG#)pa?q{{_id`uR5CkEzqodqh3Aqj9bA`?ZB1n>_xm(a(IcR#2-8KcKWa zd58^?`+9pFvD};HNp;zCz&+1KH+fi#=Fu9tpIPaq7VQc5raif-53G~>XWezq%lAS# z=05nEP3=Ap*S8$o&sx9SB|Z0B_FOr5&#Br+1|+{DC$?}144%iAK^H`?_i`^9;c4*T@+b!1ljD)VC3lO>r~ z8HugZ?!S+9U_V}JU24ldIq&x;{^%AqQ z#d_sB>y~w0o5#jty_oA_{Y!RTtQYG(v2L2j#+r4@HrDXVHjj<%KDJfs^}S>7*(P!c*Ew(e zzDD84Rn;RtK*Oc>;20qa&7k(>$q;c(2R4x7AG^)}nc0vxiyf zrWWl9_oh9$sSma%bh{@k%)RA4(lfGt(>I=} z_K@qQZ_S>I_1iaPIaaqE6U+OWp0D+rJye~k<(OKk-lnO&?zvkIa;ERJCTHr$e)Np0 z?uLy;EuMoM_N@6gC;c01IrMc_r?1>j}iC14luD)0)h8+aY) z2VMjA0(*crfVY9SfH#4CKnZvU*blr1ybF8)yblZjhk%2?0pLU62yhrU4jcoH0w;kJ zz##B3@DXqdI0KvpJ^|JPJ-{ZQ7kCt)kLU&-6rGa&<@XuwGj;N4^P3B8ev6?_KkW^` zX0hp~%{hK|q1^)H0QzauPn$aB7Jzfq9|N`mPXLbt^eqKifi}_Uqx}%@B%mDH)K>tE zxdV6@pr1DVw5d}D0OzRZ0se>ZH1HHa-)ev{t3;=d_9H+6P!4VCS%5M302=}NX=ef2 z)G4j6*bdOQ7RUnpz(SqAtms{0Q$8m;MEaen4La-NJ?E*-#j9w*3u*M- zKDXx_E@Km3NHb2Q6)$5kUP&7wmf^dhn=^M_!~DhtO$(b_S{E%|lDlvvn(4@WAN9}V zvQeQw*AopEa@(Vk!Q5w2??`TWRP4=Nh&qZ>fBgB|zdtRyHkHW?4NYToc8+3Kj+xBN(9q2EO#k$Be_^`N*;yDZ433Ttj*O0skB4p8x;= literal 0 HcmV?d00001 From d4866219af241d1cec5875b6cda4909f151595ea Mon Sep 17 00:00:00 2001 From: Johxz Date: Mon, 10 Jul 2017 19:52:20 -0500 Subject: [PATCH 2/4] correct materials.cs --- .../BaseGame/game/tools/shapes/materials.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Templates/BaseGame/game/tools/shapes/materials.cs diff --git a/Templates/BaseGame/game/tools/shapes/materials.cs b/Templates/BaseGame/game/tools/shapes/materials.cs new file mode 100644 index 000000000..2911ca4d2 --- /dev/null +++ b/Templates/BaseGame/game/tools/shapes/materials.cs @@ -0,0 +1,16 @@ +//--- noshape.dts MATERIALS BEGIN --- +singleton Material(noshape_NoShape) +{ + mapTo = "NoShape"; + + diffuseMap[0] = ""; + diffuseColor[0] = "0.8 0.003067 0 .8"; + emissive[0] = 0; + doubleSided = false; + translucent = 1; + translucentBlendOp = "LerpAlpha"; + castShadows = false; + materialTag0 = "WorldEditor"; +}; + +//--- noshape.dts MATERIALS END --- From 00265f4f7f73888f827e61855ef1774916bed929 Mon Sep 17 00:00:00 2001 From: Johxz Date: Mon, 10 Jul 2017 20:00:23 -0500 Subject: [PATCH 3/4] noshape.dae should go inside core --- .../game/{tools => core}/shapes/materials.cs | 0 .../game/{tools => core}/shapes/noshape.dts | Bin .../BaseGame/game/{tools => core}/shapes/noshape.mb | Bin 3 files changed, 0 insertions(+), 0 deletions(-) rename Templates/BaseGame/game/{tools => core}/shapes/materials.cs (100%) rename Templates/BaseGame/game/{tools => core}/shapes/noshape.dts (100%) rename Templates/BaseGame/game/{tools => core}/shapes/noshape.mb (100%) diff --git a/Templates/BaseGame/game/tools/shapes/materials.cs b/Templates/BaseGame/game/core/shapes/materials.cs similarity index 100% rename from Templates/BaseGame/game/tools/shapes/materials.cs rename to Templates/BaseGame/game/core/shapes/materials.cs diff --git a/Templates/BaseGame/game/tools/shapes/noshape.dts b/Templates/BaseGame/game/core/shapes/noshape.dts similarity index 100% rename from Templates/BaseGame/game/tools/shapes/noshape.dts rename to Templates/BaseGame/game/core/shapes/noshape.dts diff --git a/Templates/BaseGame/game/tools/shapes/noshape.mb b/Templates/BaseGame/game/core/shapes/noshape.mb similarity index 100% rename from Templates/BaseGame/game/tools/shapes/noshape.mb rename to Templates/BaseGame/game/core/shapes/noshape.mb From 39e5fe689b0737e25da46afded22e2094183ffa0 Mon Sep 17 00:00:00 2001 From: Johxz Date: Mon, 10 Jul 2017 20:02:06 -0500 Subject: [PATCH 4/4] corrected shape path --- Engine/source/T3D/shapeImage.cpp | 2 +- Engine/source/ts/tsShapeConstruct.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Engine/source/T3D/shapeImage.cpp b/Engine/source/T3D/shapeImage.cpp index 627e8e433..61c03785a 100644 --- a/Engine/source/T3D/shapeImage.cpp +++ b/Engine/source/T3D/shapeImage.cpp @@ -189,7 +189,7 @@ ShapeBaseImageData::ShapeBaseImageData() lightRadius = 10.f; lightBrightness = 1.0f; - shapeName = "core/art/shapes/noshape.dts"; + shapeName = "core/shapes/noshape.dts"; shapeNameFP = ""; imageAnimPrefix = ""; imageAnimPrefixFP = ""; diff --git a/Engine/source/ts/tsShapeConstruct.cpp b/Engine/source/ts/tsShapeConstruct.cpp index dd2a67644..6082472d7 100644 --- a/Engine/source/ts/tsShapeConstruct.cpp +++ b/Engine/source/ts/tsShapeConstruct.cpp @@ -74,9 +74,9 @@ EndImplementEnumType; //----------------------------------------------------------------------------- -String TSShapeConstructor::smCapsuleShapePath("core/art/shapes/unit_capsule.dts"); -String TSShapeConstructor::smCubeShapePath("core/art/shapes/unit_cube.dts"); -String TSShapeConstructor::smSphereShapePath("core/art/shapes/unit_sphere.dts"); +String TSShapeConstructor::smCapsuleShapePath("tools/shapes/unit_capsule.dts"); +String TSShapeConstructor::smCubeShapePath("tools/shapes/unit_cube.dts"); +String TSShapeConstructor::smSphereShapePath("tools/shapes/unit_sphere.dts"); ResourceRegisterPostLoadSignal< TSShape > TSShapeConstructor::_smAutoLoad( &TSShapeConstructor::_onTSShapeLoaded ); ResourceRegisterUnloadSignal< TSShape > TSShapeConstructor::_smAutoUnload( &TSShapeConstructor::_onTSShapeUnloaded );