spoerrireto/UP-Viagg-io
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: spoerrireto:911bcbbcaba82b162072ce3ff686c5d195687ebb
Branches Tags
spoerrireto:master
spoerrireto:programming
spoerrireto:leveldesign
spoerrireto:PerformanceV2
spoerrireto:dev
spoerrireto:story_process
spoerrireto:interaction
spoerrireto:scene_loading
spoerrireto:depthkit_samples
spoerrireto:btc_debug
..
compare: spoerrireto:3ef821fdace8aec1fd47a15d2a60213fa8fdfe0b
Branches Tags
spoerrireto:programming
spoerrireto:master
spoerrireto:leveldesign
spoerrireto:PerformanceV2
spoerrireto:dev
spoerrireto:story_process
spoerrireto:interaction
spoerrireto:scene_loading
spoerrireto:depthkit_samples
spoerrireto:btc_debug

No commits in common. "911bcbbcaba82b162072ce3ff686c5d195687ebb" and "3ef821fdace8aec1fd47a15d2a60213fa8fdfe0b" have entirely different histories.
911bcbbcab ... 3ef821fdac

7 changed files with 715333 additions and 1461 deletions
Show Stats Expand all files Collapse all files

26
Viagg-io/Assets/BehaviourTrees/1.0-SBB.bt.txt
View File

@ -121,14 +121,14 @@ Tree("10_SBB_Zugabteil_Intro") {
BTC.CompareIntentID("Zugabteil-Exposition-U-4a")
BTC.ClearPossbileSpeechIntents()
// Load Scene: Story A Picknicken
//BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Run("LoadScene.NEXT.20SBB")
}
Composite(Sequence) {
BTC.CompareIntentID("Zugabteil-Exposition-U-4b")
BTC.ClearPossbileSpeechIntents()
// Load Scene: Story B Grotto
//BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Run("LoadScene.NEXT.30SBB")
}
}
@ -174,18 +174,8 @@ Tree("10_SBB_Zugabteil_Szenenwahl_Selection") {
// Story A + B besucht
BTC.StoryBVisited()
// --- Story Ende ---
Composite(Marathon) {
Composite(Sequence) {
BTC.Show("GO.HINTS.SitDownHint")
BTC.Wait(5)
BTC.Hide("GO.HINTS.SitDownHint")
}
Composite(Sequence) {
BTC.Hide("MediaPlayer.VIDEOS.IntroFidle1")
BTC.Run("MediaPlayer.VIDEOS.StoryEndeF1")
}
}
BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Run("LoadScene.NEXT.00Menu")
}
@ -194,11 +184,9 @@ Tree("10_SBB_Zugabteil_Szenenwahl_Selection") {
// Story A besucht
// Story B nicht besucht
// --- Repetition Intro B ---
BTC.Show("GO.HINTS.SitDownHint")
BTC.Hide("MediaPlayer.VIDEOS.IntroFidle1")
BTC.Run("MediaPlayer.VIDEOS.RepetitionIntroBF1")
BTC.Run("MediaPlayer.VIDEOS.RepetitionIntroBFi_2")
BTC.Hide("GO.HINTS.SitDownHint")
RunTree("10_SBB_Zugabteil_Szenenwahl")
}
}
@ -211,11 +199,9 @@ Tree("10_SBB_Zugabteil_Szenenwahl_Selection") {
// Story B besucht
// Story A nicht besucht
// --- Repetition Intro A ---
BTC.Show("GO.HINTS.SitDownHint")
BTC.Hide("MediaPlayer.VIDEOS.IntroFidle1")
BTC.Run("MediaPlayer.VIDEOS.RepetitionIntroAF1")
BTC.Run("MediaPlayer.VIDEOS.RepetitionIntroAFi_2")
BTC.Hide("GO.HINTS.SitDownHint")
RunTree("10_SBB_Zugabteil_Szenenwahl")
}
@ -260,14 +246,14 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
BTC.CompareIntentID("Zugabteil-Exposition-U-4a")
BTC.ClearPossbileSpeechIntents()
// Load Scene: Story A Picknicken
//BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Run("LoadScene.NEXT.20SBB")
}
Composite(Sequence) {
BTC.CompareIntentID("Zugabteil-Exposition-U-4b")
BTC.ClearPossbileSpeechIntents()
// Load Scene: Story B Grotto
//BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Run("LoadScene.NEXT.30SBB")
}
}
@ -336,7 +322,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
}
// Load Scene: Story A Picknicken
//BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Run("LoadScene.NEXT.20SBB")
}
Composite(Sequence) {
@ -352,7 +338,7 @@ Tree("10_SBB_Zugabteil_Szenenwahl") {
}
// Load Scene: Story B Grotto
//BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.FadeOut("FadeScene.XRInteractionHandsSetup.Black")
BTC.Run("LoadScene.NEXT.30SBB")
}
} // Race Buttons

3
Viagg-io/Assets/BehaviourTrees/2.0-SBB.bt.txt
View File

