Merge pull request 'master' (#79) from Alienjack/AxibugEmuOnline:master into master

Reviewed-on: sin365/AxibugEmuOnline#79

AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGround.mat

@@ -2,20 +2,24 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: XMBBackGround
   m_Shader: {fileID: 4800000, guid: e14054c41729e9b4cb671e3dde0e7df0, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -23,10 +27,12 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _ColorMask: 15
     - _Frequency1: 2
     - _Frequency2: 2.1
+    - _Gamma: 0.6
     - _MaxHeight1: 0.5
     - _MaxHeight2: 0.54
     - _MidHeight1: 0.4
@@ -51,3 +57,4 @@ Material:
     - _Color1: {r: 0, g: 0.4, b: 1, a: 1}
     - _Color2: {r: 0, g: 0.69803923, b: 1, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

AxibugEmuOnline.Client/Assets/Resources/Materials/XMBBackGroundPreview.mat

@@ -2,20 +2,24 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: XMBBackGroundPreview
-  m_Shader: {fileID: 4800000, guid: 424d88aff12857f4aab1911fdb6e02e9, type: 3}
+  m_Shader: {fileID: 4800000, guid: e14054c41729e9b4cb671e3dde0e7df0, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -23,10 +27,12 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _ColorMask: 15
     - _Frequency1: 2
     - _Frequency2: 2.1
+    - _Gamma: 0.6
     - _MaxHeight1: 0.5
     - _MaxHeight2: 0.54
     - _MidHeight1: 0.4
@@ -51,3 +57,4 @@ Material:
     - _Color1: {r: 0, g: 0.4, b: 1, a: 1}
     - _Color2: {r: 0, g: 0.69803923, b: 1, a: 1}
   m_BuildTextureStacks: []
+  m_AllowLocking: 1

AxibugEmuOnline.Client/Assets/Scene/TestFilter.unity

@@ -1,467 +0,0 @@
-%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: 10
-  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.4292453, g: 0.5907795, b: 1, a: 1}
-  m_SkyboxMaterial: {fileID: 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_UseRadianceAmbientProbe: 0
---- !u!157 &3
-LightmapSettings:
-  m_ObjectHideFlags: 0
-  serializedVersion: 13
-  m_BakeOnSceneLoad: 0
-  m_GISettings:
-    serializedVersion: 2
-    m_BounceScale: 1
-    m_IndirectOutputScale: 1
-    m_AlbedoBoost: 1
-    m_EnvironmentLightingMode: 0
-    m_EnableBakedLightmaps: 1
-    m_EnableRealtimeLightmaps: 0
-  m_LightmapEditorSettings:
-    serializedVersion: 12
-    m_Resolution: 2
-    m_BakeResolution: 40
-    m_AtlasSize: 1024
-    m_AO: 0
-    m_AOMaxDistance: 1
-    m_CompAOExponent: 1
-    m_CompAOExponentDirect: 0
-    m_ExtractAmbientOcclusion: 0
-    m_Padding: 2
-    m_LightmapParameters: {fileID: 0}
-    m_LightmapsBakeMode: 1
-    m_TextureCompression: 1
-    m_ReflectionCompression: 2
-    m_MixedBakeMode: 2
-    m_BakeBackend: 1
-    m_PVRSampling: 1
-    m_PVRDirectSampleCount: 32
-    m_PVRSampleCount: 512
-    m_PVRBounces: 2
-    m_PVREnvironmentSampleCount: 256
-    m_PVREnvironmentReferencePointCount: 2048
-    m_PVRFilteringMode: 1
-    m_PVRDenoiserTypeDirect: 1
-    m_PVRDenoiserTypeIndirect: 1
-    m_PVRDenoiserTypeAO: 1
-    m_PVRFilterTypeDirect: 0
-    m_PVRFilterTypeIndirect: 0
-    m_PVRFilterTypeAO: 0
-    m_PVREnvironmentMIS: 1
-    m_PVRCulling: 1
-    m_PVRFilteringGaussRadiusDirect: 1
-    m_PVRFilteringGaussRadiusIndirect: 1
-    m_PVRFilteringGaussRadiusAO: 1
-    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
-    m_PVRFilteringAtrousPositionSigmaIndirect: 2
-    m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ExportTrainingData: 0
-    m_TrainingDataDestination: TrainingData
-    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
-  m_LightingSettings: {fileID: 0}
---- !u!196 &4
-NavMeshSettings:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_BuildSettings:
-    serializedVersion: 3
-    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
-    buildHeightMesh: 0
-    maxJobWorkers: 0
-    preserveTilesOutsideBounds: 0
-    debug:
-      m_Flags: 0
-  m_NavMeshData: {fileID: 0}
---- !u!1 &33805169
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 33805170}
-  - component: {fileID: 33805172}
-  - component: {fileID: 33805171}
-  m_Layer: 5
-  m_Name: Image (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &33805170
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 33805169}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1319295996}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &33805171
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 33805169}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: e043954733c440645ba43b09301ee4a6, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!222 &33805172
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 33805169}
-  m_CullTransparentMesh: 1
---- !u!1 &141076932
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 141076935}
-  - component: {fileID: 141076934}
-  - component: {fileID: 141076933}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!81 &141076933
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 141076932}
-  m_Enabled: 1
---- !u!20 &141076934
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 141076932}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  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: 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: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &141076935
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 141076932}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -5.3346887, y: -4.3005414, z: 3715.6099}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1319295992
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1319295996}
-  - component: {fileID: 1319295995}
-  - component: {fileID: 1319295994}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &1319295994
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1319295992}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, 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
-  m_PresetInfoIsWorld: 0
---- !u!223 &1319295995
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1319295992}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 1
-  m_Camera: {fileID: 141076934}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 1
-  m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &1319295996
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1319295992}
-  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_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 33805170}
-  - {fileID: 1376779137}
-  m_Father: {fileID: 0}
-  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 &1376779136
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1376779137}
-  - component: {fileID: 1376779139}
-  - component: {fileID: 1376779140}
-  - component: {fileID: 1376779141}
-  m_Layer: 5
-  m_Name: filter
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &1376779137
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1376779136}
-  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_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1319295996}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1376779139
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1376779136}
-  m_CullTransparentMesh: 1
---- !u!114 &1376779140
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1376779136}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 40d1396d19f4da44f98dd2fcf6f0bc56, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  filterMat: {fileID: 2100000, guid: 5965751351debd6499aa27660a1bc92e, type: 2}
-  img: {fileID: 1376779141}
-  source: {fileID: 2800000, guid: e043954733c440645ba43b09301ee4a6, type: 3}
---- !u!114 &1376779141
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1376779136}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Texture: {fileID: 0}
-  m_UVRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
---- !u!1660057539 &9223372036854775807
-SceneRoots:
-  m_ObjectHideFlags: 0
-  m_Roots:
-  - {fileID: 141076935}
-  - {fileID: 1319295996}

