Skip to content
This repository was archived by the owner on Sep 17, 2022. It is now read-only.

Commit e36e82f

Browse files
committed
Variable Animator and structure ready
Variable Animator and structure bug fixes required
1 parent 3ffa2ef commit e36e82f

File tree

10 files changed

+1745
-82
lines changed

10 files changed

+1745
-82
lines changed

Assets/Fonts/GlacialIndifference-Regular SDF_cube.asset

Lines changed: 1001 additions & 45 deletions
Large diffs are not rendered by default.

Assets/Resources/Cube.prefab

Lines changed: 198 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ MonoBehaviour:
104104
m_OnCullStateChanged:
105105
m_PersistentCalls:
106106
m_Calls: []
107-
m_text: 1
107+
m_text: 10000000
108108
m_isRightToLeft: 0
109109
m_fontAsset: {fileID: 11400000, guid: fc2e9b34af55c0c48b297de085b660c7, type: 2}
110110
m_sharedMaterial: {fileID: -8284459682570884586, guid: fc2e9b34af55c0c48b297de085b660c7,
@@ -132,15 +132,15 @@ MonoBehaviour:
132132
m_faceColor:
133133
serializedVersion: 2
134134
rgba: 4294967295
135-
m_fontSize: 8.3
135+
m_fontSize: 2.1
136136
m_fontSizeBase: 10
137137
m_fontWeight: 400
138138
m_enableAutoSizing: 1
139139
m_fontSizeMin: 1
140140
m_fontSizeMax: 10
141141
m_fontStyle: 0
142142
m_HorizontalAlignment: 2
143-
m_VerticalAlignment: 256
143+
m_VerticalAlignment: 512
144144
m_textAlignment: 65535
145145
m_characterSpacing: 0
146146
m_wordSpacing: 0
@@ -168,7 +168,7 @@ MonoBehaviour:
168168
m_VertexBufferAutoSizeReduction: 1
169169
m_useMaxVisibleDescender: 1
170170
m_pageToDisplay: 1
171-
m_margin: {x: 0, y: 0, z: 0, w: 0}
171+
m_margin: {x: 0.05, y: 0.05, z: 0.05, w: 0.05}
172172
m_isUsingLegacyAnimationComponent: 0
173173
m_isVolumetricText: 0
174174
m_hasFontAssetChanged: 0
@@ -211,6 +211,7 @@ Transform:
211211
- {fileID: 2068529975624689747}
212212
- {fileID: 8705112415091261678}
213213
- {fileID: 349206409879618392}
214+
- {fileID: 1643961142472309724}
214215
m_Father: {fileID: 0}
215216
m_RootOrder: 0
216217
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -365,7 +366,7 @@ MonoBehaviour:
365366
m_OnCullStateChanged:
366367
m_PersistentCalls:
367368
m_Calls: []
368-
m_text: 1
369+
m_text: 10000000
369370
m_isRightToLeft: 0
370371
m_fontAsset: {fileID: 11400000, guid: fc2e9b34af55c0c48b297de085b660c7, type: 2}
371372
m_sharedMaterial: {fileID: -8284459682570884586, guid: fc2e9b34af55c0c48b297de085b660c7,
@@ -393,15 +394,15 @@ MonoBehaviour:
393394
m_faceColor:
394395
serializedVersion: 2
395396
rgba: 4294967295
396-
m_fontSize: 8.3
397+
m_fontSize: 2.1
397398
m_fontSizeBase: 10
398399
m_fontWeight: 400
399400
m_enableAutoSizing: 1
400401
m_fontSizeMin: 0
401402
m_fontSizeMax: 10
402403
m_fontStyle: 0
403404
m_HorizontalAlignment: 2
404-
m_VerticalAlignment: 256
405+
m_VerticalAlignment: 512
405406
m_textAlignment: 65535
406407
m_characterSpacing: 0
407408
m_wordSpacing: 0
@@ -429,7 +430,7 @@ MonoBehaviour:
429430
m_VertexBufferAutoSizeReduction: 1
430431
m_useMaxVisibleDescender: 1
431432
m_pageToDisplay: 1
432-
m_margin: {x: 0, y: 0, z: 0, w: 0}
433+
m_margin: {x: 0.05, y: 0.05, z: 0.05, w: 0.05}
433434
m_isUsingLegacyAnimationComponent: 0
434435
m_isVolumetricText: 0
435436
m_hasFontAssetChanged: 0
@@ -542,7 +543,7 @@ MonoBehaviour:
542543
m_OnCullStateChanged:
543544
m_PersistentCalls:
544545
m_Calls: []
545-
m_text: 1
546+
m_text: 10000000
546547
m_isRightToLeft: 0
547548
m_fontAsset: {fileID: 11400000, guid: fc2e9b34af55c0c48b297de085b660c7, type: 2}
548549
m_sharedMaterial: {fileID: -8284459682570884586, guid: fc2e9b34af55c0c48b297de085b660c7,
@@ -570,15 +571,15 @@ MonoBehaviour:
570571
m_faceColor:
571572
serializedVersion: 2
572573
rgba: 4294967295
573-
m_fontSize: 8.3
574+
m_fontSize: 2.1
574575
m_fontSizeBase: 10
575576
m_fontWeight: 400
576577
m_enableAutoSizing: 1
577578
m_fontSizeMin: 0
578579
m_fontSizeMax: 10
579580
m_fontStyle: 0
580581
m_HorizontalAlignment: 2
581-
m_VerticalAlignment: 256
582+
m_VerticalAlignment: 512
582583
m_textAlignment: 65535
583584
m_characterSpacing: 0
584585
m_wordSpacing: 0
@@ -606,7 +607,7 @@ MonoBehaviour:
606607
m_VertexBufferAutoSizeReduction: 1
607608
m_useMaxVisibleDescender: 1
608609
m_pageToDisplay: 1
609-
m_margin: {x: 0, y: 0, z: 0, w: 0}
610+
m_margin: {x: 0.05, y: 0.05, z: 0.05, w: 0.05}
610611
m_isUsingLegacyAnimationComponent: 0
611612
m_isVolumetricText: 0
612613
m_hasFontAssetChanged: 0
@@ -615,6 +616,183 @@ MonoBehaviour:
615616
_SortingLayer: 0
616617
_SortingLayerID: 0
617618
_SortingOrder: 0
619+
--- !u!1 &6388088047241096895
620+
GameObject:
621+
m_ObjectHideFlags: 0
622+
m_CorrespondingSourceObject: {fileID: 0}
623+
m_PrefabInstance: {fileID: 0}
624+
m_PrefabAsset: {fileID: 0}
625+
serializedVersion: 6
626+
m_Component:
627+
- component: {fileID: 1643961142472309724}
628+
- component: {fileID: 1242279916724764430}
629+
- component: {fileID: 654929146118998515}
630+
- component: {fileID: 6451107311464724634}
631+
m_Layer: 0
632+
m_Name: face6
633+
m_TagString: Untagged
634+
m_Icon: {fileID: 0}
635+
m_NavMeshLayer: 0
636+
m_StaticEditorFlags: 0
637+
m_IsActive: 1
638+
--- !u!224 &1643961142472309724
639+
RectTransform:
640+
m_ObjectHideFlags: 0
641+
m_CorrespondingSourceObject: {fileID: 0}
642+
m_PrefabInstance: {fileID: 0}
643+
m_PrefabAsset: {fileID: 0}
644+
m_GameObject: {fileID: 6388088047241096895}
645+
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
646+
m_LocalPosition: {x: 0, y: 0, z: 0}
647+
m_LocalScale: {x: 1, y: 1, z: 1}
648+
m_Children: []
649+
m_Father: {fileID: 3357462402450317512}
650+
m_RootOrder: 5
651+
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
652+
m_AnchorMin: {x: 0.5, y: 0.5}
653+
m_AnchorMax: {x: 0.5, y: 0.5}
654+
m_AnchoredPosition: {x: 0, y: -0.51}
655+
m_SizeDelta: {x: 1, y: 1}
656+
m_Pivot: {x: 0.5, y: 0.5}
657+
--- !u!23 &1242279916724764430
658+
MeshRenderer:
659+
m_ObjectHideFlags: 0
660+
m_CorrespondingSourceObject: {fileID: 0}
661+
m_PrefabInstance: {fileID: 0}
662+
m_PrefabAsset: {fileID: 0}
663+
m_GameObject: {fileID: 6388088047241096895}
664+
m_Enabled: 1
665+
m_CastShadows: 0
666+
m_ReceiveShadows: 0
667+
m_DynamicOccludee: 1
668+
m_MotionVectors: 1
669+
m_LightProbeUsage: 1
670+
m_ReflectionProbeUsage: 1
671+
m_RayTracingMode: 2
672+
m_RenderingLayerMask: 1
673+
m_RendererPriority: 0
674+
m_Materials:
675+
- {fileID: -8284459682570884586, guid: fc2e9b34af55c0c48b297de085b660c7, type: 2}
676+
m_StaticBatchInfo:
677+
firstSubMesh: 0
678+
subMeshCount: 0
679+
m_StaticBatchRoot: {fileID: 0}
680+
m_ProbeAnchor: {fileID: 0}
681+
m_LightProbeVolumeOverride: {fileID: 0}
682+
m_ScaleInLightmap: 1
683+
m_ReceiveGI: 1
684+
m_PreserveUVs: 0
685+
m_IgnoreNormalsForChartDetection: 0
686+
m_ImportantGI: 0
687+
m_StitchLightmapSeams: 1
688+
m_SelectedEditorRenderState: 3
689+
m_MinimumChartSize: 4
690+
m_AutoUVMaxDistance: 0.5
691+
m_AutoUVMaxAngle: 89
692+
m_LightmapParameters: {fileID: 0}
693+
m_SortingLayerID: 0
694+
m_SortingLayer: 0
695+
m_SortingOrder: 0
696+
--- !u!222 &654929146118998515
697+
CanvasRenderer:
698+
m_ObjectHideFlags: 0
699+
m_CorrespondingSourceObject: {fileID: 0}
700+
m_PrefabInstance: {fileID: 0}
701+
m_PrefabAsset: {fileID: 0}
702+
m_GameObject: {fileID: 6388088047241096895}
703+
m_CullTransparentMesh: 0
704+
--- !u!114 &6451107311464724634
705+
MonoBehaviour:
706+
m_ObjectHideFlags: 0
707+
m_CorrespondingSourceObject: {fileID: 0}
708+
m_PrefabInstance: {fileID: 0}
709+
m_PrefabAsset: {fileID: 0}
710+
m_GameObject: {fileID: 6388088047241096895}
711+
m_Enabled: 1
712+
m_EditorHideFlags: 0
713+
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
714+
m_Name:
715+
m_EditorClassIdentifier:
716+
m_Material: {fileID: 0}
717+
m_Color: {r: 1, g: 1, b: 1, a: 1}
718+
m_RaycastTarget: 1
719+
m_Maskable: 1
720+
m_OnCullStateChanged:
721+
m_PersistentCalls:
722+
m_Calls: []
723+
m_text: 10000000
724+
m_isRightToLeft: 0
725+
m_fontAsset: {fileID: 11400000, guid: fc2e9b34af55c0c48b297de085b660c7, type: 2}
726+
m_sharedMaterial: {fileID: -8284459682570884586, guid: fc2e9b34af55c0c48b297de085b660c7,
727+
type: 2}
728+
m_fontSharedMaterials: []
729+
m_fontMaterial: {fileID: 0}
730+
m_fontMaterials: []
731+
m_fontColor32:
732+
serializedVersion: 2
733+
rgba: 4281478698
734+
m_fontColor: {r: 0.16470589, g: 0.18039216, b: 0.19607843, a: 1}
735+
m_enableVertexGradient: 0
736+
m_colorMode: 3
737+
m_fontColorGradient:
738+
topLeft: {r: 1, g: 1, b: 1, a: 1}
739+
topRight: {r: 1, g: 1, b: 1, a: 1}
740+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
741+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
742+
m_fontColorGradientPreset: {fileID: 0}
743+
m_spriteAsset: {fileID: 0}
744+
m_tintAllSprites: 0
745+
m_StyleSheet: {fileID: 0}
746+
m_TextStyleHashCode: -1183493901
747+
m_overrideHtmlColors: 0
748+
m_faceColor:
749+
serializedVersion: 2
750+
rgba: 4294967295
751+
m_fontSize: 2.1
752+
m_fontSizeBase: 10
753+
m_fontWeight: 400
754+
m_enableAutoSizing: 1
755+
m_fontSizeMin: 0
756+
m_fontSizeMax: 10
757+
m_fontStyle: 0
758+
m_HorizontalAlignment: 2
759+
m_VerticalAlignment: 512
760+
m_textAlignment: 65535
761+
m_characterSpacing: 0
762+
m_wordSpacing: 0
763+
m_lineSpacing: 0
764+
m_lineSpacingMax: 0
765+
m_paragraphSpacing: 0
766+
m_charWidthMaxAdj: 0
767+
m_enableWordWrapping: 1
768+
m_wordWrappingRatios: 0.4
769+
m_overflowMode: 0
770+
m_linkedTextComponent: {fileID: 0}
771+
parentLinkedComponent: {fileID: 0}
772+
m_enableKerning: 1
773+
m_enableExtraPadding: 0
774+
checkPaddingRequired: 0
775+
m_isRichText: 1
776+
m_parseCtrlCharacters: 1
777+
m_isOrthographic: 0
778+
m_isCullingEnabled: 0
779+
m_horizontalMapping: 0
780+
m_verticalMapping: 0
781+
m_uvLineOffset: 0
782+
m_geometrySortingOrder: 0
783+
m_IsTextObjectScaleStatic: 0
784+
m_VertexBufferAutoSizeReduction: 1
785+
m_useMaxVisibleDescender: 1
786+
m_pageToDisplay: 1
787+
m_margin: {x: 0.05, y: 0.05, z: 0.05, w: 0.05}
788+
m_isUsingLegacyAnimationComponent: 0
789+
m_isVolumetricText: 0
790+
m_hasFontAssetChanged: 0
791+
m_renderer: {fileID: 1242279916724764430}
792+
m_maskType: 0
793+
_SortingLayer: 0
794+
_SortingLayerID: 0
795+
_SortingOrder: 0
618796
--- !u!1 &6913065444530297940
619797
GameObject:
620798
m_ObjectHideFlags: 0
@@ -719,7 +897,7 @@ MonoBehaviour:
719897
m_OnCullStateChanged:
720898
m_PersistentCalls:
721899
m_Calls: []
722-
m_text: 1
900+
m_text: 10000000
723901
m_isRightToLeft: 0
724902
m_fontAsset: {fileID: 11400000, guid: fc2e9b34af55c0c48b297de085b660c7, type: 2}
725903
m_sharedMaterial: {fileID: -8284459682570884586, guid: fc2e9b34af55c0c48b297de085b660c7,
@@ -747,15 +925,15 @@ MonoBehaviour:
747925
m_faceColor:
748926
serializedVersion: 2
749927
rgba: 4294967295
750-
m_fontSize: 8.3
928+
m_fontSize: 2.1
751929
m_fontSizeBase: 10
752930
m_fontWeight: 400
753931
m_enableAutoSizing: 1
754932
m_fontSizeMin: 0
755933
m_fontSizeMax: 10
756934
m_fontStyle: 0
757935
m_HorizontalAlignment: 2
758-
m_VerticalAlignment: 256
936+
m_VerticalAlignment: 512
759937
m_textAlignment: 65535
760938
m_characterSpacing: 0
761939
m_wordSpacing: 0
@@ -783,7 +961,7 @@ MonoBehaviour:
783961
m_VertexBufferAutoSizeReduction: 1
784962
m_useMaxVisibleDescender: 1
785963
m_pageToDisplay: 1
786-
m_margin: {x: 0, y: 0, z: 0, w: 0}
964+
m_margin: {x: 0.05, y: 0.05, z: 0.05, w: 0.05}
787965
m_isUsingLegacyAnimationComponent: 0
788966
m_isVolumetricText: 0
789967
m_hasFontAssetChanged: 0
@@ -896,7 +1074,7 @@ MonoBehaviour:
8961074
m_OnCullStateChanged:
8971075
m_PersistentCalls:
8981076
m_Calls: []
899-
m_text: 1
1077+
m_text: 10000000
9001078
m_isRightToLeft: 0
9011079
m_fontAsset: {fileID: 11400000, guid: fc2e9b34af55c0c48b297de085b660c7, type: 2}
9021080
m_sharedMaterial: {fileID: -8284459682570884586, guid: fc2e9b34af55c0c48b297de085b660c7,
@@ -924,15 +1102,15 @@ MonoBehaviour:
9241102
m_faceColor:
9251103
serializedVersion: 2
9261104
rgba: 4294967295
927-
m_fontSize: 8.3
1105+
m_fontSize: 2.1
9281106
m_fontSizeBase: 10
9291107
m_fontWeight: 400
9301108
m_enableAutoSizing: 1
9311109
m_fontSizeMin: 0
9321110
m_fontSizeMax: 10
9331111
m_fontStyle: 0
9341112
m_HorizontalAlignment: 2
935-
m_VerticalAlignment: 256
1113+
m_VerticalAlignment: 512
9361114
m_textAlignment: 65535
9371115
m_characterSpacing: 0
9381116
m_wordSpacing: 0
@@ -960,7 +1138,7 @@ MonoBehaviour:
9601138
m_VertexBufferAutoSizeReduction: 1
9611139
m_useMaxVisibleDescender: 1
9621140
m_pageToDisplay: 1
963-
m_margin: {x: 0, y: 0, z: 0, w: 0}
1141+
m_margin: {x: 0.05, y: 0.05, z: 0.05, w: 0.05}
9641142
m_isUsingLegacyAnimationComponent: 0
9651143
m_isVolumetricText: 0
9661144
m_hasFontAssetChanged: 0

Assets/Scripts/ARgorithm/Animations/ArrayAnimator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public ContentType faceValue
5252
set
5353
{
5454
_faceValue = value;
55-
for (int i = 0; i < 5; i++)
55+
for (int i = 0; i < this.cube.transform.childCount; i++)
5656
{
5757
var child = this.cube.transform.GetChild(i).gameObject;
5858
child.GetComponent<TextMeshPro>().SetText(_faceValue.Value);

0 commit comments

Comments
 (0)