diff --git a/.DS_Store b/.DS_Store
index c548071fa8c0f8d5b851b50e55160cab5989ccef..311fed6ff16be41f475b3dfc93c5f395adf86999 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Lets Literate.xcodeproj/project.pbxproj b/Lets Literate.xcodeproj/project.pbxproj
index 8425f39295f5c5c50b3fec3d34c07b5fda36a3b7..07b45e0f9c01da652df4cb38d88e7a126488f716 100755
--- a/Lets Literate.xcodeproj/project.pbxproj
+++ b/Lets Literate.xcodeproj/project.pbxproj
@@ -10,6 +10,8 @@
A6005B8D27B03632009E2967 /* passwordsBruteForceIntro.m4v in Resources */ = {isa = PBXBuildFile; fileRef = A6005B8C27B03632009E2967 /* passwordsBruteForceIntro.m4v */; };
A6005B8F27B03704009E2967 /* passwordsIntro.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = A6005B8E27B03704009E2967 /* passwordsIntro.mp4 */; };
A6005B9127B0388C009E2967 /* passwordsBruteForceFrom1To3.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = A6005B9027B0388C009E2967 /* passwordsBruteForceFrom1To3.mp4 */; };
+ A611458C27BCF90E00D71111 /* explore_disclaimer_02.png in Resources */ = {isa = PBXBuildFile; fileRef = A611458B27BCF90E00D71111 /* explore_disclaimer_02.png */; };
+ A611458E27BCFBEB00D71111 /* good_bad_02.png in Resources */ = {isa = PBXBuildFile; fileRef = A611458D27BCFBEB00D71111 /* good_bad_02.png */; };
A623508D27AAE67D0030D490 /* InventoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A623508C27AAE67D0030D490 /* InventoryViewController.swift */; };
A623508F27AAE8360030D490 /* mainmenu_background03.png in Resources */ = {isa = PBXBuildFile; fileRef = A623508E27AAE8360030D490 /* mainmenu_background03.png */; };
A623509527AAEB290030D490 /* ExploreViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A623509427AAEB290030D490 /* ExploreViewController.swift */; };
@@ -42,6 +44,7 @@
A675CCA727B818C1003B3C58 /* explore_btn_reflect.png in Resources */ = {isa = PBXBuildFile; fileRef = A675CCA627B818C1003B3C58 /* explore_btn_reflect.png */; };
A675CCA927B81A39003B3C58 /* reflect_slide.png in Resources */ = {isa = PBXBuildFile; fileRef = A675CCA827B81A39003B3C58 /* reflect_slide.png */; };
A680413627B5857000314DE6 /* inventory_not_collected.png in Resources */ = {isa = PBXBuildFile; fileRef = A680413527B5857000314DE6 /* inventory_not_collected.png */; };
+ A69E3DC727BE907F00D561AA /* ar-mode.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = A69E3DC627BE907F00D561AA /* ar-mode.mp4 */; };
A6A78BF427A9579800675532 /* Avatar.png in Resources */ = {isa = PBXBuildFile; fileRef = A6A78BF327A9579800675532 /* Avatar.png */; };
A6B94B2127B5557300861198 /* inventory_collected2.png in Resources */ = {isa = PBXBuildFile; fileRef = A6B94B2027B5557300861198 /* inventory_collected2.png */; };
A6B94B2327B55C4500861198 /* tutorial.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = A6B94B2227B55C4500861198 /* tutorial.mp4 */; };
@@ -57,6 +60,8 @@
A6005B8C27B03632009E2967 /* passwordsBruteForceIntro.m4v */ = {isa = PBXFileReference; lastKnownFileType = file; path = passwordsBruteForceIntro.m4v; sourceTree = "<group>"; };
A6005B8E27B03704009E2967 /* passwordsIntro.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = passwordsIntro.mp4; sourceTree = "<group>"; };
A6005B9027B0388C009E2967 /* passwordsBruteForceFrom1To3.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = passwordsBruteForceFrom1To3.mp4; sourceTree = "<group>"; };
+ A611458B27BCF90E00D71111 /* explore_disclaimer_02.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = explore_disclaimer_02.png; sourceTree = "<group>"; };
+ A611458D27BCFBEB00D71111 /* good_bad_02.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = good_bad_02.png; sourceTree = "<group>"; };
A623508C27AAE67D0030D490 /* InventoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InventoryViewController.swift; sourceTree = "<group>"; };
A623508E27AAE8360030D490 /* mainmenu_background03.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mainmenu_background03.png; sourceTree = "<group>"; };
A623509427AAEB290030D490 /* ExploreViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExploreViewController.swift; sourceTree = "<group>"; };
@@ -78,7 +83,6 @@
A664716D27A8399900417BF1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
A664717627A83AB000417BF1 /* HomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeViewController.swift; sourceTree = "<group>"; };
A664717A27A840E200417BF1 /* Letsliterate.rcproject */ = {isa = PBXFileReference; lastKnownFileType = file.rcproject; path = Letsliterate.rcproject; sourceTree = "<group>"; };
- A6703EC427BB69130039D279 /* ar-mode.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ar-mode.mp4"; sourceTree = "<group>"; };
A672B65127B19391000A9007 /* ImagesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagesViewController.swift; sourceTree = "<group>"; };
A672B65327B1944C000A9007 /* strong_password.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = strong_password.png; sourceTree = "<group>"; };
A672B65427B1944D000A9007 /* ranking_passwords.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ranking_passwords.png; sourceTree = "<group>"; };
@@ -91,6 +95,7 @@
A675CCA627B818C1003B3C58 /* explore_btn_reflect.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = explore_btn_reflect.png; sourceTree = "<group>"; };
A675CCA827B81A39003B3C58 /* reflect_slide.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = reflect_slide.png; sourceTree = "<group>"; };
A680413527B5857000314DE6 /* inventory_not_collected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = inventory_not_collected.png; sourceTree = "<group>"; };
+ A69E3DC627BE907F00D561AA /* ar-mode.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ar-mode.mp4"; sourceTree = "<group>"; };
A6A78BF327A9579800675532 /* Avatar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Avatar.png; sourceTree = "<group>"; };
A6B94B2027B5557300861198 /* inventory_collected2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = inventory_collected2.png; sourceTree = "<group>"; };
A6B94B2227B55C4500861198 /* tutorial.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = tutorial.mp4; sourceTree = "<group>"; };
@@ -155,6 +160,7 @@
A6A78BF327A9579800675532 /* Avatar.png */,
A623508E27AAE8360030D490 /* mainmenu_background03.png */,
A675CCA027B81174003B3C58 /* explore_disclaimer.png */,
+ A611458B27BCF90E00D71111 /* explore_disclaimer_02.png */,
A63DDDAA27AC0607007CB857 /* explore_mask_scan.png */,
A63DDDAC27AC07F8007CB857 /* explore_btn_inventory.png */,
A675CCA427B818B2003B3C58 /* explore_btn_menu_hamburger.png */,
@@ -171,11 +177,12 @@
A672B65427B1944D000A9007 /* ranking_passwords.png */,
A672B65327B1944C000A9007 /* strong_password.png */,
A672B65827B19455000A9007 /* good_idea_bad_idea.png */,
+ A611458D27BCFBEB00D71111 /* good_bad_02.png */,
A672B65727B19455000A9007 /* types_of_usage.png */,
A680413527B5857000314DE6 /* inventory_not_collected.png */,
A6B94B2027B5557300861198 /* inventory_collected2.png */,
A675CCA827B81A39003B3C58 /* reflect_slide.png */,
- A6703EC427BB69130039D279 /* ar-mode.mp4 */,
+ A69E3DC627BE907F00D561AA /* ar-mode.mp4 */,
A6B94B2227B55C4500861198 /* tutorial.mp4 */,
);
path = "Lets Literate";
@@ -245,6 +252,7 @@
A664716E27A8399900417BF1 /* LaunchScreen.storyboard in Resources */,
A6005B8F27B03704009E2967 /* passwordsIntro.mp4 in Resources */,
A63DDDAD27AC07F8007CB857 /* explore_btn_inventory.png in Resources */,
+ A611458E27BCFBEB00D71111 /* good_bad_02.png in Resources */,
A6B94B2327B55C4500861198 /* tutorial.mp4 in Resources */,
A675CCA327B8149F003B3C58 /* bruteForce_btn_use.png in Resources */,
A623508F27AAE8360030D490 /* mainmenu_background03.png in Resources */,
@@ -263,6 +271,7 @@
A675CCA527B818B2003B3C58 /* explore_btn_menu_hamburger.png in Resources */,
A6E5FCE927BABD7D008EF9E1 /* mainmenu_btn_ar.png in Resources */,
A633CDCE27A93ED600450383 /* mainmenu_btn_explore.png in Resources */,
+ A611458C27BCF90E00D71111 /* explore_disclaimer_02.png in Resources */,
A6B94B2127B5557300861198 /* inventory_collected2.png in Resources */,
A6B94B2527B56A5E00861198 /* passwordsBruteForceOutro.mp4 in Resources */,
A675CCA927B81A39003B3C58 /* reflect_slide.png in Resources */,
@@ -271,6 +280,7 @@
A6005B8D27B03632009E2967 /* passwordsBruteForceIntro.m4v in Resources */,
A633CDC827A93E3500450383 /* mainmenu_background02.png in Resources */,
A675CC9F27B80FCF003B3C58 /* bruteForce_mask_scan_four_stones.png in Resources */,
+ A69E3DC727BE907F00D561AA /* ar-mode.mp4 in Resources */,
A672B65527B1944D000A9007 /* strong_password.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
diff --git a/Lets Literate.xcodeproj/project.xcworkspace/xcuserdata/aljoscha.xcuserdatad/UserInterfaceState.xcuserstate b/Lets Literate.xcodeproj/project.xcworkspace/xcuserdata/aljoscha.xcuserdatad/UserInterfaceState.xcuserstate
index 469b0d94e168b1d8ab069188c38d0604b0229881..5cabeb11ad4a0e46087d47e0bdf941316a711c16 100755
Binary files a/Lets Literate.xcodeproj/project.xcworkspace/xcuserdata/aljoscha.xcuserdatad/UserInterfaceState.xcuserstate and b/Lets Literate.xcodeproj/project.xcworkspace/xcuserdata/aljoscha.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Lets Literate/.DS_Store b/Lets Literate/.DS_Store
index 104787f1f0cbb53a898c89e43644431dd4c627bc..0ee9e5a12d08ff0fdc36da6bdb7ba564dea2fe70 100644
Binary files a/Lets Literate/.DS_Store and b/Lets Literate/.DS_Store differ
diff --git a/Lets Literate/Assets.xcassets/AR Stonetextures Demo.arresourcegroup/stone_H_schwarz.arreferenceimage/Contents.json b/Lets Literate/Assets.xcassets/AR Stonetextures Demo.arresourcegroup/stone_H_schwarz.arreferenceimage/Contents.json
index cdba5e0284cc09d9749bbbf86b16d3d10b475fab..67df10aea40a20823d2271517b360bee4fa4d1b6 100644
--- a/Lets Literate/Assets.xcassets/AR Stonetextures Demo.arresourcegroup/stone_H_schwarz.arreferenceimage/Contents.json
+++ b/Lets Literate/Assets.xcassets/AR Stonetextures Demo.arresourcegroup/stone_H_schwarz.arreferenceimage/Contents.json
@@ -11,6 +11,6 @@
},
"properties" : {
"unit" : "centimeters",
- "width" : 0
+ "width" : 5
}
}
diff --git a/Lets Literate/ExploreViewController.swift b/Lets Literate/ExploreViewController.swift
index 30d01c5e7264e08ee69a04e04df1f233c3017716..a2cce9672055c5349c2e882666b099117c3f9831 100755
--- a/Lets Literate/ExploreViewController.swift
+++ b/Lets Literate/ExploreViewController.swift
@@ -41,7 +41,7 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
if task11_stone_to_use == "1" {
print("Task1.1: correct stone selected")
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate)
- self._playPasswordsTaskBruteForceAttackFrom1To3Chars()
+ //self._playPasswordsTaskBruteForceAttackFrom1To3Chars()
Game.setMode(mode: .task1)
subTask = 2
imageScanMask.image = UIImage(named:"bruteForce_mask_scan_four_stones.png")
@@ -150,7 +150,7 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
super.viewDidAppear(animated)
print("viewDidAppear(_:) called")
if self._disclaimer_showed == false {
- self._taskImage = "explore_disclaimer.png"
+ self._taskImage = "explore_disclaimer_02.png"
performSegue(withIdentifier: "fromExplore2ImagesSegue", sender: self)
self._disclaimer_showed = true
}
@@ -201,7 +201,7 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
print("inTask1: no imageAnchor found")
return
}
- if let imageName = imageAnchor.name, imageName == "demo_stone_texture05" { //"demo_stone_texture02" - "stone_H_schwarz"
+ if let imageName = imageAnchor.name, imageName == "stone_h_a" { //"demo_stone_texture02" - "stone_H_schwarz"
print("Station Passwords - Task 1.1: stone for H anchor found")
rkView.session.remove(anchor: imageAnchor)
rkView.session.pause()
@@ -211,7 +211,7 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
self.task11_stone_to_use = "H"
return
}
- if let imageName = imageAnchor.name, imageName == "demo_stone_texture02" { //"demo_stone_texture03" - "stone_i_schwarz"
+ if let imageName = imageAnchor.name, imageName == "stone_i_a" { //"demo_stone_texture03" - "stone_i_schwarz"
print("Station Passwords - Task 1.1: stone for i anchor found")
rkView.session.remove(anchor: imageAnchor)
rkView.session.pause()
@@ -221,7 +221,7 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
self.task11_stone_to_use = "i"
return
}
- if let imageName = imageAnchor.name, imageName == "demo_stone_texture06" { //"demo_stone_texture05" - "stone_1_schwarz"
+ if let imageName = imageAnchor.name, imageName == "stone_1_a" { //"demo_stone_texture05" - "stone_1_schwarz"
print("Station Passwords - Task 1.1: stone for One anchor found")
rkView.session.remove(anchor: imageAnchor)
rkView.session.pause()
@@ -231,7 +231,7 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
self.task11_stone_to_use = "1"
return
}
- if let imageName = imageAnchor.name, imageName == "demo_stone_texture03" { //"demo_stone_texture06" - "stone_Fragezeichen_schwarz" //"demo_stone_texture06"
+ if let imageName = imageAnchor.name, imageName == "stone_frage_a" { //"demo_stone_texture06" - "stone_Fragezeichen_schwarz" //"demo_stone_texture06"
print("Station Passwords - Task 1.1: stone for questionmark anchor found")
rkView.session.remove(anchor: imageAnchor)
rkView.session.pause()
@@ -272,6 +272,17 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
self.task12_stones_to_use = "1i?H"
return
}
+ if let imageName = imageAnchor.name, imageName == "stones_wrong02" {
+ print("Station Passwords - Task 1.2: stones_wrong01 anchor found")
+ rkView.session.remove(anchor: imageAnchor)
+ rkView.session.pause()
+ self.labelDecoded.text = "This is the '?Hi1'"
+ self.labelDecoded.isHidden = false
+ self.btnUse.isHidden = false
+ btnUse.isEnabled = true
+ self.task12_stones_to_use = "1i?H"
+ return
+ }
//other possibilities here and up at btn
}
//if the game is in station mode, we want to scan task planes of a cube
@@ -280,11 +291,11 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
print("inStation, inPasswords: no imageAnchor found")
return
}
- if let imageName = imageAnchor.name, imageName == "anchor_passwords_task1" {
+ if let imageName = imageAnchor.name, imageName == "anchor_passwords_task3" {
//delete the anchor
rkView.session.pause()
rkView.session.remove(anchor: imageAnchor)
- print("Removed anchor: anchor_passwords_task1")
+ print("Removed anchor: anchor_passwords_task3")
if Game.getStations()[0].getTasks()[0].isSolved() == false {
print("Start of Task 1 of Station Passwords")
@@ -359,11 +370,11 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
rkView.session.run(configurationPasswords)
print("Task 2 done, back to station mode")
}
- if let imageName = imageAnchor.name, imageName == "anchor_passwords_task3" {
+ if let imageName = imageAnchor.name, imageName == "anchor_passwords_task1" {
//delete the anchor
rkView.session.pause()
rkView.session.remove(anchor: imageAnchor)
- print("Removed anchor: anchor_passwords_task3")
+ print("Removed anchor: anchor_passwords_task1")
if Game.getStations()[0].getTasks()[2].isSolved() == false {
print("Start of Task 3 of Station Passwords")
@@ -406,7 +417,7 @@ class ExploreViewController: UIViewController, ARSessionDelegate, UIAlertViewDel
if Game.getStations()[0].getTasks()[3].isSolved() == false {
print("Start of Task 4 of Station Passwords")
AudioServicesPlaySystemSound(kSystemSoundID_Vibrate)
- self._taskImage = "good_idea_bad_idea.png"
+ self._taskImage = "good_bad_02.png"
performSegue(withIdentifier: "fromExplore2ImagesSegue", sender: self)
print("Show information ... we make just a sleep for 5 seconds")
self._pause = true
diff --git a/Lets Literate/Game.swift b/Lets Literate/Game.swift
index d2cfcb8420eedabf95e69fc291d646796793c5d8..6223a01359c19dec7d1b5d3ac88e646b0f7110f4 100755
--- a/Lets Literate/Game.swift
+++ b/Lets Literate/Game.swift
@@ -108,6 +108,9 @@ class Game {
}
return nil
}
+ private static func removeStations () {
+ Game.stations.removeAll()
+ }
public static func getStations () -> [Station] {
return Game.stations
@@ -148,6 +151,7 @@ class Game {
print("Actual station is set to none.")
Game.setActStation(station: .none)
+ Game.removeStations()
//initialize the password station
print("Initialize Station Passwords")
diff --git a/Lets Literate/ar-mode.mp4 b/Lets Literate/ar-mode.mp4
index df1f848027a2a1ef456e271ae76d5b6673e1c065..99acea8e27988120db4de2399a6ddd472a16cbb0 100644
Binary files a/Lets Literate/ar-mode.mp4 and b/Lets Literate/ar-mode.mp4 differ
diff --git a/Lets Literate/explore_disclaimer_02.png b/Lets Literate/explore_disclaimer_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..06f6d3640f2158dade32599da7477f42a35a6295
Binary files /dev/null and b/Lets Literate/explore_disclaimer_02.png differ
diff --git a/Lets Literate/good_bad_02.png b/Lets Literate/good_bad_02.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0b12663d4155c65ee56082832e1d9422e4469d6
Binary files /dev/null and b/Lets Literate/good_bad_02.png differ