AxibugEmuOnline.Client/Assets/Script/AppMain/Initer.cs

@@ -15,6 +15,7 @@ namespace AxibugEmuOnline.Client
         GameObject IMPORTENT;
 
         
+
 #if UNITY_EDITOR
         public bool bTest = false;
         public string mTestSrvIP = "192.168.0.47";

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterChain.cginc

@@ -0,0 +1,17 @@
+#define vec2 float2
+#define vec3 float3
+#define vec4 float4
+#define texture(tex,uv) tex2D(tex,uv)
+#define vTexCoord IN.uv
+#define fract frac
+#define mix lerp
+#define mod(x,y) x%y
+
+float sinc(float x) { if (x == 0) { return 1.0; } else { return sin(x) / x; } }
+
+sampler2D Original;
+float4 OriginalSize;
+sampler2D Source;
+float4 SourceSize;
+float4 OutputSize;
+float FrameCount;

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterChain.cginc.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8e15245c3d9a7ba4ab348d97af4d5cea
+guid: b1fa889ae5b319140943db562bd5fc94
 ShaderIncludeImporter:
   externalObjects: {}
   userData: 

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterChainEffect.cs

@@ -1,18 +1,21 @@
-using AxibugEmuOnline.Client;
+using Assets.Script.AppMain.Filter;
+using AxibugEmuOnline.Client;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Rendering;
+using UnityEngine.Experimental.Rendering;
 
 public abstract class FilterChainEffect : FilterEffect
 {
     #region SealedForDisable
     protected sealed override string ShaderName => null;
     protected sealed override void OnInit(Material renderMat) { }
-    protected sealed override void OnRenderer(Material renderMat, Texture src, RenderTexture result)
+
+    public sealed override void Render(Texture src, RenderTexture result)
     {
         OnRenderer(src, result);
     }
+    protected sealed override void OnRenderer(Material renderMat, Texture src, RenderTexture result) { }
     #endregion
 
     List<PassDefine> m_passes = new List<PassDefine>();
@@ -21,8 +24,11 @@ public abstract class FilterChainEffect : FilterEffect
     static int OriginalSize;
     static int Source;
     static int SourceSize;
+    static int FrameCount;
+    static int OutputSize;
 
     List<int> m_passOutputTexNames = new List<int>();
+    List<int> m_passOutputTexSizes = new List<int>();
 
     static FilterChainEffect()
     {
@@ -30,6 +36,8 @@ public abstract class FilterChainEffect : FilterEffect
         OriginalSize = Shader.PropertyToID(nameof(OriginalSize));
         Source = Shader.PropertyToID(nameof(Source));
         SourceSize = Shader.PropertyToID(nameof(SourceSize));
+        FrameCount = Shader.PropertyToID(nameof(FrameCount));
+        OutputSize = Shader.PropertyToID(nameof(OutputSize));
     }
 
     protected sealed override void Init()
@@ -39,8 +47,12 @@ public abstract class FilterChainEffect : FilterEffect
         {
             m_passes[i].Init(i);
             m_passOutputTexNames.Add(Shader.PropertyToID(m_passes[i].NormalOutputTextureName));
+            m_passOutputTexSizes.Add(Shader.PropertyToID($"{m_passes[i].NormalOutputTextureName}Size"));
             if (m_passes[i].AliasOutputTextureName != null)
+            {
                 m_passOutputTexNames.Add(Shader.PropertyToID(m_passes[i].AliasOutputTextureName));
+                m_passOutputTexSizes.Add(Shader.PropertyToID($"{m_passes[i].AliasOutputTextureName}Size"));
+            }
         }
     }
 
