Merge branch 'programming'
This commit is contained in:
commit
42e98ae3d8
@ -75,7 +75,7 @@ Tree("10_SBB_Zugabteil_Intro") {
|
|||||||
Composite(Selector) {
|
Composite(Selector) {
|
||||||
Composite(Sequence) {
|
Composite(Sequence) {
|
||||||
BTC.NoStoriesVisited()
|
BTC.NoStoriesVisited()
|
||||||
BTC.Wait(8)
|
BTC.Wait(5)
|
||||||
BTC.Hide("MediaPlayer.VIDEOS.IntroFidle1")
|
BTC.Hide("MediaPlayer.VIDEOS.IntroFidle1")
|
||||||
|
|
||||||
// --- Zugabteil - Exposition ---
|
// --- Zugabteil - Exposition ---
|
||||||
|
@ -84,7 +84,7 @@ public class NamedAVProMediaPlayer : ComponentHandler
|
|||||||
case NodeState.FirstRun:
|
case NodeState.FirstRun:
|
||||||
_videoActor.SetActive(true);
|
_videoActor.SetActive(true);
|
||||||
_mediaPlayer.PlatformOptionsAndroid.videoApi = Android.VideoApi.ExoPlayer;
|
_mediaPlayer.PlatformOptionsAndroid.videoApi = Android.VideoApi.ExoPlayer;
|
||||||
_mediaPlayer.PlatformOptionsAndroid.preferSoftwareDecoder = true;
|
//_mediaPlayer.PlatformOptionsAndroid.preferSoftwareDecoder = true;
|
||||||
|
|
||||||
_mediaPlayer.OpenMedia(new MediaPath(videoPath, MediaPathType.RelativeToPersistentDataFolder));
|
_mediaPlayer.OpenMedia(new MediaPath(videoPath, MediaPathType.RelativeToPersistentDataFolder));
|
||||||
break;
|
break;
|
||||||
|
@ -15,7 +15,7 @@ public class PlayAVProVideo : MonoBehaviour
|
|||||||
_mediaPlayer = GetComponent<MediaPlayer>();
|
_mediaPlayer = GetComponent<MediaPlayer>();
|
||||||
if (_mediaPlayer != null)
|
if (_mediaPlayer != null)
|
||||||
{
|
{
|
||||||
Debug.Log("Panorama is loading");
|
_mediaPlayer.PlatformOptionsAndroid.videoApi = Android.VideoApi.ExoPlayer;
|
||||||
_mediaPlayer.OpenMedia(new MediaPath(videoPath, MediaPathType.RelativeToPersistentDataFolder), autoPlay: true);
|
_mediaPlayer.OpenMedia(new MediaPath(videoPath, MediaPathType.RelativeToPersistentDataFolder), autoPlay: true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -24,7 +24,7 @@ public class PlayAVProVideo : MonoBehaviour
|
|||||||
{
|
{
|
||||||
if (_mediaPlayer != null)
|
if (_mediaPlayer != null)
|
||||||
{
|
{
|
||||||
Debug.Log("Panorama is closing");
|
_mediaPlayer.Stop();
|
||||||
_mediaPlayer.CloseMedia();
|
_mediaPlayer.CloseMedia();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user