diff --git a/README.md b/README.md index e76008b..fd23d8d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Project_2018_Frozen Project for 2018 Frozen exhibition in Seoul. -Post Processing v2 beta +Post-processing Stack 1.0.4 + Klak Chromatics \ No newline at end of file diff --git a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity index 6c59f1d..8506a92 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Frozen.unity +++ b/Unity_2018_Frozen/Assets/Frozen/Frozen.unity @@ -768,7 +768,7 @@ GameObject: - component: {fileID: 439594037} - component: {fileID: 439594036} m_Layer: 5 - m_Name: Final Canvas + m_Name: Composite Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -906,6 +906,71 @@ MonoBehaviour: m_EditorClassIdentifier: bufferName: uniform_buffer uniform: {fileID: 11400000, guid: 43a114cac50c03e4ea881a51dbb6e7bd, type: 2} +--- !u!1 &520040865 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 520040869} + - component: {fileID: 520040868} + m_Layer: 0 + m_Name: Final Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &520040868 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520040865} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + 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: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32 + m_RenderingPath: 1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 1 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &520040869 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 520040865} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1.2665577, y: 6.04, z: 0.06573248} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 21 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &528715328 GameObject: m_ObjectHideFlags: 0 @@ -1293,6 +1358,100 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &750667758 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 750667763} + - component: {fileID: 750667762} + - component: {fileID: 750667761} + - component: {fileID: 750667760} + m_Layer: 5 + m_Name: Spout Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &750667760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 750667758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &750667761 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 750667758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!223 &750667762 +Canvas: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 750667758} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 1817143148} + m_PlaneDistance: 10 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &750667763 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 750667758} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 1000268179} + m_Father: {fileID: 0} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &764073633 GameObject: m_ObjectHideFlags: 0 @@ -1880,16 +2039,16 @@ MonoBehaviour: width: 8 depth: 5 height: 3 ---- !u!1 &957254312 +--- !u!1 &1000268178 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 5 m_Component: - - component: {fileID: 957254313} - - component: {fileID: 957254315} - - component: {fileID: 957254314} + - component: {fileID: 1000268179} + - component: {fileID: 1000268182} + - component: {fileID: 1000268181} m_Layer: 5 m_Name: RawImage m_TagString: Untagged @@ -1897,17 +2056,17 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &957254313 +--- !u!224 &1000268179 RectTransform: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 957254312} + m_GameObject: {fileID: 1000268178} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 1765914297} + m_Father: {fileID: 750667763} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -1915,18 +2074,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 5040, y: 3200} m_Pivot: {x: 0, y: 1} ---- !u!114 &957254314 +--- !u!114 &1000268181 MonoBehaviour: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 957254312} + m_GameObject: {fileID: 1000268178} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: f05d2e0d0f372ae48998e59e3d376a63, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -1941,12 +2100,12 @@ MonoBehaviour: y: 0 width: 1 height: 1 ---- !u!222 &957254315 +--- !u!222 &1000268182 CanvasRenderer: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 957254312} + m_GameObject: {fileID: 1000268178} --- !u!1 &1035960133 GameObject: m_ObjectHideFlags: 0 @@ -2135,6 +2294,73 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1196719910} +--- !u!1 &1227078084 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1227078085} + - component: {fileID: 1227078088} + - component: {fileID: 1227078087} + m_Layer: 5 + m_Name: RawImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1227078085 +RectTransform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1227078084} + 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: 1765914297} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1260, y: 800} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1227078087 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1227078084} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Texture: {fileID: 8400000, guid: b8e6ff168206f134585d024c016832b6, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &1227078088 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1227078084} --- !u!1 &1283180266 GameObject: m_ObjectHideFlags: 0 @@ -2145,10 +2371,8 @@ GameObject: - component: {fileID: 1283180270} - component: {fileID: 1283180267} - component: {fileID: 1283180269} - - component: {fileID: 1283180271} - - component: {fileID: 1283180268} m_Layer: 0 - m_Name: Final Camera + m_Name: Composite Camera m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2190,22 +2414,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!114 &1283180268 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1283180266} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fda5366b87aa3934a8e5823faa38f54c, type: 3} - m_Name: - m_EditorClassIdentifier: - sharingName: FrozenSpout - textureFormat: 28 - yFlip: 1 - output: {fileID: 0} - m_Shader: {fileID: 4800000, guid: 499c23f758325064e88cd0632bcb368f, type: 3} --- !u!114 &1283180269 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2225,24 +2433,12 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1283180266} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.2665577, y: 6.04, z: 0.06573248} + m_LocalPosition: {x: 0, y: 10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1283180271 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1283180266} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7cf1e6cce802d3c49a437b3125a95960, type: 3} - m_Name: - m_EditorClassIdentifier: - space: {x: 2880, y: 1800, z: 1080} --- !u!1 &1390635887 GameObject: m_ObjectHideFlags: 0 @@ -2283,8 +2479,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 400c2cde369742e4690d5216c5c3b3c3, type: 3} m_Name: m_EditorClassIdentifier: - width: 1280 - height: 720 + width: 1260 + height: 800 fps: 60 fullscreen: 0 --- !u!1 &1430681566 @@ -2475,7 +2671,7 @@ GameObject: - component: {fileID: 1765914294} - component: {fileID: 1765914298} m_Layer: 5 - m_Name: Debug Canvas + m_Name: Final Canvas m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2526,7 +2722,7 @@ Canvas: m_GameObject: {fileID: 1765914293} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 151858423} m_PlaneDistance: 1 m_PixelPerfect: 0 @@ -2548,10 +2744,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 957254313} + - {fileID: 1227078085} - {fileID: 2084135710} m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2637,6 +2833,102 @@ CanvasRenderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1774693141} +--- !u!1 &1817143146 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1817143149} + - component: {fileID: 1817143148} + - component: {fileID: 1817143150} + - component: {fileID: 1817143147} + m_Layer: 0 + m_Name: Spout Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1817143147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1817143146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fda5366b87aa3934a8e5823faa38f54c, type: 3} + m_Name: + m_EditorClassIdentifier: + sharingName: FrozenSpout + textureFormat: 28 + yFlip: 1 + output: {fileID: 0} + m_Shader: {fileID: 0} +--- !u!20 &1817143148 +Camera: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1817143146} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + 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: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 32 + m_RenderingPath: 1 + m_TargetTexture: {fileID: 8400000, guid: b8e6ff168206f134585d024c016832b6, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 1 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1817143149 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1817143146} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 25, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1817143150 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1817143146} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7cf1e6cce802d3c49a437b3125a95960, type: 3} + m_Name: + m_EditorClassIdentifier: + space: {x: 2880, y: 1800, z: 1080} + material: {fileID: 2100000, guid: f05d2e0d0f372ae48998e59e3d376a63, type: 2} --- !u!1 &1820320968 GameObject: m_ObjectHideFlags: 0 @@ -2780,6 +3072,34 @@ MonoBehaviour: colorize: 1 debugMaterial: {fileID: 2100000, guid: 95b4d9b25b7a7e3449627228b10d9009, type: 2} debugInfo: +--- !u!1 &2024329733 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 2024329734} + m_Layer: 0 + m_Name: '-------------------------------------' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2024329734 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2024329733} + 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: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2084135709 GameObject: m_ObjectHideFlags: 0 @@ -2812,7 +3132,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -646, y: -14} + m_AnchoredPosition: {x: -484, y: 260} m_SizeDelta: {x: 250, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2084135711 diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/SpaceWrapping.mat b/Unity_2018_Frozen/Assets/Frozen/Material/SpaceWrapping.mat new file mode 100644 index 0000000..1e6d08d --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Material/SpaceWrapping.mat @@ -0,0 +1,83 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: SpaceWrapping + m_Shader: {fileID: 4800000, guid: 9b82b95d24b82e54c9ca082bb65d0f78, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _ColorMask: 15 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UVSec: 0 + - _UseUIAlphaClip: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Unity_2018_Frozen/Assets/Frozen/Material/SpaceWrapping.mat.meta b/Unity_2018_Frozen/Assets/Frozen/Material/SpaceWrapping.mat.meta new file mode 100644 index 0000000..75a548b --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Material/SpaceWrapping.mat.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f05d2e0d0f372ae48998e59e3d376a63 +timeCreated: 1523861927 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Script/SpaceHomography.cs b/Unity_2018_Frozen/Assets/Frozen/Script/SpaceHomography.cs index 2b18cba..71875f8 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Script/SpaceHomography.cs +++ b/Unity_2018_Frozen/Assets/Frozen/Script/SpaceHomography.cs @@ -5,7 +5,8 @@ using UnityEngine; public class SpaceHomography : MonoBehaviour { public Vector3 space; - + [SerializeField] + Material material; Vector2 texture_size; private void Start() @@ -91,9 +92,18 @@ public class SpaceHomography : MonoBehaviour homos.Add(matrix); } +#if false Shader.SetGlobalMatrixArray("homography", homos); Shader.SetGlobalVector("homo_space", space); Shader.SetGlobalVector("texture_size", texture_size); +#else + if (material != null) + { + material.SetMatrixArray("homography", homos); + material.SetVector("homo_space", space); + material.SetVector("texture_size", texture_size); + } +#endif } private void FindHomography(Vector2[] src, Vector2[] dest, ref Matrix4x4 homography) diff --git a/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpaceMapping.shader b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpaceMapping.shader new file mode 100644 index 0000000..2d17e42 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpaceMapping.shader @@ -0,0 +1,140 @@ +Shader "UltraCombos/Frozen/SpaceMapping" +{ + Properties + { + [PerRendererData] _MainTex("Sprite Texture", 2D) = "white" {} + + _StencilComp("Stencil Comparison", Float) = 8 + _Stencil("Stencil ID", Float) = 0 + _StencilOp("Stencil Operation", Float) = 0 + _StencilWriteMask("Stencil Write Mask", Float) = 255 + _StencilReadMask("Stencil Read Mask", Float) = 255 + + _ColorMask("Color Mask", Float) = 15 + } + + SubShader + { + Tags + { + "Queue" = "Transparent" + "IgnoreProjector" = "True" + "RenderType" = "Transparent" + "PreviewType" = "Plane" + "CanUseSpriteAtlas" = "True" + } + + Stencil + { + Ref[_Stencil] + Comp[_StencilComp] + Pass[_StencilOp] + ReadMask[_StencilReadMask] + WriteMask[_StencilWriteMask] + } + + Cull Off + Lighting Off + ZWrite Off + ZTest[unity_GUIZTestMode] + //Blend OneMinusSrcColor One//SrcAlpha One // SrcAlpha OneMinusSrcAlpha + Blend One Zero + ColorMask[_ColorMask] + + Pass + { + Name "Default" + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 2.0 + + #include "UnityCG.cginc" + #include "UnityUI.cginc" + + struct appdata_t + { + float4 vertex : POSITION; + float2 texcoord : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct v2f + { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + float2 texcoord : TEXCOORD0; + float4 worldPosition : TEXCOORD1; + UNITY_VERTEX_OUTPUT_STEREO + }; + + fixed4 _TextureSampleAdd; + float4 _ClipRect; + + v2f vert(appdata_t IN) + { + v2f OUT; + UNITY_SETUP_INSTANCE_ID(IN); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(OUT); + OUT.worldPosition = IN.vertex; + OUT.vertex = UnityObjectToClipPos(OUT.worldPosition); + + OUT.texcoord = IN.texcoord; + + return OUT; + } + + sampler2D _MainTex; + + float4x4 homography[3]; + float3 homo_space; + float2 texture_size; + + fixed4 frag(v2f IN) : SV_Target + { + //half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color; + //color.a *= UnityGet2DClipping(IN.worldPosition.xy, _ClipRect); + + const float3 space = homo_space; + const float2 clipped_size = texture_size; + + float2 uv = float2(IN.texcoord.x, 1 - IN.texcoord.y); + float2 pos = uv * clipped_size; + + if (pos.y <= space.z) + { + if (pos.x < space.z || pos.x > space.z + space.x) + { + pos = float2(0, 0); + } + else + { + float4 homo_pos = mul(homography[0], float4(pos, 0, 1)); + pos = homo_pos.xy / homo_pos.w; + } + } + else if (pos.x <= space.z) + { + float4 homo_pos = mul(homography[1], float4(pos, 0, 1)); + pos = homo_pos.xy / homo_pos.w; + } + else if (pos.x >= space.z + space.x) + { + float4 homo_pos = mul(homography[2], float4(pos, 0, 1)); + pos = homo_pos.xy / homo_pos.w; + } + + uv = pos / clipped_size; + uv = float2(uv.x, 1 - uv.y); + half4 color = any(length(pos)) ? tex2D(_MainTex, uv) : float4(0, 0, 0, 1); + + //uv = float2(IN.texcoord.x, 1 - IN.texcoord.y); + //color = half4(uv, 0, 1); + //color = tex2D(_MainTex, IN.texcoord); + + return color; + } + ENDCG + } + } +} diff --git a/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpaceMapping.shader.meta b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpaceMapping.shader.meta new file mode 100644 index 0000000..c90348b --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpaceMapping.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 9b82b95d24b82e54c9ca082bb65d0f78 +timeCreated: 1523861549 +licenseType: Free +ShaderImporter: + externalObjects: {} + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Frozen/Shader/SpaceMapping.shader b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpoutSpaceMapping.shader similarity index 97% rename from Unity_2018_Frozen/Assets/Frozen/Shader/SpaceMapping.shader rename to Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpoutSpaceMapping.shader index 43a4395..5478b84 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Shader/SpaceMapping.shader +++ b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpoutSpaceMapping.shader @@ -1,4 +1,4 @@ -Shader "Frozen/SpaceMapping" +Shader "UltraCombos/Frozen/SpoutSpaceMapping" { Properties { diff --git a/Unity_2018_Frozen/Assets/Frozen/Shader/SpaceMapping.shader.meta b/Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpoutSpaceMapping.shader.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Shader/SpaceMapping.shader.meta rename to Unity_2018_Frozen/Assets/Frozen/Shader/FrozenSpoutSpaceMapping.shader.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Composite.renderTexture b/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Composite.renderTexture new file mode 100644 index 0000000..6fbbb01 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Composite.renderTexture @@ -0,0 +1,33 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: RenderTexture-Composite + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_Width: 5040 + m_Height: 3200 + m_AntiAliasing: 1 + m_DepthFormat: 0 + m_ColorFormat: 0 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 1 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Final.renderTexture.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Composite.renderTexture.meta similarity index 100% rename from Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Final.renderTexture.meta rename to Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Composite.renderTexture.meta diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Final.renderTexture b/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Spout.renderTexture similarity index 95% rename from Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Final.renderTexture rename to Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Spout.renderTexture index 523b572..0f30b7c 100644 --- a/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Final.renderTexture +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Spout.renderTexture @@ -5,7 +5,7 @@ RenderTexture: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: RenderTexture-Final + m_Name: RenderTexture-Spout m_ImageContentsHash: serializedVersion: 2 Hash: 00000000000000000000000000000000 diff --git a/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Spout.renderTexture.meta b/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Spout.renderTexture.meta new file mode 100644 index 0000000..0199ef0 --- /dev/null +++ b/Unity_2018_Frozen/Assets/Frozen/Texture/RenderTexture-Spout.renderTexture.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: b8e6ff168206f134585d024c016832b6 +timeCreated: 1521000544 +licenseType: Free +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity_2018_Frozen/Assets/Unity-Technologies/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs b/Unity_2018_Frozen/Assets/Unity-Technologies/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs index 2d07ba6..de1c864 100644 --- a/Unity_2018_Frozen/Assets/Unity-Technologies/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs +++ b/Unity_2018_Frozen/Assets/Unity-Technologies/PostProcessing/Runtime/Components/EyeAdaptationComponent.cs @@ -34,6 +34,7 @@ namespace UnityEngine.PostProcessing { get { + if (model == null) return false; return model.enabled && SystemInfo.supportsComputeShaders && !context.interrupted; diff --git a/Unity_2018_Frozen/Assets/Unity-Technologies/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset b/Unity_2018_Frozen/Assets/Unity-Technologies/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset index 6d40403..91a63dd 100644 --- a/Unity_2018_Frozen/Assets/Unity-Technologies/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset +++ b/Unity_2018_Frozen/Assets/Unity-Technologies/PostProcessing/Utilities/CustomMotionTexture/CustomMotionVectorDebugProfile.asset @@ -9,7 +9,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8a3bdb2cd68f901469e7cc149151eb49, type: 3} - m_Name: ExampleProfile + m_Name: CustomMotionVectorDebugProfile m_EditorClassIdentifier: debugViews: m_Enabled: 1 @@ -24,6 +24,10 @@ MonoBehaviour: motionVectorsOpacity: 1 motionVectorsResolution: 48 motionVectorsAmplitude: 64 + fog: + m_Enabled: 0 + m_Settings: + excludeSkybox: 1 antialiasing: m_Enabled: 0 m_Settings: @@ -85,7 +89,8 @@ MonoBehaviour: highPercent: 95 minLuminance: 0.03 maxLuminance: 2 - exposureCompensation: 0.5 + keyValue: 0.25 + dynamicKeyValue: 1 adaptationType: 0 speedUp: 2 speedDown: 1 @@ -129,47 +134,26 @@ MonoBehaviour: colorWheels: mode: 1 log: - slope: - r: 0 - g: 0 - b: 0 - a: 0 - power: - r: 0 - g: 0 - b: 0 - a: 0 - offset: - r: 0 - g: 0 - b: 0 - a: 0 + slope: {r: 0, g: 0, b: 0, a: 0} + power: {r: 0, g: 0, b: 0, a: 0} + offset: {r: 0, g: 0, b: 0, a: 0} linear: - lift: - r: 0 - g: 0 - b: 0 - a: 0 - gamma: - r: 0 - g: 0 - b: 0 - a: 0 - gain: - r: 0 - g: 0 - b: 0 - a: 0 + lift: {r: 0, g: 0, b: 0, a: 0} + gamma: {r: 0, g: 0, b: 0, a: 0} + gain: {r: 0, g: 0, b: 0, a: 0} curves: master: curve: + serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 1 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 1 @@ -182,13 +166,16 @@ MonoBehaviour: m_Range: 1 red: curve: + serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 1 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 1 @@ -201,13 +188,16 @@ MonoBehaviour: m_Range: 1 green: curve: + serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 1 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 1 @@ -220,13 +210,16 @@ MonoBehaviour: m_Range: 1 blue: curve: + serializedVersion: 2 m_Curve: - - time: 0 + - serializedVersion: 2 + time: 0 value: 0 inSlope: 1 outSlope: 1 tangentMode: 0 - - time: 1 + - serializedVersion: 2 + time: 1 value: 1 inSlope: 1 outSlope: 1 @@ -239,6 +232,7 @@ MonoBehaviour: m_Range: 1 hueVShue: curve: + serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 @@ -248,6 +242,7 @@ MonoBehaviour: m_Range: 1 hueVSsat: curve: + serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 @@ -257,6 +252,7 @@ MonoBehaviour: m_Range: 1 satVSsat: curve: + serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 @@ -266,6 +262,7 @@ MonoBehaviour: m_Range: 1 lumVSsat: curve: + serializedVersion: 2 m_Curve: [] m_PreInfinity: 2 m_PostInfinity: 2 @@ -299,20 +296,16 @@ MonoBehaviour: m_Enabled: 0 m_Settings: mode: 0 - color: - r: 0 - g: 0 - b: 0 - a: 1 + color: {r: 0, g: 0, b: 0, a: 1} center: {x: 0.5, y: 0.5} intensity: 0.45 smoothness: 0.2 roundness: 1 mask: {fileID: 0} opacity: 1 + rounded: 0 dithering: m_Enabled: 0 - m_Settings: {} monitors: currentMonitorID: 0 refreshOnPlay: 0