diff --git a/Assets/Audio/AudioManager.prefab b/Assets/Audio/AudioManager.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..928c7890f73b4f20cbeb25b551c654c2fe8abf6a
--- /dev/null
+++ b/Assets/Audio/AudioManager.prefab
@@ -0,0 +1,82 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3923429697160011822
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8360031938800264741}
+ - component: {fileID: -6367014251060243384}
+ m_Layer: 0
+ m_Name: AudioManager
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &8360031938800264741
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3923429697160011822}
+ 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!114 &-6367014251060243384
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3923429697160011822}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c7e67caf6f91a4def848dea4afe884f3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ sounds:
+ - name: footsteps
+ clip: {fileID: 8300000, guid: f6a4b0024764d49e7a0d36849e643915, type: 3}
+ volume: 1
+ pitch: 0
+ loop: 0
+ source: {fileID: 0}
+ - name: garage_door
+ clip: {fileID: 8300000, guid: dc1fc1dde58794c21b3cb356eb363118, type: 3}
+ volume: 1
+ pitch: 0
+ loop: 0
+ source: {fileID: 0}
+ - name: saber_cut
+ clip: {fileID: 8300000, guid: dce869a21486141ec8ccbe034e1b00e8, type: 3}
+ volume: 1
+ pitch: 0
+ loop: 0
+ source: {fileID: 0}
+ - name: saber_humming
+ clip: {fileID: 8300000, guid: 742bdafa7de494d8089fb55a030e007f, type: 3}
+ volume: 1
+ pitch: 0
+ loop: 0
+ source: {fileID: 0}
+ - name: saber_turn_off
+ clip: {fileID: 8300000, guid: c789e49582ebd4e539ee2e09831b0641, type: 3}
+ volume: 1
+ pitch: 0
+ loop: 0
+ source: {fileID: 0}
+ - name: saber_turn_on
+ clip: {fileID: 8300000, guid: c5613685c31734a58b48222869701bad, type: 3}
+ volume: 1
+ pitch: 0
+ loop: 0
+ source: {fileID: 0}
diff --git a/Assets/Audio/AudioManager.prefab.meta b/Assets/Audio/AudioManager.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d209fa038fb3bef4cca6ce087ad0c08ab74b78b3
--- /dev/null
+++ b/Assets/Audio/AudioManager.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ce14fcd5f9f874b4586589b48955550a
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/AudioManager.cs b/Assets/AudioManager.cs
index 5bac47100f5bf7856846b74378dd4c6179a5cd74..b2fea353d25cedbcccb4f6165991618cf378e04b 100644
--- a/Assets/AudioManager.cs
+++ b/Assets/AudioManager.cs
@@ -37,6 +37,7 @@ public class AudioManager : MonoBehaviour
Debug.LogWarning("Sound: " + name + " not found!");
return;
}
+ Debug.Log("Sound: " + name + " played!");
s.source.Play();
}
diff --git a/Assets/Models/Lightsabers/SaberBlue.prefab b/Assets/Models/Lightsabers/SaberBlue.prefab
index 4c533d16cd5e2e8727f883ef41b44c88833fdc63..173112ddc296cc9e92649bfd653798c2d98bbe7f 100644
--- a/Assets/Models/Lightsabers/SaberBlue.prefab
+++ b/Assets/Models/Lightsabers/SaberBlue.prefab
@@ -11,7 +11,6 @@ GameObject:
- component: {fileID: 2002676811811134828}
- component: {fileID: 4934756297935723444}
- component: {fileID: 6047589666526543022}
- - component: {fileID: 501887343540923824}
m_Layer: 0
m_Name: Sphere
m_TagString: Untagged
@@ -82,20 +81,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &501887343540923824
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2476736485281991167}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 4711208715938537054, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!1 &2670033473453035898
GameObject:
m_ObjectHideFlags: 0
@@ -107,7 +92,6 @@ GameObject:
- component: {fileID: 5430401038383094248}
- component: {fileID: 6561956927124411095}
- component: {fileID: 6241837742344947385}
- - component: {fileID: 9213638358231278275}
m_Layer: 0
m_Name: Cylinder.001
m_TagString: Untagged
@@ -178,20 +162,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &9213638358231278275
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 2670033473453035898}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: -7387706064836869012, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!54 &201148715
Rigidbody:
m_ObjectHideFlags: 0
@@ -254,7 +224,6 @@ GameObject:
- component: {fileID: 1819927639413183861}
- component: {fileID: 7766791634380401927}
- component: {fileID: 5699838649109809510}
- - component: {fileID: 5165247799832635494}
m_Layer: 0
m_Name: Cylinder.003
m_TagString: Untagged
@@ -325,20 +294,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &5165247799832635494
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3395298484381185767}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 6239881831769578202, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!1 &3441095255025812787
GameObject:
m_ObjectHideFlags: 0
@@ -570,7 +525,6 @@ GameObject:
- component: {fileID: 7483576872158291172}
- component: {fileID: 4228089424530968124}
- component: {fileID: 2065398365942802027}
- - component: {fileID: 2470245230663911528}
m_Layer: 0
m_Name: Cylinder.005
m_TagString: Untagged
@@ -641,20 +595,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &2470245230663911528
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 3899787647720555611}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 3390558720134950976, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!1 &4660016671522463036
GameObject:
m_ObjectHideFlags: 0
@@ -696,7 +636,6 @@ GameObject:
- component: {fileID: 2675588229096564863}
- component: {fileID: 5542363392361784891}
- component: {fileID: 2889230961855483564}
- - component: {fileID: 2049150650096901539}
m_Layer: 0
m_Name: Cylinder.009
m_TagString: Untagged
@@ -767,20 +706,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &2049150650096901539
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5206598183120968814}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 3525479140033381557, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!1 &5458718779681886625
GameObject:
m_ObjectHideFlags: 0
@@ -792,7 +717,6 @@ GameObject:
- component: {fileID: 7606746927088664576}
- component: {fileID: 7274694728702853430}
- component: {fileID: 8935268819805341222}
- - component: {fileID: 5362319573240726903}
m_Layer: 0
m_Name: Cylinder.007
m_TagString: Untagged
@@ -863,20 +787,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &5362319573240726903
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 5458718779681886625}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 3163171260390484736, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!1 &6597477378941146524
GameObject:
m_ObjectHideFlags: 0
@@ -888,7 +798,6 @@ GameObject:
- component: {fileID: 4885021084279674066}
- component: {fileID: 8971090476567807975}
- component: {fileID: 8376971930187243464}
- - component: {fileID: 7061337663368762134}
m_Layer: 0
m_Name: Cylinder.006
m_TagString: Untagged
@@ -959,20 +868,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &7061337663368762134
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6597477378941146524}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: -125435165217083709, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!1 &6681503832187716144
GameObject:
m_ObjectHideFlags: 0
@@ -1014,7 +909,6 @@ GameObject:
- component: {fileID: 6245435574286928763}
- component: {fileID: 6568902616814216607}
- component: {fileID: 7509620825647953972}
- - component: {fileID: 9103749197793850721}
m_Layer: 0
m_Name: Cylinder.004
m_TagString: Untagged
@@ -1085,20 +979,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &9103749197793850721
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6761538402700238143}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 6255687079079774844, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!1 &7391157662777420793
GameObject:
m_ObjectHideFlags: 0
@@ -1180,7 +1060,6 @@ GameObject:
- component: {fileID: 7608950478051029364}
- component: {fileID: 2891993151892260376}
- component: {fileID: 6139853890046652886}
- - component: {fileID: 1332301848171797353}
m_Layer: 0
m_Name: Cylinder
m_TagString: Untagged
@@ -1251,20 +1130,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &1332301848171797353
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8588739918005791762}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 2534964839176971238, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!1 &8811692754108172065
GameObject:
m_ObjectHideFlags: 0
@@ -1276,7 +1141,6 @@ GameObject:
- component: {fileID: 726083357923091596}
- component: {fileID: 2554300245510410378}
- component: {fileID: 3014574731611789901}
- - component: {fileID: 3190480892045822837}
m_Layer: 0
m_Name: Cylinder.002
m_TagString: Untagged
@@ -1347,20 +1211,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &3190480892045822837
-MeshCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 8811692754108172065}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 4
- m_Convex: 0
- m_CookingOptions: 30
- m_Mesh: {fileID: 8691780276856062721, guid: 2e0427b29f4946d499452abb5d082636, type: 3}
--- !u!1001 &2476815688702944256
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index 426277c0ce686afc291746feccb1ae865850905e..22068c33e666c320966835a118724d6354d33f1d 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -9921,6 +9921,28 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
+--- !u!1 &282992344 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 107946, guid: dc06161b6d97feb419f45f03b62e14b9,
+ type: 3}
+ m_PrefabInstance: {fileID: 282992343}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &282992345
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 282992344}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0b700f903bc168141b28577849589e2d, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_ActionSet:
+ actionSetPath:
+ leftHand: 1
+ rightHand: 2
--- !u!4 &308581538 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 029feb27265da7849b7078bd795f361a,
@@ -20624,6 +20646,68 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 2.0000005, y: 0.5000001, z: 0.5}
m_Center: {x: -0.99999976, y: 0, z: 0}
+--- !u!1 &911553874
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 911553876}
+ - component: {fileID: 911553875}
+ m_Layer: 0
+ m_Name: test
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &911553875
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 911553874}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 16a9b39235339104889bf8e9178fc630, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ booleanAction:
+ actionPath: /actions/default/in/GrabGrip
+ needsReinit: 0
+ inputSource: 0
+ onChange:
+ m_PersistentCalls:
+ m_Calls: []
+ onUpdate:
+ m_PersistentCalls:
+ m_Calls: []
+ onPress:
+ m_PersistentCalls:
+ m_Calls: []
+ onPressDown:
+ m_PersistentCalls:
+ m_Calls: []
+ onPressUp:
+ m_PersistentCalls:
+ m_Calls: []
+--- !u!4 &911553876
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 911553874}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 19.159903, y: 6.1293254, z: -37.96315}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 32
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &913004836
PrefabInstance:
m_ObjectHideFlags: 0
@@ -59026,6 +59110,43 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 79f30c7baf59f68468ea82a38473449d, type: 3}
+--- !u!1 &1486644278 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3441095255025812787, guid: 79f30c7baf59f68468ea82a38473449d,
+ type: 3}
+ m_PrefabInstance: {fileID: 1486644277}
+ m_PrefabAsset: {fileID: 0}
+--- !u!114 &1486644279
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1486644278}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 16a9b39235339104889bf8e9178fc630, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ booleanAction:
+ actionPath:
+ needsReinit: 0
+ inputSource: 0
+ onChange:
+ m_PersistentCalls:
+ m_Calls: []
+ onUpdate:
+ m_PersistentCalls:
+ m_Calls: []
+ onPress:
+ m_PersistentCalls:
+ m_Calls: []
+ onPressDown:
+ m_PersistentCalls:
+ m_Calls: []
+ onPressUp:
+ m_PersistentCalls:
+ m_Calls: []
--- !u!1001 &1487455162
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/LightSaberScripts/WeaponManager.cs b/Assets/Scripts/LightSaberScripts/WeaponManager.cs
index 0fea1850a3585b1e3fbedf101080529310da213d..94186f4d7b794bbbd1443738251a394899f3bb70 100644
--- a/Assets/Scripts/LightSaberScripts/WeaponManager.cs
+++ b/Assets/Scripts/LightSaberScripts/WeaponManager.cs
@@ -57,11 +57,11 @@ Vector3 vector = new Vector3(-1.0f,0f);
void Update()
{
//if(i%120 == 0){weaponTurnedOn = !weaponTurnedOn;Debug.Log("Weapon state changed");}i++; //for blade function tests without input.
+ if (interactable == null){
+ return;
+ }
if (interactable.attachedToHand != null){
SteamVR_Input_Sources source = interactable.attachedToHand.handType;
-
- Debug.Log(source.ToString());
-
if (activateBlade[source].stateDown){
weaponTurnedOn = !weaponTurnedOn;
Debug.Log("Weapon state changed");