Skip to content
Snippets Groups Projects
Commit 4134e53a authored by Tobias Schöner's avatar Tobias Schöner
Browse files

Made Scrollscreen scrollable

Changed EventHandling to OnPointerDown as otherwise scroll events were not passed through
Changed Scrollscreen layout to GridLayout under new 'Scrolls' Gameobject
Improved Scrollscreen layout
parent 7fb8572b
No related branches found
No related tags found
1 merge request!1feat: added visualisation for CircleFact; added Torus- and ConeGenerator
......@@ -377,12 +377,12 @@ PrefabInstance:
- target: {fileID: 1063267681976544647, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_Value
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1063267682090589445, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: -0.00012207031
objectReference: {fileID: 0}
- target: {fileID: 1063267682145540348, guid: b996060e27da25c498842defc1996d84,
type: 3}
......@@ -594,6 +594,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6233676630648857052, guid: b996060e27da25c498842defc1996d84,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b996060e27da25c498842defc1996d84, type: 3}
--- !u!224 &3020720018354060037 stripped
......
......@@ -957,6 +957,7 @@ GameObject:
- component: {fileID: 1063267681730612748}
- component: {fileID: 1063267681730612749}
- component: {fileID: 1063267681730612746}
- component: {fileID: 7992155641363241229}
m_Layer: 5
m_Name: Scrollscreen
m_TagString: Untagged
......@@ -974,15 +975,16 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Children:
- {fileID: 6233676630648857052}
m_Father: {fileID: 1063267681848407549}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -53, y: -540}
m_SizeDelta: {x: 105, y: 1080}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 110, y: 1080}
m_Pivot: {x: 1, y: 1}
--- !u!222 &1063267681730612748
CanvasRenderer:
m_ObjectHideFlags: 0
......@@ -1039,11 +1041,42 @@ MonoBehaviour:
ScrollPrefab: {fileID: 3173330253721512196, guid: a6a9a3ebdb022e546a21d9f9ff148261,
type: 3}
DetailScreen: {fileID: 1063267680909148020}
scrollscreenContent: {fileID: 6233676630648857052}
x_Start: -240
y_Start: 200
X_Pacece_Between_Items: 105
y_Pacece_Between_Items: 105
number_of_Column: 3
--- !u!114 &7992155641363241229
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1063267681730612744}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 6233676630648857052}
m_Horizontal: 1
m_Vertical: 1
m_MovementType: 2
m_Elasticity: 0.1
m_Inertia: 1
m_DecelerationRate: 0.135
m_ScrollSensitivity: 10
m_Viewport: {fileID: 1063267681730612747}
m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0}
m_HorizontalScrollbarVisibility: 0
m_VerticalScrollbarVisibility: 0
m_HorizontalScrollbarSpacing: 0
m_VerticalScrollbarSpacing: 0
m_OnValueChanged:
m_PersistentCalls:
m_Calls: []
--- !u!1 &1063267681758443993
GameObject:
m_ObjectHideFlags: 0
......@@ -1796,8 +1829,8 @@ MonoBehaviour:
m_TargetGraphic: {fileID: 1063267681950920689}
m_HandleRect: {fileID: 1063267681950920702}
m_Direction: 0
m_Value: 1
m_Size: 0.4705884
m_Value: 0
m_Size: 1
m_NumberOfSteps: 0
m_OnValueChanged:
m_PersistentCalls:
......@@ -1836,7 +1869,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 6860.9316, y: 0.000030517578}
m_AnchoredPosition: {x: 0, y: 0.000030517578}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!114 &1063267682090589447
......@@ -3220,6 +3253,81 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3101365397042056749
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6233676630648857052}
- component: {fileID: 5121397746952168180}
- component: {fileID: 1290355233158292639}
m_Layer: 5
m_Name: Scrolls
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6233676630648857052
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3101365397042056749}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1063267681730612747}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 110, y: 0}
m_Pivot: {x: 1, y: 1}
--- !u!114 &5121397746952168180
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3101365397042056749}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 5
m_Right: 5
m_Top: 5
m_Bottom: 5
m_ChildAlignment: 0
m_StartCorner: 0
m_StartAxis: 0
m_CellSize: {x: 100, y: 100}
m_Spacing: {x: 5, y: 5}
m_Constraint: 0
m_ConstraintCount: 2
--- !u!114 &1290355233158292639
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3101365397042056749}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 1
--- !u!1 &5894918260326328225
GameObject:
m_ObjectHideFlags: 0
......@@ -3252,7 +3360,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 7200, y: 0}
m_AnchoredPosition: {x: -0.000030517578, y: 0}
m_SizeDelta: {x: 0, y: 100}
m_Pivot: {x: 0.5, y: 1}
--- !u!1001 &1695473884174914986
......
......@@ -12,7 +12,6 @@ GameObject:
- component: {fileID: 3213819025273557502}
- component: {fileID: 2305338954152611092}
- component: {fileID: 114452647229146242}
- component: {fileID: 114809707957640338}
m_Layer: 5
m_Name: ScrollDisplay
m_TagString: Untagged
......@@ -57,12 +56,14 @@ MonoBehaviour:
m_GameObject: {fileID: 3173330253721512196}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
......@@ -75,6 +76,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &114452647229146242
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -87,53 +89,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 67d16c96068129c4c8631966f2166bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
scroll:
problemTheory:
solutionTheory:
label:
description:
declarations: []
DetailScreen: {fileID: 0}
--- !u!114 &114809707957640338
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3173330253721512196}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -1862395651, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Delegates:
- eventID: 4
callback:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 114452647229146242}
m_MethodName: onClick
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 0}
m_MethodName:
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName:
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
delegates: []
--- !u!1 &5809183911047187526
GameObject:
m_ObjectHideFlags: 0
......@@ -194,6 +150,8 @@ MonoBehaviour:
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: []
......@@ -218,13 +176,12 @@ MonoBehaviour:
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_outlineColor:
serializedVersion: 2
rgba: 4278190080
m_fontSize: 41.05
m_fontSizeBase: 36
m_fontWeight: 400
......@@ -232,7 +189,9 @@ MonoBehaviour:
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 514
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
......@@ -242,10 +201,8 @@ MonoBehaviour:
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_firstOverflowCharacterIndex: -1
m_linkedTextComponent: {fileID: 0}
m_isLinkedTextComponent: 0
m_isTextTruncated: 0
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
......@@ -253,39 +210,17 @@ MonoBehaviour:
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_ignoreRectMaskCulling: 0
m_ignoreCulling: 1
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 3.2196655, y: 3.2196655, z: 3.6221313, w: 3.6221313}
m_textInfo:
textComponent: {fileID: 5867570113647991285}
characterCount: 8
spriteCount: 0
spaceCount: 1
wordCount: 2
linkCount: 0
lineCount: 2
pageCount: 1
materialCount: 1
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_hasFontAssetChanged: 0
m_subTextObjects:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
......@@ -15,6 +15,7 @@ public class DisplayScrolls : MonoBehaviour
public GameObject ScrollPrefab;
public GameObject DetailScreen;
public Transform scrollscreenContent;
public int x_Start;
......@@ -24,16 +25,10 @@ public class DisplayScrolls : MonoBehaviour
public int number_of_Column;
// Update is called once per frame
void Update()
{
}
public Vector3 GetPosition(int i)
{
return new Vector3(x_Start + (X_Pacece_Between_Items * (i % number_of_Column)), y_Start + (-y_Pacece_Between_Items * (i / number_of_Column)), 0f);
//return new Vector3(x_Start + (X_Pacece_Between_Items * (i % number_of_Column)), y_Start + (-y_Pacece_Between_Items * (i / number_of_Column)), 0f);
return Vector3.zero;
}
/* [System.Serializable]
......@@ -113,7 +108,7 @@ void BuildScrolls(string jsonString)
for (int i = 0; i < this.scrolls.Count; i++)
{
var obj = Instantiate(ScrollPrefab, Vector3.zero, Quaternion.identity, transform);
var obj = Instantiate(ScrollPrefab, Vector3.zero, Quaternion.identity, scrollscreenContent);
obj.GetComponent<RectTransform>().localPosition = GetPosition(i);
obj.GetComponent<ScrollClickedScript>().scroll = this.scrolls[i];
obj.GetComponent<ScrollClickedScript>().DetailScreen = this.DetailScreen;
......
using UnityEngine;
using UnityEngine.EventSystems;
public class ScrollClickedScript : MonoBehaviour
public class ScrollClickedScript : MonoBehaviour, IPointerDownHandler
{
public Scroll scroll;
public GameObject DetailScreen;
public void onClick()
public void OnPointerDown(PointerEventData eventData)
{
this.DetailScreen.GetComponent<ScrollDetails>().setScroll(this.scroll);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment