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

Commit 52880cc

Browse files
alanpjohnyatharthmathurVin-dictive
authored
Creating the ARStage (#7)
* working on AR module * Groundwork for #5 Pulled data to get branch upto date with master Reorganised scripts and modules * Eventlist and ObjectMap implementation attempt Trying out how we can implement the event list and object map which will be used to render stuff * changes * Revert "changes" This reverts commit 5092a5a. * changed .gitignore * added Engine namespace * ContentType and NDimensionalArray * Added Engine module Rename StageData attributes Added Stage class * ToString and FromString added for StateLog * updated Delegate type Updated type of delegate ARgorithmEvent to support GameObject parameter * Revert "updated Delegate type" This reverts commit 117b028. * Update delegate function properly Ignore prev two commits if possible Delegate ARgorithmEvent takes GameObject parameter as well * design enhancement * Added new StageHandler script, removed entire folder Goodbye ARgorithm.Utils * added undo operations in ArrayStructure * Added Array Animator * Scenes Testing and visualization test working * scene changes * fixed index bug * Revert "fixed index bug" This reverts commit 9e6939d. * AR functionality implemented * fixed cube positioning * Undo for structure * fixed cube positioning, added undo * Fixed Undo and forward bug * fixed placement indicator behaviour * Fixed Minor UI issues * Fixed Undo method in ARTap to Place * rotation fix * Rotation and Positions of Cubes Placing done * Changes Size of Placement Indicator * Implemented Scene Management * Commiting Project Settings * Cleaned by files and updated comments Also moved ArrayAnimator to the ARgorithm.Animations namespace coz it shouldnt be in structures Co-authored-by: Yatharth <yatharth.mathur@gmail.com> Co-authored-by: Vinay Valson <vinay.valson@gmail.com>
1 parent 8d04c50 commit 52880cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+5742
-3026
lines changed

.gitignore

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,27 @@
1-
[Ll]ibrary/
2-
[Tt]emp/
3-
[Oo]bj/
4-
[Bb]uild/
5-
[Bb]uilds/
6-
[Ll]ogs/
1+
# This .gitignore file should be placed at the root of your Unity project directory
2+
#
3+
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
4+
#
5+
/[Ll]ibrary/
6+
/[Tt]emp/
7+
/[Oo]bj/
8+
/[Bb]uild/
9+
/[Bb]uilds/
10+
/[Ll]ogs/
11+
/[Uu]ser[Ss]ettings/
12+
13+
# MemoryCaptures can get excessive in size.
14+
# They also could contain extremely sensitive data
15+
/[Mm]emoryCaptures/
16+
17+
# Asset meta data should only be ignored when the corresponding asset is also ignored
18+
!/[Aa]ssets/**/*.meta
719

820
# Uncomment this line if you wish to ignore the asset store tools plugin
9-
# [Aa]ssets/AssetStoreTools*
21+
# /[Aa]ssets/AssetStoreTools*
22+
23+
# Autogenerated Jetbrains Rider plugin
24+
/[Aa]ssets/Plugins/Editor/JetBrains*
1025

1126
# Visual Studio cache directory
1227
.vs/
@@ -42,7 +57,15 @@ sysinfo.txt
4257

4358
# Builds
4459
*.apk
60+
*.aab
4561
*.unitypackage
4662

4763
# Crashlytics generated file
4864
crashlytics-build.properties
65+
66+
# Packed Addressables
67+
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
68+
69+
# Temporary auto-generated Android Assets
70+
/[Aa]ssets/[Ss]treamingAssets/aa.meta
71+
/[Aa]ssets/[Ss]treamingAssets/aa/*

.vscode/settings.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"files.exclude":
3+
{
4+
"**/.DS_Store":true,
5+
"**/.git":true,
6+
"**/.gitignore":true,
7+
"**/.gitmodules":true,
8+
"**/*.booproj":true,
9+
"**/*.pidb":true,
10+
"**/*.suo":true,
11+
"**/*.user":true,
12+
"**/*.userprefs":true,
13+
"**/*.unityproj":true,
14+
"**/*.dll":true,
15+
"**/*.exe":true,
16+
"**/*.pdf":true,
17+
"**/*.mid":true,
18+
"**/*.midi":true,
19+
"**/*.wav":true,
20+
"**/*.gif":true,
21+
"**/*.ico":true,
22+
"**/*.jpg":true,
23+
"**/*.jpeg":true,
24+
"**/*.png":true,
25+
"**/*.psd":true,
26+
"**/*.tga":true,
27+
"**/*.tif":true,
28+
"**/*.tiff":true,
29+
"**/*.3ds":true,
30+
"**/*.3DS":true,
31+
"**/*.fbx":true,
32+
"**/*.FBX":true,
33+
"**/*.lxo":true,
34+
"**/*.LXO":true,
35+
"**/*.ma":true,
36+
"**/*.MA":true,
37+
"**/*.obj":true,
38+
"**/*.OBJ":true,
39+
"**/*.asset":true,
40+
"**/*.cubemap":true,
41+
"**/*.flare":true,
42+
"**/*.mat":true,
43+
"**/*.meta":true,
44+
"**/*.prefab":true,
45+
"**/*.unity":true,
46+
"build/":true,
47+
"Build/":true,
48+
"Library/":true,
49+
"library/":true,
50+
"obj/":true,
51+
"Obj/":true,
52+
"ProjectSettings/":true,
53+
"temp/":true,
54+
"Temp/":true
55+
}
56+
}

