From 9ae7ac1b82a9b7ad4ba016d67647ad19c15fb4cc Mon Sep 17 00:00:00 2001 From: Braedon Lewis Date: Mon, 30 Jan 2023 10:50:38 -0500 Subject: [PATCH] Pure black and white filter (#245) * Spaceball cleanup and small bug fix * Replace old hit sound in spaceball * Camera filters * added 9 new filters, including 3 types of sepia * oops * remark * normalization of fade out and fade in on filters are by 100 * GenerateFilterTypeEnum comments * Pure black and white filter --- Assets/Resources/Filters.meta | 5 + Assets/Resources/Filters/blackwhite.png | Bin 0 -> 1215 bytes Assets/Resources/Filters/blackwhite.png.meta | 96 ++++++++++++++++++ Assets/Resources/Filters/blackwhite_2.png | Bin 0 -> 1694 bytes .../Resources/Filters/blackwhite_2.png.meta | 96 ++++++++++++++++++ .../Kitties/Animations/CaughtFail.anim.meta | 7 +- Assets/Scripts/Games/Global/Filter.cs | 2 + 7 files changed, 205 insertions(+), 1 deletion(-) create mode 100644 Assets/Resources/Filters/blackwhite.png create mode 100644 Assets/Resources/Filters/blackwhite.png.meta create mode 100644 Assets/Resources/Filters/blackwhite_2.png create mode 100644 Assets/Resources/Filters/blackwhite_2.png.meta diff --git a/Assets/Resources/Filters.meta b/Assets/Resources/Filters.meta index 9a787c1fb..c28ca6c5d 100644 --- a/Assets/Resources/Filters.meta +++ b/Assets/Resources/Filters.meta @@ -1,7 +1,12 @@ fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Resources/Filters.meta guid: bde6dc88e46cbba40aaddc58ec33b38f folderAsset: yes DefaultImporter: +======== +guid: 547e95233859f9748964251265244a43 +NativeFormatImporter: +>>>>>>>> upstream/master:Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta externalObjects: {} userData: assetBundleName: diff --git a/Assets/Resources/Filters/blackwhite.png b/Assets/Resources/Filters/blackwhite.png new file mode 100644 index 0000000000000000000000000000000000000000..e7819833bd0c0a1e53306ebeee933c7fa9aab685 GIT binary patch literal 1215 zcmeAS@N?(olHy`uVBq!ia0y~yU;#226gb#`WY0gYWk7*8PZ!6K3dXm$FZ$hf5MjB{ z_W%ELlkP1-E{u;7-bb9dIekm$?UQr%mVMY3vu^v>^GXg442(=H90Cdu#=k8GZqLtK zE`uxvl>DIgfZ>1wOc6wNBNHP#1MBQHN~mfJ7!ugv#(^0QjSb8VO}=3hQEcL{U@%}t zSPW9Rz~KO+!$Gyx9;j}TVVHqxg+hSB1BL|&lS5TdUC+mG2Gt4y4S@oNfDI?LgrMGo zI*gqm4b=(`5ukH4Zls8EqWH0anZX#<3KlLF83vJ@OY#iWLkb1ml6*Pm4OQ`8;<&&8?2=tZtTj|Je^zaQNGGsDGY(Gr9k1xx9nw z`rWSIB@B^VI>+U~q_c2?apCh*~D~Tj^WJqvNrzCE4`bLwC)FK+j-i)r_a_yr+9v~M9#MScXsPOgH8So zw*Sv$?YZ;c=>0Bxzf&=0yHm{i+5b;W7hKPiU{rtpP2;Am^~L}0-QE7n{JH$a+U|Oz z|0~|4{|0hy{+0ay?9bxe|DW8SvwzX=@_#4)gx-w*ntv|-=HH1xJ+Iz<|9AFh=R5ho z$v?N7fBba$k6eD$YvvCQv$bdLcmMX{V-`^R-d+1&0kx-p5C1dyXLWl1+xv6sUB2rA zHM*D9U)yi_|HQlVKh!_>pZm8GXk^#B`#;T}uYdJ#Dv)#PUH_l(=k{N986NlAMLmA_ z^(y-f_xk(S;=P}#Z*C7Rt}Fh&^LzCAse9|{H`f+_w=6%bu<^!oyX>3kX?C?|mwrAw zH{0%GWb(V>V)M7s-)qa_f0|xf&&TjgZSF%i+xw?qT{kX?w>0>^@8rLeZyruKaakclFpACZ}JWJ+D$e ze)7%7wI|9K|FP&_U6=E&X!%u8I=KA3`rEpnq4V{>Tb{h>owoZ~@pYN%Z{NQ!47ImE eZ2SDgy8n!JPfvx`ch7PKl~10oelF{r5}E+Z!}wtU literal 0 HcmV?d00001 diff --git a/Assets/Resources/Filters/blackwhite.png.meta b/Assets/Resources/Filters/blackwhite.png.meta new file mode 100644 index 000000000..b0ae9151d --- /dev/null +++ b/Assets/Resources/Filters/blackwhite.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: b3b072bbde7f35c49824a49c7482fef1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Filters/blackwhite_2.png b/Assets/Resources/Filters/blackwhite_2.png new file mode 100644 index 0000000000000000000000000000000000000000..71a9953561558a3e127ba0d27b3d517cac537859 GIT binary patch literal 1694 zcmah~X;4#F7=46AMPutW9UCw(RAQl`1r;M?(Lz}zP$`U6p(=|NG&WQN1bA3$MXiQq zMn(k#xRe$oNT4hs1f5nA4aq2$$PywN5;5TsjOGzS^7`01lt2A*=idA7_kHI(_uTW& zM@9r;9Y1yi000{j9PkwY*r8LvWw8S~{$h2!0{{+*Aptw1(``l+moE1PuMQZLv?6}= zrX%!2u4mTvDLTp{!f?i*qKdY*ZO^YB6k7RrI<`0tBth;ZZr_hy=jcm->&+^{wHJb>T!cJ5SN$cyQ^@dh%aBFakPk6 z#lL5MT9%7(+%Pk=JDtvi1rx5hJTgw-V^3vRtD&ujQmkT=51(r)GVyqLGeNUTQH<_H z!$yKZOKh5j?h^Jw#svJk+a7SjYYvo<$+9RU+(_U(HaMDY8c%9r!7ey+`JbUs+&}{8 zeI1I>5c&wrUo|xbZNWDUh^oRMhLSu{7`NKHaDe4j)|qwz)g3*;Jq6Y;J>_;h-;bv8k5hHcsTniCZj%ez%j12S7GMJ6DI{6T}D z&t(Vl8na0&A2-8U+WyXuT-biz{9D|73fO_T$AFAMQ{&qzj!o@ZMz?GuWFIW0RIx_J z)`8xLL`Sj|8Dx-k52Bh}p#Wdf)a*w&jUdA+f=0&)8aC86#3`ZNG<$;HV2qJB%Nap~ zhPY{qXX~U*ME@8U``~I3+Ulyr!9sj%?5{Ol8k*x zf9s+=GaytOtpyfwYKvbfSD@*;cE9IwGY(m&t;Yc*C-LaLHdZY?yLRU>NEE21C&rEz zpoA)i$xkUnL;>BL6i;#z*snPyNEeihs%&&P=MKv50F;ahFQ`t2egW&vQ7HR9E%-4S zdNbxY#K%BGmgjmj>=!fXg?#z4{3+lpjoj_tw8*Qc8<}3$K|$iqZh#KRZClV0jE9 z2XVp<(bUXSoz71vM6jn+Pm_W=avwUsYYs=nxz|{Y>W$kX(-RDhbwRK%XnuP1nVHMf z1woXn$Z=z(6^XWD53)kT9^KBx;MYeIevjHj9i^_QPW&mMS(!8DKnl7rHXWuGQwlT5(MDT#;E%Y{vo8 ze`Dur*kA^L#m^Hw7Z!bi1(FxUQ%?gnbigjPZq1qnjz5kq{b2{OcuU}usozgXU_?O8 Iu5W+*2lNDBkpKVy literal 0 HcmV?d00001 diff --git a/Assets/Resources/Filters/blackwhite_2.png.meta b/Assets/Resources/Filters/blackwhite_2.png.meta new file mode 100644 index 000000000..d5fb94871 --- /dev/null +++ b/Assets/Resources/Filters/blackwhite_2.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 821c6c21c998dab4d8be5b2d0614bcca +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 0 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta b/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta index 406958291..c28ca6c5d 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta @@ -1,8 +1,13 @@ fileFormatVersion: 2 +<<<<<<<< HEAD:Assets/Resources/Filters.meta +guid: bde6dc88e46cbba40aaddc58ec33b38f +folderAsset: yes +DefaultImporter: +======== guid: 547e95233859f9748964251265244a43 NativeFormatImporter: +>>>>>>>> upstream/master:Assets/Resources/Sprites/Games/Kitties/Animations/CaughtFail.anim.meta externalObjects: {} - mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/Games/Global/Filter.cs b/Assets/Scripts/Games/Global/Filter.cs index 374663fc0..87e43e5aa 100644 --- a/Assets/Scripts/Games/Global/Filter.cs +++ b/Assets/Scripts/Games/Global/Filter.cs @@ -71,6 +71,8 @@ namespace HeavenStudio.Games.Global tritanopia = 50, vibrance = 51, winter = 52, + blackwhite = 53, + blackwhite_2 = 54, } #region MonoBehaviour