Skip to content

Commit

Permalink
Unity 5 upgrade: getComponent fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
tyson-kubota committed Dec 18, 2016
1 parent c028364 commit b9946fa
Show file tree
Hide file tree
Showing 40 changed files with 179 additions and 1,516 deletions.
2 changes: 1 addition & 1 deletion AnimatedFlowUVs.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ private var resetTime : float;
private var thisRenderer : Material;

function Start () {
thisRenderer = renderer.material;
thisRenderer = GetComponent.<Renderer>().material;
thisRenderer.mainTextureOffset = Vector2(0,0);
resetTime = Mathf.Abs(1/speed);
}
Expand Down
8 changes: 5 additions & 3 deletions AudioDuckingRegion.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
var duckingObject : GameObject;
var duckingVal : float = .5f;
var StopAudioOnComplete : boolean = false;
var audioSource : AudioSource;

function Start () {
audioSource = duckingObject.GetComponent.<AudioSource>();
}

function OnTriggerEnter (other : Collider) {
Expand All @@ -21,17 +23,17 @@ function OnTriggerExit (other : Collider) {

function lerpDuck (timer : float, endVal : float) {

var start = duckingObject.audio.volume;
var start = audioSource.volume;
var end = endVal;
var i = 0.0;
var step = 1.0/timer;

while (i <= 1.0) {
i += step * Time.deltaTime;
duckingObject.audio.volume = Mathf.Lerp(start, end, i);
audioSource.volume = Mathf.Lerp(start, end, i);
yield;
}
yield WaitForSeconds (timer);

if (StopAudioOnComplete) {duckingObject.audio.Stop();}
if (StopAudioOnComplete) {audioSource.Stop();}
}
10 changes: 8 additions & 2 deletions AudioPlayTrigger.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
#pragma strict

var audioSource : AudioSource;

function Start () {
audioSource = GetComponent.<AudioSource>();
}

function OnTriggerEnter (other : Collider) {
if (other.gameObject.CompareTag ("Player")) {
if (audio) {audio.Play();}
if (audioSource) {audioSource.Play();}
}
}

function OnTriggerExit (other : Collider) {
if (other.gameObject.CompareTag ("Player")) {
if (audio) {audio.Stop();}
if (audioSource) {audioSource.Stop();}
}
}
8 changes: 7 additions & 1 deletion AudioPlayVisibility.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
#pragma strict

var audioSource : AudioSource;

function Start () {
audioSource = GetComponent.<AudioSource>();
}

function OnBecameVisible () {
if (audio) {audio.Play();}
if (audioSource) {audioSource.Play();}
}
16 changes: 0 additions & 16 deletions BouncingBall.js

This file was deleted.

8 changes: 0 additions & 8 deletions CombineConnectedCylinders.js

This file was deleted.

6 changes: 3 additions & 3 deletions EndSequence1stPerson.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function PlayOutro () {
//LerpIntoDiamond(14);
MusicBedInterpolated.falsifyCheckDistance();
FadeMusic(8, OutroMusicBed);
animation.Play("end-player-anim");
GetComponent.<Animation>().Play("end-player-anim");
EndTriggerComponent.AddDiamondCore(5);
yield WaitForSeconds (1);
EndTriggerComponent.AddDiamond3DCore(6);
Expand Down Expand Up @@ -134,15 +134,15 @@ function LerpIntoDiamond (timer : float) {
function FadeEndMenuLogo(timer:float){

EndMenuLogoCamera.GetComponent(Camera).enabled = true;
EndMenuLogoObject.renderer.enabled = true;
EndMenuLogoObject.GetComponent.<Renderer>().enabled = true;
var start = 0;
var end = 1.0;
var i = 0.0;
var step = 1.0/timer;

while (i <= 1.0) {
i += step * Time.deltaTime;
EndMenuLogoObject.renderer.material.color.a = Mathf.Lerp(start, end, i);
EndMenuLogoObject.GetComponent.<Renderer>().material.color.a = Mathf.Lerp(start, end, i);
yield;
}

Expand Down
24 changes: 15 additions & 9 deletions EndSequenceTrigger.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@ var diamondCore : GameObject;
var diamond3DCore1 : GameObject;
var diamond3DCore2 : GameObject;

var audioSource : AudioSource;

function Awake () {
EndScriptComponent = Player.GetComponent("EndSequence1stPerson");
}

function Start () {
audioSource = GetComponent.<AudioSource>();
}

function OnTriggerEnter (other : Collider) {
if (other.gameObject.CompareTag ("Player") && lifeCountdown.inOutro == false) {
lifeCountdown.inOutro = true;
Expand All @@ -25,9 +31,9 @@ function OnTriggerEnter (other : Collider) {
}

for(var shard : GameObject in GameObject.FindGameObjectsWithTag("Shard"))
shard.animation.Play();
shard.GetComponent.<Animation>().Play();

if (audio) {audio.Play();}
if (audioSource) {audioSource.Play();}

FallingPlayer.ScoreFlashTextureScript.FadeFlash (12.0, FadeDir.In);
//yield WaitForSeconds (1.0);
Expand Down Expand Up @@ -59,7 +65,7 @@ function SwapDiamonds(timer : float){
i += step * Time.deltaTime;

for(var shard : GameObject in GameObject.FindGameObjectsWithTag("Shard"))
shard.transform.Find("sky-rock-angled-segment").renderer.material.color = Color.Lerp(start, end, i);
shard.transform.Find("sky-rock-angled-segment").GetComponent.<Renderer>().material.color = Color.Lerp(start, end, i);

yield;
}
Expand All @@ -80,7 +86,7 @@ function AddDiamondCore(timer : float){

while (i <= 1.0) {
i += step * Time.deltaTime;
diamondCore.renderer.material.color.a = Mathf.Lerp(start, end, i);
diamondCore.GetComponent.<Renderer>().material.color.a = Mathf.Lerp(start, end, i);
yield;
}

Expand All @@ -90,14 +96,14 @@ function AddDiamondCore(timer : float){

function FadeDiamond(timer : float){

var start = endDiamond.renderer.material.color;
var start = endDiamond.GetComponent.<Renderer>().material.color;
var end = Color.black;
var i = 0.0;
var step = 1.0/timer;

while (i <= 1.0) {
i += step * Time.deltaTime;
endDiamond.renderer.material.color = Color.Lerp(start, end, i);
endDiamond.GetComponent.<Renderer>().material.color = Color.Lerp(start, end, i);
yield;
}

Expand All @@ -111,14 +117,14 @@ function AddDiamond3DCore(timer : float){
diamond3DCore2.active = true;

var start = Color.black;
var end = diamond3DCore1.renderer.material.color;
var end = diamond3DCore1.GetComponent.<Renderer>().material.color;
var i = 0.0;
var step = 1.0/timer;

while (i <= 1.0) {
i += step * Time.deltaTime;
diamond3DCore1.renderer.material.color = Color.Lerp(start, end, i);
diamond3DCore2.renderer.material.color = Color.Lerp(start, end, i);
diamond3DCore1.GetComponent.<Renderer>().material.color = Color.Lerp(start, end, i);
diamond3DCore2.GetComponent.<Renderer>().material.color = Color.Lerp(start, end, i);
yield;
}

Expand Down
29 changes: 17 additions & 12 deletions FallingPlayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ private var myTransform : Transform;
private var BackdropMist : GameObject;
BackdropMist = transform.FindChild("Cylinder").gameObject;

var rb : Rigidbody;

function Awake() {
// if (iPhoneInput.orientation == iPhoneOrientation.LandscapeRight) {
// flipMultiplier = -1;
Expand All @@ -90,7 +92,7 @@ function Awake() {
function Start() {
// startingFogColor = RenderSettings.fogColor * 2;
startingFogEndDistance = RenderSettings.fogEndDistance;
startingCameraFarClipPlane = myTransform.FindChild("Camera").camera.farClipPlane;
startingCameraFarClipPlane = myTransform.FindChild("Camera").GetComponent.<Camera>().farClipPlane;
isAlive = 1;
UIscriptComponent = UIscriptName.GetComponent(fallingUITest);
lifeStartTime = Time.time;
Expand All @@ -104,7 +106,10 @@ function Start() {
// fadeInAudio ();
FadeAudio (0.1, FadeDir.In);
isPausable = false;
rigidbody.isKinematic = false;

rb = GetComponent.<Rigidbody>();
rb.isKinematic = false;

if (!introComponent) {
UIscriptComponent.UnhideGUI();
}
Expand Down Expand Up @@ -155,7 +160,7 @@ function FadeAudio (timer : float, fadeType : FadeDir) {

function DeathRespawn () {
isPausable = false;
rigidbody.isKinematic = true;
rb.isKinematic = true;
lifeStartTime = Time.time;
var respawnPosition = Respawn.currentRespawn.transform.position;

Expand All @@ -182,14 +187,14 @@ function DeathRespawn () {
RenderSettings.fogEndDistance = startingFogEndDistance;

// Camera.main.transform.position = respawnPosition - (transform.forward * 4) + Vector3.up; // reset camera too
collider.attachedRigidbody.transform.Translate(respawnPosition);
GetComponent.<Collider>().attachedRigidbody.transform.Translate(respawnPosition);
// Relocate the player. We need to do this or the camera will keep trying to focus on the (invisible) player where he's standing on top of the FalloutDeath box collider.
myTransform.position = respawnPosition; // + Vector3.up;
// Camera.main.SendMessage("fadeIn");

FadeAudio (fadeTime, FadeDir.In);
// thisOceanCamera.SendMessage("fadeIn");
rigidbody.isKinematic = false;
rb.isKinematic = false;
// isAlive = 1;

MoveController.controlMultiplier = 1;
Expand All @@ -200,7 +205,7 @@ function DeathRespawn () {

function LatestCheckpointRespawn () {
isPausable = false;
rigidbody.isKinematic = true;
rb.isKinematic = true;
var respawnPosition = Respawn.currentRespawn.transform.position;
//UIscriptComponent.fadeOut();

Expand All @@ -212,11 +217,11 @@ function LatestCheckpointRespawn () {
isAlive = 1;
RenderSettings.fogEndDistance = startingFogEndDistance;

collider.attachedRigidbody.transform.Translate(respawnPosition);
GetComponent.<Collider>().attachedRigidbody.transform.Translate(respawnPosition);
myTransform.position = respawnPosition; // + Vector3.up;

FadeAudio (fadeTime, FadeDir.In);
rigidbody.isKinematic = false;
rb.isKinematic = false;

MoveController.controlMultiplier = 1;

Expand All @@ -237,11 +242,11 @@ function changeLevelBackdrop () {
changeBackdrop.cloudRenderer.enabled = false;
changeBackdrop.endSphereRenderer.enabled = false;

// the Fade argument below this breaks unpredictably if player gameobject lacks a Fade script component
// Fade.use.Colors(guiTexture, (RenderSettings.fogColor * 2), startingFogColor, 2.0);
// the Fade argument below this breaks unpredictably if player gameobject lacks a Fade script component
// Fade.use.Colors(guiTexture, (RenderSettings.fogColor * 2), startingFogColor, 2.0);
RenderSettings.fogEndDistance = startingFogEndDistance;
myTransform.FindChild("Camera").camera.farClipPlane = startingCameraFarClipPlane;
myTransform.FindChild("plane-close").renderer.materials = [origMat];
myTransform.FindChild("Camera").GetComponent.<Camera>().farClipPlane = startingCameraFarClipPlane;
myTransform.FindChild("plane-close").GetComponent.<Renderer>().materials = [origMat];
iTween.ColorTo(BackdropMist,{"a":startingCloudsAlpha,"time":.5});
}

Expand Down
Loading

0 comments on commit b9946fa

Please sign in to comment.