diff --git a/.github/workflows/npmpublish.yml b/.github/workflows/npmpublish.yml new file mode 100644 index 0000000..2dfef20 --- /dev/null +++ b/.github/workflows/npmpublish.yml @@ -0,0 +1,31 @@ +name: Node.js Package + +on: + push: + branches: + - master + +jobs: + publish-npm: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + with: + node-version: 12 + registry-url: https://registry.npmjs.org/ + - run: npm publish Packages/UnityFx.Outline + env: + NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + + publish-gpr: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - uses: actions/setup-node@v1 + with: + node-version: 12 + registry-url: https://npm.pkg.github.com/ + - run: npm publish Packages/UnityFx.Outline + env: + NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.gitignore b/.gitignore index 058c8c8..60d4cea 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,7 @@ [Bb]uild/ [Bb]uilds/ [Pp]roject[Ss]ettings/ -[Pp]ackages/ -[Uu]nity[Pp]ackage[Mm]anager/ -Assets/Plugins/UnityFx.Outline/CHANGELOG.md -Assets/Plugins/UnityFx.Outline/CHANGELOG.md.meta Assets/AssetStoreTools* # Visual Studio cache directory diff --git a/Assets/Examples.meta b/Assets/Examples.meta index 7a8f4bb..040f581 100644 --- a/Assets/Examples.meta +++ b/Assets/Examples.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: faeaadda5f8d8d14db2a4d6a51b99e42 +guid: cd9a1f8eda7b3ae4da8c3a27817dae4e folderAsset: yes -timeCreated: 1566126961 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/Helpers.meta b/Assets/Examples/PostProcessing.meta similarity index 77% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/Helpers.meta rename to Assets/Examples/PostProcessing.meta index f18352b..ff5cf73 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/Helpers.meta +++ b/Assets/Examples/PostProcessing.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: de5ff1c474a17ba44a09339f7b56a80b +guid: 0afa5bb63d529a84daf887e3dc44b420 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Examples/PostProcessing/PostProcessingProfile.asset b/Assets/Examples/PostProcessing/PostProcessingProfile.asset new file mode 100644 index 0000000..725ebe2 --- /dev/null +++ b/Assets/Examples/PostProcessing/PostProcessingProfile.asset @@ -0,0 +1,39 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3} + m_Name: PostProcessingProfile + m_EditorClassIdentifier: + settings: + - {fileID: 114600372921182068} +--- !u!114 &114600372921182068 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 362f6fe821115814693a671c047d5f31, type: 3} + m_Name: Outline + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + _defaultResources: {fileID: 11400000, guid: d28e70f030b1a634db9a6a6d5478ef19, type: 2} + Resources: + overrideState: 0 + value: {fileID: 11400000, guid: d28e70f030b1a634db9a6a6d5478ef19, type: 2} + Layers: + overrideState: 0 + value: {fileID: 0} diff --git a/Assets/Examples/PostProcessing/PostProcessingProfile.asset.meta b/Assets/Examples/PostProcessing/PostProcessingProfile.asset.meta new file mode 100644 index 0000000..c432c9a --- /dev/null +++ b/Assets/Examples/PostProcessing/PostProcessingProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4e92bcee87e63243abc9035c870abe2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/PostProcessing/PostProcessingSample.unity b/Assets/Examples/PostProcessing/PostProcessingSample.unity new file mode 100644 index 0000000..289e850 --- /dev/null +++ b/Assets/Examples/PostProcessing/PostProcessingSample.unity @@ -0,0 +1,644 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 11 + m_GIWorkflowMode: 0 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 1 + m_LightmapEditorSettings: + serializedVersion: 10 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringMode: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ShowResolutionOverlay: 1 + m_LightingDataAsset: {fileID: 0} + m_UseShadowmask: 1 +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &167171210 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 167171212} + - component: {fileID: 167171211} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &167171211 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167171210} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 0.5 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &167171212 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 167171210} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &692811812 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 692811816} + - component: {fileID: 692811815} + - component: {fileID: 692811813} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &692811813 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692811812} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 692811816} + volumeLayer: + serializedVersion: 2 + m_Bits: 256 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 0 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: + - assemblyQualifiedName: UnityFx.Outline.PostProcessing.Outline, UnityFx.Outline.PostProcessing, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + m_AfterStackBundles: [] +--- !u!20 &692811815 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692811812} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 1 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &692811816 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692811812} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1579373806} + - {fileID: 748173443} + - {fileID: 1789341921} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &748173439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 748173443} + - component: {fileID: 748173442} + - component: {fileID: 748173441} + - component: {fileID: 748173440} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &748173440 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748173439} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!65 &748173441 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748173439} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &748173442 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748173439} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &748173443 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 748173439} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.51, y: 0, z: 4} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 692811816} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &880286468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 880286470} + - component: {fileID: 880286469} + m_Layer: 8 + m_Name: PostProcessingVolume + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &880286469 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880286468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: d4e92bcee87e63243abc9035c870abe2, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 +--- !u!4 &880286470 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880286468} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1579373802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1579373806} + - component: {fileID: 1579373805} + - component: {fileID: 1579373804} + - component: {fileID: 1579373803} + m_Layer: 0 + m_Name: Sphere + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &1579373803 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579373802} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!135 &1579373804 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579373802} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1579373805 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579373802} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1579373806 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1579373802} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 4} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 692811816} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1789341920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1789341921} + - component: {fileID: 1789341925} + - component: {fileID: 1789341924} + - component: {fileID: 1789341923} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1789341921 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1789341920} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.5, y: 0, z: 4} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 692811816} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1789341923 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1789341920} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!136 &1789341924 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1789341920} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!33 &1789341925 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1789341920} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} diff --git a/Assets/Examples/PostProcessing/PostProcessingSample.unity.meta b/Assets/Examples/PostProcessing/PostProcessingSample.unity.meta new file mode 100644 index 0000000..8ca40bd --- /dev/null +++ b/Assets/Examples/PostProcessing/PostProcessingSample.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4d21e5bd8f334a040a5dd6da35054df4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/Scenes.meta b/Assets/Examples/Scenes.meta deleted file mode 100644 index 99e36b8..0000000 --- a/Assets/Examples/Scenes.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 22f7f37d74888a24c9d14a3069a2939b -folderAsset: yes -timeCreated: 1566127079 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins.meta b/Assets/Examples/SimplePerCamera.meta similarity index 62% rename from Assets/Plugins.meta rename to Assets/Examples/SimplePerCamera.meta index aa18e8f..31b3630 100644 --- a/Assets/Plugins.meta +++ b/Assets/Examples/SimplePerCamera.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: eb53fafbd9395414e9244e0f7eb923ca +guid: 874c6e35dd593604d9dc8bf919bc94d7 folderAsset: yes -timeCreated: 1566126961 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Examples/Scenes/Outline.unity b/Assets/Examples/SimplePerCamera/Outline.unity similarity index 100% rename from Assets/Examples/Scenes/Outline.unity rename to Assets/Examples/SimplePerCamera/Outline.unity diff --git a/Assets/Examples/Scenes/Outline.unity.meta b/Assets/Examples/SimplePerCamera/Outline.unity.meta similarity index 100% rename from Assets/Examples/Scenes/Outline.unity.meta rename to Assets/Examples/SimplePerCamera/Outline.unity.meta diff --git a/Assets/Examples/Scripts/OutlineEffectBuilder.cs b/Assets/Examples/SimplePerCamera/OutlineEffectBuilder.cs similarity index 95% rename from Assets/Examples/Scripts/OutlineEffectBuilder.cs rename to Assets/Examples/SimplePerCamera/OutlineEffectBuilder.cs index c5a2355..444b39c 100644 --- a/Assets/Examples/Scripts/OutlineEffectBuilder.cs +++ b/Assets/Examples/SimplePerCamera/OutlineEffectBuilder.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Examples/Scripts/OutlineEffectBuilder.cs.meta b/Assets/Examples/SimplePerCamera/OutlineEffectBuilder.cs.meta similarity index 100% rename from Assets/Examples/Scripts/OutlineEffectBuilder.cs.meta rename to Assets/Examples/SimplePerCamera/OutlineEffectBuilder.cs.meta diff --git a/Assets/Examples/Prefabs/TestOutlineLayers.asset b/Assets/Examples/SimplePerCamera/TestOutlineLayers.asset similarity index 90% rename from Assets/Examples/Prefabs/TestOutlineLayers.asset rename to Assets/Examples/SimplePerCamera/TestOutlineLayers.asset index 47339ac..3de703c 100644 --- a/Assets/Examples/Prefabs/TestOutlineLayers.asset +++ b/Assets/Examples/SimplePerCamera/TestOutlineLayers.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/Assets/Examples/Prefabs/TestOutlineLayers.asset.meta b/Assets/Examples/SimplePerCamera/TestOutlineLayers.asset.meta similarity index 100% rename from Assets/Examples/Prefabs/TestOutlineLayers.asset.meta rename to Assets/Examples/SimplePerCamera/TestOutlineLayers.asset.meta diff --git a/Assets/Examples/SimplePerObject.meta b/Assets/Examples/SimplePerObject.meta new file mode 100644 index 0000000..9c27014 --- /dev/null +++ b/Assets/Examples/SimplePerObject.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dc9211a2b55b6d44098fcc852d15936c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Examples/Prefabs/TestOutlineSettings.asset b/Assets/Examples/SimplePerObject/TestOutlineSettings.asset similarity index 79% rename from Assets/Examples/Prefabs/TestOutlineSettings.asset rename to Assets/Examples/SimplePerObject/TestOutlineSettings.asset index 7d525e8..d94ff6a 100644 --- a/Assets/Examples/Prefabs/TestOutlineSettings.asset +++ b/Assets/Examples/SimplePerObject/TestOutlineSettings.asset @@ -3,8 +3,9 @@ --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 diff --git a/Assets/Examples/Prefabs/TestOutlineSettings.asset.meta b/Assets/Examples/SimplePerObject/TestOutlineSettings.asset.meta similarity index 100% rename from Assets/Examples/Prefabs/TestOutlineSettings.asset.meta rename to Assets/Examples/SimplePerObject/TestOutlineSettings.asset.meta diff --git a/Assets/Plugins/UnityFx.Outline.meta b/Assets/Plugins/UnityFx.Outline.meta deleted file mode 100644 index c424a54..0000000 --- a/Assets/Plugins/UnityFx.Outline.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 766865668fa015b4494bbe7d5b6af917 -folderAsset: yes -timeCreated: 1566126961 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Prefabs.meta b/Assets/Plugins/UnityFx.Outline/Runtime/Prefabs.meta deleted file mode 100644 index ea1dc5f..0000000 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Prefabs.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: b90860b10dff53e44890172cd1c61e76 -folderAsset: yes -timeCreated: 1566149544 -licenseType: Free -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Runtime/UnityFx.Outline.Tests.asmdef b/Assets/Plugins/UnityFx.Outline/Tests/Runtime/UnityFx.Outline.Tests.asmdef deleted file mode 100644 index 1108d4a..0000000 --- a/Assets/Plugins/UnityFx.Outline/Tests/Runtime/UnityFx.Outline.Tests.asmdef +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "UnityFx.Outline.Tests", - "references": [ - "UnityFx.Outline" - ], - "optionalUnityReferences": [ - "TestAssemblies" - ], - "includePlatforms": [], - "excludePlatforms": [] -} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 14e4872..c7d442d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/); this project adheres to [Semantic Versioning](http://semver.org/). +## [0.7.1] - 2020.01.28 + +Bugfixes and project layout changes. + +### Fixed +- Fixed `OutlineBehaviour` to allow changing its state while its `GameObject` is inactive. + ## [0.7.0] - 2019.11.26 `MaterialPropertyBlock`-based rendering and [Unity Post-processing Stack v2](https://github.com/Unity-Technologies/PostProcessing/tree/v2) compatibility. diff --git a/NpmPublish.bat b/NpmPublish.bat index 3fff6f8..5ac393f 100644 --- a/NpmPublish.bat +++ b/NpmPublish.bat @@ -1,2 +1,2 @@ -xcopy CHANGELOG.md Assets\Plugins\UnityFx.Outline\CHANGELOG.md /Y -npm publish Assets\Plugins\UnityFx.Outline +npm publish Packages\UnityFx.Outline +npm publish Packages\UnityFx.Outline.PostProcessing diff --git a/Packages/UnityFx.Outline.PostProcessing/CHANGELOG.md b/Packages/UnityFx.Outline.PostProcessing/CHANGELOG.md new file mode 100644 index 0000000..3a73de8 --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/CHANGELOG.md @@ -0,0 +1,9 @@ +# UnityFx.Outline.PostProcessing changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/); this project adheres to [Semantic Versioning](http://semver.org/). + +## [0.1.0] - unreleased + +### Added +- Initial release. diff --git a/Packages/UnityFx.Outline.PostProcessing/CHANGELOG.md.meta b/Packages/UnityFx.Outline.PostProcessing/CHANGELOG.md.meta new file mode 100644 index 0000000..73d1d67 --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/CHANGELOG.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d5d97340f52aca745b5b5d55c881ebc5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/UnityFx.Outline.PostProcessing/README.md b/Packages/UnityFx.Outline.PostProcessing/README.md new file mode 100644 index 0000000..1fc72d2 --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/README.md @@ -0,0 +1,11 @@ +# UnityFx.Outline.PostProcessing + +## SUMMARY +Screen-space outline effects for Unity Post-processing Stack v2. + +## USEFUL LINKS +* [Github project](https://github.com/Arvtesh/UnityFx.Outline) +* [npm package](https://www.npmjs.com/package/com.unityfx.outline.postprocessing) +* [Documentation](https://github.com/Arvtesh/UnityFx.Outline/blob/master/README.md) +* [License](https://github.com/Arvtesh/UnityFx.Outline/blob/master/LICENSE.md) +* [Support](mailto:arvtesh@gmail.com) diff --git a/Packages/UnityFx.Outline.PostProcessing/README.md.meta b/Packages/UnityFx.Outline.PostProcessing/README.md.meta new file mode 100644 index 0000000..48d5112 --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/README.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9b8ad98b0bcd54241b6b9c186551ecc3 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Runtime.meta b/Packages/UnityFx.Outline.PostProcessing/Runtime.meta similarity index 77% rename from Assets/Plugins/UnityFx.Outline/Tests/Runtime.meta rename to Packages/UnityFx.Outline.PostProcessing/Runtime.meta index 07c5fae..9898607 100644 --- a/Assets/Plugins/UnityFx.Outline/Tests/Runtime.meta +++ b/Packages/UnityFx.Outline.PostProcessing/Runtime.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7f94575f099b1c44893d9feb18c2bc46 +guid: 58b0863f5e2afd341a39b8095514add5 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Examples/Scripts.meta b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts.meta similarity index 62% rename from Assets/Examples/Scripts.meta rename to Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts.meta index 0b14ca7..0fe0ce1 100644 --- a/Assets/Examples/Scripts.meta +++ b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: 404ea2aedc6d1f24685d160324a2cb73 +guid: 96bc3f6fffa960f4691dcc70b0dc8a02 folderAsset: yes -timeCreated: 1566127090 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/Outline.cs b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/Outline.cs new file mode 100644 index 0000000..b8cbd52 --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/Outline.cs @@ -0,0 +1,61 @@ +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. +// See the LICENSE.md file in the project root for more information. + +using System; +using UnityEngine; +using UnityEngine.Rendering.PostProcessing; + +namespace UnityFx.Outline.PostProcessing +{ + [Serializable] + [PostProcess(typeof(OutlineEffectRenderer), PostProcessEvent.BeforeStack, "UnityFx/Outline", false)] + public sealed class Outline : PostProcessEffectSettings + { + [SerializeField] + private OutlineResources _defaultResources; + + [Serializable] + public class OutlineResourcesParameter : ParameterOverride + { + internal Outline Settings; + + protected override void OnEnable() + { + if (value == null) + { + value = Settings._defaultResources; + } + } + } + + [Serializable] + public class OutlineLayersParameter : ParameterOverride + { + } + + // NOTE: PostProcessEffectSettings.OnEnable implementation requires the fields to be public to function properly. + public OutlineResourcesParameter Resources = new OutlineResourcesParameter(); + public OutlineLayersParameter Layers = new OutlineLayersParameter(); + + public Outline() + { + // NOTE: The better way to do this is implementing OnEnable(), but it is already implemented as private (!!!) method in PostProcessEffectSettings. + Resources.Settings = this; + } + + public override bool IsEnabledAndSupported(PostProcessRenderContext context) + { +#if UNITY_EDITOR + + // Don't render outline preview when the editor is not playing. + if (!Application.isPlaying) + { + return false; + } + +#endif + + return base.IsEnabledAndSupported(context) && Resources != null && Layers != null && Layers.value != null; + } + } +} diff --git a/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/Outline.cs.meta b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/Outline.cs.meta new file mode 100644 index 0000000..063c836 --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/Outline.cs.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: 362f6fe821115814693a671c047d5f31 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: + - _defaultResources: {fileID: 11400000, guid: d28e70f030b1a634db9a6a6d5478ef19, + type: 2} + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/OutlineEffectRenderer.cs b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/OutlineEffectRenderer.cs new file mode 100644 index 0000000..3b8cf2f --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/OutlineEffectRenderer.cs @@ -0,0 +1,55 @@ +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. +// See the LICENSE.md file in the project root for more information. + +using System; +using UnityEngine; +using UnityEngine.Rendering.PostProcessing; +using UnityEngine.Scripting; + +namespace UnityFx.Outline.PostProcessing +{ + [Preserve] + public sealed class OutlineEffectRenderer : PostProcessEffectRenderer + { + private OutlineResources _defaultResources; + + public override void Render(PostProcessRenderContext context) + { + OutlineResources resources; + + if (settings.Resources.value != null) + { + resources = settings.Resources; + } + else + { + if (!_defaultResources) + { + _defaultResources = ScriptableObject.CreateInstance(); + _defaultResources.ResetToDefaults(); + _defaultResources.FullscreenTriangleMesh = RuntimeUtilities.fullscreenTriangle; + } + + resources = _defaultResources; + } + + if (resources && resources.IsValid) + { + using (var renderer = new OutlineRenderer(context.command, context.source, context.destination)) + { + settings.Layers.value.Render(renderer, resources); + } + } + } + + public override void Release() + { + if (_defaultResources) + { + ScriptableObject.Destroy(_defaultResources); + } + + base.Release(); + } + } +} diff --git a/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/OutlineEffectRenderer.cs.meta b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/OutlineEffectRenderer.cs.meta new file mode 100644 index 0000000..4fbea54 --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/Runtime/Scripts/OutlineEffectRenderer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 94b195a6784c3664eb4f501e87f38ce3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/UnityFx.Outline.PostProcessing/Runtime/UnityFx.Outline.PostProcessing.asmdef b/Packages/UnityFx.Outline.PostProcessing/Runtime/UnityFx.Outline.PostProcessing.asmdef new file mode 100644 index 0000000..7ccfffc --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/Runtime/UnityFx.Outline.PostProcessing.asmdef @@ -0,0 +1,15 @@ +{ + "name": "UnityFx.Outline.PostProcessing", + "references": [ + "Unity.Postprocessing.Runtime", + "UnityFx.Outline" + ], + "optionalUnityReferences": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [] +} \ No newline at end of file diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Runtime/UnityFx.Outline.Tests.asmdef.meta b/Packages/UnityFx.Outline.PostProcessing/Runtime/UnityFx.Outline.PostProcessing.asmdef.meta similarity index 76% rename from Assets/Plugins/UnityFx.Outline/Tests/Runtime/UnityFx.Outline.Tests.asmdef.meta rename to Packages/UnityFx.Outline.PostProcessing/Runtime/UnityFx.Outline.PostProcessing.asmdef.meta index b868faf..c9386d2 100644 --- a/Assets/Plugins/UnityFx.Outline/Tests/Runtime/UnityFx.Outline.Tests.asmdef.meta +++ b/Packages/UnityFx.Outline.PostProcessing/Runtime/UnityFx.Outline.PostProcessing.asmdef.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b6f43252634db42458f45f5519ce6f50 +guid: 8e3d165dc2f9115429adabaabad94f93 AssemblyDefinitionImporter: externalObjects: {} userData: diff --git a/Packages/UnityFx.Outline.PostProcessing/package.json b/Packages/UnityFx.Outline.PostProcessing/package.json new file mode 100644 index 0000000..2da098a --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/package.json @@ -0,0 +1,33 @@ +{ + "name": "com.unityfx.outline.postprocessing", + "version": "0.1.0", + "displayName": "Screen-space outline (Post-processing v2)", + "description": "Configurable outline for Unity post-processing stack (v2). Both solid and blurred modes supported (Gauss blur).", + "unity": "2018.1", + "dependencies": { + "com.unityfx.outline": "0.7.1", + "com.unity.postprocessing": "2.2.2" + }, + "keywords": [ + "UnityFx", + "UnityFx.Outline", + "UnityFx.Outline.PostProcessing", + "Outline", + "Post-processing", + "Post-effect" + ], + "category": "UnityFx", + "author": { + "name": "Arvtesh", + "email": "arvtesh@gmail.com" + }, + "license": "MIT", + "homepage": "https://github.com/Arvtesh/UnityFx.Outline", + "repository": { + "type": "git", + "url": "https://github.com/Arvtesh/UnityFx.Outline.git" + }, + "bugs": { + "url": "https://github.com/Arvtesh/UnityFx.Outline/issues" + } +} diff --git a/Packages/UnityFx.Outline.PostProcessing/package.json.meta b/Packages/UnityFx.Outline.PostProcessing/package.json.meta new file mode 100644 index 0000000..62b5420 --- /dev/null +++ b/Packages/UnityFx.Outline.PostProcessing/package.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5e0ccba19a9670b46ad359a388c4ddc5 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/UnityFx.Outline/CHANGELOG.md b/Packages/UnityFx.Outline/CHANGELOG.md new file mode 100644 index 0000000..c7d442d --- /dev/null +++ b/Packages/UnityFx.Outline/CHANGELOG.md @@ -0,0 +1,106 @@ +# UnityFx.Outline changelog +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/); this project adheres to [Semantic Versioning](http://semver.org/). + +## [0.7.1] - 2020.01.28 + +Bugfixes and project layout changes. + +### Fixed +- Fixed `OutlineBehaviour` to allow changing its state while its `GameObject` is inactive. + +## [0.7.0] - 2019.11.26 + +`MaterialPropertyBlock`-based rendering and [Unity Post-processing Stack v2](https://github.com/Unity-Technologies/PostProcessing/tree/v2) compatibility. + +### Added +- Moved to for `MaterialPropertyBlock`-based rendering. This is in-line with Unity post-processing Stack and is more performant approach. +- Significant optimizations made to `OutlineRenderer`. + +### Changed +- `IOutlineSettings` now implements `IEquatable`. +- Changed all outline shaders to use HLSL-based macros. +- Modified all shaders to ignore MVP vertex transform to be compatible with the new rendering model. +- Exposed rendering APIs for `OutlineLayer` and `OutlineLayerCollection`. + +### Fixed +- Fixed `TiledGPUPerformanceWarning` on mobile targets. + +### Removed +- Removed `OutlineMaterialSet` class. It is not used in `MaterialPropertyBlock`-based effect rendering. + +## [0.6.0] - 2019.09.26 + +Quality of life improvements. + +### Added +- Added `OutlineLayer.Enabled`. +- Added `OutlineLayer.Name`. +- Added possibility to change render order of layers via `OutlineLayer.Priority`. +- Added possibility to edit renderers of an `OutlineLayer`. +- Added possibility to alter `CameraEvent` used to render `OutlineEffect`. +- Added more info to the `OutlineLayer` preview inspector. + +### Changed +- `IOutilneSettings` setters now throw if overriden. + +### Fixed +- Fixed `OutlineLayer.Add` not filtering renderers by the mask passed. + +## [0.5.0] - 2019.09.09 + +Editor UI improvements and unit tests. + +### Added +- Added `OutlineSettings`, that can be shared between dfferent `OutlineLayer` and `OutlineBehaviour` instances. +- Added custom inspectors for `OutlineSettings`, `OutlineLayerCollection`. +- Added undo/redo support to all custom inspectors. +- Added unit-tests. + +### Changed +- Improved inspectors for `OutlineBehaviour` and `OutlineEffect`. + +## [0.4.0] - 2019.08.31 + +Blurred outlines. + +### Added +- Added Gauss blurring to outlines. +- Added outline mode parameter (possible values are `Solid` and `Blurred`). +- Added outline intensity parameter (for blurred outlines only). +- Added `IOutlineSettings` interface to make outline settings the same for `OutlineBehaviour` and `OutlineLayer`. +- Added `OutlineMaterialSet` helper. + +### Changed +- Changed solid outline to use Gauss sampling (to achieve smoother outlines). +- Changed outline implementation to use different passed for horizontal and vertical sampling (to make algorithm complexity linear instead of quadric). + +### Fixed +- Fixed an issue with `OutlineBehaviour` not rendering outlines if attached to a `GameObject` with no renderers. + +### Removed +- Removed `OutlineResourceCache` class. + +## [0.3.0] - 2019.08.27 + +### Added +- Added support for sharing outline layers between `OutlineEffect` instances. +- Added custom editors for `OutlineEffect` and `OutlineBehaviour`. +- Added possibility to setup outline layers as `ScriptableObject` asset. + +### Fixed +- Fixed profiler error 'BeginSample and EndSample count must match'. + +## [0.2.0] - 2019.08.19 + +### Added +- Added `OutlineBehaviour` for rendering per-object outlines. +- Added `OutlineResources` to help initialize outline effects in runtime. +- Added `OutlineRenderer` as low-level helper for outline rendering. + +## [0.1.0] - 2019.08.18 + +### Added +- Initial release. + diff --git a/Packages/UnityFx.Outline/CHANGELOG.md.meta b/Packages/UnityFx.Outline/CHANGELOG.md.meta new file mode 100644 index 0000000..b191c07 --- /dev/null +++ b/Packages/UnityFx.Outline/CHANGELOG.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a0afeafc656ad714fbfb0e40dc4587e1 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/UnityFx.Outline/Editor.meta b/Packages/UnityFx.Outline/Editor.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Editor.meta rename to Packages/UnityFx.Outline/Editor.meta diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts.meta b/Packages/UnityFx.Outline/Editor/Scripts.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts.meta rename to Packages/UnityFx.Outline/Editor/Scripts.meta diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs b/Packages/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs similarity index 96% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs index ea92d3c..459340c 100644 --- a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs +++ b/Packages/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs.meta b/Packages/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs.meta rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineBehaviourEditor.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs b/Packages/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs similarity index 97% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs index 10ee383..ff0934c 100644 --- a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs +++ b/Packages/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; @@ -9,7 +9,7 @@ namespace UnityFx.Outline { - internal static class OutlineEditorUtility + public static class OutlineEditorUtility { public static void RenderDivider(Color color, int thickness = 1, int padding = 5) { @@ -18,7 +18,6 @@ public static void RenderDivider(Color color, int thickness = 1, int padding = 5 r.height = thickness; r.y += padding / 2; r.x -= 2; - r.width += 6; EditorGUI.DrawRect(r, color); } diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs.meta b/Packages/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs.meta rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineEditorUtility.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs b/Packages/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs similarity index 95% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs index 464e492..bd8c508 100644 --- a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs +++ b/Packages/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs.meta b/Packages/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs.meta rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineEffectEditor.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs b/Packages/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs similarity index 90% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs index 7e3615f..f0c57e0 100644 --- a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs +++ b/Packages/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; @@ -29,9 +29,10 @@ public override void OnInspectorGUI() for (var i = 0; i < _layers.Count; i++) { EditorGUILayout.Space(); + OutlineEditorUtility.RenderDivider(Color.gray); - var rect = EditorGUILayout.BeginHorizontal(); - var enabled = EditorGUILayout.ToggleLeft("Layer #" + i.ToString(), _layers[i].Enabled); + EditorGUILayout.BeginHorizontal(); + var enabled = EditorGUILayout.ToggleLeft("Layer #" + i.ToString(), _layers[i].Enabled, EditorStyles.boldLabel); if (enabled != _layers[i].Enabled) { @@ -57,13 +58,6 @@ public override void OnInspectorGUI() EditorGUILayout.EndHorizontal(); EditorGUILayout.Space(); - rect.xMin -= 2; - rect.xMax += 2; - rect.yMin -= 2; - rect.yMax += 2; - - GUI.Box(rect, GUIContent.none); - var name = EditorGUILayout.TextField("Layer Name", _layers[i].NameTag); if (name != _layers[i].NameTag) diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs.meta b/Packages/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs.meta rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineLayerCollectionEditor.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs b/Packages/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs similarity index 89% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs index 5f6e78c..efa43c4 100644 --- a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs +++ b/Packages/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs.meta b/Packages/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs.meta rename to Packages/UnityFx.Outline/Editor/Scripts/OutlineSettingsEditor.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Editor/UnityFx.Outline.Editor.asmdef b/Packages/UnityFx.Outline/Editor/UnityFx.Outline.Editor.asmdef similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Editor/UnityFx.Outline.Editor.asmdef rename to Packages/UnityFx.Outline/Editor/UnityFx.Outline.Editor.asmdef diff --git a/Assets/Plugins/UnityFx.Outline/Editor/UnityFx.Outline.Editor.asmdef.meta b/Packages/UnityFx.Outline/Editor/UnityFx.Outline.Editor.asmdef.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Editor/UnityFx.Outline.Editor.asmdef.meta rename to Packages/UnityFx.Outline/Editor/UnityFx.Outline.Editor.asmdef.meta diff --git a/Assets/Plugins/UnityFx.Outline/README.md b/Packages/UnityFx.Outline/README.md similarity index 100% rename from Assets/Plugins/UnityFx.Outline/README.md rename to Packages/UnityFx.Outline/README.md diff --git a/Assets/Plugins/UnityFx.Outline/README.md.meta b/Packages/UnityFx.Outline/README.md.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/README.md.meta rename to Packages/UnityFx.Outline/README.md.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime.meta b/Packages/UnityFx.Outline/Runtime.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime.meta rename to Packages/UnityFx.Outline/Runtime.meta diff --git a/Assets/Examples/Prefabs.meta b/Packages/UnityFx.Outline/Runtime/Prefabs.meta similarity index 62% rename from Assets/Examples/Prefabs.meta rename to Packages/UnityFx.Outline/Runtime/Prefabs.meta index aba1446..88c5e98 100644 --- a/Assets/Examples/Prefabs.meta +++ b/Packages/UnityFx.Outline/Runtime/Prefabs.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: 0e903e59d63cf9044a57305cf8636618 +guid: 82099d138ba6a5c40a5915c4ca5211fe folderAsset: yes -timeCreated: 1566568633 -licenseType: Pro DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Prefabs/OutlineResources.asset b/Packages/UnityFx.Outline/Runtime/Prefabs/OutlineResources.asset similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Prefabs/OutlineResources.asset rename to Packages/UnityFx.Outline/Runtime/Prefabs/OutlineResources.asset diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Prefabs/OutlineResources.asset.meta b/Packages/UnityFx.Outline/Runtime/Prefabs/OutlineResources.asset.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Prefabs/OutlineResources.asset.meta rename to Packages/UnityFx.Outline/Runtime/Prefabs/OutlineResources.asset.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts.meta b/Packages/UnityFx.Outline/Runtime/Scripts.meta similarity index 80% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts.meta rename to Packages/UnityFx.Outline/Runtime/Scripts.meta index bfafa3d..fdf3731 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts.meta +++ b/Packages/UnityFx.Outline/Runtime/Scripts.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 guid: 5474ddc00e5e1574cba82c3dbad68ded folderAsset: yes -timeCreated: 1566126961 -licenseType: Free DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/Helpers/AssemblyInfo.cs b/Packages/UnityFx.Outline/Runtime/Scripts/AssemblyInfo.cs similarity index 94% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/Helpers/AssemblyInfo.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/AssemblyInfo.cs index 041e387..4e069a1 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/Helpers/AssemblyInfo.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/AssemblyInfo.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System.Reflection; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/Helpers/AssemblyInfo.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/AssemblyInfo.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/Helpers/AssemblyInfo.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/AssemblyInfo.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs b/Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs similarity index 93% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs index cc46038..cef4b6c 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettings.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs b/Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs similarity index 86% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs index 032af2a..0939a90 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/IOutlineSettingsEx.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs similarity index 97% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs index 70989b9..553e553 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.Renderers.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs similarity index 87% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs index 11e3e0c..9c6249f 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; @@ -78,6 +78,8 @@ public OutlineResources OutlineResources if (_outlineResources != value) { + CreateSettingsIfNeeded(); + _outlineResources = value; _outlineSettings.SetResources(_outlineResources); } @@ -91,6 +93,7 @@ public ICollection OutlineRenderers { get { + CreateRenderersIfNeeded(); return _renderers; } } @@ -111,7 +114,10 @@ public ICollection Cameras /// public void UpdateChanged() { - _outlineSettings.UpdateChanged(); + if (_outlineSettings != null) + { + _outlineSettings.UpdateChanged(); + } } #endregion @@ -122,11 +128,16 @@ private void Awake() { CreateRenderersIfNeeded(); CreateSettingsIfNeeded(); + + _outlineSettings.SetResources(_outlineResources); } private void OnDestroy() { - _outlineSettings.SetResources(null); + if (_outlineSettings != null) + { + _outlineSettings.SetResources(null); + } } private void OnEnable() @@ -212,12 +223,21 @@ private void OnValidate() CreateRenderersIfNeeded(); CreateCommandBufferIfNeeded(); CreateSettingsIfNeeded(); + + _outlineSettings.SetResources(_outlineResources); } private void Reset() { - _outlineSettings.SetResources(_outlineResources); - _renderers.Reset(); + if (_outlineSettings != null) + { + _outlineSettings.SetResources(_outlineResources); + } + + if (_renderers != null) + { + _renderers.Reset(); + } } #endif @@ -233,10 +253,20 @@ public OutlineSettings OutlineSettings { get { + if (_outlineSettings == null) + { + _outlineSettings = new OutlineSettingsInstance(); + } + return _outlineSettings.OutlineSettings; } set { + if (_outlineSettings == null) + { + _outlineSettings = new OutlineSettingsInstance(); + } + _outlineSettings.OutlineSettings = value; } } @@ -250,10 +280,12 @@ public Color OutlineColor { get { + CreateSettingsIfNeeded(); return _outlineSettings.OutlineColor; } set { + CreateSettingsIfNeeded(); _outlineSettings.OutlineColor = value; } } @@ -263,10 +295,12 @@ public int OutlineWidth { get { + CreateSettingsIfNeeded(); return _outlineSettings.OutlineWidth; } set { + CreateSettingsIfNeeded(); _outlineSettings.OutlineWidth = value; } } @@ -276,10 +310,12 @@ public float OutlineIntensity { get { + CreateSettingsIfNeeded(); return _outlineSettings.OutlineIntensity; } set { + CreateSettingsIfNeeded(); _outlineSettings.OutlineIntensity = value; } } @@ -289,10 +325,12 @@ public OutlineMode OutlineMode { get { + CreateSettingsIfNeeded(); return _outlineSettings.OutlineMode; } set { + CreateSettingsIfNeeded(); _outlineSettings.OutlineMode = value; } } @@ -358,10 +396,8 @@ private void CreateSettingsIfNeeded() { if (_outlineSettings == null) { - _outlineSettings = new OutlineSettingsInstance(); + _outlineSettings = new OutlineSettingsInstance(_outlineResources); } - - _outlineSettings.SetResources(_outlineResources); } #endregion diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineBehaviour.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs similarity index 98% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs index fe306cd..cab15bf 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineEffect.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs similarity index 97% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs index 79dbd9e..881ce33 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.Renderers.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs similarity index 99% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs index f909b66..a31b3dd 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayer.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs similarity index 98% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs index 9ec46cf..84895ed 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineLayerCollection.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs similarity index 83% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs index 76c7c69..b628af7 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineMode.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs similarity index 99% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs index aa08159..2d33e1b 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineRenderer.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs similarity index 98% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs index 36d4514..945e013 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineResources.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs similarity index 96% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs index 7bb7cfe..be81f4a 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettings.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs similarity index 94% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs index cd90e9c..b581145 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs +++ b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; @@ -43,6 +43,15 @@ public OutlineResources OutlineResources } } + internal OutlineSettingsInstance() + { + } + + internal OutlineSettingsInstance(OutlineResources resources) + { + _resources = resources; + } + internal void SetResources(OutlineResources resources) { if (resources != _resources) diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs.meta b/Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs.meta rename to Packages/UnityFx.Outline/Runtime/Scripts/OutlineSettingsInstance.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders.meta b/Packages/UnityFx.Outline/Runtime/Shaders.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Shaders.meta rename to Packages/UnityFx.Outline/Runtime/Shaders.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader b/Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader similarity index 94% rename from Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader rename to Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader index 737bf8c..8c3b7a4 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader +++ b/Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. // Renders outline based on a texture produces by 'UnityF/Outline/RenderColor' output. diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader.meta b/Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader.meta rename to Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass1.shader.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader b/Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader similarity index 95% rename from Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader rename to Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader index 5b46ff2..c8be4b7 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader +++ b/Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. // Renders outline based on a texture produces by 'UnityF/Outline/RenderColor' output. diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader.meta b/Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader.meta rename to Packages/UnityFx.Outline/Runtime/Shaders/OutlinePass2.shader.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader b/Packages/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader similarity index 90% rename from Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader rename to Packages/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader index 1b79f93..ab3f9a6 100644 --- a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader +++ b/Packages/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. // Renders everything with while color. diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader.meta b/Packages/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader.meta rename to Packages/UnityFx.Outline/Runtime/Shaders/OutlineRenderColor.shader.meta diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/UnityFx.Outline.asmdef b/Packages/UnityFx.Outline/Runtime/UnityFx.Outline.asmdef similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/UnityFx.Outline.asmdef rename to Packages/UnityFx.Outline/Runtime/UnityFx.Outline.asmdef diff --git a/Assets/Plugins/UnityFx.Outline/Runtime/UnityFx.Outline.asmdef.meta b/Packages/UnityFx.Outline/Runtime/UnityFx.Outline.asmdef.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Runtime/UnityFx.Outline.asmdef.meta rename to Packages/UnityFx.Outline/Runtime/UnityFx.Outline.asmdef.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests.meta b/Packages/UnityFx.Outline/Tests.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests.meta rename to Packages/UnityFx.Outline/Tests.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor.meta b/Packages/UnityFx.Outline/Tests/Editor.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor.meta rename to Packages/UnityFx.Outline/Tests/Editor.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts.meta b/Packages/UnityFx.Outline/Tests/Editor/Scripts.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts.meta rename to Packages/UnityFx.Outline/Tests/Editor/Scripts.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers.meta b/Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers.meta rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs b/Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs similarity index 96% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs index c39e3bb..b2b32d1 100644 --- a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs +++ b/Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs.meta b/Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs.meta rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsExTests.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs b/Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs similarity index 98% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs index eef5dc4..a93b909 100644 --- a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs +++ b/Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs.meta b/Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs.meta rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/Helpers/IOutlineSettingsTests.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs similarity index 90% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs index 80be2ca..02c4202 100644 --- a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs +++ b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs.meta b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs.meta rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineBehaviourTests.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs similarity index 98% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs index 78177c6..8e46e4f 100644 --- a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs +++ b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs.meta b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs.meta rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerCollectionTests.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs similarity index 98% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs index f965443..58c202e 100644 --- a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs +++ b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs.meta b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs.meta rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineLayerTests.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs similarity index 93% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs index fc2b70f..e4c83b0 100644 --- a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs +++ b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs.meta b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs.meta rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineRendererTests.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs similarity index 90% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs index 7607c81..e47efbe 100644 --- a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs +++ b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs @@ -1,4 +1,4 @@ -// Copyright (C) 2019 Alexander Bogarsukov. All rights reserved. +// Copyright (C) 2019-2020 Alexander Bogarsukov. All rights reserved. // See the LICENSE.md file in the project root for more information. using System; diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs.meta b/Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs.meta rename to Packages/UnityFx.Outline/Tests/Editor/Scripts/OutlineSettingsTests.cs.meta diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/UnityFx.Outline.Editor.Tests.asmdef b/Packages/UnityFx.Outline/Tests/Editor/UnityFx.Outline.Editor.Tests.asmdef similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/UnityFx.Outline.Editor.Tests.asmdef rename to Packages/UnityFx.Outline/Tests/Editor/UnityFx.Outline.Editor.Tests.asmdef diff --git a/Assets/Plugins/UnityFx.Outline/Tests/Editor/UnityFx.Outline.Editor.Tests.asmdef.meta b/Packages/UnityFx.Outline/Tests/Editor/UnityFx.Outline.Editor.Tests.asmdef.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/Tests/Editor/UnityFx.Outline.Editor.Tests.asmdef.meta rename to Packages/UnityFx.Outline/Tests/Editor/UnityFx.Outline.Editor.Tests.asmdef.meta diff --git a/Assets/Plugins/UnityFx.Outline/package.json b/Packages/UnityFx.Outline/package.json similarity index 91% rename from Assets/Plugins/UnityFx.Outline/package.json rename to Packages/UnityFx.Outline/package.json index 696575f..1a5ff20 100644 --- a/Assets/Plugins/UnityFx.Outline/package.json +++ b/Packages/UnityFx.Outline/package.json @@ -1,7 +1,7 @@ { "name": "com.unityfx.outline", - "version": "0.7.0", - "displayName": "Screen-space outlines for Unity", + "version": "0.7.1", + "displayName": "Screen-space outline", "description": "Configurable per-object and per-camera outlines. Both solid and blurred outline modes are supported (Gauss blur). The outlines can be easily customized either through scripts or with Unity editor (both in edit-time or runtime).", "unity": "2017.2", "keywords": [ diff --git a/Assets/Plugins/UnityFx.Outline/package.json.meta b/Packages/UnityFx.Outline/package.json.meta similarity index 100% rename from Assets/Plugins/UnityFx.Outline/package.json.meta rename to Packages/UnityFx.Outline/package.json.meta diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..2fb6ccc --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,41 @@ +{ + "dependencies": { + "com.unity.ads": "2.0.8", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.8", + "com.unity.postprocessing": "2.2.2", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.4.1", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +}