Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Text tool #512

Draft
wants to merge 32 commits into
base: main
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9abcb52
Initial WIP
andybak Aug 27, 2023
1b42886
WIP - generate png textures for text widget on export
andybak Aug 31, 2023
3d9e29a
Add a button (just a placeholder for now)
andybak Aug 31, 2023
295c80c
Merge branch 'main' into feature/text-tool
andybak Sep 7, 2023
c31504a
wip
andybak Sep 14, 2023
583826d
Initial save/load support WIP
andybak Sep 28, 2023
efc10c7
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Sep 30, 2023
98e0f7a
Fix saving
andybak Sep 30, 2023
3495c4f
Merge remote-tracking branch 'origin/main' into feature/text-tool
andybak Oct 26, 2023
c2f1410
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Nov 23, 2023
e39cb53
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Nov 29, 2023
dbc56fb
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Dec 7, 2023
2c26ce6
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Dec 7, 2023
7514f22
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Dec 20, 2023
59628b4
dotnet-format
andybak Dec 20, 2023
529c058
dotnet-format
andybak Dec 20, 2023
b10f426
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Jan 1, 2024
7c8b60e
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Feb 28, 2024
db6c0f7
Fix l10n strings after merge
andybak Feb 28, 2024
3b05317
Fix typo
andybak Feb 28, 2024
a3fd255
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Mar 5, 2024
ae1e7e1
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Apr 3, 2024
59c2796
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Apr 7, 2024
362e85a
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak Apr 27, 2024
c8ce22e
Merge remote-tracking branch 'upstream/main' into feature/text-tool
andybak May 3, 2024
7a2f5b9
Update text api endpoints
andybak May 5, 2024
b4091e9
WIP changes
andybak May 5, 2024
2c1f895
Merge remote-tracking branch 'origin/main' into feature/text-tool
andybak May 19, 2024
e16183f
Merge remote-tracking branch 'origin/main' into feature/text-tool
andybak Sep 15, 2024
770b18e
Merge remote-tracking branch 'origin/main' into feature/text-tool
andybak Dec 22, 2024
9317709
Merge remote-tracking branch 'origin/main' into feature/text-tool
andybak Jan 13, 2025
d21b340
Merge remote-tracking branch 'origin/main' into feature/text-tool
andybak Feb 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
wip
andybak committed Sep 14, 2023
commit c31504ae10869b9bc5c89d0520dab0d0cad95064
9 changes: 6 additions & 3 deletions Assets/Prefabs/Panels/AdvancedToolsPanel.prefab
Original file line number Diff line number Diff line change
@@ -814,6 +814,9 @@ MonoBehaviour:
- m_PopUpPrefab: {fileID: 1887799951535888, guid: a600c48c5f105874e8e750977bb95d4b,
type: 3}
m_Command: 11500
- m_PopUpPrefab: {fileID: 8644332587479430734, guid: bdb7d2ac05cca8346b210c2b576878cb,
type: 3}
m_Command: 12001
m_PanelDescription: ADVANCEDTOOLS_PANEL_DESCRIPTION
m_LocalizedPanelDescription:
m_TableReference:
@@ -2501,7 +2504,7 @@ GameObject:
- component: {fileID: 1319175746123658152}
- component: {fileID: 7156252261596179870}
m_Layer: 16
m_Name: Button_Join (1)
m_Name: Button_Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -2594,7 +2597,7 @@ MonoBehaviour:
m_GameObject: {fileID: 6535217432110762182}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 962894c5495cabc458506a8548e8a1e2, type: 3}
m_Script: {fileID: 11500000, guid: f924f0ff57b618b44aaef2d9484ee7af, type: 3}
m_Name:
m_EditorClassIdentifier:
m_DescriptionType: 0
@@ -2631,7 +2634,7 @@ MonoBehaviour:
m_HoverScale: 1.1
m_HoverBoxColliderGrow: 0.2
m_AddOverlay: 0
m_Tool: 11001
m_Tool: 5400
m_EatGazeInputOnPress: 0
references:
version: 2
301 changes: 301 additions & 0 deletions Assets/Prefabs/TextTool.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,301 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8463577212548165003
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8463577212548165002}
- component: {fileID: 8463577212548165001}
m_Layer: 14
m_Name: TextTool
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &8463577212548165002
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8463577212548165003}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.49999997, y: 0.5, z: 0.5}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8463577212721617487}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8463577212548165001
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8463577212548165003}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 79236c9b5a85413493e75b7d56ad5f51, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Type: 5400
m_ShowTransformGizmo: 0
m_ExitOnAbortCommand: 1
m_ScalingSupported: 0
m_PopUpPrefab: {fileID: 3095268576859284452, guid: bdb7d2ac05cca8346b210c2b576878cb,
type: 3}
--- !u!1 &8463577212721617472
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8463577212721617487}
m_Layer: 14
m_Name: BadTeleportIcon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8463577212721617487
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8463577212721617472}
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:
- {fileID: 8463577212531524173}
- {fileID: 8463577213261396087}
m_Father: {fileID: 8463577212548165002}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8463577213261396072
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8463577213261396087}
- component: {fileID: 8463577213261396086}
m_Layer: 14
m_Name: Line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8463577213261396087
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8463577213261396072}
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: 8463577212721617487}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &8463577213261396086
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8463577213261396072}
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: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 6418e904d805fbf44886e90b2158285a, 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: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 1}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.02
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0.02
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
shadowBias: 0
generateLightingData: 0
m_UseWorldSpace: 0
m_Loop: 0
--- !u!1001 &8463577212531923149
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8463577212721617487}
m_Modifications:
- target: {fileID: 100000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_Name
value: X
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalScale.x
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalScale.y
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalScale.z
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalPosition.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalPosition.z
value: 1.168
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2300000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_CastShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2300000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_ReceiveShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2300000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 03f3b4747259a364b800508ac27e1c17, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7d1776294cb9ac042b975b59dd2bbd4b, type: 3}
--- !u!4 &8463577212531524173 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 400000, guid: 7d1776294cb9ac042b975b59dd2bbd4b,
type: 3}
m_PrefabInstance: {fileID: 8463577212531923149}
m_PrefabAsset: {fileID: 0}
7 changes: 7 additions & 0 deletions Assets/Prefabs/TextTool.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Assets/Prefabs/TextWidget.prefab
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 104792}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.146, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -124,7 +124,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 5}
m_SizeDelta: {x: 5, y: 5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &2357204
MeshRenderer:
@@ -215,8 +215,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 12
m_fontSizeBase: 12
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
@@ -231,7 +231,7 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_enableWordWrapping: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
@@ -448,7 +448,7 @@ Transform:
m_GameObject: {fileID: 135062}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.005}
m_LocalScale: {x: 1, y: 1, z: 0.00125}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2887450827974332392}
Loading