From ab254595aba8d7e0180bf249d9d6a1d32bdb582d Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Mon, 22 Jun 2020 14:47:47 -0700 Subject: [PATCH] Fix inverted scale modes and remove unused logs --- .../Plugins/ConformalDecals.dll | Bin 41984 -> 41472 bytes .../Versioning/ConformalDecals.version | 4 ++-- README.md | 2 +- .../MaterialProperties/MaterialProperty.cs | 1 - .../MaterialPropertyCollection.cs | 5 ----- .../ConformalDecals/ModuleConformalDecal.cs | 19 ++++++------------ changelog.txt | 7 +++++++ 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll index a42d00a0b889d231e71639e0f69c0428da409bc2..b2a4c61da709da33c687926e75d528308a559fc0 100644 GIT binary patch delta 3173 zcmYk832+q06^8%rm3C)FyQ^EfE3HlptUy8+E3JSa2u6rQAWqu^o3jX%osw95B49-% z1V*w!Gzb|HA#oVuq7sL7VJIuuAza3B73C145QR`>f}m0mAlRW2Z0GfC6Vp{a)8G5M zU-$IuH!}_AdBbVGZFA0*$pc5B$~EL<#jrwPHyNxE+(G zV4`PFS-6Jx>6)+rHXvS%whv*|Vu`(ib&7rV3O-;FU)jepzsPY^3~q@+9k2HSQNeNx z>U{Ztv3f0C*6?~-dQ|y-nnAQVT=u`2Jw38#y7<6R?0CYkD_Z=^F^6S{DrXTJA=c1! zlsMunGAga8t6fj-3~|Tl(rO5;!B(qq#Lm*L#wTh#xXmhFi(N5@`<|v=wQjojXeX@0 zFrF6mxFpfDB#C>mF3rm#ws2aUmxTlIlR3X&6^)6d-hhpk@28$Ej%Ut z#|H1y#M?tF`8Qhl%c0vC^NOvx9?_8NWHr>v=MB0znLC|sVdtkLRlH@C)C(4TnI>p_*X|61(J!@)RPinLCr>5tTwmP24=v#uN1ZM1f ztEhKyocJjJGJn+&J4Tc_wv%QtqZK@6h`tdMnISR?viYJIF}~nwc9kGibQjo?0(SD4 zVS22eOV61f6PzzTD)92ncJb$em-tP)$SlYdw+dp!s=|Y;RJe+2SXFpMQ8IINI8bLK zAhHtQ99jg8-t7=OiWk~@N%LjPNIkNN?~C2qeKJ_&(aJ12;wg2~tivO-&Zb#wDFv-Y zu*(^~Ub2KSXLyo-0b6>9dif}EtV8(P`P9o2eDs8cwvQ}Hu|M>A-n96Bu+&RSega=h znMZx)VfVcd@kckZj1tze0CS3pvOyHKrDa!md#tDkWb&J_Vo|`Gd|&$dPDaP-E28BN ze8aD6sko`=>(o1%7ZZvi+V7$s zY8j|gbj{9?iL4OiksNs0#3n_R(Na7-GNOH+B54ferR=%UB}prdP=Tr44M=K6PU81k zCKi;N zPJIY6OlrfjD36|tF^XMMbL<{X8G9D_Wm8V97`G zXvq1Swf9|qJ_16Cy{-Yv2=pj=A{MbE?xSc>pK(QW4E#c+>-oPUG%Z#G~l#u!4m7{>j)1dB}CpvBO;z64E5OD1h3 z4l6B_w2`==v|?`(_u~ttRe1|^Kl&pYg`!k1MgNb?8SvK>TXX=vu|y$?+8Wn5y&Me^ zO>*#2_=8Dp*q2hNk4CFJuquWX=$R;~9Xssv^a`9-)sXvP)irzq%{u8{R=$!kP`a*0~ zRO=4wOYp9uS)Nby<>*y(6`$!V@kd4d?mqozxD}xg?%*rE4ww{K+dcPP{bjfn^&9`y zU&H%~tR9E4HuAlur+*b0MgzW>EXSRNOxT~}u1U?gRb(8KUN%dIRL(}92$7pNamW;#OgCHbYc+5mefqcHLq$i8Xl%h1MVAtWN44O( zq8#Ta)`Gw^>9kp!U{Z@BLmOhWKqyMph7+Apv@{{~EpNq56K}AUF$}G!sg`bTuzHiy zrkhSN5GA!~isT!y6@7~8(u<5%JZ1ilHKQ)Q%yk%@; zv==QA(oWiz8+#!XjgQU6UUVv|iH##VrpW22w07h7kH>k4Lb#~VZHo65eJVvH(Fa>b z^hU}iTQ^D+eQnYVMN1RD<=t3h(pkvk)eX>Zg3JneNPEz1QZwplpY~y^qH5Zw{YdZr zKfY)jfJUEkdePv5?G@u)91I_vTpiEPp9nvg|MwixwmvtUwSFZF-wyqQg&%I{&=Y`V z3kQ;aY8x}XW9suO4vlu633s=2#};2IS=9hmUBk&+1J(1#sqUtRD)J9Bk?K&YRrDWT z)hU9VIdNsD*6lo*R6D8trBm@AcbqH~2Rc_5E91E@l~MZkAKiSxvrbe-t-3dU7ma^h iek0piZP_V&{|T{p&nsbP*MBVhba^;_-#=Mfq3wSJo2xni delta 3340 zcmZ9O3vgA%8OQ&-_vYSn&VA(ObsxzM2?62eeUlIp9yL%PJR~;CLqvs!L`n)Y@e)J{ z7!U|fL>}G9yCER8>ZF)@94*1Btrfx6SH~$CCQ`;y(kc&Suu|00Z_iz(jA!PYv%l}Z z`|Wayz;M86xdG&N8H%ax8sGm-ikipN7C>naMreC zXo~wR;3gh_6qqfB@&a)$8)@v`OQvkP_lpje&$`4bY$Q7*&aj-&Qt}|LX>@ZW;M!bZ z@*;qVkM>oVwY*9qk)Ac@CnY-o;@(HKP3J%TM2_qeOrQL)Qi#S`qJ-+eoqB?6u* z_Pn^qlU;g5dW?N%S50{9Sis)Ifqa)UReCWBhVxim0-AYih@{v7(d8-i++qkh#3!EF ztXq_NOIWXHpyz91r?({Ogage@kC6w1JL2Q{$Q#i9LRLr2>l9yj?+)_FWYU|0^oY=e zIL;)cXgrqe6f+W+jL(}GmN5e^x<^xZ6X{NpWeR)_-8QC+gtYz`GJwsw$ZYs|)#LnD1>1CeJE#v$#Lu3@pTwfw?6GT$d{MG}Ltn%iRi1lICK9-`W@PlYHv#e*)ftf;~>%7tc| zwXCsuF40>wh4;8bRy4~N<8Bcup3K*|#lqt3($j8oIK*<;I)}n6bj7~?o@r|%Z=Frj z*2W@NEYBl;Q@o6Kc*xlYtY2J?*0Rsc2_b>2j&=`dmw63y4j7BSXq zW|iO1>bED7TgpVo2)<@M)w0F9Zn4n(lI4|KEDu68ODqMs;;3yS{D&uQuKmBh8L(l2RYELHS-`!#I{b}KsT zX2`;{Hp({X=9Gm!imDT&_#vgB)ZX(;YM`{0v?(AdN(X?XVoM8-k<^Zylp9(WHpVG< zZz_{#={TwF2rf)LsAWU5XeZutJM?V$$F)guCsq*VV7L-1Qyuznlqz~E$*Ye*b=(aa z>>)iD4T>&0hU)ov+@f}^Jk7}q(4lBbT0}2^P_!bYoEM^7(PJrtwn7{k2ibqS)*C42 zML4F!*8+pKBAisTz*o+T@mEEQeS@}QoKy6>jB*~umx|ub7_>!kL(!eCa$W-Wco|^3 zc8_b&R)Vmii>#cNVgeEMzh3*A4cbc4phU*Yc^RItXuam*gSImCC@qb&QTR}4S)`4^ z6{VGiQ+YYAD{Wf1STBeD2UhpA6r=Ugu-|SGKJhyfDp4z`jaF@SV1hmd&na_$tjX{qSHNBufhdIq0mBo5^U9RtsrrUUX64`g`tP^8Hg&H z5?rm+{f|=uvd(_u-(TcY@FB3-PL=rl6@W z!uyKu4!x-_#yLf2@F%?y-zXXg_Up@$G}Rht8!qARdNU$%#FxP@^cGA|G+=zAuR^~f zN62HWK}7xlQ1lODh_MdWr%O5xnXr!|I73o9c2P2Kz!F9OqTJemzBpM~u>mJ7I*!Is z_7}7bIH&MvxQuN?(jAr?tLi2cSack+<|a&4Bx|;#>6V(Cu_{hlsxudx(WdA&r;lil z_@FwY?E}lU(em7ZQ>w-xquSAdzbSgjNI(bpOlu6<$I1EjC*f9<;~mSM#E%tCvdC0q zXd{d#aZFLVmQQq1QGN1vd<%SSHPY#M*63o`f=3j!S~TfSt3wRhrPiWI9(`NXuUk8s zGfRvum}&jUNvbfO!fr(wLn@4|IIGA{v<<^+<3879-fnEirX-7}y6yxWpRpPHm z6lhlTM&=#H)A&%)xnv(L_2j$aZmJVz8N1M{DC(GR>_!6}>vGAXj!A3}`V@sS>x_Lk zqv&NYO0cd6sn262~h#@89g~#(j#uvS^he zxrW_%!lL+Y>_&wC807YsyYV27Sk#VInx{i}RZ$Ji(=#|BDM<0wIF=fR5v6Z7ohW$M zxzczR@0n|-*Cg@nedeF%|05@yITKB&LjxM|GyH_UAbccTBq8;85VYHH~>9qZ`cew6Ng zV(VVN!`DY&`u*aCy*a++Cq6rVy1uifb70!FeIMhj7}&d_R2e;~%1Ew;WQ2=ae|zKo wZO=O|e7ca@-@G1` MainTexture == null ? 1 : MainTexture.AspectRatio; public void OnBeforeSerialize() { - Debug.Log($"Serializing MaterialPropertyCollection {this.GetInstanceID()}"); if (_materialProperties == null) throw new SerializationException("Tried to serialize an uninitialized MaterialPropertyCollection"); _serializedNames = _materialProperties.Keys.ToArray(); @@ -77,7 +76,6 @@ namespace ConformalDecals.MaterialProperties { } public void OnAfterDeserialize() { - Debug.Log($"Deserializing MaterialPropertyCollection {this.GetInstanceID()}"); if (_serializedNames == null) throw new SerializationException("ID array is null"); if (_serializedProperties == null) throw new SerializationException("Property array is null"); if (_serializedProperties.Length != _serializedNames.Length) throw new SerializationException("Material property arrays are different lengths."); @@ -95,7 +93,6 @@ namespace ConformalDecals.MaterialProperties { } public void Awake() { - Debug.Log($"MaterialPropertyCollection {this.GetInstanceID()} onAwake"); _materialProperties ??= new Dictionary(); } @@ -209,8 +206,6 @@ namespace ConformalDecals.MaterialProperties { if (_mainTexture == null) throw new InvalidOperationException("UpdateTile called but no main texture is specified!"); var mainTexSize = _mainTexture.Dimensions; - Debug.Log($"Main texture is {_mainTexture.PropertyName} and its size is {mainTexSize}"); - foreach (var entry in _materialProperties) { if (entry.Value is MaterialTextureProperty textureProperty && textureProperty.autoTile) { textureProperty.SetTile(tile, mainTexSize); diff --git a/Source/ConformalDecals/ModuleConformalDecal.cs b/Source/ConformalDecals/ModuleConformalDecal.cs index c5b06e2..30f77b1 100644 --- a/Source/ConformalDecals/ModuleConformalDecal.cs +++ b/Source/ConformalDecals/ModuleConformalDecal.cs @@ -130,7 +130,6 @@ namespace ConformalDecals { /// public override void OnLoad(ConfigNode node) { - this.Log("Loading module"); try { // SETUP TRANSFORMS decalFrontTransform = part.FindModelTransform(decalFront); @@ -150,7 +149,6 @@ namespace ConformalDecals { // SETUP BACK MATERIAL if (updateBackScale) { - this.Log("Getting material and base scale for back material"); var backRenderer = decalBackTransform.GetComponent(); if (backRenderer == null) { this.LogError($"Specified decalBack transform {decalBack} has no renderer attached! Setting updateBackScale to false."); @@ -190,7 +188,6 @@ namespace ConformalDecals { // handle texture tiling parameters var tileString = node.GetValue("tile"); - this.Log(tileString); if (!string.IsNullOrEmpty(tileString)) { var tileValid = ParseExtensions.TryParseRect(tileString, out tileRect); if (!tileValid) throw new FormatException($"Invalid rect value for tile '{tileString}'"); @@ -203,8 +200,7 @@ namespace ConformalDecals { materialProperties.UpdateTile(tileIndex, tileSize); } - // QUEUE PART FOR ICON FIXING IN VAB - DecalIconFixer.QueuePart(part.name); + } catch (Exception e) { this.LogException("Exception parsing partmodule", e); @@ -225,6 +221,9 @@ namespace ConformalDecals { opacity = defaultOpacity; cutoff = defaultCutoff; wear = defaultWear; + + // QUEUE PART FOR ICON FIXING IN VAB + DecalIconFixer.QueuePart(part.name); } } @@ -235,10 +234,6 @@ namespace ConformalDecals { /// public override void OnStart(StartState state) { - this.Log("Starting module"); - - - materialProperties.RenderQueue = DecalQueue; _boundsRenderer = decalProjectorTransform.GetComponent(); @@ -362,8 +357,6 @@ namespace ConformalDecals { _isAttached = true; - this.Log($"Decal attached to {part.parent.partName}"); - // hide model decalModelTransform.gameObject.SetActive(false); @@ -403,10 +396,10 @@ namespace ConformalDecals { switch (scaleMode) { default: case DecalScaleMode.HEIGHT: - size = new Vector2(scale, scale * aspectRatio); + size = new Vector2(scale / aspectRatio, scale); break; case DecalScaleMode.WIDTH: - size = new Vector2(scale / aspectRatio, scale); + size = new Vector2(scale, scale * aspectRatio); break; case DecalScaleMode.AVERAGE: var width1 = 2 * scale / (1 + aspectRatio); diff --git a/changelog.txt b/changelog.txt index 3d730e5..c99bd55 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ + +v0.2.0 +------ +- Fixes: + - Fixed WIDTH and HEIGHT scale modes being flipped + - Removed debug log statements + v0.1.3 ------ Fixes: