helar
/
Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

full body and animation, removed haptics that caused system crash

This commit is contained in:
jonasty 2022-03-24 22:50:55 +02:00
parent 0cb487d781
commit e6cfaaf188
12 changed files with 2472 additions and 1026 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Assets/Polaris - Low Poly Ecosystem/Polaris Extension - URP Support/Materials/Foliage/URP_Grass.mat
View File

@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3183739782219250664
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 6
@ -122,16 +135,3 @@ Material:
- _WavingTint: {r: 1, g: 1, b: 1, a: 1}
- _Wind: {r: 1, g: 1, b: 4, a: 8}
m_BuildTextureStacks: []
--- !u!114 &3526091933610125097
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5

26
Assets/Polaris - Low Poly Ecosystem/Polaris Extension - URP Support/Materials/Foliage/URP_GrassInteractive.mat
View File

@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7375077612025055926
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 6
@ -123,16 +136,3 @@ Material:
- _WavingTint: {r: 1, g: 1, b: 1, a: 1}
- _Wind: {r: 1, g: 1, b: 4, a: 8}
m_BuildTextureStacks: []
--- !u!114 &8371006547628974838
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5

26
Assets/Polaris - Low Poly Ecosystem/Polaris Extension - URP Support/Materials/Foliage/URP_TreeBillboard.mat
View File

@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8109630410480568565
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 6
@ -82,16 +95,3 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
--- !u!114 &6875768884243782342
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5

2
Assets/Polaris - Low Poly Ecosystem/Polaris Extension - URP Support/Materials/Terrain/URP_4Splats.mat
View File

@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-665454261363273941
--- !u!114 &-8516441631397128744
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}

26
Assets/Polaris - Low Poly Ecosystem/Polaris Extension - URP Support/Materials/Terrain/URP_4Splats4Normals.mat
View File

@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-3812546137789226465
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 6
@ -181,16 +194,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!114 &9040730398170259855
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5

26
Assets/Polaris - Low Poly Ecosystem/Polaris Extension - URP Support/Materials/Terrain/URP_8Splats.mat
View File

@ -1,18 +1,5 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6490047112712672205
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 6
@ -186,3 +173,16 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!114 &953072827018921558
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5

26
Assets/Polaris - Low Poly Ecosystem/Polaris Extension - URP Support/Materials/Terrain/URP_GradientLookup.mat
View File

@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6746866460897044516
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5
--- !u!21 &2100000
Material:
serializedVersion: 6
@ -97,16 +110,3 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!114 &8311216500740289429
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 5

2
Assets/Polaris - Low Poly Ecosystem/Polaris Extension - URP Support/Materials/Terrain/URP_VertexColor.mat
View File

@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-4490344768316273443
--- !u!114 &-7770683026536191615
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}

2265
Assets/Project Files/Robot Kyle.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Project Files/Robot Kyle.prefab.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f950195469996c74ba499ffd00cc239e
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

20
Assets/Project Files/Scripts/JonasB/GestureRecognizer.cs
View File

@ -9,7 +9,7 @@ using UnityEngine.Events;
public class GestureRecognizer : MonoBehaviour
{
public InputDevice rightHandController;
//public InputDevice rightHandController;
public XRNode rightHandSource;
public InputHelpers.Button rightInputButton;
public InputHelpers.Button rightControlButton;
@ -60,13 +60,13 @@ public class GestureRecognizer : MonoBehaviour
if (!isMoving && startGesture)
{
StartMovement();
StartCoroutine("Haptics");
//StartCoroutine("Haptics");
}
// Ending the movement
else if (isMoving && !startGesture)
{
EndMovement();
StopCoroutine("Haptics");
//StopCoroutine("Haptics");
}
// Updating the movement
else if (isMoving && startGesture)
@ -75,13 +75,13 @@ public class GestureRecognizer : MonoBehaviour
}
}
// Still needs to be tested
IEnumerator Haptics()
{
while (true)
{
rightHandController.SendHapticImpulse(0u, 0.7f, 0.2f);
}
}
//IEnumerator Haptics()
//{
// while (true)
// {
// rightHandController.SendHapticImpulse(0u, 0.7f, 0.2f);
// }
//}
void StartMovement()
{

1046
Assets/Scenes/JonasB/Portals.unity
View File

File diff suppressed because it is too large Load Diff