diff --git a/Assets/PopcornFX/README.txt b/Assets/PopcornFX/README.txt new file mode 100644 index 0000000..85ad519 --- /dev/null +++ b/Assets/PopcornFX/README.txt @@ -0,0 +1,256 @@ + + ' .' + | '| .' + . \_/ \_.', + ..,_.' _____ ( + `. | __ \ '..o o o o o o o o o o o o o + : | |__) | ,' ___ _ __ ___ ___ _ __ _ __ _____ __ __ + ._-' | ___/ / / _ \ | '_ \ / __/ / _ \ | '__| | '_ \ | ___| \ \ / / + `. | | ( | (_) | | |_) | | (_ | (_) | | | | | | | | |_ \ V / + ,' |_| _`. \___/ | .__/ \___\ \___/ |_| |_| |_| | _| ) ( + ,.'"\ _.._ ( `' |_| | | / ' \ + :' | / `' o o o o o o o o o o |_| /_/ \_\ + ," ', +' ' + Realtime Particle FX Solution + + + This program is the property of Persistant Studios SARL. + + PopcornFX : + http://www.popcornfx.com + http://www.facebook.com/3D.PopcornFX + http://www.twitter.com/popcornfx + +================================================================================= + +PopcornFX is a 3D realtime FX Solution for Games & Interactive applications. +PopcornFX is for studios, 3D FX artist, Technical Artist who are looking for a +powerful and complete tool exclusively dedicated to the creation of realtime +effects. + +This plugin is to be used with the totally free PopcornFX editor which will +change your way of creating particle effects: better FX faster !! + +The plugin allows you to run the FX created with the PopcornFX dedicated editor +in your Unity games. +We also have a free discovery FX pack available to get you started. +Modify it with the PopcornFX editor or directly use its effects in your games. + +This plugin requires Unity Pro for versions of Unity anterior to Unity 5. + +Online Documentation : http://wiki.popcornfx.com/index.php/Unity + +For bug reports/support, checkout answers.popcornfx.com or our Unity forum thread +forum.unity3d.com/threads/pkfx.297938/ + +================================================================================= + +Popcorn Unity Plugin v2.9 + + Supported platforms : + - Win (D3D9, D3D11, OpenGL2/Core) + - Mac OSX (OpenGL2/Core) + - Linux (OpenGL Core) + - Android (with NEON support) + - iOS (OpenGLES) + +================================================================================= + +CHANGELOG + + v2.9p3 + - Build scene mesh at runtime on all platforms. + - Can register multiple camera. + - Fixed 1 frame delay on registered camera. + - Do not all the HBOs at application start. + - StopEffect() became TerminateEffect(). + - StopEffect() stop the emission but continue to update the transform and attributes until all particles died. + - Load Attribute Samplers when the FX start. + - Fixed a crash if an Attribute Sampler Skinned Mesh is not in the first position of the samplers list. + - Add Support for Unity 5.6 + - Sync. PopcornFX runtime v1.11.3 + + v2.9p2 + - Attribute samplers : handle ETC2 texture format. + - Fixed Sample scene custom shaders. + - Sync. PopcornFX runtime v1.11.0 + + v2.9p1 + - Attribute samplers : Fixed an error when unsupported samplers are above the others. + - Support the reversed depth buffer in Unity 5.5 + - Sync. PopcornFX runtime v1.10.8 + + v2.9 + - Attribute samplers : added getter/setters for easier access via scripts + - Attribute sampler image : Logs an error when texture read is disabled. + - Attribute sampler image : Added PVRTC support. + - Attribute sampler shape : allow to drag an drop a MeshFilter on a + sampler mesh. + - Attribute samplers : Fixed broken list with unsupported samplers. + - Attributes : fixed leak with attributes names when getting descriptors. + - Attributes : now display their descriptions as tooltips. + - Scene mesh builder : now creates path if it doesn't already exist. + - Fixed a #define preventing the plugin to load on OSX when targetting + iOS. + - Added DeepReset : like Reset but also unloads FXs and clean the render + mediums. + - Now attempts to load the pack from relative path to prevent issues with + non-ascii paths. + - Added a "reset attributes to default values" button on PKFxFX. + - Fixed checks for attribute samplers OnDestroy. + - Fixed attribute sampler mesh : don't pin non-blittable types (bool). + - Fixed sampler shape mesh : not feed with the mesh after StopEffect + StartEffect. + - Implemented native OSX assert catcher. + - Sync. PopcornFX runtime v1.10.4 + + v2.8 + - Attribute samplers : shapes, textures, curves... + - Fixed orthographic cameras support (see PopcornFX Preferences...) + - Fixed glitchy billboarding on Android. + - Added multi-object editing for FX components. + - Fixed conf file loading when loading from a read-only location. + - Fixed moving pkfx files breaking components association. + - Fixed scene reset when destroying the first camera. + - Moved from C# assemblies to sources (see updater). + - Added audio sampling named audiogroup. + - Stability improvements. + - Renamed native libraries from HH prefix to PK prefix, reflecting a + name change that happened even before the plugin was released. + - Added OpenGL Core support. + + v2.7 + - New rendering pipeline, fully integrated with command buffers (Unity + 5.2 and up). Includes retrieving of the scene's depth without resorting + to an offline camera (Unity 5.0 and up). + - Added support for distortion/soft particles in VR. + - Added support for Android multi-threaded rendering (Unity 5.3+). + - Depth texture now public. + - Custom shaders (DX11, DX9, OpenGL/ES). + - Sync with PopcornFX 1.9.0. + - Fixed PKFxManager's Debug class that was hiding Unity's in some + versions of the plugin. + - Fixed KillEffect's behaviour on trails. + - Added TransformAllParticles() to apply a global transform on all + particles (useful for floating origin setups). + + v2.6 + - Added PKFxFX.GetAttr(string) and integer overloads for the + PKFxManager.Attribute class. + - Added PKFxFX.IsPlayable(). + - Added possibility to overload the OnAudioSpectrum and OnAudioWaveform + callbacks. + - Added possibility to use Application.PersistentDataPath instead of the + default Application.StreamingAssetsPath (useful for adding effects post- + install). + - Added support for Windows XP. + - Moved rendering to the new command buffer interface (Unity >= 5.2). + This fixes image effects bugs and lens flare layers bugs. + - Changed the PopcornFX Settings menu. It's now a window exposing the + individual effect killing, logging, PackFX location and rendering event + settings. + - Destroying an effect now calls StopFX(). + - Added a control button on PKFxFX components to force-reload attributes. + - Fixed a crash when destroying the PKFxRenderingPlugin component of a + scene and calling PKFxFX.KillEffect in the same frame. + - Fixed native VR detection. + - Fixed PNG loading on iOS (bug or crash depending on the version). + + v2.5 + - Fixed a crash when deleting hot-reloaded effects. + - Fixed a crash when calling StopEffect in OnDisable. + - Fixed a crash when getting in and out of a scene with effects using + spacial layers. + - Fixed race-condition issues. + - Fixed a bug where localspace effects and attributes were 1 frame behind + - Added an Alive() method to the PKFxFX component that returns true as + long as an effect is spawning particles. + - Added the possibility to enable the killing of individual effects. + - Added a main conf file for settings (holds the log in file and effects + killing settings so far). + - Added support of PopcornFX's sound layers (see online documentation). + - Added support for audio waveform sampling. + - Added support for audio sampling (waveform and spectrum) for iOS. + - Added PKFxManager.UnloadEffect(string path); + - Fixed Unity 5.1's native VR double update bug (soft particles and + distortions still not available) (2.5p1). + - Fixed empty log file bug (2.5p1). + - Added global time multiplier for slow-mo/fast forwarding particles + (2.5p1). + - Sync with PopcornFX Editor 1.8.2 (fixes issues with mesh sampling) + (2.5p1). + - Fixed OpenGL2 mesh renderer texturing issues (2.5p2). + + v2.4 + - Synchronized with PopcornFX Editor v1.8.X (make sure to upgrade your + packs). + - New fat library for ios64 support. + - Fixed a bug where PopcornFX components would interfere with other + plugins' components. + - Effects hot-reload in Windows and MacOSX editor mode. + - Int/Int2/3/4 attributes support. + - Float attributes now support min/max values. + + v2.3 + - Fixed a bug where fx wouldn't load in specific pack architectures. + - Added PKFxManager.GetStats() to retrieve stats from the PopcornFX run- + time. + - Added a link to the online documentation in the Help menu ("PopcornFX + Wiki"). + - Added a version identifier in the PKFxRenderingPlugin component's + inspector view. + - Added "PopcornFX Settings" in the Edit menu with options to enable or + disable the runtime log to a file (requires a restart to take effect). + - Added "Create PopcornFX" in the GameObject menu to create empty + effects or PopcornFX-enabled cameras. + - Fixed UI refresh after drag'n'drop of a pkfx file in the FX field of + a PKFxFX component. + - Added a warning when in editor if the color space is not set to linear + + v2.2 + - Fixed audio sampling on MacosX + - Fixed DX11 LOD bias + - OSX binaries now Universal (x86 and x86_64) + - Soft animation blending now supported in GL/DX9/DX11 + - Fixed DX11 depth texture update bug (soft particles and distortion) + - Fixed component.camera api deprecation for Unity 5 + - Drag'n'drop .pkfx files on FX components instead of the unconvenient + list + + v2.1 + - Proper color space detection (sRGB/gamma correction) + - Distortions blur pass (Blue channel) + - Fixed distortions bug + - Massive renames to comply with naming convention + /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ + /!\/!\/!\ THIS WILL BREAK MANY PREEXISTING FX COMPONENT! /!\/!\/!\ + /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ + - DX11 bugfixes, proper distortions and soft particles + - Fixed mobile crash on some sampling functions + - Masked event ids to prevent interfering with other native plugins + - Fixed bug where additive meshes were never culled + - Fixed lost devices in DX9 + - Fixed depth/distortion FOV bug + - Fixed distortion viewport bug + - Windows x32/x64 support. + + v2.0 + - Distortions! + - Mobile depth-related rendering features (soft particles, distortion). + + - PackFX hierarchy : effects are now accessible at any pack subdirectory + - Packs must now be baked in the StreamingAssets directory. + /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ + /!\/!\/!\ THIS WILL BREAK ANY PREEXISTING FX COMPONENT! /!\/!\/!\ + /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ /!\ + + v1.08 + - Refactoring of the PKFxManager static class to account for iOS' static + libraries limitation. + +================================================================================= + +Known bugs. + + - VelocityCapsuleAligned billboarders produce visual glitches on Android. diff --git a/Assets/PopcornFX/README.txt.meta b/Assets/PopcornFX/README.txt.meta new file mode 100644 index 0000000..23c4c55 --- /dev/null +++ b/Assets/PopcornFX/README.txt.meta @@ -0,0 +1,6 @@ +fileFormatVersion: 2 +guid: 50ac4b2564c242642b5543f927628f65 +TextScriptImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Resources.meta b/Assets/PopcornFX/Resources.meta new file mode 100644 index 0000000..9ac115b --- /dev/null +++ b/Assets/PopcornFX/Resources.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 587698cc57b4d944aa44db2f57b6eb3d +folderAsset: yes +timeCreated: 1471448495 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Resources/PKFxDepthCopyToColor.shader b/Assets/PopcornFX/Resources/PKFxDepthCopyToColor.shader new file mode 100644 index 0000000..34e45a2 --- /dev/null +++ b/Assets/PopcornFX/Resources/PKFxDepthCopyToColor.shader @@ -0,0 +1,56 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "Hidden/PKFx Depth Copy to Color" +{ + Properties + { + _Flip("Set to 1 when in forward rendering.", Range(0, 1)) = 0.0 + } + SubShader + { + // No culling or depth + ZTest Always + ZWrite On + + // Writes to a single-component texture (TextureFormat.RHalf) + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + fixed2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + float _Flip; + + v2f vert(appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = v.uv * (1 - _Flip) + _Flip * float2(v.uv.x, 1 - v.uv.y); + return o; + } + + sampler2D _CameraDepthTexture; + + fixed4 frag(v2f i) : SV_Target + { + float4 col = tex2D(_CameraDepthTexture, i.uv); + return col; + } + ENDCG + } + } +} diff --git a/Assets/PopcornFX/Resources/PKFxDepthCopyToColor.shader.meta b/Assets/PopcornFX/Resources/PKFxDepthCopyToColor.shader.meta new file mode 100644 index 0000000..a39db4d --- /dev/null +++ b/Assets/PopcornFX/Resources/PKFxDepthCopyToColor.shader.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 706da03e9f2cd4a299e6016d1c2709ab +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Resources/PKFxDistQuickDirtyBlurEffect.shader b/Assets/PopcornFX/Resources/PKFxDistQuickDirtyBlurEffect.shader new file mode 100644 index 0000000..31ca77b --- /dev/null +++ b/Assets/PopcornFX/Resources/PKFxDistQuickDirtyBlurEffect.shader @@ -0,0 +1,78 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "Hidden/PKFx Blur Shader for Distortion Pass" { + Properties { + _MainTex ("Base (RGB)", 2D) = "" {} + _DistortionTex ("Distortion (RGB)", 2D) = "" {} + _BlurFactor ("Blur factor [ 0 ; 1 ]", Range (0, 1)) = 0.2 + } + + CGINCLUDE + + #include "UnityCG.cginc" + + struct v2f { + half4 pos : POSITION; + half2 uv : TEXCOORD0; + + }; + + sampler2D _MainTex; + sampler2D _DistortionTex; + float _BlurFactor; + + v2f vert (appdata_img v) { + v2f o; + o.pos = UnityObjectToClipPos(v.vertex); + + o.uv.xy = v.texcoord.xy; + + + + return o; + } + + half4 frag (v2f i) : COLOR { + half4 color = tex2D (_MainTex, i.uv) * half(0.325).xxxx; + + float2 offsets = float(tex2D (_DistortionTex, i.uv).z * _BlurFactor / 20.0).xx; + + half4 b1 = offsets.xyxy * half4(1,1, -1,-1); + half4 b2 = offsets.xyxy * half4(1,-1, -1,1); + + half4 uv01 = i.uv.xyxy + b1; + half4 uv02 = i.uv.xyxy + b2; + half4 uv21 = i.uv.xyxy + b1 * 1.5; + half4 uv22 = i.uv.xyxy + b2 * 1.5; + + color += 0.1125 * tex2D (_MainTex, uv01.xy); + color += 0.1125 * tex2D (_MainTex, uv02.xy); + color += 0.1125 * tex2D (_MainTex, uv01.zw); + color += 0.1125 * tex2D (_MainTex, uv02.zw); + + color += 0.05625 * tex2D (_MainTex, uv21.xy); + color += 0.05625 * tex2D (_MainTex, uv22.xy); + color += 0.05625 * tex2D (_MainTex, uv21.zw); + color += 0.05625 * tex2D (_MainTex, uv22.zw); + + return color; + } + + ENDCG + +Subshader { + Pass { + ZTest Always Cull Off ZWrite Off + Fog { Mode off } + + CGPROGRAM + #pragma fragmentoption ARB_precision_hint_fastest + #pragma vertex vert + #pragma fragment frag + ENDCG + } +} + +Fallback off + +} // shader \ No newline at end of file diff --git a/Assets/PopcornFX/Resources/PKFxDistQuickDirtyBlurEffect.shader.meta b/Assets/PopcornFX/Resources/PKFxDistQuickDirtyBlurEffect.shader.meta new file mode 100644 index 0000000..cca33ee --- /dev/null +++ b/Assets/PopcornFX/Resources/PKFxDistQuickDirtyBlurEffect.shader.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 55e0de699de284621a7c66106e2e25b8 +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Resources/PKFxDistortionEffect.shader b/Assets/PopcornFX/Resources/PKFxDistortionEffect.shader new file mode 100644 index 0000000..f972d6d --- /dev/null +++ b/Assets/PopcornFX/Resources/PKFxDistortionEffect.shader @@ -0,0 +1,70 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "Hidden/PKFx Distortion" +{ + Properties + { + _MainTex ("Base (RGB)", 2D) = "white" {} + _DistortionTex ("Distortion (RGB)", 2D) = "black" {} + } + + SubShader + { + // No culling or depth + Cull Off ZWrite Off ZTest Always + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = v.uv; + return o; + } + + uniform sampler2D _MainTex; + uniform sampler2D _DistortionTex; + + float4 SampleColorAt(float2 uvOffset) + { + return tex2D(_MainTex, uvOffset); + } + + float4 frag (v2f i) : SV_Target + { + float4 _DistBlurFactor = float4(15.0f, 15.0f, 0.75f, 1.0f); + float4 baseOffset = (tex2D(_DistortionTex, i.uv)); + baseOffset *= _DistBlurFactor; + + float4 color1 = SampleColorAt(baseOffset.xy * 0.01 + i.uv); + float4 color2 = SampleColorAt(baseOffset.xy * 0.0125 + i.uv); + float4 color3 = SampleColorAt(baseOffset.xy * 0.015 + i.uv); + float4 color4 = SampleColorAt(baseOffset.xy * 0.0175 + i.uv); + + return float4(lerp(color1.x, color2.x, 0.5f), lerp(color2.y, color3.y, 0.5f), color4.z, 1); + } +ENDCG + } + } + +Fallback off + +} diff --git a/Assets/PopcornFX/Resources/PKFxDistortionEffect.shader.meta b/Assets/PopcornFX/Resources/PKFxDistortionEffect.shader.meta new file mode 100644 index 0000000..6ae5023 --- /dev/null +++ b/Assets/PopcornFX/Resources/PKFxDistortionEffect.shader.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d148465e45222432f85a1d3e92677308 +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Resources/PkFxDepthCopy.shader b/Assets/PopcornFX/Resources/PkFxDepthCopy.shader new file mode 100644 index 0000000..fbbf990 --- /dev/null +++ b/Assets/PopcornFX/Resources/PkFxDepthCopy.shader @@ -0,0 +1,74 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "Hidden/PKFx Depth Copy" +{ + Properties + { + _Flip("Set to 1 when in forward rendering.", Range(0, 1)) = 0.0 + } + SubShader + { + // No culling or depth + ZTest Always + ZWrite On + + // Writes to a single-component texture (TextureFormat.Depth) + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + fixed2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + float _Flip; + + v2f vert(appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = v.uv * (1 - _Flip) + _Flip * float2(v.uv.x, 1 - v.uv.y); + return o; + } + + sampler2D _CameraDepthTexture; + +#if !defined(SHADER_API_D3D9) && !defined(SHADER_API_D3D11_9X) + fixed frag(v2f i) : SV_Depth + { + fixed4 col = tex2D(_CameraDepthTexture, i.uv); +#if defined(UNITY_REVERSED_Z) + return 1.0f - col.r; +#else + return col.r; +#endif + } +#else + void frag(v2f i, out float4 dummycol:COLOR, out float depth : DEPTH) + { + fixed4 col = tex2D(_CameraDepthTexture, i.uv); + dummycol = col; + +#if defined(UNITY_REVERSED_Z) + depth = 1.0f - col.r; +#else + depth = col.r; +#endif + } +#endif + ENDCG + } + } +} diff --git a/Assets/PopcornFX/Resources/PkFxDepthCopy.shader.meta b/Assets/PopcornFX/Resources/PkFxDepthCopy.shader.meta new file mode 100644 index 0000000..532a879 --- /dev/null +++ b/Assets/PopcornFX/Resources/PkFxDepthCopy.shader.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 21c14ee18b806476b86b293d24947cf3 +ShaderImporter: + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Scripts.meta b/Assets/PopcornFX/Scripts.meta new file mode 100644 index 0000000..7f457e6 --- /dev/null +++ b/Assets/PopcornFX/Scripts.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: b57669ec08bb2b344bf3e81677b68404 +folderAsset: yes +timeCreated: 1471448495 +licenseType: Store +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Scripts/Editor.meta b/Assets/PopcornFX/Scripts/Editor.meta new file mode 100644 index 0000000..ab6a9af --- /dev/null +++ b/Assets/PopcornFX/Scripts/Editor.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 49fd1a44f26384d16aa2219f7c328a10 +labels: +- free +- plugin +- particles +- FX +- PopcornFX +folderAsset: yes +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Scripts/Editor/PKFx-Editor.dll b/Assets/PopcornFX/Scripts/Editor/PKFx-Editor.dll new file mode 100644 index 0000000..e31d8aa Binary files /dev/null and b/Assets/PopcornFX/Scripts/Editor/PKFx-Editor.dll differ diff --git a/Assets/PopcornFX/Scripts/Editor/PKFx-Editor.dll.meta b/Assets/PopcornFX/Scripts/Editor/PKFx-Editor.dll.meta new file mode 100644 index 0000000..eea2f3d --- /dev/null +++ b/Assets/PopcornFX/Scripts/Editor/PKFx-Editor.dll.meta @@ -0,0 +1,29 @@ +fileFormatVersion: 2 +guid: 9ae675be4d0894c0697cbdee53161f19 +labels: +- free +- plugin +- particles +- FX +- PopcornFX +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Any: + enabled: 0 + settings: {} + Editor: + enabled: 1 + settings: + DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Scripts/PKFx-Helper.dll b/Assets/PopcornFX/Scripts/PKFx-Helper.dll new file mode 100644 index 0000000..8d52d33 Binary files /dev/null and b/Assets/PopcornFX/Scripts/PKFx-Helper.dll differ diff --git a/Assets/PopcornFX/Scripts/PKFx-Helper.dll.meta b/Assets/PopcornFX/Scripts/PKFx-Helper.dll.meta new file mode 100644 index 0000000..98b13e1 --- /dev/null +++ b/Assets/PopcornFX/Scripts/PKFx-Helper.dll.meta @@ -0,0 +1,29 @@ +fileFormatVersion: 2 +guid: 094c62b2eaacc41fa8eff89b96e32871 +labels: +- free +- plugin +- particles +- FX +- PopcornFX +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Any: + enabled: 1 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Scripts/PKFx-Runtime.dll b/Assets/PopcornFX/Scripts/PKFx-Runtime.dll new file mode 100644 index 0000000..662b4f0 Binary files /dev/null and b/Assets/PopcornFX/Scripts/PKFx-Runtime.dll differ diff --git a/Assets/PopcornFX/Scripts/PKFx-Runtime.dll.meta b/Assets/PopcornFX/Scripts/PKFx-Runtime.dll.meta new file mode 100644 index 0000000..6b36ac4 --- /dev/null +++ b/Assets/PopcornFX/Scripts/PKFx-Runtime.dll.meta @@ -0,0 +1,29 @@ +fileFormatVersion: 2 +guid: 097bb12263a8c413f87630c377349664 +labels: +- free +- plugin +- particles +- FX +- PopcornFX +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Any: + enabled: 1 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/PopcornFX/Scripts/PKFxManager.dll b/Assets/PopcornFX/Scripts/PKFxManager.dll new file mode 100644 index 0000000..d3370bd Binary files /dev/null and b/Assets/PopcornFX/Scripts/PKFxManager.dll differ diff --git a/Assets/PopcornFX/Scripts/PKFxManager.dll.meta b/Assets/PopcornFX/Scripts/PKFxManager.dll.meta new file mode 100644 index 0000000..c0b4c0d --- /dev/null +++ b/Assets/PopcornFX/Scripts/PKFxManager.dll.meta @@ -0,0 +1,29 @@ +fileFormatVersion: 2 +guid: 26dbc23a24afb434aa17cbc54f0d4e1b +labels: +- free +- plugin +- particles +- FX +- PopcornFX +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + isOverridable: 0 + platformData: + Any: + enabled: 1 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/fie.csproj b/fie.csproj index 9070aac..37f5c90 100644 --- a/fie.csproj +++ b/fie.csproj @@ -2371,6 +2371,18 @@ False Assets\Plugins\Photon3Unity3D.dll + + Assets\PopcornFX\Scripts\Editor\PKFx-Editor.dll + + + Assets\PopcornFX\Scripts\PKFx-Helper.dll + + + Assets\PopcornFX\Scripts\PKFx-Runtime.dll + + + Assets\PopcornFX\Scripts\PKFxManager.dll + Assets\Control Mapper\Internal\Libraries\Editor\Rewired_Editor.dll