Assets/Prefabs/ARgorithmItem.prefab

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ RectTransform:
3434
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3535
m_AnchorMin: {x: 0.5, y: 0.5}
3636
m_AnchorMax: {x: 0.5, y: 0.5}
37-
m_AnchoredPosition: {x: 17.2, y: -41.7}
38-
m_SizeDelta: {x: 606.0645, y: 67.27164}
37+
m_AnchoredPosition: {x: 0.30601, y: -39.4}
38+
m_SizeDelta: {x: 639.7585, y: 78.884186}
3939
m_Pivot: {x: 0.5, y: 0.5}
4040
--- !u!222 &8151022268133371557
4141
CanvasRenderer:
@@ -64,7 +64,7 @@ MonoBehaviour:
6464
m_OnCullStateChanged:
6565
m_PersistentCalls:
6666
m_Calls: []
67-
m_text: Lorem Ipsum
67+
m_text: "THIS WILL GET DELETED BY ITSELF \n"
6868
m_isRightToLeft: 0
6969
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
7070
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
@@ -92,10 +92,10 @@ MonoBehaviour:
9292
m_faceColor:
9393
serializedVersion: 2
9494
rgba: 4294967295
95-
m_fontSize: 25
95+
m_fontSize: 44.3
9696
m_fontSizeBase: 25
9797
m_fontWeight: 400
98-
m_enableAutoSizing: 0
98+
m_enableAutoSizing: 1
9999
m_fontSizeMin: 18
100100
m_fontSizeMax: 72
101101
m_fontStyle: 0
@@ -110,7 +110,7 @@ MonoBehaviour:
110110
m_charWidthMaxAdj: 0
111111
m_enableWordWrapping: 1
112112
m_wordWrappingRatios: 0.4
113-
m_overflowMode: 0
113+
m_overflowMode: 3
114114
m_linkedTextComponent: {fileID: 0}
115115
parentLinkedComponent: {fileID: 0}
116116
m_enableKerning: 1
@@ -535,7 +535,7 @@ MonoBehaviour:
535535
m_OnCullStateChanged:
536536
m_PersistentCalls:
537537
m_Calls: []
538-
m_text: Bubble Sort
538+
m_text: ALGORITHM NAME
539539
m_isRightToLeft: 0
540540
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
541541
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
@@ -640,8 +640,8 @@ RectTransform:
640640
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
641641
m_AnchorMin: {x: 0.5, y: 0.5}
642642
m_AnchorMax: {x: 0.5, y: 0.5}
643-
m_AnchoredPosition: {x: -269, y: 44.061}
644-
m_SizeDelta: {x: 101.14667, y: 57.87774}
643+
m_AnchoredPosition: {x: -287.6, y: 44.061}
644+
m_SizeDelta: {x: 63.98619, y: 57.87774}
645645
m_Pivot: {x: 0.5, y: 0.5}
646646
--- !u!222 &8151022269695092988
647647
CanvasRenderer:

Assets/Prefabs/Comments Box.prefab

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &3408954944413619464
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 3408954944413619465}
12+
- component: {fileID: 3408954944413619467}
13+
- component: {fileID: 3408954944413619466}
14+
m_Layer: 5
15+
m_Name: Comments Box
16+
m_TagString: CommentBox
17+
m_Icon: {fileID: 0}
18+
m_NavMeshLayer: 0
19+
m_StaticEditorFlags: 0
20+
m_IsActive: 1
21+
--- !u!224 &3408954944413619465
22+
RectTransform:
23+
m_ObjectHideFlags: 0
24+
m_CorrespondingSourceObject: {fileID: 0}
25+
m_PrefabInstance: {fileID: 0}
26+
m_PrefabAsset: {fileID: 0}
27+
m_GameObject: {fileID: 3408954944413619464}
28+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
29+
m_LocalPosition: {x: 0, y: 0, z: 0}
30+
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_Children: []
32+
m_Father: {fileID: 0}
33+
m_RootOrder: 0
34+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35+
m_AnchorMin: {x: 0, y: 0.13377024}
36+
m_AnchorMax: {x: 1, y: 0.22982432}
37+
m_AnchoredPosition: {x: 0, y: 1}
38+
m_SizeDelta: {x: 0, y: -0.6480713}
39+
m_Pivot: {x: 0.5, y: 0.5}
40+
--- !u!222 &3408954944413619467
41+
CanvasRenderer:
42+
m_ObjectHideFlags: 0
43+
m_CorrespondingSourceObject: {fileID: 0}
44+
m_PrefabInstance: {fileID: 0}
45+
m_PrefabAsset: {fileID: 0}
46+
m_GameObject: {fileID: 3408954944413619464}
47+
m_CullTransparentMesh: 0
48+
--- !u!114 &3408954944413619466
49+
MonoBehaviour:
50+
m_ObjectHideFlags: 0
51+
m_CorrespondingSourceObject: {fileID: 0}
52+
m_PrefabInstance: {fileID: 0}
53+
m_PrefabAsset: {fileID: 0}
54+
m_GameObject: {fileID: 3408954944413619464}
55+
m_Enabled: 1
56+
m_EditorHideFlags: 0
57+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
58+
m_Name:
59+
m_EditorClassIdentifier:
60+
m_Material: {fileID: 0}
61+
m_Color: {r: 1, g: 1, b: 1, a: 1}
62+
m_RaycastTarget: 1
63+
m_Maskable: 1
64+
m_OnCullStateChanged:
65+
m_PersistentCalls:
66+
m_Calls: []
67+
m_text: Hello World
68+
m_isRightToLeft: 0
69+
m_fontAsset: {fileID: 11400000, guid: db8e5d852fafb3f4ab85b612e8d470ce, type: 2}
70+
m_sharedMaterial: {fileID: 8963545961531463164, guid: db8e5d852fafb3f4ab85b612e8d470ce,
71+
type: 2}
72+
m_fontSharedMaterials: []
73+
m_fontMaterial: {fileID: 0}
74+
m_fontMaterials: []
75+
m_fontColor32:
76+
serializedVersion: 2
77+
rgba: 4294967295
78+
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
79+
m_enableVertexGradient: 0
80+
m_colorMode: 3
81+
m_fontColorGradient:
82+
topLeft: {r: 1, g: 1, b: 1, a: 1}
83+
topRight: {r: 1, g: 1, b: 1, a: 1}
84+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
85+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
86+
m_fontColorGradientPreset: {fileID: 0}
87+
m_spriteAsset: {fileID: 0}
88+
m_tintAllSprites: 0
89+
m_StyleSheet: {fileID: 0}
90+
m_TextStyleHashCode: -1183493901
91+
m_overrideHtmlColors: 0
92+
m_faceColor:
93+
serializedVersion: 2
94+
rgba: 4294967295
95+
m_fontSize: 45
96+
m_fontSizeBase: 45
97+
m_fontWeight: 400
98+
m_enableAutoSizing: 0
99+
m_fontSizeMin: 18
100+
m_fontSizeMax: 72
101+
m_fontStyle: 0
102+
m_HorizontalAlignment: 2
103+
m_VerticalAlignment: 512
104+
m_textAlignment: 65535
105+
m_characterSpacing: 0
106+
m_wordSpacing: 0
107+
m_lineSpacing: 0
108+
m_lineSpacingMax: 0
109+
m_paragraphSpacing: 0
110+
m_charWidthMaxAdj: 0
111+
m_enableWordWrapping: 1
112+
m_wordWrappingRatios: 0.4
113+
m_overflowMode: 0
114+
m_linkedTextComponent: {fileID: 0}
115+
parentLinkedComponent: {fileID: 0}
116+
m_enableKerning: 1
117+
m_enableExtraPadding: 0
118+
checkPaddingRequired: 0
119+
m_isRichText: 1
120+
m_parseCtrlCharacters: 1
121+
m_isOrthographic: 1
122+
m_isCullingEnabled: 0
123+
m_horizontalMapping: 0
124+
m_verticalMapping: 0
125+
m_uvLineOffset: 0
126+
m_geometrySortingOrder: 0
127+
m_IsTextObjectScaleStatic: 0
128+
m_VertexBufferAutoSizeReduction: 1
129+
m_useMaxVisibleDescender: 1
130+
m_pageToDisplay: 1
131+
m_margin: {x: 0, y: 0, z: 0, w: 0}
132+
m_isUsingLegacyAnimationComponent: 0
133+
m_isVolumetricText: 0
134+
m_hasFontAssetChanged: 0
135+
m_baseMaterial: {fileID: 0}
136+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

Assets/Prefabs/Comments Box.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)