@@ -55,19 +67,31 @@ public abstract class FilterChainEffect : FilterEffect
         for (int i = 0; i < m_passes.Count; i++)
         {
             var pass = m_passes[i];
+            pass.OnRender();
 
             pass.Mat.SetTexture(Original, input);
             pass.Mat.SetVector(OriginalSize, originalSize);
             pass.Mat.SetTexture(Source, lastoutput);
             pass.Mat.SetVector(SourceSize, new Vector4(lastoutput.width, lastoutput.height, 1f / lastoutput.width, 1f / lastoutput.height));
-            foreach (var existoutput in m_passOutputTexNames)
+            pass.Mat.SetFloat(FrameCount, Time.frameCount);
+
+            for (int index = 0; index < m_passOutputTexNames.Count; index++)
             {
-                if (pass.Mat.HasTexture(existoutput) && m_outputCaches.TryGetValue(existoutput, out var passOutput))
+                var existoutput = m_passOutputTexNames[index];
+                var existoutputSize = m_passOutputTexSizes[index];
+                if (m_outputCaches.TryGetValue(existoutput, out var passOutput))
+                {
+                    if (pass.Mat.HasTexture(existoutput))
                         pass.Mat.SetTexture(existoutput, passOutput);
+                    if (pass.Mat.HasVector(existoutputSize))
+                        pass.Mat.SetVector(existoutputSize, new Vector4(passOutput.width, passOutput.height, 1f / passOutput.width, 1f / passOutput.height));
+                }
             }
 
             var output = pass.GetOutput(input, lastoutput, finalOut);
 
+            pass.Mat.SetVector(OutputSize, new Vector4(output.width, output.height, 1f / output.width, 1f / output.height));
+
             m_outputCaches[pass.NormalOutputTextureName_PID] = output;
             if (pass.AliasOutputTextureName != null) m_outputCaches[pass.AliasOutputTextureName_PID] = output;
 
@@ -77,6 +101,9 @@ public abstract class FilterChainEffect : FilterEffect
         }
 
         Graphics.Blit(lastoutput, finalOut);
+
+        foreach (var rt in m_outputCaches.Values)
+            RenderTexture.ReleaseTemporary(rt);
     }
 
     protected abstract void DefinePasses(ref List<PassDefine> passes);
@@ -86,13 +113,15 @@ public abstract class FilterChainEffect : FilterEffect
         public string ShaderName { get; private set; }
         public FilterMode FilterMode { get; private set; }
         public TextureWrapMode WrapMode { get; private set; }
-        public EnumScaleMode ScaleMode { get; private set; }
+        public EnumScaleMode ScaleModeX { get; private set; }
+        public EnumScaleMode ScaleModeY { get; private set; }
         public float ScaleX { get; private set; }
         public float ScaleY { get; private set; }
         public string AliasOutputTextureName { get; private set; }
         public int AliasOutputTextureName_PID { get; private set; }
         public string NormalOutputTextureName { get; private set; }
         public int NormalOutputTextureName_PID { get; private set; }
+        public bool sRGB { get; private set; }
 
         private PassDefine() { }
 
@@ -100,8 +129,9 @@ public abstract class FilterChainEffect : FilterEffect
             string shaderName,
             FilterMode filterMode = FilterMode.Point,
             TextureWrapMode wrapMode = TextureWrapMode.Clamp,
-            EnumScaleMode scaleMode = EnumScaleMode.Source, float scaleX = 1f, float scaleY = 1f,
+            EnumScaleMode scaleModeX = EnumScaleMode.Source, EnumScaleMode scaleModeY = EnumScaleMode.Source, float scaleX = 1f, float scaleY = 1f,
-            string outputAlias = null
+            string outputAlias = null,
+            bool sRGB = false
             )
         {
             return new PassDefine()
@@ -109,15 +139,36 @@ public abstract class FilterChainEffect : FilterEffect
                 ShaderName = shaderName,
                 FilterMode = filterMode,
                 WrapMode = wrapMode,
-                ScaleMode = scaleMode,
+                ScaleModeX = scaleModeX,
+                ScaleModeY = scaleModeY,
                 ScaleX = scaleX,
                 ScaleY = scaleY,
                 AliasOutputTextureName = outputAlias,
+                sRGB = sRGB,
             };
         }
 
+        private Dictionary<string, FilterParameter> m_linkingParams = new Dictionary<string, FilterParameter>();
+        public PassDefine SetParameters(string shaderValName, FilterParameter para)
+        {
+            m_linkingParams[shaderValName] = para;
+            return this;
+        }
+
         public int PassIndex { get; private set; }
         public Material Mat { get; private set; }
+
+        public void OnRender()
+        {
+            foreach (var item in m_linkingParams)
+            {
+                var valType = item.Value.ValueType;
+                var val = item.Value.Value;
+                var paraName = item.Key;
+                if (valType == typeof(float))
+                    Mat.SetFloat(paraName, (float)val);
+            }
+        }
         internal void Init(int passIndex)
         {
             Mat = new Material(Shader.Find(ShaderName));
@@ -131,23 +182,35 @@ public abstract class FilterChainEffect : FilterEffect
         internal RenderTexture GetOutput(Texture original, Texture source, Texture final)
         {
             int width = 0;
-            int height = 0;
+            switch (ScaleModeX)
-            switch (ScaleMode)
             {
                 case EnumScaleMode.Viewport:
                     width = (int)(final.width * ScaleX);
-                    height = (int)(final.height * ScaleY);
                     break;
                 case EnumScaleMode.Source:
                     width = (int)(source.width * ScaleX);
-                    height = (int)(source.height * ScaleY);
                     break;
                 case EnumScaleMode.Absolute:
                     width = (int)ScaleX;
+                    break;
+            }
+            int height = 0;
+            switch (ScaleModeY)
+            {
+                case EnumScaleMode.Viewport:
+                    height = (int)(final.height * ScaleY);
+                    break;
+                case EnumScaleMode.Source:
+                    height = (int)(source.height * ScaleY);
+                    break;
+                case EnumScaleMode.Absolute:
                     height = (int)ScaleY;
                     break;
             }
-            var rt = RenderTexture.GetTemporary(width, height);
+
+            //if (sRGB) format = GraphicsFormat.R8G8B8A8_SRGB;
+            var rt = RenderTexture.GetTemporary(width, height, 0, GraphicsFormat.R8G8B8A8_UNorm, 1);
+
             rt.wrapMode = WrapMode;
             rt.filterMode = FilterMode;
 

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterEffect.cs

@@ -63,7 +63,7 @@ namespace AxibugEmuOnline.Client
             }
         }
 
