diff --git a/.idea/.idea.textdecalURP/.idea/vcs.xml b/.idea/.idea.textdecalURP/.idea/vcs.xml index 35eb1dd..23b6803 100644 --- a/.idea/.idea.textdecalURP/.idea/vcs.xml +++ b/.idea/.idea.textdecalURP/.idea/vcs.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/Assets/Decal.mat b/Assets/Decal.mat index 81b3102..4f113a0 100644 --- a/Assets/Decal.mat +++ b/Assets/Decal.mat @@ -27,7 +27,7 @@ Material: m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 - m_EnableInstancingVariants: 1 + m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} @@ -106,7 +106,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - Normal_Blend: 0.5 + - Normal_Blend: 0 - _AlphaClip: 0 - _Blend: 0 - _BumpScale: 1 @@ -114,6 +114,7 @@ Material: - _ClearCoatSmoothness: 0 - _Cull: 2 - _Cutoff: 0.5 + - _DecalAngleFadeSupported: 1 - _DecalMeshBiasType: 0 - _DecalMeshDepthBias: 0 - _DecalMeshViewBias: 0 diff --git a/Assets/Materials/Decal NEW.shadergraph b/Assets/Materials/Decal NEW.shadergraph index adc5c8f..ac369f5 100644 --- a/Assets/Materials/Decal NEW.shadergraph +++ b/Assets/Materials/Decal NEW.shadergraph @@ -457,6 +457,7 @@ }, "isMainTexture": false, "useTilingAndOffset": false, + "useTexelSize": true, "m_Modifiable": true, "m_DefaultType": 0 } @@ -1896,6 +1897,7 @@ }, "isMainTexture": false, "useTilingAndOffset": false, + "useTexelSize": true, "m_Modifiable": true, "m_DefaultType": 3 } @@ -2131,7 +2133,7 @@ "affectsEmission": false, "drawOrder": 0, "supportLodCrossFade": false, - "angleFade": false + "angleFade": true } } diff --git a/Assets/Scenes/Demo.unity b/Assets/Scenes/Demo.unity index 814259e..94cfd2e 100644 --- a/Assets/Scenes/Demo.unity +++ b/Assets/Scenes/Demo.unity @@ -248,17 +248,81 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 491907534986306920, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontSize + value: 34.1 + objectReference: {fileID: 0} + - target: {fileID: 605717808340412959, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.669 + objectReference: {fileID: 0} + - target: {fileID: 605717808340412959, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9983768 + objectReference: {fileID: 0} + - target: {fileID: 605717808340412959, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_LocalRotation.y + value: -0.056954157 + objectReference: {fileID: 0} + - target: {fileID: 605717808340412959, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.112 + objectReference: {fileID: 0} + - target: {fileID: 605717808340412959, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.8157 + objectReference: {fileID: 0} + - target: {fileID: 605717808340412959, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -6.53 + objectReference: {fileID: 0} - target: {fileID: 2921371403644450591, guid: c0692338f575948c2b29f5250365d5f4, type: 3} propertyPath: m_Name value: Column objectReference: {fileID: 0} + - target: {fileID: 3319862354615631022, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontSize + value: 34.1 + objectReference: {fileID: 0} + - target: {fileID: 3363945773620408176, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 8109139054178677978, guid: 2c5214b08cc6f4f6995178c0023caefd, type: 2} + - target: {fileID: 3496937135024099762, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontSize + value: 36.2 + objectReference: {fileID: 0} + - target: {fileID: 3496937135024099762, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontAsset + value: + objectReference: {fileID: 11400000, guid: 2c5214b08cc6f4f6995178c0023caefd, type: 2} + - target: {fileID: 3496937135024099762, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_sharedMaterial + value: + objectReference: {fileID: 8109139054178677978, guid: 2c5214b08cc6f4f6995178c0023caefd, type: 2} + - target: {fileID: 3496937135024099762, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_hasFontAssetChanged + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3943832970754321075, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.endAngleFade + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 3943832970754321075, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.startAngleFade + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3943832970754321075, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.projectionDepth + value: 9.03 + objectReference: {fileID: 0} - target: {fileID: 5440016801744141780, guid: c0692338f575948c2b29f5250365d5f4, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 5440016801744141780, guid: c0692338f575948c2b29f5250365d5f4, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.506 objectReference: {fileID: 0} - target: {fileID: 5440016801744141780, guid: c0692338f575948c2b29f5250365d5f4, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scenes/Logo.unity b/Assets/Scenes/Logo.unity index 718b7b5..d508e1a 100644 --- a/Assets/Scenes/Logo.unity +++ b/Assets/Scenes/Logo.unity @@ -609,12 +609,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 2 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &131721791 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1254,12 +1254,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 9.81 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &296480567 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1452,12 +1452,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 10 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &322141913 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1648,12 +1648,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 9.81 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &367981269 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2121,12 +2121,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 14.11 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 6.42 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &583330699 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2317,12 +2317,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 4 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 6.42 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &592857315 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2549,12 +2549,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 2 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &713161357 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2884,12 +2884,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 2.35 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &731653033 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3119,12 +3119,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 14.11 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 6.42 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &799260253 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3315,12 +3315,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 2 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &884850620 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3512,12 +3512,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 10 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 6.42 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &901158057 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3708,12 +3708,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 10 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &971693530 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3906,12 +3906,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 9.81 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 33 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &1033282808 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4300,12 +4300,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 9.81 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 4 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &1222819996 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5134,6 +5134,195 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1322232849} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1339938832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1339938834} + - component: {fileID: 1339938833} + - component: {fileID: 1339938836} + - component: {fileID: 1339938835} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1339938833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339938832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1956784ffe7f6466a906dc5830f1e568, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!224 &1339938834 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339938832} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -8.86} + 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} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -15.27, y: 0.45} + m_SizeDelta: {x: 20, y: 5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1339938835 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339938832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, 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_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c65727ca8d16b48ec912238fdb925a76, type: 2} + m_sharedMaterial: {fileID: 8109139054178677978, guid: c65727ca8d16b48ec912238fdb925a76, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 0 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + _SortingLayer: 0 + _SortingLayerID: 0 + _SortingOrder: 0 + m_hasFontAssetChanged: 0 + m_renderer: {fileID: 1339938836} + m_maskType: 0 +--- !u!23 &1339938836 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1339938832} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 8109139054178677978, guid: c65727ca8d16b48ec912238fdb925a76, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + 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 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1349264595 GameObject: m_ObjectHideFlags: 0 @@ -5499,12 +5688,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 10 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &1440982056 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5714,12 +5903,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 10.81 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 4294967295 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &1459560987 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5910,12 +6099,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 10 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &1516105314 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6710,12 +6899,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 10 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &1820788358 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7085,12 +7274,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 2 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &1943940438 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7436,12 +7625,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 2 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 3 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &2029655210 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7632,12 +7821,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: - projectionDepth: 9.81 - useDefaultUV: 1 - vertexData: 0 - UVData: 0 - rotationData: 0 - decalLayerMask: 1 + settings: + projectionDepth: 1 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + rotationData: 0 --- !u!114 &2060330013 MonoBehaviour: m_ObjectHideFlags: 0 @@ -7977,3 +8166,4 @@ SceneRoots: - {fileID: 1590073266} - {fileID: 746528937} - {fileID: 1769627673} + - {fileID: 1339938834} diff --git a/Assets/Scenes/SampleCurvedText/Fonts & Materials/LiberationSans SDF Decal Lit.asset b/Assets/Scenes/SampleCurvedText/Fonts & Materials/LiberationSans SDF Decal Lit.asset index 06494cf..99b789b 100644 --- a/Assets/Scenes/SampleCurvedText/Fonts & Materials/LiberationSans SDF Decal Lit.asset +++ b/Assets/Scenes/SampleCurvedText/Fonts & Materials/LiberationSans SDF Decal Lit.asset @@ -12,115 +12,51 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _DBUFFER_MRT2 - m_InvalidKeywords: - - BEVEL_ON - - NORMAL_BEVEL_ON - - UNDERLAY_ON + - AFFECT_NORMAL + - OUTLINE_ON + - TEXT_DECAL_ROTATION + m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} - disabledShaderPasses: [] + disabledShaderPasses: + - TextDecalForwardEmissive m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: - - _BaseMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _BumpMap: - 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} - - _FaceTex: - m_Texture: {fileID: 0} - m_Scale: {x: 2, y: 2} - m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 28684132378477856} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - - _MaskTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OutlineTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _SpecGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_Lightmaps: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_LightmapsInd: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - unity_ShadowMasks: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _AlphaTestToggle: 0 - - _Ambient: 0.3 - - _Bevel: -1 - - _BevelAmount: 0 + - _Bevel: -0.03 - _BevelClamp: 0 - - _BevelOffset: 0.013 - - _BevelRoundness: 1 - - _BevelType: 0 - - _BevelWidth: 0.078 + - _BevelOffset: 0 + - _BevelRoundness: 0 + - _BevelWidth: 0 - _ColorMask: 15 - _CullMode: 0 - - _Cutoff: 0.5 - _DecalLayerMaskFromDecal: 1 - - _DestBlend: 0 - - _Diffuse: 0.3 - _DrawOrder: 0 - - _Emission: 0 - - _FaceDilate: 0.005 - - _GlossSource: 0 + - _FaceDilate: 0 - _GradientScale: 10 - - _LightAngle: 0 - - _MaskEdgeSoftness: 0.01 - - _MaskInverse: 0 - - _MaskSoftnessX: 0 - - _MaskSoftnessY: 0 - - _MaskWipeControl: 0.5 - _Metallic: 0 - _NormalBlend: 1 - - _NormalMapToggle: 0 - - _OutlineMode: 0 - _OutlineSoftness: 0 - - _OutlineWidth: 0.152 + - _OutlineWidth: 0.158 - _PerspectiveFilter: 0.875 - - _QueueControl: -1 - - _QueueOffset: 0 - - _Reflectivity: 5 - _ScaleRatioA: 0.9 - _ScaleRatioB: 1 - - _ScaleRatioC: 0.7875 + - _ScaleRatioC: 1 - _ScaleX: 1 - _ScaleY: 1 - _ShaderFlags: 0 - - _Sharpness: 0.606 - - _Smoothness: 1 - - _Softness: 0 - - _SourceBlend: 0 - - _SpecGlossMapToggle: 0 - - _SpecularPower: 0 + - _Sharpness: 0 + - _Smoothness: 0 - _Stencil: 0 - _StencilComp: 8 - _StencilOp: 0 @@ -128,41 +64,14 @@ Material: - _StencilWriteMask: 255 - _TextureHeight: 512 - _TextureWidth: 512 - - _UnderlayDilate: 0 - - _UnderlayOffsetX: 0 - - _UnderlayOffsetY: 0 - - _UnderlaySoftness: 0 - _VertexOffsetX: 0 - _VertexOffsetY: 0 - _WeightBold: 0.5 - _WeightNormal: 0 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} - _Emission: {r: 0, g: 0, b: 0, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} - - _FaceUVSpeed: {r: 0, g: 0, b: 0, a: 0} - - _IsoPerimeter: {r: 0, g: 0, b: 0, a: 0} - - _IsoPerimeter_: {r: 0, g: 0, b: 0, a: 0} - - _MaskEdgeColor: {r: 1, g: 1, b: 1, a: 1} - - _OutlineColor: {r: 1, g: 0, b: 0, a: 1} - - _OutlineColor1: {r: 0, g: 1, b: 1, a: 1} - - _OutlineColor2: {r: 0.009433985, g: 0.02534519, b: 1, a: 1} - - _OutlineColor3: {r: 0, g: 0, b: 0, a: 1} - - _OutlineOffset1: {r: 0, g: 0, b: 0, a: 0} - - _OutlineOffset2: {r: 0, g: 0, b: 0, a: 0} - - _OutlineOffset3: {r: 0, g: 0, b: 0, a: 0} - - _OutlineSoftness: {r: 0, g: 0, b: 0, a: 0} - - _OutlineTex_ST: {r: 1, g: 1, b: 0, a: 0} - - _OutlineUVSpeed: {r: 0, g: 0, b: 0, a: 0} - - _OutlineWidth: {r: 0, g: 0, b: 0, a: 0} - - _Softness: {r: 1, g: 0, b: 0, a: 0} - - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} - - _Specular: {r: 1, g: 0, b: 0, a: 1} - - _SpecularColor: {r: 1, g: 1, b: 1, a: 1} - - _UnderlayColor: {r: 0, g: 0, b: 0, a: 1} - - _UnderlayOffset: {r: 0, g: 0, b: 0, a: 0} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] m_AllowLocking: 1 --- !u!114 &11400000 @@ -8155,7 +8064,7 @@ Texture2D: serializedVersion: 2 Hash: 00000000000000000000000000000000 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 4 m_Width: 1024 m_Height: 1024 m_CompleteImageSize: 1048576 diff --git a/Assets/Scenes/SampleCurvedText/Prefabs/TextDecal-on-Spline.prefab b/Assets/Scenes/SampleCurvedText/Prefabs/TextDecal-on-Spline.prefab index e38008a..5947534 100644 --- a/Assets/Scenes/SampleCurvedText/Prefabs/TextDecal-on-Spline.prefab +++ b/Assets/Scenes/SampleCurvedText/Prefabs/TextDecal-on-Spline.prefab @@ -9,11 +9,11 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3413616897687392729} + - component: {fileID: 7991737669874668352} - component: {fileID: 4594602923215036524} - component: {fileID: 2444311190203915950} - - component: {fileID: 1261892355106492789} - component: {fileID: 4355643101717498844} - - component: {fileID: 7991737669874668352} + - component: {fileID: 1261892355106492789} m_Layer: 0 m_Name: TextDecal-on-Spline m_TagString: Untagged @@ -40,6 +40,18 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 24, y: 5} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &7991737669874668352 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8117397333951933013} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 05798bd8f0b876340941273f09bab577, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!23 &4594602923215036524 MeshRenderer: m_ObjectHideFlags: 0 @@ -63,7 +75,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2180264, guid: e94d7d87d2cda4c5c84e029c43412de1, type: 2} + - {fileID: 8109139054178677978, guid: 2c5214b08cc6f4f6995178c0023caefd, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -107,8 +119,8 @@ MonoBehaviour: m_Calls: [] m_text: CURVED TEXT m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: e94d7d87d2cda4c5c84e029c43412de1, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: e94d7d87d2cda4c5c84e029c43412de1, type: 2} + m_fontAsset: {fileID: 11400000, guid: 2c5214b08cc6f4f6995178c0023caefd, type: 2} + m_sharedMaterial: {fileID: 8109139054178677978, guid: 2c5214b08cc6f4f6995178c0023caefd, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -132,7 +144,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 34.25 + m_fontSize: 34.1 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1 @@ -179,23 +191,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_renderer: {fileID: 4594602923215036524} m_maskType: 0 ---- !u!114 &1261892355106492789 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8117397333951933013} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} - m_Name: - m_EditorClassIdentifier: - projectionDepth: 1 - vertexData: 5 - UVData: 6 - rotationData: 7 - decalLayerMask: 3 --- !u!114 &4355643101717498844 MonoBehaviour: m_ObjectHideFlags: 0 @@ -296,7 +291,7 @@ MonoBehaviour: m_Data: [] m_Knots: m_KnotsLink: [] ---- !u!114 &7991737669874668352 +--- !u!114 &1261892355106492789 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -305,6 +300,14 @@ MonoBehaviour: m_GameObject: {fileID: 8117397333951933013} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 05798bd8f0b876340941273f09bab577, type: 3} + m_Script: {fileID: 11500000, guid: f6e705d8c563048b898ce13a6b9685f6, type: 3} m_Name: m_EditorClassIdentifier: + settings: + projectionDepth: 5.92 + startAngleFade: 180 + endAngleFade: 180 + useDefaultUV: 1 + vertexData: 0 + UVData: 0 + extraData: 0 diff --git a/Assets/Scenes/SampleCurvedText/Scenes/SampleCurvedText.unity b/Assets/Scenes/SampleCurvedText/Scenes/SampleCurvedText.unity index ca5228c..c177b16 100644 --- a/Assets/Scenes/SampleCurvedText/Scenes/SampleCurvedText.unity +++ b/Assets/Scenes/SampleCurvedText/Scenes/SampleCurvedText.unity @@ -119,6 +119,62 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &51640878 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 51640880} + - component: {fileID: 51640879} + m_Layer: 0 + m_Name: Decal Projector + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &51640879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51640878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0777d029ed3dffa4692f417d4aba19ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: ab72239e406ed4e6ab4a6b4902f58af4, type: 2} + m_DrawDistance: 1000 + m_FadeScale: 0.9 + m_StartAngleFade: 0 + m_EndAngleFade: 62.508034 + m_UVScale: {x: 1, y: 1} + m_UVBias: {x: 0, y: 0} + m_DecalLayerMask: 1 + m_ScaleMode: 0 + m_Offset: {x: 0, y: 0, z: 0.5} + m_Size: {x: 1, y: 1, z: 1} + m_FadeFactor: 1 +--- !u!4 &51640880 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 51640878} + serializedVersion: 2 + m_LocalRotation: {x: 0.6624155, y: -0, z: -0, w: -0.7491366} + m_LocalPosition: {x: 0.14308354, y: -1.469, z: 0.133} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 277.031, y: 0, z: 0} --- !u!1 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -256,127 +312,6 @@ MonoBehaviour: m_MipBias: 0 m_VarianceClampScale: 0.9 m_ContrastAdaptiveSharpening: 0 ---- !u!1 &410087039 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 410087041} - - component: {fileID: 410087040} - - component: {fileID: 410087042} - m_Layer: 0 - m_Name: Spot Key Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &410087040 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - m_Enabled: 1 - serializedVersion: 11 - m_Type: 1 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1 - m_Range: 2.6830819 - m_SpotAngle: 105.4989 - m_InnerSpotAngle: 21.80208 - 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_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 3010 - m_UseColorTemperature: 1 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ForceVisible: 0 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_LightUnit: 1 - m_LuxAtDistance: 1 - m_EnableSpotReflector: 1 ---- !u!4 &410087041 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - serializedVersion: 2 - m_LocalRotation: {x: 0.068811774, y: -0.46968615, z: -0.5014825, w: 0.72330856} - m_LocalPosition: {x: 1.319, y: -0.896, z: -1.678} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 201.81, y: 126.276, z: 121.678} ---- !u!114 &410087042 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 410087039} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 1 --- !u!1 &832575517 GameObject: m_ObjectHideFlags: 0 @@ -555,10 +490,182 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 67353544000364137, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.endAngleFade + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 67353544000364137, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.startAngleFade + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 67353544000364137, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.projectionDepth + value: 1.64 + objectReference: {fileID: 0} + - target: {fileID: 491907534986306920, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_text + value: CURVED TEXT + objectReference: {fileID: 0} + - target: {fileID: 491907534986306920, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontSize + value: 34.1 + objectReference: {fileID: 0} + - target: {fileID: 605717808340412959, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_LocalPosition.z + value: -0.606 + objectReference: {fileID: 0} + - target: {fileID: 605717808340412959, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0.049 + objectReference: {fileID: 0} + - target: {fileID: 605717808340412959, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_AnchoredPosition.y + value: -0.876 + objectReference: {fileID: 0} + - target: {fileID: 2196157112884982645, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.endAngleFade + value: 1.812088 + objectReference: {fileID: 0} + - target: {fileID: 2196157112884982645, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.startAngleFade + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2196157112884982645, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.projectionDepth + value: 6.7 + objectReference: {fileID: 0} + - target: {fileID: 2352830982551122905, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_SizeDelta.x + value: 29.6 + objectReference: {fileID: 0} - target: {fileID: 2921371403644450591, guid: c0692338f575948c2b29f5250365d5f4, type: 3} propertyPath: m_Name value: Column objectReference: {fileID: 0} + - target: {fileID: 3319862354615631022, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_text + value: CURVED TEXT TEST + objectReference: {fileID: 0} + - target: {fileID: 3319862354615631022, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontSize + value: 30.05 + objectReference: {fileID: 0} + - target: {fileID: 3496937135024099762, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontColor.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3496937135024099762, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontColor.g + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3496937135024099762, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontColor.r + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3496937135024099762, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_fontColor32.rgba + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_MetaData.Array.size + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[2].Position.x + value: 10.128 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[2].Position.y + value: 5.291996 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].Position.x + value: 15.671999 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].Position.y + value: 8.171997 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].Position.z + value: 4.212 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_MetaData.Array.data[3].Tension + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].TangentIn.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].TangentIn.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].TangentIn.z + value: -0.7534672 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].TangentOut.z + value: 0.7534672 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[2].Rotation.value.w + value: 0.70520055 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[2].Rotation.value.x + value: 0.05188601 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[2].Rotation.value.y + value: 0.6660524 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[2].Rotation.value.z + value: 0.23743266 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].Rotation.value.w + value: 0.5549618 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].Rotation.value.x + value: 0.18802314 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].Rotation.value.y + value: 0.43027836 + objectReference: {fileID: 0} + - target: {fileID: 3714114516797303260, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_Splines.Array.data[0].m_Knots.Array.data[3].Rotation.value.z + value: 0.686677 + objectReference: {fileID: 0} + - target: {fileID: 3943832970754321075, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.endAngleFade + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 3943832970754321075, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.startAngleFade + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3943832970754321075, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: settings.projectionDepth + value: 1.64 + objectReference: {fileID: 0} + - target: {fileID: 4482198334614511301, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4727623871106449958, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5440016801744141780, guid: c0692338f575948c2b29f5250365d5f4, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -599,6 +706,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6313662425225220499, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9178262327743203413, guid: c0692338f575948c2b29f5250365d5f4, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -613,12 +728,70 @@ PrefabInstance: insertIndex: -1 addedObject: {fileID: 0} m_SourcePrefab: {fileID: 100100000, guid: c0692338f575948c2b29f5250365d5f4, type: 3} +--- !u!1001 &5364830616505734369 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 857128074950868888, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_Name + value: Spot Key Light + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalPosition.x + value: 0.1714 + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalPosition.y + value: -0.8613 + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalPosition.z + value: -0.7054 + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalRotation.w + value: 0.6691307 + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalRotation.y + value: -0.7431448 + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -96 + objectReference: {fileID: 0} + - target: {fileID: 3853310305137733340, guid: 1ba7a805354a249caa88910b4175d867, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1ba7a805354a249caa88910b4175d867, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 330585546} - - {fileID: 410087041} + - {fileID: 5364830616505734369} - {fileID: 1716222683} - {fileID: 832575519} - {fileID: 4749368109573058144} + - {fileID: 51640880} diff --git a/Assets/Scenes/SampleCurvedText/Spot Key Light.prefab b/Assets/Scenes/SampleCurvedText/Spot Key Light.prefab new file mode 100644 index 0000000..5c6a08d --- /dev/null +++ b/Assets/Scenes/SampleCurvedText/Spot Key Light.prefab @@ -0,0 +1,123 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &857128074950868888 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3853310305137733340} + - component: {fileID: 2979826486768225258} + - component: {fileID: 2068772783054093414} + m_Layer: 0 + m_Name: Spot Key Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3853310305137733340 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857128074950868888} + serializedVersion: 2 + m_LocalRotation: {x: 0.068811774, y: -0.46968615, z: -0.5014825, w: 0.72330856} + m_LocalPosition: {x: 0.352, y: -0.994, z: -0.718} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 201.81, y: 126.276, z: 121.678} +--- !u!108 &2979826486768225258 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857128074950868888} + m_Enabled: 1 + serializedVersion: 11 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 2.6830819 + m_SpotAngle: 105.4989 + m_InnerSpotAngle: 21.80208 + 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_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 3010 + m_UseColorTemperature: 1 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 +--- !u!114 &2068772783054093414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 857128074950868888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Version: 3 + m_UsePipelineSettings: 1 + m_AdditionalLightsShadowResolutionTier: 2 + m_LightLayerMask: 1 + m_RenderingLayers: 1 + m_CustomShadowLayers: 0 + m_ShadowLayerMask: 1 + m_ShadowRenderingLayers: 1 + m_LightCookieSize: {x: 1, y: 1} + m_LightCookieOffset: {x: 0, y: 0} + m_SoftShadowQuality: 1 diff --git a/Assets/Scenes/SampleCurvedText/Spot Key Light.prefab.meta b/Assets/Scenes/SampleCurvedText/Spot Key Light.prefab.meta new file mode 100644 index 0000000..cff626c --- /dev/null +++ b/Assets/Scenes/SampleCurvedText/Spot Key Light.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1ba7a805354a249caa88910b4175d867 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/Build Profiles/iOS-profile.asset b/Assets/Settings/Build Profiles/iOS-profile.asset new file mode 100644 index 0000000..719828c --- /dev/null +++ b/Assets/Settings/Build Profiles/iOS-profile.asset @@ -0,0 +1,46 @@ +%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: 15003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: iOS-profile + m_EditorClassIdentifier: + m_AssetVersion: 1 + m_BuildTarget: 9 + m_Subtarget: 0 + m_PlatformId: ad48d16a66894befa4d8181998c3cb09 + m_PlatformBuildProfile: + rid: 9159647122016960581 + m_OverrideGlobalSceneList: 0 + m_Scenes: [] + m_ScriptingDefines: [] + m_PlayerSettingsYaml: + m_Settings: [] + references: + version: 2 + RefIds: + - rid: 9159647122016960581 + type: {class: iOSPlatformSettings, ns: UnityEditor.iOS, asm: UnityEditor.iOS.Extensions} + data: + m_Development: 0 + m_ConnectProfiler: 0 + m_BuildWithDeepProfilingSupport: 0 + m_AllowDebugging: 0 + m_WaitForManagedDebugger: 0 + m_ManagedDebuggerFixedPort: 0 + m_ExplicitNullChecks: 0 + m_ExplicitDivideByZeroChecks: 0 + m_ExplicitArrayBoundsChecks: 0 + m_CompressionType: 0 + m_InstallInBuildFolder: 0 + m_iOSXcodeBuildConfig: 1 + m_SymlinkSources: 0 + m_PreferredXcode: + m_SymlinkTrampoline: 0 diff --git a/Assets/Settings/Build Profiles/iOS-profile.asset.meta b/Assets/Settings/Build Profiles/iOS-profile.asset.meta new file mode 100644 index 0000000..3dd5d9f --- /dev/null +++ b/Assets/Settings/Build Profiles/iOS-profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a83c12d4f67e4d9ba3f0690f4e10e48 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/Mobile_RPAsset.asset b/Assets/Settings/Mobile_RPAsset.asset index 2d0619e..85a2891 100644 --- a/Assets/Settings/Mobile_RPAsset.asset +++ b/Assets/Settings/Mobile_RPAsset.asset @@ -53,6 +53,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierHigh: 1024 m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 1 + m_ReflectionProbeAtlas: 1 m_ShadowDistance: 50 m_ShadowCascadeCount: 1 m_Cascade2Split: 0.25 @@ -129,6 +130,7 @@ MonoBehaviour: m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterBicubicLightmapSampling: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/Settings/PC_RPAsset.asset b/Assets/Settings/PC_RPAsset.asset index 7335511..be43854 100644 --- a/Assets/Settings/PC_RPAsset.asset +++ b/Assets/Settings/PC_RPAsset.asset @@ -53,6 +53,7 @@ MonoBehaviour: m_AdditionalLightsShadowResolutionTierHigh: 4096 m_ReflectionProbeBlending: 1 m_ReflectionProbeBoxProjection: 1 + m_ReflectionProbeAtlas: 1 m_ShadowDistance: 50 m_ShadowCascadeCount: 4 m_Cascade2Split: 0.25 @@ -129,6 +130,7 @@ MonoBehaviour: m_PrefilterScreenCoord: 1 m_PrefilterNativeRenderPass: 1 m_PrefilterUseLegacyLightmaps: 0 + m_PrefilterBicubicLightmapSampling: 1 m_ShaderVariantLogLevel: 0 m_ShadowCascades: 0 m_Textures: diff --git a/Assets/Settings/PC_Renderer.asset b/Assets/Settings/PC_Renderer.asset index 98f902f..5e7d445 100644 --- a/Assets/Settings/PC_Renderer.asset +++ b/Assets/Settings/PC_Renderer.asset @@ -68,8 +68,6 @@ MonoBehaviour: m_Active: 1 settings: technique: 0 - dBufferSettings: - surfaceData: 2 screenSpaceSettings: normalBlend: 2 decalLayers: 0 @@ -93,7 +91,7 @@ MonoBehaviour: dBufferSettings: surfaceData: 2 screenSpaceSettings: - normalBlend: 0 + normalBlend: 2 --- !u!114 &4298913457023969250 MonoBehaviour: m_ObjectHideFlags: 0 @@ -109,8 +107,6 @@ MonoBehaviour: m_Active: 1 settings: technique: 0 - dBufferSettings: - surfaceData: 2 screenSpaceSettings: - normalBlend: 0 + normalBlend: 2 decalLayers: 0 diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 71a7ebc..5cf6e45 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -55,6 +55,12 @@ MonoBehaviour: - rid: 8712630790384254976 - rid: 1984086672035282944 - rid: 4275609463838998617 + - rid: 9159647100883959808 + - rid: 9159647100883959809 + - rid: 9159647100883959810 + - rid: 9159647100883959811 + - rid: 9159647100883959812 + - rid: 9159647100883959813 m_RuntimeSettings: m_List: - rid: 6852985685364965378 @@ -67,6 +73,7 @@ MonoBehaviour: - rid: 6852985685364965394 - rid: 8712630790384254976 - rid: 1984086672035282944 + - rid: 9159647100883959812 m_AssetVersion: 8 m_ObsoleteDefaultVolumeProfile: {fileID: 0} m_RenderingLayerNames: @@ -218,6 +225,8 @@ MonoBehaviour: m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608, type: 3} + m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - rid: 6852985685364965379 type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} @@ -272,3 +281,122 @@ MonoBehaviour: data: m_Version: 0 m_CoreCopyPS: {fileID: 4800000, guid: 12dc59547ea167a4ab435097dd0f9add, type: 3} + - rid: 9159647100883959808 + type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3} + subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3} + gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3} + bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3} + cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3} + paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3} + lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3} + lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3} + bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3} + temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, type: 3} + LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} + LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, type: 3} + scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3} + easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3} + uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} + finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3} + m_ShaderResourcesVersion: 0 + - rid: 9159647100883959809 + type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} + m_Version: 0 + - rid: 9159647100883959810 + type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Version: 0 + - rid: 9159647100883959811 + type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + blueNoise16LTex: + - {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3} + - {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3} + - {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3} + - {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3} + - {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3} + - {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3} + - {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3} + - {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3} + - {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3} + - {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3} + - {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3} + - {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3} + - {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3} + - {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3} + - {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3} + - {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3} + - {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3} + - {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3} + - {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3} + - {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3} + - {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3} + - {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3} + - {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3} + - {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3} + - {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3} + - {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3} + - {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3} + - {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3} + - {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3} + - {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3} + - {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3} + - {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3} + filmGrainTex: + - {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3} + - {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3} + - {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3} + - {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3} + - {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3} + - {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3} + - {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3} + - {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3} + - {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3} + - {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3} + smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3} + smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3} + m_TexturesResourcesVersion: 0 + - rid: 9159647100883959812 + type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a, type: 3} + m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba, type: 3} + m_VisualizationLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + m_ConversionLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + - rid: 9159647100883959813 + type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_UseBicubicLightmapSampling: 0 diff --git a/Assets/TextDecalRuntimeInit.cs b/Assets/TextDecalRuntimeInit.cs new file mode 100644 index 0000000..412bb48 --- /dev/null +++ b/Assets/TextDecalRuntimeInit.cs @@ -0,0 +1,18 @@ +using space.chikalin.textdecal; +using TMPro; +using UnityEngine; + +public class TextDecalRuntimeInit : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + gameObject.AddComponent(); + } + + // Update is called once per frame + void Update() + { + gameObject.GetComponent().text = $"{Time.timeSinceLevelLoad:0.000}"; + } +} diff --git a/Assets/TextDecalRuntimeInit.cs.meta b/Assets/TextDecalRuntimeInit.cs.meta new file mode 100644 index 0000000..faf3e8d --- /dev/null +++ b/Assets/TextDecalRuntimeInit.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1956784ffe7f6466a906dc5830f1e568 \ No newline at end of file diff --git a/Assets/TextMesh Pro/Fonts/LiberationSans Bitmap.asset b/Assets/TextMesh Pro/Fonts/LiberationSans Bitmap.asset index 335b65b..fe10277 100644 --- a/Assets/TextMesh Pro/Fonts/LiberationSans Bitmap.asset +++ b/Assets/TextMesh Pro/Fonts/LiberationSans Bitmap.asset @@ -89,7 +89,7 @@ Texture2D: serializedVersion: 2 Hash: 00000000000000000000000000000000 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 4 m_Width: 1 m_Height: 1 m_CompleteImageSize: 1 diff --git a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset index a0880a2..1ae4652 100644 --- a/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset +++ b/Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset @@ -5052,7 +5052,7 @@ Texture2D: serializedVersion: 2 Hash: 00000000000000000000000000000000 m_IsAlphaChannelOptional: 0 - serializedVersion: 3 + serializedVersion: 4 m_Width: 1 m_Height: 1 m_CompleteImageSize: 1 diff --git a/Packages/manifest.json b/Packages/manifest.json index fa6e557..6be3ab0 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -2,15 +2,15 @@ "dependencies": { "com.unity.collab-proxy": "2.7.1", "com.unity.entities": "1.3.8", - "com.unity.ide.rider": "3.0.34", + "com.unity.ide.rider": "3.0.36", "com.unity.inputsystem": "1.14.0", "com.unity.recorder": "5.1.2", - "com.unity.render-pipelines.universal": "17.0.4", + "com.unity.render-pipelines.universal": "17.1.0", "com.unity.splines": "2.8.0", "com.unity.test-framework": "1.5.1", "com.unity.ugui": "2.0.0", "com.vladfaust.unitywakatime": "https://github.com/kirillchikalin/unity-wakatime.git?path=Assets/com.vladfaust.unitywakatime", - "space.chikalin.textdecal": "https://kirill:ceabbce93926efb31e21a5a7c0926fe1d3e9bed1@git.chikalin.space/unity/space.chikalin.textdecal.git", + "space.chikalin.textdecal": "file:/Users/kirill/unity/textdecal/space.chikalin.textdecal", "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index add46bd..2a53bf2 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -18,7 +18,7 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.19", + "version": "1.8.21", "depth": 1, "source": "registry", "dependencies": { @@ -75,7 +75,7 @@ "dependencies": {} }, "com.unity.ide.rider": { - "version": "3.0.34", + "version": "3.0.36", "depth": 0, "source": "registry", "dependencies": { @@ -132,7 +132,7 @@ "url": "https://packages.unity.com" }, "com.unity.render-pipelines.core": { - "version": "17.0.4", + "version": "17.1.0", "depth": 1, "source": "builtin", "dependencies": { @@ -147,12 +147,12 @@ } }, "com.unity.render-pipelines.universal": { - "version": "17.0.4", + "version": "17.1.0", "depth": 0, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.4", - "com.unity.shadergraph": "17.0.4", + "com.unity.render-pipelines.core": "17.1.0", + "com.unity.shadergraph": "17.1.0", "com.unity.render-pipelines.universal-config": "17.0.3" } }, @@ -199,18 +199,18 @@ "url": "https://packages.unity.com" }, "com.unity.settings-manager": { - "version": "2.0.1", + "version": "2.1.0", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.shadergraph": { - "version": "17.0.4", + "version": "17.1.0", "depth": 1, "source": "builtin", "dependencies": { - "com.unity.render-pipelines.core": "17.0.4", + "com.unity.render-pipelines.core": "17.1.0", "com.unity.searcher": "4.9.3" } }, @@ -236,15 +236,23 @@ } }, "com.unity.test-framework.performance": { - "version": "3.0.3", + "version": "3.1.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.test-framework": "1.1.31", + "com.unity.test-framework": "1.1.33", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.textmeshpro": { + "version": "5.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.ugui": "2.0.0" + } + }, "com.unity.timeline": { "version": "1.8.7", "depth": 1, @@ -274,13 +282,12 @@ "hash": "f5bbe6f52b3f4d02d43c0186b68a97276ccdf1cf" }, "space.chikalin.textdecal": { - "version": "https://kirill:ceabbce93926efb31e21a5a7c0926fe1d3e9bed1@git.chikalin.space/unity/space.chikalin.textdecal.git", + "version": "file:/Users/kirill/unity/textdecal/space.chikalin.textdecal", "depth": 0, - "source": "git", + "source": "local", "dependencies": { - "com.unity.ugui": "2.0.0" - }, - "hash": "b3b5d168e3b6440b28e630c45eb56638152b64a9" + "com.unity.textmeshpro": "3.0.9" + } }, "com.unity.modules.accessibility": { "version": "1.0.0", diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index dcb3768..d4da1ff 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -166,7 +166,7 @@ PlayerSettings: applicationIdentifier: Android: com.space.chikalin.textdecal Standalone: com.space.chikalin.textdecal - iPhone: com.Unity-Technologies.com.unity.template.urp-blank + iPhone: com.space.chikalin.textdecal buildNumber: Standalone: 0.0.50 VisionOS: 0 @@ -175,7 +175,7 @@ PlayerSettings: overrideDefaultApplicationIdentifier: 0 AndroidBundleVersionCode: 1 AndroidMinSdkVersion: 23 - AndroidTargetSdkVersion: 35 + AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 1 @@ -517,7 +517,16 @@ PlayerSettings: m_Height: 720 m_Kind: 1 m_SubKind: - m_BuildTargetBatching: [] + m_BuildTargetBatching: + - m_BuildTarget: Android + m_StaticBatching: 1 + m_DynamicBatching: 0 + - m_BuildTarget: WebGL + m_StaticBatching: 0 + m_DynamicBatching: 0 + - m_BuildTarget: iPhone + m_StaticBatching: 1 + m_DynamicBatching: 0 m_BuildTargetShaderSettings: [] m_BuildTargetGraphicsJobs: [] m_BuildTargetGraphicsJobMode: [] @@ -817,15 +826,16 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 webGLWebAssemblyTable: 0 webGLWebAssemblyBigInt: 0 webGLCloseOnQuit: 0 webWasm2023: 0 + webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: Android: UNITY_ASTOOLS_EXPERIMENTAL Standalone: UNITY_ASTOOLS_EXPERIMENTAL + iPhone: UNITY_ASTOOLS_EXPERIMENTAL additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: @@ -952,3 +962,4 @@ PlayerSettings: insecureHttpOption: 0 androidVulkanDenyFilterList: [] androidVulkanAllowFilterList: [] + androidVulkanDeviceFilterListAsset: {fileID: 0} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 2795afa..b4a5ff6 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.45f1 -m_EditorVersionWithRevision: 6000.0.45f1 (d91bd3d4e081) +m_EditorVersion: 6000.1.0f1 +m_EditorVersionWithRevision: 6000.1.0f1 (9ea152932a88)