Compare commits
7 Commits
d482d4244c
...
1ea6211b8b
Author | SHA1 | Date | |
---|---|---|---|
1ea6211b8b | |||
5af4d33d3b | |||
99d1d4897f | |||
8321b89e0c | |||
c55e456702 | |||
3bec521669 | |||
3803f347ce |
BIN
Viagg-io/Assets/Audio/FMOD/Allgemein.bank
Normal file → Executable file
BIN
Viagg-io/Assets/Audio/FMOD/Allgemein.bank
Normal file → Executable file
Binary file not shown.
BIN
Viagg-io/Assets/Audio/FMOD/Grotto_Essen.bank
Normal file → Executable file
BIN
Viagg-io/Assets/Audio/FMOD/Grotto_Essen.bank
Normal file → Executable file
Binary file not shown.
BIN
Viagg-io/Assets/Audio/FMOD/Grotto_Kueche.bank
Normal file → Executable file
BIN
Viagg-io/Assets/Audio/FMOD/Grotto_Kueche.bank
Normal file → Executable file
Binary file not shown.
BIN
Viagg-io/Assets/Audio/FMOD/Master.bank
Normal file → Executable file
BIN
Viagg-io/Assets/Audio/FMOD/Master.bank
Normal file → Executable file
Binary file not shown.
BIN
Viagg-io/Assets/Audio/FMOD/Master.strings.bank
Normal file → Executable file
BIN
Viagg-io/Assets/Audio/FMOD/Master.strings.bank
Normal file → Executable file
Binary file not shown.
BIN
Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank
Executable file
BIN
Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank
Executable file
Binary file not shown.
7
Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank.meta
Normal file
7
Viagg-io/Assets/Audio/FMOD/Picknick.Baeckerei.bank.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3c05e1e61ddc64ac78d98db31ad68bae
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Viagg-io/Assets/Audio/FMOD/SBB.bank
Normal file → Executable file
BIN
Viagg-io/Assets/Audio/FMOD/SBB.bank
Normal file → Executable file
Binary file not shown.
@ -14,13 +14,13 @@
|
||||
Composite(Sequence) {
|
||||
//RunTree("32_Grotto_Story_B_Grotto_Intro")
|
||||
|
||||
RunTree("32_Grotto_Kueche_Intro")
|
||||
//RunTree("32_Grotto_Kueche_Intro")
|
||||
//RunTree("32_Grotto_Kueche_Zwiebeln_schneiden")
|
||||
//RunTree("32_Grotto_Kueche_alles_gefunden")
|
||||
//RunTree("32_Grotto_Kueche_Interesse_Kochen")
|
||||
//RunTree("32_Grotto_Kueche_Kochen_Anzahl")
|
||||
//RunTree("32_Grotto_Kueche_Zusammen_Kochen")
|
||||
//RunTree("32_Grotto_Kueche_Parmigiano")
|
||||
RunTree("32_Grotto_Kueche_Parmigiano")
|
||||
//RunTree("32_Grotto_Im_Grotto_Essen_Intro")
|
||||
}
|
||||
}
|
||||
@ -553,11 +553,11 @@ Tree("32_Grotto_Kueche_Intro") {
|
||||
// Pilze leuchten
|
||||
// momentan nur 1 Pilz
|
||||
BTC.Enable("NamedOutline.INTERACTABLES.Pilz01")
|
||||
BTC.Set("Collider.INTERACTABLES.GlassWasserTrigger", "otherTag", "Steinpilze")
|
||||
|
||||
Composite(Race) {
|
||||
Composite(Sequence) {
|
||||
// Pilze ins Wasser Glas legen
|
||||
BTC.Set("Collider.INTERACTABLES.GlassWasserTrigger", "otherTag", "Steinpilze")
|
||||
BTC.Run("Collider.INTERACTABLES.GlassWasserTrigger")
|
||||
}
|
||||
Composite(Sequence) {
|
||||
@ -569,6 +569,7 @@ Tree("32_Grotto_Kueche_Intro") {
|
||||
BTC.Run("Collider.INTERACTABLES.GlassWasserTrigger")
|
||||
}
|
||||
}
|
||||
|
||||
BTC.Disable("NamedOutline.INTERACTABLES.Pilz01")
|
||||
RunTree("32_Grotto_Kueche_Zwiebeln_schneiden")
|
||||
}
|
||||
@ -1104,8 +1105,7 @@ Tree("32_Grotto_Kueche_Zusammen_Kochen") {
|
||||
BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Steinpilze")
|
||||
BTC.Run("Collider.INTERACTABLES.Topf")
|
||||
|
||||
//RunTree("32_Grotto_Kueche_Parmigiano")
|
||||
RunTree("32_Grotto_Im_Grotto_Essen_Intro")
|
||||
RunTree("32_Grotto_Kueche_Parmigiano")
|
||||
}
|
||||
}
|
||||
|
||||
@ -1124,15 +1124,13 @@ Tree("32_Grotto_Kueche_Selbststaendig_Kochen") {
|
||||
Tree("32_Grotto_Kueche_Parmigiano") {
|
||||
// --- Kueche - Parmigiano ---
|
||||
Composite(Sequence) {
|
||||
BTC.SynthesizeText("Ho preparato il parmigiano, puoi aggiungerlo al risotto, per piacere?")
|
||||
BTC.SpeechOutputEnded()
|
||||
BTC.Run("AudioSource.AUDIO.Kueche5ZusammenKoc")
|
||||
|
||||
// Parmigiano in Topf geben
|
||||
BTC.Set("Collider.INTERACTABLES.Topf", "otherTag", "Parmigiano")
|
||||
BTC.Run("Collider.INTERACTABLES.Topf")
|
||||
|
||||
BTC.SynthesizeText("Hai finito?")
|
||||
BTC.SpeechOutputEnded()
|
||||
BTC.Run("AudioSource.AUDIO.Kueche6ZusammenKoc")
|
||||
|
||||
// Antwort User
|
||||
BTC.AddPossbileSpeechIntent("Kueche.Zusammen_Kochen.6")
|
||||
@ -1169,26 +1167,34 @@ Tree("32_Grotto_Kueche_Parmigiano") {
|
||||
}
|
||||
}
|
||||
|
||||
BTC.SynthesizeText("Bitte stelle den Risotto hier hin.")
|
||||
BTC.SpeechOutputEnded()
|
||||
BTC.Run("AudioSource.AUDIO.Kueche7ZusammenKoc")
|
||||
|
||||
// Stelle für Pfanne leuchtet
|
||||
BTC.Enable("Collider/NamedOutline.INTERACTABLES.TopfUntersetzer")
|
||||
|
||||
// Pfanne rueber stellen
|
||||
BTC.Run("NamedGrabEvent.INTERACTABLES.Topf")
|
||||
BTC.Set("Collider/NamedOutline.INTERACTABLES.TopfUntersetzer", "otherTag", "Topf")
|
||||
BTC.Run("Collider/NamedOutline.INTERACTABLES.TopfUntersetzer")
|
||||
BTC.Disable("Collider/NamedOutline.INTERACTABLES.TopfUntersetzer")
|
||||
// ToDo: Fallback Keine Reaktion
|
||||
|
||||
BTC.Run("AudioSource.AUDIO.Kueche5FZusammenKo")
|
||||
BTC.Run("AudioSource.AUDIO.Kueche6FZusammenKo")
|
||||
Composite(Race) {
|
||||
Composite(Sequence) {
|
||||
// Pfanne rueber stellen
|
||||
BTC.Run("Collider/NamedOutline.INTERACTABLES.TopfUntersetzer")
|
||||
}
|
||||
Composite(Sequence) {
|
||||
// Keine Reaction
|
||||
BTC.Wait(5)
|
||||
BTC.Run("AudioSource.AUDIO.Kueche8ZusammenKoc")
|
||||
// Pfanne rueber stellen
|
||||
BTC.Run("Collider/NamedOutline.INTERACTABLES.TopfUntersetzer")
|
||||
}
|
||||
}
|
||||
|
||||
BTC.Disable("Collider/NamedOutline.INTERACTABLES.TopfUntersetzer")
|
||||
|
||||
BTC.Run("AudioSource.AUDIO.Kueche10ZusammenKo")
|
||||
BTC.Run("AudioSource.AUDIO.Kueche12ZusammenKo")
|
||||
|
||||
// --- Kueche - Outro ---
|
||||
BTC.Run("AudioSource.AUDIO.Kueche1GOutro")
|
||||
BTC.SynthesizeText("Ich bin Giuseppe, Francescas Grossonkel. Und wer bist du?")
|
||||
BTC.SpeechOutputEnded()
|
||||
BTC.Run("AudioSource.AUDIO.KuecheOutro1")
|
||||
BTC.Run("AudioSource.AUDIO.KuecheOutro2")
|
||||
|
||||
// Name sagen
|
||||
BTC.AddPossbileSpeechIntent("Kueche.Outro.4")
|
||||
@ -1209,12 +1215,6 @@ Tree("32_Grotto_Kueche_Parmigiano") {
|
||||
// -- Selector 2: Intent nicht erkannt
|
||||
Composite(Sequence) {
|
||||
BTC.ClearPossbileSpeechIntents()
|
||||
|
||||
// Fallback Button
|
||||
BTC.Set("TextMeshPro.GO.Option1Button", "text", "Mein Name ist User.")
|
||||
BTC.Show("GO.GO.Option1Button")
|
||||
BTC.Run("NamedEventTrigger.GO.Option1Button")
|
||||
BTC.Hide("GO.GO.Option1Button")
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1229,8 +1229,10 @@ Tree("32_Grotto_Kueche_Parmigiano") {
|
||||
}
|
||||
}
|
||||
|
||||
BTC.Run("AudioSource.AUDIO.Kueche3GOutro")
|
||||
BTC.Run("AudioSource.AUDIO.Kueche2GOutro")
|
||||
BTC.Run("AudioSource.AUDIO.KuecheOutro7")
|
||||
BTC.Run("AudioSource.AUDIO.KuecheOutro8")
|
||||
|
||||
RunTree("32_Grotto_Im_Grotto_Essen_Intro")
|
||||
}
|
||||
}
|
||||
|
||||
@ -1239,16 +1241,98 @@ Tree("32_Grotto_Im_Grotto_Essen_Intro") {
|
||||
Composite(Sequence) {
|
||||
// Initialization
|
||||
Composite(Marathon) {
|
||||
BTC.SetPosition("GO.XRInteractionHandsSetup.XROrigin", -3.837, 0, -10.676)
|
||||
BTC.SetPosition("GO.HANDMENU", -3.837, 0, -10.676)
|
||||
BTC.SetPosition("GO.XRInteractionHandsSetup.XROrigin", -4.648, 0, -12.295)
|
||||
BTC.SetPosition("GO.HANDMENU", -4.648, 0, -12.295)
|
||||
BTC.Run("StudioEventEmitter.STATIC.KuechenAmbi")
|
||||
BTC.Run("StudioEventEmitter.AUDIO.Ambi2D")
|
||||
BTC.StopSound("StudioEventEmitter.STATIC.Ambi3D")
|
||||
BTC.StopSound("StudioEventEmitter.STATIC.HerdplatteAnstelle")
|
||||
//BTC.StopSound("StudioEventEmitter.STATIC.HerdplatteAnstelle")
|
||||
BTC.StopSound("StudioEventEmitter.INTERACTABLES.Abloeschen")
|
||||
}
|
||||
|
||||
BTC.GetKeyDown("Return")
|
||||
BTC.Run("AudioSource.AUDIO.ImGrottoessen1Intr")
|
||||
BTC.Run("AudioSource.AUDIO.ImGrottoessen2Intr")
|
||||
|
||||
BTC.AddPossbileSpeechIntent("Im_Grotto_essen.Intro.3")
|
||||
BTC.StartSpeechIntentRecognition()
|
||||
|
||||
Composite(Race) {
|
||||
// -- Race 1: User sagt etwas
|
||||
Composite(Sequence) {
|
||||
BTC.UserStartedSpeechInput()
|
||||
|
||||
Composite(Selector) {
|
||||
// -- Selector 1: Intent erkannt
|
||||
Composite(Sequence) {
|
||||
BTC.SpeechIntentRecognized()
|
||||
BTC.ClearPossbileSpeechIntents()
|
||||
}
|
||||
|
||||
// -- Selector 2: Intent nicht erkannt
|
||||
Composite(Sequence) {
|
||||
BTC.ClearPossbileSpeechIntents()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// -- Race 2: User sagt nichts
|
||||
Composite(Sequence) {
|
||||
BTC.Wait(5)
|
||||
BTC.CompareUserSpeechInputStarted(false)
|
||||
BTC.AbortSpeechEventListener()
|
||||
BTC.StopSpeechIntentRecognition()
|
||||
BTC.ClearPossbileSpeechIntents()
|
||||
}
|
||||
}
|
||||
|
||||
BTC.Run("AudioSource.AUDIO.ImGrottoessen6Intr")
|
||||
BTC.Run("AudioSource.AUDIO.ImGrottoessen7Intr")
|
||||
BTC.Run("AudioSource.AUDIO.ImGrottoessen8Intr")
|
||||
BTC.Run("AudioSource.AUDIO.ImGrottoessen9Intr")
|
||||
BTC.Run("AudioSource.AUDIO.ImGrottoessen10Int")
|
||||
|
||||
// --- Im Grotto Essen - Zweite Bestellung ---
|
||||
BTC.Run("AudioSource.AUDIO.ImGrottoessen1Zwei")
|
||||
|
||||
BTC.AddPossbileSpeechIntent("Im_Grotto_essen.Zweite_Bestellung.2")
|
||||
BTC.StartSpeechIntentRecognition()
|
||||
|
||||
Composite(Race) {
|
||||
// -- Race 1: User sagt etwas
|
||||
Composite(Sequence) {
|
||||
BTC.UserStartedSpeechInput()
|
||||
|
||||
Composite(Selector) {
|
||||
// -- Selector 1: Intent erkannt
|
||||
Composite(Sequence) {
|
||||
BTC.SpeechIntentRecognized()
|
||||
BTC.ClearPossbileSpeechIntents()
|
||||
RunTree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen")
|
||||
}
|
||||
|
||||
// -- Selector 2: Intent nicht erkannt
|
||||
Composite(Sequence) {
|
||||
BTC.ClearPossbileSpeechIntents()
|
||||
RunTree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// -- Race 2: User sagt nichts
|
||||
Composite(Sequence) {
|
||||
BTC.Wait(5)
|
||||
BTC.CompareUserSpeechInputStarted(false)
|
||||
BTC.AbortSpeechEventListener()
|
||||
BTC.StopSpeechIntentRecognition()
|
||||
BTC.ClearPossbileSpeechIntents()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Tree("32_Grotto_Im_Grotto_Essen_Nachfrage_Kellner_Essen") {
|
||||
Composite(Sequence) {
|
||||
BTC.Run("AudioSource.AUDIO.ImGrottoessen1Esse")
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -202,11 +202,12 @@ MonoBehaviour:
|
||||
Value: 0
|
||||
HasValue: 0
|
||||
Plugins:
|
||||
Value: []
|
||||
HasValue: 0
|
||||
Value:
|
||||
- resonanceaudio
|
||||
HasValue: 1
|
||||
StaticPlugins:
|
||||
Value: []
|
||||
HasValue: 0
|
||||
HasValue: 1
|
||||
CallbackHandler:
|
||||
Value: {fileID: 0}
|
||||
HasValue: 0
|
||||
@ -700,6 +701,7 @@ MonoBehaviour:
|
||||
- Allgemein
|
||||
- Grotto_Essen
|
||||
- Grotto_Kueche
|
||||
- Picknick.Baeckerei
|
||||
- SBB
|
||||
BanksToLoad:
|
||||
- Grotto.Essen
|
||||
@ -710,7 +712,7 @@ MonoBehaviour:
|
||||
LiveUpdatePort: 9264
|
||||
EnableMemoryTracking: 0
|
||||
AndroidUseOBB: 0
|
||||
AndroidPatchBuild: 1
|
||||
AndroidPatchBuild: 0
|
||||
MeterChannelOrdering: 0
|
||||
StopEventsOutsideMaxDistance: 0
|
||||
BoltUnitOptionsBuildPending: 0
|
||||
@ -936,7 +938,8 @@ MonoBehaviour:
|
||||
Value: 0
|
||||
HasValue: 0
|
||||
Plugins:
|
||||
Value: []
|
||||
Value:
|
||||
- resonanceaudio
|
||||
HasValue: 1
|
||||
StaticPlugins:
|
||||
Value: []
|
||||
|
@ -208,7 +208,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0.114, y: -0.3}
|
||||
m_SizeDelta: {x: 0.45219, y: 0.81636}
|
||||
m_SizeDelta: {x: 0.1, y: 0.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1078164051229086756
|
||||
CanvasRenderer:
|
||||
@ -872,13 +872,13 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1053014236144696775}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.7071065, y: -0, z: -0, w: 0.7071071}
|
||||
m_LocalPosition: {x: 0, y: 0.0123, z: 0.0493}
|
||||
m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 0.0123, z: 0.04929924}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 5063272971443299340}
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
|
||||
m_Father: {fileID: 1996412656006795194}
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180}
|
||||
--- !u!20 &7001199050030130134
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1619,9 +1619,7 @@ Transform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 107801045539344950}
|
||||
- {fileID: 6202651521140937909}
|
||||
- {fileID: 7824485373208701159}
|
||||
- {fileID: 1996412656006795194}
|
||||
m_Father: {fileID: 5630431603393244975}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1897047047148633122
|
||||
@ -2823,6 +2821,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_previewImg: {fileID: 437821110515054555}
|
||||
_capturecam: {fileID: 7001199050030130134}
|
||||
--- !u!1 &3665889797944952490
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3567,7 +3566,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0.114, y: -0.3}
|
||||
m_SizeDelta: {x: 0.45219, y: 0.81636}
|
||||
m_SizeDelta: {x: 0.1, y: 0.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5598266507612873172
|
||||
CanvasRenderer:
|
||||
@ -3884,7 +3883,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0.114, y: -0.3}
|
||||
m_SizeDelta: {x: 0.45219, y: 0.81636}
|
||||
m_SizeDelta: {x: 0.1, y: 0.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3096466457922170211
|
||||
CanvasRenderer:
|
||||
@ -4607,14 +4606,14 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5117592593628755675}
|
||||
m_LocalRotation: {x: 0, y: 0.70710677, z: 0.70710677, w: 0}
|
||||
m_LocalRotation: {x: -0, y: 0.7071068, z: 0.7071068, w: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.15144438, y: 0.17863165, z: 0.571365}
|
||||
m_LocalScale: {x: 0.15144433, y: 0.17863162, z: 0.5713649}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 7413929428606852214}
|
||||
- {fileID: 1816826061814438359}
|
||||
m_Father: {fileID: 5063272971443299340}
|
||||
m_Father: {fileID: 1996412656006795194}
|
||||
m_LocalEulerAnglesHint: {x: -90, y: 90, z: 90}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@ -5008,6 +5007,40 @@ MonoBehaviour:
|
||||
m_Interactions:
|
||||
m_SingletonActionBindings: []
|
||||
m_Flags: 0
|
||||
--- !u!1 &5547875041402855972
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1996412656006795194}
|
||||
m_Layer: 9
|
||||
m_Name: SmartphoneParent
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1996412656006795194
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5547875041402855972}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.15405792, y: 0.17151026, z: 0.027164565, w: 0.9726832}
|
||||
m_LocalPosition: {x: -0.02, y: -0.03, z: 0.02}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 107801045539344950}
|
||||
- {fileID: 6202651521140937909}
|
||||
- {fileID: 7824485373208701159}
|
||||
m_Father: {fileID: 5063272971443299340}
|
||||
m_LocalEulerAnglesHint: {x: -18, y: 20, z: 0}
|
||||
--- !u!1 &5702985173780472227
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -5479,7 +5512,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0.114, y: -0.3}
|
||||
m_SizeDelta: {x: 0.45219, y: 0.81636}
|
||||
m_SizeDelta: {x: 0.1, y: 0.2}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4250884776106483072
|
||||
CanvasRenderer:
|
||||
@ -6134,7 +6167,7 @@ PrefabInstance:
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 5063272971443299340}
|
||||
m_TransformParent: {fileID: 1996412656006795194}
|
||||
m_Modifications:
|
||||
- target: {fileID: 152089758756199514, guid: fd16c97ca719775409e646d3ee101b19, type: 3}
|
||||
propertyPath: m_Layer
|
||||
|
@ -114,6 +114,10 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: parmesan-Teller
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 51b3089525a15a9479d3f93e13317319, type: 3}
|
||||
propertyPath: m_TagString
|
||||
value: Parmigiano
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects:
|
||||
@ -124,6 +128,12 @@ PrefabInstance:
|
||||
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 51b3089525a15a9479d3f93e13317319, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 16671615709839493}
|
||||
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 51b3089525a15a9479d3f93e13317319, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 504090817570551319}
|
||||
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 51b3089525a15a9479d3f93e13317319, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6201616903712091354}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 51b3089525a15a9479d3f93e13317319, type: 3}
|
||||
--- !u!1 &5975078356169429800 stripped
|
||||
GameObject:
|
||||
@ -152,6 +162,185 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -9046420995860336821, guid: 51b3089525a15a9479d3f93e13317319, type: 3}
|
||||
--- !u!54 &504090817570551319
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5975078356169429800}
|
||||
serializedVersion: 4
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 1
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 1
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!114 &6201616903712091354
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5975078356169429800}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_InteractionManager: {fileID: 0}
|
||||
m_Colliders: []
|
||||
m_InteractionLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_InteractionLayers:
|
||||
m_Bits: 1
|
||||
m_DistanceCalculationMode: 1
|
||||
m_SelectMode: 0
|
||||
m_FocusMode: 1
|
||||
m_CustomReticle: {fileID: 0}
|
||||
m_AllowGazeInteraction: 0
|
||||
m_AllowGazeSelect: 0
|
||||
m_OverrideGazeTimeToSelect: 0
|
||||
m_GazeTimeToSelect: 0.5
|
||||
m_OverrideTimeToAutoDeselectGaze: 0
|
||||
m_TimeToAutoDeselectGaze: 3
|
||||
m_AllowGazeAssistance: 0
|
||||
m_FirstHoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LastHoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_HoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_HoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FirstSelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LastSelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_SelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_SelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FirstFocusEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_LastFocusExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FocusEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FocusExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Activated:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Deactivated:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_StartingHoverFilters: []
|
||||
m_StartingSelectFilters: []
|
||||
m_StartingInteractionStrengthFilters: []
|
||||
m_OnFirstHoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnLastHoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnHoverEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnHoverExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectEntered:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectExited:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnSelectCanceled:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnActivate:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_OnDeactivate:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_AttachTransform: {fileID: 0}
|
||||
m_SecondaryAttachTransform: {fileID: 0}
|
||||
m_UseDynamicAttach: 1
|
||||
m_MatchAttachPosition: 1
|
||||
m_MatchAttachRotation: 1
|
||||
m_SnapToColliderVolume: 1
|
||||
m_ReinitializeDynamicAttachEverySingleGrab: 1
|
||||
m_AttachEaseInTime: 0.15
|
||||
m_MovementType: 0
|
||||
m_VelocityDamping: 1
|
||||
m_VelocityScale: 1
|
||||
m_AngularVelocityDamping: 1
|
||||
m_AngularVelocityScale: 1
|
||||
m_TrackPosition: 1
|
||||
m_SmoothPosition: 0
|
||||
m_SmoothPositionAmount: 8
|
||||
m_TightenPosition: 0.1
|
||||
m_TrackRotation: 1
|
||||
m_SmoothRotation: 0
|
||||
m_SmoothRotationAmount: 8
|
||||
m_TightenRotation: 0.1
|
||||
m_TrackScale: 1
|
||||
m_SmoothScale: 0
|
||||
m_SmoothScaleAmount: 8
|
||||
m_TightenScale: 0.1
|
||||
m_ThrowOnDetach: 1
|
||||
m_ThrowSmoothingDuration: 0.25
|
||||
m_ThrowSmoothingCurve:
|
||||
serializedVersion: 2
|
||||
m_Curve:
|
||||
- serializedVersion: 3
|
||||
time: 1
|
||||
value: 1
|
||||
inSlope: 0
|
||||
outSlope: 0
|
||||
tangentMode: 0
|
||||
weightedMode: 0
|
||||
inWeight: 0
|
||||
outWeight: 0
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
m_ThrowVelocityScale: 1.5
|
||||
m_ThrowAngularVelocityScale: 1
|
||||
m_ForceGravityOnDetach: 0
|
||||
m_RetainTransformParent: 1
|
||||
m_AttachPointCompatibilityMode: 0
|
||||
m_StartingSingleGrabTransformers: []
|
||||
m_StartingMultipleGrabTransformers: []
|
||||
m_AddDefaultGrabTransformers: 1
|
||||
--- !u!4 &6458283598279264658 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 51b3089525a15a9479d3f93e13317319, type: 3}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -3,27 +3,24 @@ using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using System;
|
||||
using UnityEngine.UI;
|
||||
using Oculus.Platform;
|
||||
|
||||
public class Screenshot : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
RawImage _previewImg;
|
||||
|
||||
GameObject XRCamera; //the XR Player Camera, named "Main Camera"
|
||||
GameObject XRHoloVideoCamera; //the XR Player Camera, named "Main Camera no-post-processing"
|
||||
GameObject SmartphoneCaptureCamera; //the GameObject, named "SmartphoneCaptureCamera" is a Camera with a CullingMask where the Layer "hands" is excluded ("_HANDMENU" and "XR Interactions Hands Setup" are on the "hands" layer)
|
||||
[SerializeField]
|
||||
Camera _capturecam;
|
||||
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
//StartCoroutine(TakeScreenshot());
|
||||
|
||||
/* if (Input.GetKeyDown(KeyCode.P))
|
||||
{
|
||||
StartCoroutine(TakeScreenshot());
|
||||
}
|
||||
*/
|
||||
/* if (Input.GetKeyDown(KeyCode.P))
|
||||
{
|
||||
CreatePreview();
|
||||
}*/
|
||||
|
||||
}
|
||||
|
||||
public void OnClickTakeScreenshot()
|
||||
@ -33,7 +30,7 @@ public class Screenshot : MonoBehaviour
|
||||
|
||||
public void OnClickPreview()
|
||||
{
|
||||
StartCoroutine(CreatePreview());
|
||||
CreatePreview();
|
||||
}
|
||||
|
||||
public void DestroyPreviewTexture()
|
||||
@ -51,31 +48,27 @@ public class Screenshot : MonoBehaviour
|
||||
ScreenCapture.CaptureScreenshot("snapshot_" + timpStamp + ".png");
|
||||
}
|
||||
|
||||
IEnumerator CreatePreview()
|
||||
void CreatePreview()
|
||||
{
|
||||
yield return new WaitForEndOfFrame();
|
||||
|
||||
// find all Cameras:
|
||||
XRCamera = GameObject.Find("Main Camera");
|
||||
XRHoloVideoCamera = GameObject.Find("Main Camera no-post-processing");
|
||||
SmartphoneCaptureCamera = GameObject.Find("SmartphoneCaptureCamera");
|
||||
_capturecam.enabled = true;
|
||||
RenderTexture screenTexture = new RenderTexture(Screen.width, Screen.height, 16);
|
||||
_capturecam.targetTexture = screenTexture;
|
||||
RenderTexture.active = screenTexture;
|
||||
_capturecam.Render();
|
||||
|
||||
// get the Camera components:
|
||||
Camera vrcam = XRCamera.GetComponent<Camera>();
|
||||
Camera vrcamnopost = XRHoloVideoCamera.GetComponent<Camera>();
|
||||
Camera capturecam = SmartphoneCaptureCamera.GetComponent<Camera>();
|
||||
Texture2D renderedTexture = new Texture2D(Screen.width, Screen.height);
|
||||
renderedTexture.ReadPixels(new Rect(0, 0, Screen.width, Screen.height), 0, 0);
|
||||
renderedTexture.Apply();
|
||||
|
||||
RenderTexture.active = null;
|
||||
_capturecam.enabled = false;
|
||||
|
||||
// switch active Cameras
|
||||
vrcam.enabled = false;
|
||||
vrcamnopost.enabled = false;
|
||||
capturecam.enabled = true;
|
||||
_previewImg.texture = renderedTexture;
|
||||
|
||||
// call the function to take actual screenshot
|
||||
_previewImg.texture = ScreenCapture.CaptureScreenshotAsTexture();
|
||||
|
||||
// switch active Cameras back
|
||||
vrcam.enabled = true;
|
||||
vrcamnopost.enabled = true;
|
||||
capturecam.enabled = false;
|
||||
// Save texture in png file
|
||||
byte[] byteArray = renderedTexture.EncodeToPNG();
|
||||
string timpStamp = DateTime.Now.ToString("ddMMyyyyHHmmssffff");
|
||||
System.IO.File.WriteAllBytes(Application.persistentDataPath + $"/snapshot_{timpStamp}.png", byteArray);
|
||||
}
|
||||
}
|
||||
|
@ -205,13 +205,8 @@
|
||||
"intentSentences": [
|
||||
"Mi chiamo xy.",
|
||||
"Sono xy.",
|
||||
"xy."
|
||||
]
|
||||
},
|
||||
{
|
||||
"intentID": "Kueche.Outro.5",
|
||||
"intentSentences": [
|
||||
"Il mio nome \u00e8 xy"
|
||||
"xy.",
|
||||
"Il mio nome \u00e8 xy."
|
||||
]
|
||||
},
|
||||
{
|
||||
|
@ -140,6 +140,9 @@ PlayerSettings:
|
||||
bundleVersion: 0.1
|
||||
preloadedAssets:
|
||||
- {fileID: 11400000, guid: be340e3c48769439d8d18a5a2bccd498, type: 2}
|
||||
- {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2}
|
||||
- {fileID: -8196854396901781169, guid: 1a4c68ca72a83449f938d669337cb305, type: 2}
|
||||
- {fileID: 7708199778347151547, guid: 0f4832b23b368b643bc8a91696fbb473, type: 2}
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
|
Loading…
x
Reference in New Issue
Block a user