Commit 2a8caa54 authored by Nathan De Castro's avatar Nathan De Castro

Added objects to the tutorial and roof, Setup VR ready for testing!

parent c38f9435
......@@ -156,9 +156,6 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\SteamVR\InteractionSystem\Readme_InteractionSystem.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
</Reference>
......@@ -201,9 +198,6 @@
<Reference Include="UnityEngine.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.VR">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
</Reference>
......
......@@ -154,9 +154,6 @@
<Reference Include="Assembly-UnityScript">
<HintPath>C:/Users/yuki/Documents/Work/Listen/Library/ScriptAssemblies/Assembly-UnityScript.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/Editor/UnityEditor.Advertisements.dll</HintPath>
</Reference>
......@@ -199,9 +196,6 @@
<Reference Include="UnityEngine.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.VR">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/Editor/UnityEditor.VR.dll</HintPath>
</Reference>
......
......@@ -219,9 +219,6 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\SteamVR\InteractionSystem\Readme_InteractionSystem.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
......@@ -237,9 +234,6 @@
<Reference Include="UnityEngine.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.VR">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath>
</Reference>
......
......@@ -75,6 +75,9 @@
<Compile Include="Assets\Scripts\UI\RestartText.cs" />
<Compile Include="Assets\Scripts\UI\Status.cs" />
<Compile Include="Assets\Scripts\UI\Visibility.cs" />
<Compile Include="Assets\Scripts\VR\InteractableItem.cs" />
<Compile Include="Assets\Scripts\VR\WandButtons.cs" />
<Compile Include="Assets\Scripts\VR\WandController.cs" />
<Compile Include="Assets\SteamVR\Extras\SteamVR_GazeTracker.cs" />
<Compile Include="Assets\SteamVR\Extras\SteamVR_LaserPointer.cs" />
<Compile Include="Assets\SteamVR\Extras\SteamVR_Teleporter.cs" />
......@@ -270,9 +273,6 @@
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlurAndFlares.shader" />
<None Include="Assets\SteamVR\InteractionSystem\Readme_InteractionSystem.txt" />
<None Include="Assets\Standard Assets\Effects\ImageEffects\Shaders\_BloomAndFlares\BlendForBloom.shader" />
<Reference Include="UnityEngine.Advertisements">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/Advertisements/UnityEngine.Advertisements.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
......@@ -288,9 +288,6 @@
<Reference Include="UnityEngine.HoloLens">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityHoloLens/RuntimeEditor/UnityEngine.HoloLens.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Purchasing">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityPurchasing/UnityEngine.Purchasing.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.VR">
<HintPath>C:/Program Files/Unity/Editor/Data/UnityExtensions/Unity/UnityVR/RuntimeEditor/UnityEngine.VR.dll</HintPath>
</Reference>
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1074928679614392}
m_IsPrefabParent: 1
--- !u!1 &1074928679614392
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4481930841849142}
- component: {fileID: 114431572037265222}
- component: {fileID: 82674644019993906}
- component: {fileID: 114807479069452012}
m_Layer: 0
m_Name: World
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &4481930841849142
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1074928679614392}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &82674644019993906
AudioSource:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1074928679614392}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 0.567
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
- serializedVersion: 2
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 2
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!114 &114431572037265222
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1074928679614392}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 7f36286627b1f254eb10c26bb73fcbf1, type: 3}
m_Name:
m_EditorClassIdentifier:
death_cam_set: {fileID: 0}
stay_on_scene: 0
win_state: 0
lose_state: 0
number_of_pickups: 0
difficulty:
player_is_alive: 0
in_exit_zone: 0
--- !u!114 &114807479069452012
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1074928679614392}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8ccadfc64067d6e4db4be7af2125a53f, type: 3}
m_Name:
m_EditorClassIdentifier:
cube: {fileID: 0}
color_range_min: 3
color_range_max: 40
use_pitch: 0
light_angle_scaler: 5
light_angle_max: 130
splash_force_scaler: 5
buffer_size: 64
audio_update_rate: 40
fileFormatVersion: 2
guid: 6621ab22a2756ff4c930cb8dd067287d
timeCreated: 1490706490
licenseType: Free
NativeFormatImporter:
userData:
assetBundleName:
assetBundleVariant:
......@@ -10,7 +10,7 @@ public class SwitchState : MonoBehaviour {
// Use this for initialization
void Start () {
main_light.enabled = false;
}
// Update is called once per frame
......
fileFormatVersion: 2
guid: 752f753ba139e164ea5b0cb825fa4ba2
folderAsset: yes
timeCreated: 1490697642
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
public class InteractableItem : MonoBehaviour {
private Rigidbody rb;
private bool currentlyInteracting;
private float velocityFactor = 20000f;
private Vector3 posDelta;
private float rotationFactor = 400f;
private Quaternion rotationDelta;
private float angle;
private Vector3 axis;
private WandController attachedWand;
private Transform interactionPoint;
// Use this for initialization
void Start () {
rb = GetComponent<Rigidbody>();
interactionPoint = new GameObject().transform;
velocityFactor /= rb.mass;
rotationFactor /= rb.mass;
}
// Update is called once per frame
void Update() {
if (attachedWand && currentlyInteracting) {
posDelta = attachedWand.transform.position - interactionPoint.position;
this.rb.velocity = posDelta * velocityFactor * Time.fixedDeltaTime;
rotationDelta = attachedWand.transform.rotation * Quaternion.Inverse(interactionPoint.rotation);
rotationDelta.ToAngleAxis(out angle, out axis);
if (angle > 180) {
angle -= 360;
}
this.rb.angularVelocity = (Time.fixedDeltaTime * angle * axis) * rotationFactor;
}
}
public void BeginInteraction(WandController wand) {
attachedWand = wand;
interactionPoint.position = wand.transform.position;
interactionPoint.rotation = wand.transform.rotation;
interactionPoint.SetParent(transform, true);
currentlyInteracting = true;
}
public void EndInteraction(WandController wand) {
if (wand == attachedWand) {
attachedWand = null;
currentlyInteracting = false;
}
}
public bool IsInteracting() {
return currentlyInteracting;
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: c0665a7a5f376ad42b153d0553733b65
timeCreated: 1490697874
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
public class WandButtons : MonoBehaviour {
private SteamVR_TrackedController controller_event;
// Use this for initialization
void Start () {
controller_event = GetComponent<SteamVR_TrackedController> ();
}
// Update is called once per frame
void Update () {
if (controller_event.triggerPressed) {
Debug.Log ("Controller " + controller_event.controllerIndex + " pressed the trigger");
SteamVR_Controller.Input ((int) controller_event.controllerIndex).TriggerHapticPulse (1000);
}
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: d68221a3c29444b418bc58dab9722f5d
timeCreated: 1490699560
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
public class WandController : MonoBehaviour {
private Valve.VR.EVRButtonId gripButton = Valve.VR.EVRButtonId.k_EButton_Grip;
private Valve.VR.EVRButtonId triggerButton = Valve.VR.EVRButtonId.k_EButton_SteamVR_Trigger;
private SteamVR_Controller.Device controller { get { return SteamVR_Controller.Input ((int) trackedObj.index); } }
private SteamVR_TrackedObject trackedObj;
private GameObject pickup;
// Use this for initialization
void Start () {
trackedObj = GetComponent<SteamVR_TrackedObject> ();
}
// Update is called once per frame
void Update () {
if (controller == null) {
Debug.Log ("Controller not initialized");
return;
}
if (controller.GetPressDown (gripButton) && pickup != null) {
pickup.transform.parent = this.transform;
pickup.GetComponent<Rigidbody> ().useGravity = false;
}
if (controller.GetPressUp (gripButton) && pickup != null) {
pickup.transform.parent = null;
pickup.GetComponent<Rigidbody> ().useGravity = true;
}
if (controller.GetPressDown (triggerButton) && pickup != null) {
pickup.transform.parent = this.transform;
pickup.GetComponent<Rigidbody> ().useGravity = false;
}
if (controller.GetPressUp (triggerButton) && pickup != null) {
pickup.transform.parent = null;
pickup.GetComponent<Rigidbody> ().useGravity = true;
}
}
private void OnTriggerEnter (Collider collider) {
pickup = collider.gameObject;
}
private void OnTriggerExit (Collider collider) {
pickup = null;
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: aab377028ac07954780328373aafcd7b
timeCreated: 1490697824
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
......@@ -5,8 +5,6 @@
//=============================================================================
using UnityEngine;
using UnityEngine.Events;
using System.Collections;
namespace Valve.VR.InteractionSystem
{
......
This diff is collapsed.
......@@ -8,8 +8,8 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: _LP_LPwire_135110008
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 5
m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_SavedProperties:
......
This diff is collapsed.
sceneSetups:
- path: Assets/_Scenes/Game.unity
- path: Assets/_Scenes/Tutorial.unity
isLoaded: 1
isActive: 1
No preview for this file type
No preview for this file type
Base path: C:/Program Files/Unity/Editor/Data
Cmd: getPlatforms
Cmd: compileSnippet
api=4 type=0 insize=1023 outsize=2230 kw=DIRECTIONAL SHADOWS_SCREEN _EMISSION _NORMALMAP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP ok=1
Cmd: compileSnippet
api=4 type=1 insize=1023 outsize=6610 kw=DIRECTIONAL SHADOWS_SCREEN _EMISSION _NORMALMAP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP ok=1
Cmd: compileSnippet
api=4 type=0 insize=949 outsize=2098 kw=SPOT _NORMALMAP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP ok=1
Cmd: compileSnippet
api=4 type=1 insize=949 outsize=3494 kw=SPOT _NORMALMAP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP ok=1
Cmd: compileSnippet
api=4 type=0 insize=949 outsize=2098 kw=POINT _NORMALMAP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP ok=1
Cmd: compileSnippet
api=4 type=1 insize=949 outsize=3250 kw=POINT _NORMALMAP pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP ok=1
Cmd: compileSnippet
api=4 type=0 insize=18516 outsize=1126 kw=SHADOWS_SPLIT_SPHERES SHADOWS_SINGLE_CASCADE pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP ok=1
Cmd: compileSnippet
api=4 type=1 insize=18516 outsize=1426 kw=SHADOWS_SPLIT_SPHERES SHADOWS_SINGLE_CASCADE pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING SHADER_API_DESKTOP ok=1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment