Skip to content

Commit 648e0ba

Browse files
committed
Video player fixes
1 parent 515a6a6 commit 648e0ba

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

Assets/ImageChanger.cs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ void Start()
2424
// use the sprite renderer of the game object to display the sprite
2525
SpriteRenderer imageComponent = imageObject.GetComponent<SpriteRenderer>();
2626
imageComponent.sprite = images[currentImage];
27-
// skillsCollisionScript.SetSkills(videos[currentImage]);
27+
skillsCollisionScript.SetSkills(videos[currentImage]);
2828

2929
}
3030

@@ -34,20 +34,8 @@ public void OnButtonPressed(VirtualButtonBehaviour vb)
3434
SpriteRenderer imageComponent = imageObject.GetComponent<SpriteRenderer>();
3535
currentImage = (currentImage + 1) % images.Length;
3636
imageComponent.sprite = images[currentImage];
37-
// skillsCollisionScript.SetSkills(videos[currentImage]);
37+
skillsCollisionScript.SetSkills(videos[currentImage]);
3838

39-
// changing the skills dipsplayed on the skill card
40-
// switch(imageComponent.sprite.name)
41-
// {
42-
// case "moncraft":
43-
// skillsCollisionScript.SetSkills("Moncraft skill1" + "\n" + "Moncraft skill2");
44-
45-
// break;
46-
// case "game":
47-
// skillsCollisionScript.SetSkills("Game skill1" + "\n" + "Game skill2" + "\n" + "Game skill3");
48-
// break;
49-
50-
// }
5139
}
5240

5341
public void OnButtonReleased(VirtualButtonBehaviour vb)

Assets/OnCollision.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ void Start()
2323
void OnTriggerEnter (Collider otherObj)
2424
{
2525
if ( otherObj.name == "Projects"){
26-
// Debug.Log("Collision entered " + otherObj.name);
2726
isColliding = true;
2827
ShowSkills();
2928
}
@@ -40,6 +39,7 @@ void OnTriggerExit (Collider otherObj)
4039
// Debug.Log("Collision entered " + otherObj.name);
4140
isColliding = false;
4241
videoPlayer.clip = defaultVideo;
42+
videoPlayer.Play();
4343
}
4444

4545
}
@@ -48,6 +48,8 @@ private void ShowSkills()
4848
{
4949
if (isColliding)
5050
{
51+
// reloald video player
52+
videoPlayer.Stop();
5153
videoPlayer.Play();
5254
}
5355
}

0 commit comments

Comments
 (0)