Skip to content

Commit

Permalink
Various instruction changes
Browse files Browse the repository at this point in the history
In Task 1 dialog box, it now tells the participant to use slow and
controlled movements (issue #25) and at the end it tells the participant
to try to map most of the floor in the room (issue #24).

Fixed issue #29, by making the Task 1 dialog box be on when the AREnv
scene is initiated.
  • Loading branch information
petrepa committed Nov 29, 2020
1 parent e436404 commit e671e12
Show file tree
Hide file tree
Showing 82 changed files with 16,748 additions and 21 deletions.
17 changes: 12 additions & 5 deletions TFE4580 Unity App/Assets/Scenes/AREnv.unity

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

Binary file modified TFE4580 Unity App/Library/ArtifactDB
Binary file not shown.
Binary file modified TFE4580 Unity App/Library/EditorUserBuildSettings.asset
Binary file not shown.
Binary file modified TFE4580 Unity App/Library/LastBuild.buildreport
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ hdr-display-enabled=0
gc-max-time-slice=3
androidStartInFullscreen=1
androidRenderOutsideSafeArea=1
buildDate=637422779091681230
buildDate=637422790575533100
Binary file modified TFE4580 Unity App/Library/PlayerDataCache/Android/Data/data.unity3d
Binary file not shown.
Binary file modified TFE4580 Unity App/Library/SceneVisibilityState.asset
Binary file not shown.
Binary file modified TFE4580 Unity App/Library/SourceAssetDB
Binary file not shown.
2 changes: 1 addition & 1 deletion TFE4580 Unity App/Temp/StagingArea/UnityManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<meta-data android:name="unity.splash-mode" android:value="0" />
<meta-data android:name="unity.splash-enable" android:value="True" />
<meta-data android:name="notch.config" android:value="portrait|landscape" />
<meta-data android:name="unity.build-id" android:value="23a8cd19-9a02-4432-bced-fce10a4408a4" />
<meta-data android:name="unity.build-id" android:value="846aa3c0-bbc7-40de-b8c9-8e08285fc576" />
</application>
<uses-feature android:glEsVersion="0x00030000" />
<uses-permission android:name="android.permission.CAMERA" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ hdr-display-enabled=0
gc-max-time-slice=3
androidStartInFullscreen=1
androidRenderOutsideSafeArea=1
buildDate=637422779091681230
buildDate=637422790575533100
Binary file modified TFE4580 Unity App/Temp/StagingArea/raw/bin/Data/data.unity3d
Binary file not shown.
335 changes: 335 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-020ee2efbef074438b1c86b2c910fd5c

Large diffs are not rendered by default.

278 changes: 278 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-05033e92fcd1a4a2f90d87e1ddec0cd1

Large diffs are not rendered by default.

346 changes: 346 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-089820a95a8884a7a9c9823a2f8e91ca

Large diffs are not rendered by default.

364 changes: 364 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-0b23ded8c1a584515b1d22fb5b5d23c8

Large diffs are not rendered by default.

335 changes: 335 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-0b6ce392aea4f4ec585b21cf0651261d

Large diffs are not rendered by default.

364 changes: 364 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-0dd15356672f949029fb00dd0629aa34

Large diffs are not rendered by default.

277 changes: 277 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-1156a7ca403784c2f8c32155a04f077c

Large diffs are not rendered by default.

384 changes: 384 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-129fff52065fe49908b632e4bd177e54

Large diffs are not rendered by default.

281 changes: 281 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-1bbc93084d7fd4f45a8f40e045baa589

Large diffs are not rendered by default.

282 changes: 282 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-2062d0e9862654f4d98ab5e8660131da

Large diffs are not rendered by default.

346 changes: 346 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-275cd01fa05104a2c9b28e25b2b2db50

Large diffs are not rendered by default.

346 changes: 346 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-29854c30d39e24b0fbc1755c0d9176bc

Large diffs are not rendered by default.

319 changes: 319 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-305393d04e73248d08c3ed7e40c7167e

Large diffs are not rendered by default.

279 changes: 279 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-33e591280fe7340fb8c9b80b53f20685

Large diffs are not rendered by default.

278 changes: 278 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-3da28c9a265c34e59b6c892d1d0d39bb

Large diffs are not rendered by default.

360 changes: 360 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-40a82c430bd694bfb80f495127a8c762

Large diffs are not rendered by default.

279 changes: 279 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-469161659844641a586c393ee12a0315

Large diffs are not rendered by default.

380 changes: 380 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-4b6ee6ac0921f449c90dba464d79212a

Large diffs are not rendered by default.

277 changes: 277 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-4cd2680e216094d9cbd9869dfdbaa4c5

Large diffs are not rendered by default.

281 changes: 281 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-4d8aa7d9fa5b44b87a82c047a32b30ef

Large diffs are not rendered by default.

346 changes: 346 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-50647f8c57462489594d63e23415b136

Large diffs are not rendered by default.

295 changes: 295 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-5bb357f1b0dc045be9a0a76c088015d5

Large diffs are not rendered by default.

295 changes: 295 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-5e424594ceafd4233a49befc7add710f

Large diffs are not rendered by default.

281 changes: 281 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-61f95794a92604736814bb004e3fa293

Large diffs are not rendered by default.

380 changes: 380 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-6f8247658d8be45668901a30ca924d7f

Large diffs are not rendered by default.

335 changes: 335 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-777fc4e5191904b4daa8c8a8b3424fb1

Large diffs are not rendered by default.

278 changes: 278 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-869b30c1fba444c76b463ce21ec88b35

Large diffs are not rendered by default.

364 changes: 364 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-86fe8a0397e4f428185b230737697903

Large diffs are not rendered by default.

277 changes: 277 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-8e09aec3688824bb0b543aa2733a0da5

Large diffs are not rendered by default.

384 changes: 384 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-943480b65326e40ccb0d172045f25497

Large diffs are not rendered by default.

278 changes: 278 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-954006f126815427099c853e126604e8

Large diffs are not rendered by default.

319 changes: 319 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-95cf214d33f684b9da4451c3b74cae61

Large diffs are not rendered by default.

282 changes: 282 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-a0e30687ede9b4c70af760eecf32d98c

Large diffs are not rendered by default.

384 changes: 384 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-a328bcf83b6ba42b686e8845d4bb4290

Large diffs are not rendered by default.

281 changes: 281 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-aa8895cb8a1b843c3ae67e3a1dd85e65

Large diffs are not rendered by default.

319 changes: 319 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-acd40b720afbe4a3099f1dd13717dc37

Large diffs are not rendered by default.

319 changes: 319 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-b3a4a22908c3b40d4a79ee86d68ab264

Large diffs are not rendered by default.

380 changes: 380 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-b3f613d3496874b50abc6a5f135ea686

Large diffs are not rendered by default.

282 changes: 282 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-b4fb8d65d96494e8e979f1976846bcdf

Large diffs are not rendered by default.

295 changes: 295 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-b9df0cf72ce444c33a9e3f3fe17d4f0a

Large diffs are not rendered by default.

384 changes: 384 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-c3106e8ca1d444acebad441c480e03b3

Large diffs are not rendered by default.

380 changes: 380 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-c6a183e5f2a394e41a1f08fd06db41c5

Large diffs are not rendered by default.

282 changes: 282 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-c72f4cc5ad08745f9b6014d031e304fb

Large diffs are not rendered by default.

360 changes: 360 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-e0b8ce0b962ed416f8efd4ffe13a113a

Large diffs are not rendered by default.

335 changes: 335 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-e3433aa3d2b764cb9bd9b4d937c3dc00

Large diffs are not rendered by default.

364 changes: 364 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-e4bc28f96b96e40d6b0841913881eb43

Large diffs are not rendered by default.

360 changes: 360 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-e777eb37f22504c43951f8e675b3487b

Large diffs are not rendered by default.

360 changes: 360 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-ec01ee76034544b9ebf2c10fbba293f6

Large diffs are not rendered by default.

295 changes: 295 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-ed7e5caeecebf4d4c9ec7df81e9ce717

Large diffs are not rendered by default.

279 changes: 279 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-eed519e6f14f542e189fd62a87045c5f

Large diffs are not rendered by default.

279 changes: 279 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-f433f4e47e3aa44e49304f084e282357

Large diffs are not rendered by default.

277 changes: 277 additions & 0 deletions TFE4580 Unity App/Temp/UnityTempFile-fd217e4c46d6b4488ac7c8987dd4e54d

Large diffs are not rendered by default.

Binary file modified TFE4580 Unity App/Temp/__Backupscenes/0.backup
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
android:value="portrait|landscape" />
<meta-data
android:name="unity.build-id"
android:value="23a8cd19-9a02-4432-bced-fce10a4408a4" />
android:value="846aa3c0-bbc7-40de-b8c9-8e08285fc576" />
<meta-data
android:name="com.google.ar.core"
android:value="required" /> <!-- The minimal version code of ARCore APK required for an app using this SDK. -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Sun Nov 29 21:19:07 CET 2020
#Sun Nov 29 21:37:41 CET 2020
base.0=/Users/petrepa/Project/TFE4580/TFE4580 Unity App/Temp/gradleOut/launcher/build/intermediates/dex/release/out/classes.dex
path.0=classes.dex
renamed.0=classes.dex
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
android:value="portrait|landscape" />
<meta-data
android:name="unity.build-id"
android:value="23a8cd19-9a02-4432-bced-fce10a4408a4" />
android:value="846aa3c0-bbc7-40de-b8c9-8e08285fc576" />
<meta-data
android:name="com.google.ar.core"
android:value="required" /> <!-- The minimal version code of ARCore APK required for an app using this SDK. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
85-->[:unityLibrary] /Users/petrepa/Project/TFE4580/TFE4580 Unity App/Temp/gradleOut/unityLibrary/build/intermediates/library_manifest/release/AndroidManifest.xml:71:9-73:68
86 android:name="unity.build-id"
86-->[:unityLibrary] /Users/petrepa/Project/TFE4580/TFE4580 Unity App/Temp/gradleOut/unityLibrary/build/intermediates/library_manifest/release/AndroidManifest.xml:72:13-42
87 android:value="23a8cd19-9a02-4432-bced-fce10a4408a4" />
87 android:value="846aa3c0-bbc7-40de-b8c9-8e08285fc576" />
87-->[:unityLibrary] /Users/petrepa/Project/TFE4580/TFE4580 Unity App/Temp/gradleOut/unityLibrary/build/intermediates/library_manifest/release/AndroidManifest.xml:73:13-65
88 <meta-data
88-->[:unityLibrary] /Users/petrepa/Project/TFE4580/TFE4580 Unity App/Temp/gradleOut/unityLibrary/build/intermediates/library_manifest/release/AndroidManifest.xml:74:9-76:40
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ hdr-display-enabled=0
gc-max-time-slice=3
androidStartInFullscreen=1
androidRenderOutsideSafeArea=1
buildDate=637422779091681230
buildDate=637422790575533100
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
android:value="portrait|landscape" />
<meta-data
android:name="unity.build-id"
android:value="23a8cd19-9a02-4432-bced-fce10a4408a4" />
android:value="846aa3c0-bbc7-40de-b8c9-8e08285fc576" />
<meta-data
android:name="com.google.ar.core"
android:value="required" /> <!-- The minimal version code of ARCore APK required for an app using this SDK. -->
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
<span class="mdl-layout-title">Lint Report: No errors or warnings</span>
<div class="mdl-layout-spacer"></div>
<nav class="mdl-navigation mdl-layout--large-screen-only">
Check performed at Sun Nov 29 21:19:05 CET 2020 </nav>
Check performed at Sun Nov 29 21:37:40 CET 2020 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
android:value="portrait|landscape" />
<meta-data
android:name="unity.build-id"
android:value="23a8cd19-9a02-4432-bced-fce10a4408a4" />
android:value="846aa3c0-bbc7-40de-b8c9-8e08285fc576" />
<meta-data
android:name="com.google.ar.core"
android:value="required" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ hdr-display-enabled=0
gc-max-time-slice=3
androidStartInFullscreen=1
androidRenderOutsideSafeArea=1
buildDate=637422779091681230
buildDate=637422790575533100
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
android:value="portrait|landscape" />
<meta-data
android:name="unity.build-id"
android:value="23a8cd19-9a02-4432-bced-fce10a4408a4" />
android:value="846aa3c0-bbc7-40de-b8c9-8e08285fc576" />
<meta-data
android:name="com.google.ar.core"
android:value="required" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
71-->/Users/petrepa/Project/TFE4580/TFE4580 Unity App/Temp/gradleOut/unityLibrary/src/main/AndroidManifest.xml:18:5-101
72 android:name="unity.build-id"
72-->/Users/petrepa/Project/TFE4580/TFE4580 Unity App/Temp/gradleOut/unityLibrary/src/main/AndroidManifest.xml:18:16-45
73 android:value="23a8cd19-9a02-4432-bced-fce10a4408a4" />
73 android:value="846aa3c0-bbc7-40de-b8c9-8e08285fc576" />
73-->/Users/petrepa/Project/TFE4580/TFE4580 Unity App/Temp/gradleOut/unityLibrary/src/main/AndroidManifest.xml:18:46-98
74 <meta-data
74-->/Users/petrepa/Project/TFE4580/TFE4580 Unity App/Temp/gradleOut/unityLibrary/src/main/AndroidManifest.xml:19:5-77
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<meta-data android:name="unity.splash-mode" android:value="0" />
<meta-data android:name="unity.splash-enable" android:value="True" />
<meta-data android:name="notch.config" android:value="portrait|landscape" />
<meta-data android:name="unity.build-id" android:value="23a8cd19-9a02-4432-bced-fce10a4408a4" />
<meta-data android:name="unity.build-id" android:value="846aa3c0-bbc7-40de-b8c9-8e08285fc576" />
<meta-data android:name="com.google.ar.core" android:value="required" />
</application>
<uses-feature android:glEsVersion="0x00030000" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ hdr-display-enabled=0
gc-max-time-slice=3
androidStartInFullscreen=1
androidRenderOutsideSafeArea=1
buildDate=637422779091681230
buildDate=637422790575533100
Binary file not shown.

0 comments on commit e671e12

Please sign in to comment.