@ -34,7 +34,10 @@
Tree("20_SBB_Story_A_Picknicken_Start") {
Composite(Sequence) {
Composite(Marathon) {
BTC.FadeIn("FadeScene.XRInteractionHandsSetup.Black")
BTC.Run("MediaPlayer.VIDEOS.StartF1")
}
BTC.Run("MediaPlayer.VIDEOS.StartFidle2")

40
Viagg-io/Assets/BehaviourTrees/2.2-Geschaeft.bt.txt
View File

@ -42,12 +42,10 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
Composite(Marathon) {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroVidl_01")
BTC.FadeIn("FadeScene.XRInteractionHandsSetup.Black")
BTC.Show("GO.HINTS.StandUpHint")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroF2")
}
Composite(Marathon) {
BTC.Hide("GO.HINTS.StandUpHint")
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroFidl_03")
BTC.Hide("MediaPlayer.VIDEOS.BaeckereiIntroVidl_01")
}
@ -68,13 +66,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroVidl_09")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Intro-U-9")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -97,7 +93,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -107,13 +102,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroVidl_11")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Intro-U-11")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -136,7 +129,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -146,13 +138,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroVidl_13")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Intro-U-13")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -175,7 +165,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -189,13 +178,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiIntroFidl_16")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Intro-U-16a")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -220,7 +207,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
// --- Story A Picknicken - Nachfrage Bestellung ---
Composite(Marathon) {
@ -236,13 +222,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.Run("MediaPlayer.VIDEOS.NachfrageBestellun_VIdle4")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Nachfrage_Bestellung-U-4a")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -267,7 +251,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Intro") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
// --- Story A Picknicken - Bestellung Begleiter Beide ---
Composite(Marathon) {
@ -345,13 +328,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Mitnehmen") {
BTC.Run("MediaPlayer.VIDEOS.BezahleneinzelnVid_03")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Bezahlen_einzeln-U-3")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -374,7 +355,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Mitnehmen") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -406,13 +386,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Mitnehmen") {
BTC.Run("MediaPlayer.VIDEOS.BezahleneinzelnVid_07")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Bezahlen_einzeln-U-7a")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -435,7 +413,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Mitnehmen") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -505,13 +482,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Dank_Einkauf") {
BTC.Run("MediaPlayer.VIDEOS.DankEinkaufVidle3")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Dank_Einkauf-U-3a")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -534,7 +509,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Dank_Einkauf") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -591,6 +565,8 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.Hide("MediaPlayer.VIDEOS.BestellungBegleite_BeideVIdle14")
BTC.Hide("MediaPlayer.VIDEOS.BestellungBegleite_VIdle17")
// Init Position User
BTC.SetPosition("GO.XRInteractionHandsSetup.XROrigin", -0.718, 0, -0.28)
BTC.SetPosition("GO.HANDMENU", -0.85, 0, -0.28)
BTC.RotateToAngle("GO.XRInteractionHandsSetup.XROrigin", -90.0)
BTC.RotateToAngle("GO.HANDMENU", -90.0)
}
@ -631,13 +607,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroEidl_11")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-11a")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -660,7 +634,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -669,13 +642,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.Run("MediaPlayer.VIDEOS.BaeckereiOutroEidl_13")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-13a")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -698,7 +669,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -728,13 +698,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-25")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -757,7 +725,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}
@ -774,13 +741,11 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-29a")
BTC.AddPossbileSpeechIntent("Story_A_Picknicken-Baeckerei_Outro-U-29b")
BTC.StartSpeechIntentRecognition()
BTC.Show("GO.HINTS.SpeakHint")
Composite(Race) {
// -- Race 1: User sagt etwas
Composite(Sequence) {
BTC.UserStartedSpeechInput()
BTC.Hide("GO.HINTS.SpeakHint")
Composite(Selector) {
// -- Selector 1: Intent erkannt
@ -803,7 +768,6 @@ Tree("22_Geschaeft_Story_A_Picknicken_Baeckerei_Outro") {
BTC.AbortSpeechEventListener()
BTC.StopSpeechIntentRecognition()
BTC.ClearPossbileSpeechIntents()
BTC.Hide("GO.HINTS.SpeakHint")
}
}

3
Viagg-io/Assets/BehaviourTrees/3.0-SBB.bt.txt
View File

@ -35,7 +35,10 @@
Tree("30_SBB_Story_B_Grotto_Start") {
Composite(Sequence) {
Composite(Marathon) {
BTC.Run("MediaPlayer.VIDEOS.StartF1")
BTC.FadeIn("FadeScene.XRInteractionHandsSetup.Black")
}
BTC.Run("MediaPlayer.VIDEOS.StartFidle2")
BTC.AddPossbileSpeechIntent("Story_B_Grotto-Start-U-2a")

257013
Viagg-io/Assets/Scenes/0.5-Tutorial.unity
View File

File diff suppressed because it is too large Load Diff

458712
Viagg-io/Assets/Scenes/2.2-Geschaeft.unity
View File

File diff suppressed because it is too large Load Diff

989
Viagg-io/Assets/Scenes/2.6-Castello.unity
View File

File diff suppressed because it is too large Load Diff