-        public void Render(Texture src, RenderTexture result)
+        public virtual void Render(Texture src, RenderTexture result)
         {
             m_material.SetVector(m_iResolutionID, new Vector4(result.width, result.height));
             OnRenderer(m_material, src, result);

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/FilterShaderTemplate.shader.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 28e36f59e5007bc45bf2ab9d1ad62a02
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/RetroArch_Glow.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 59751f7f4dc560f47b438056fbc26701
+guid: 3e3772f57abeaa24dbb402e7a11fc45f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/RetroArch_Glow/CRTGlowPassShader.shader

@@ -1,4 +1,4 @@
-Shader "Filter/RetroArch/MattiasCRTWithGlow"
+Shader "Filter/RetroArch/MattiasCRTWithGlow"
 {
     Properties
     {
@@ -292,7 +292,8 @@
                 float2 uv : TEXCOORD0;
             };
 
-            #include "blur_params.cginc"
+            #define GLOW_FALLOFF 1
+            #define TAPS 1
             #define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
 
             float4 frag(v2f IN) : SV_Target
@@ -331,7 +332,8 @@
                 float2 uv : TEXCOORD0;
             };
 
-            #include "blur_params.cginc"
+            #define GLOW_FALLOFF 1
+            #define TAPS 1
             #define kernel(x) exp(-GLOW_FALLOFF * (x) * (x))
 
             float4 frag(v2f IN) : SV_Target

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/RetroArch_Glow/CRTGlowPassShader.shader.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d9ec870308fa2594badb4f3036d36fd5
+guid: 8e9191ac23b05c14fa2a62f037ce8261
 ShaderImporter:
   externalObjects: {}
   defaultTextures: []

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/RetroArch_Glow/RetroArchMattiasCRTGlow.cs

@@ -1,4 +1,4 @@
-using Assets.Script.AppMain.Filter;
+using Assets.Script.AppMain.Filter;
 using AxibugEmuOnline.Client;
 using UnityEngine;
 using UnityEngine.Rendering;

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/RetroArch_Glow/RetroArchMattiasCRTGlow.cs.meta

@@ -1,2 +1,2 @@
 fileFormatVersion: 2
-guid: fb6622dcbc754b744bb70f1655c3e526
+guid: 7302f16df724bf54baf807ca65d60d93

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/RetroArch_Glow/RetroArch_Glow.mat

@@ -1,41 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!21 &2100000
-Material:
-  serializedVersion: 8
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: RetroArch_Glow
-  m_Shader: {fileID: 4800000, guid: d9ec870308fa2594badb4f3036d36fd5, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
-  m_InvalidKeywords: []
-  m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
-  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: -1
-  stringTagMap: {}
-  disabledShaderPasses: []
-  m_LockedProperties: 
-  m_SavedProperties:
-    serializedVersion: 3
-    m_TexEnvs:
-    - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    m_Ints: []
-    m_Floats:
-    - _BLOOM_STRENGTH: 0.45
-    - _BOOST: 0.4
-    - _GLOW_ROLLOFF: 2.2
-    - _GLOW_WHITEPOINT: 0.4
-    - _OUTPUT_GAMMA: 2.2
-    - _gamma: 11
-    - _horiz_gauss_width: 0.4
-    m_Colors: []
-  m_BuildTextureStacks: []
-  m_AllowLocking: 1

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/RetroArch_Glow/RetroArch_Glow.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5965751351debd6499aa27660a1bc92e
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/RetroArch_Glow/blur_params.cginc

@@ -1,4 +0,0 @@
-// Higher value, more centered glow.
-// Lower values might need more taps.
-#define GLOW_FALLOFF 0.35
-#define TAPS 4

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/ShaderTEMPLATE.shader.bak

@@ -1,9 +1,8 @@
-
+Shader "HIDDEN/FILTERTEMPLATE"
-Shader "Hidden/TEMPLATE"
 {
     Properties
     {
-        _MainTex ("Base (RGB)", 2D) = "white" {}
+
     }
     SubShader
     {
@@ -13,9 +12,9 @@ Shader "Hidden/TEMPLATE"
 
             #pragma vertex vert_img
             #pragma fragment frag
-            #include "UnityCG.cginc"
 
-            sampler2D _MainTex;
+            #include "UnityCG.cginc"
+            #include "../FilterChain.cginc"
 
             struct v2f
             {
@@ -23,7 +22,7 @@ Shader "Hidden/TEMPLATE"
                 float2 uv : TEXCOORD0;
             };
 
-            fixed4 frag (v2f i) : SV_Target
+            fixed4 frag (v2f IN) : SV_Target
             {
                 return fixed4(1,1,1,1);
             }

AxibugEmuOnline.Client/Assets/Script/AppMain/Manager/AppSettings/Filter/ShaderTEMPLATE.shader.bak.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7053096623e85d842aa0a92bcc9944ea
+guid: 3480f0318898c9b4c88c90b2545cf4c7
 DefaultImporter:
   externalObjects: {}
   userData: 

AxibugEmuOnline.Client/Assets/Script/AppMain/UI/XMBBackGround.shader

@@ -32,6 +32,8 @@
         _Power2("Power",Float)=50.0
         _Frequency2("Frequency",Float)=2.1
         _Speed2("Speed",Float)=0.3
+
+        _Gamma("GAMMA",float) = 2.2
     }
 
     SubShader
@@ -152,6 +154,8 @@
             float _Frequency2;
             float _Speed2;
 
+            float _Gamma;
+
             fixed4 frag(v2f IN) : SV_Target
             {
                  float2 uv= IN.texcoord;
@@ -196,6 +200,8 @@
                 clip (fragColor.a - 0.001);
                 #endif
 
+                fragColor = pow(fragColor,1/_Gamma);
+
                 return fragColor;
             }
 

AxibugEmuOnline.Client/Assets/Script/TestFilter.cs

@@ -1,50 +0,0 @@
-#if UNITY_EDITOR
-using UnityEngine;
-using UnityEngine.Rendering;
-using UnityEngine.UI;
-
-[ExecuteInEditMode]
-public class TestFilter : MonoBehaviour
-{
-    public Material filterMat;
-    public RawImage img;
-    public Texture2D source;
-
-    private RenderTexture rt;
-    private RenderTexture rtWrap;
-
-    private void Update()
-    {
-        if (rt == null)
-        {
-            rt = RenderTexture.GetTemporary(Screen.width, Screen.height);
-            rtWrap = RenderTexture.GetTemporary(Screen.width, Screen.height);
-        }
-        else if (rt.width != Screen.width || rt.height != Screen.height)
-        {
-            RenderTexture.ReleaseTemporary(rt);
-            RenderTexture.ReleaseTemporary(rtWrap);
-
-            rt = RenderTexture.GetTemporary(Screen.width, Screen.height);
-            rtWrap = RenderTexture.GetTemporary(Screen.width, Screen.height);
-        }
-
-        filterMat.SetVector("_iResolution", new Vector2(rt.width, rt.height));
-        filterMat.SetTexture("_Source", source);
-
-        CommandBuffer cmd = new CommandBuffer();
-        {
-            cmd.Blit(source, rt);
-            for (int i = 0; i < filterMat.shader.passCount; i++)
-            {
-                cmd.Blit(rt, rtWrap, filterMat, i);
-                cmd.Blit(rtWrap, rt);
-            }
-        }
-        Graphics.ExecuteCommandBuffer(cmd);
-        //cmd.Release();
-
-        img.texture = rt;
-    }
-}
-#endif

AxibugEmuOnline.Client/Assets/Script/TestFilter.cs.meta

@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 40d1396d19f4da44f98dd2fcf6f0bc56

AxibugEmuOnline.Client/ProjectSettings/GraphicsSettings.asset

@@ -25,7 +25,7 @@ GraphicsSettings:
   m_LensFlare:
     m_Mode: 1
     m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
-  m_VideoShadersIncludeMode: 2
+  m_VideoShadersIncludeMode: 1
   m_AlwaysIncludedShaders:
   - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@@ -34,9 +34,6 @@ GraphicsSettings:
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10783, guid: 0000000000000000f000000000000000, type: 0}
-  - {fileID: 4800000, guid: 5dd9160e7dde4dd4db07347ce4780217, type: 3}
-  - {fileID: 4800000, guid: 57c38351364c92e45aef2dc17245b3ce, type: 3}
-  - {fileID: 4800000, guid: bab7d8f2e62367743930d118a37e824a, type: 3}
   m_PreloadedShaders: []
   m_PreloadShadersBatchTimeLimit: -1
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}

AxibugEmuOnline.Client/ProjectSettings/ProjectSettings.asset

@@ -47,7 +47,7 @@ PlayerSettings:
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
-  m_ActiveColorSpace: 0
+  m_ActiveColorSpace: 1
   unsupportedMSAAFallback: 0
   m_SpriteBatchMaxVertexCount: 65535
   m_SpriteBatchVertexThreshold: 300