From 67d41e333f052059bdad0a7598f1a8787ef9263b Mon Sep 17 00:00:00 2001 From: max Date: Mon, 28 Oct 2019 23:45:27 +0100 Subject: [PATCH] Test With VFX Graph and volumetric Fog in "Max Fun" --- .../.idea.UnityProject/.idea/contentModel.xml | 6 +- .../.idea.UnityProject/.idea/indexLayout.xml | 3 +- .../.idea.UnityProject/.idea/workspace.xml | 92 ++- UnityProject/Assembly-CSharp-Editor.csproj | 480 +++++++------- UnityProject/Assembly-CSharp.csproj | 450 ++++++------- UnityProject/Assets/New Camera Animation.anim | 198 ++---- .../Examples/VisualEffectGraph/Boxes.vfx | 592 ++++++++++++------ .../Examples/VisualEffectGraph/Max Fun.meta} | 2 +- .../Examples/VisualEffectGraph/Max Fun.unity | 454 +++++++++++++- .../Max Fun/Scene Settings Profile.asset | 219 +++++++ .../Max Fun/Scene Settings Profile.asset.meta | 8 + .../Assets/{Shader.meta => SteamVR.meta} | 2 +- UnityProject/Assets/SteamVR/Editor.meta | 8 + UnityProject/Assets/SteamVR/Extras.meta | 8 + UnityProject/Assets/SteamVR/Icon.meta | 8 + UnityProject/Assets/SteamVR/Input.meta | 8 + .../SteamVR/Input/BehaviourUnityEvents.meta | 8 + UnityProject/Assets/SteamVR/Input/Editor.meta | 8 + .../SteamVR/Input/Editor/Resources.meta | 8 + .../SteamVR/Input/Editor/Resources/Icons.meta | 8 + .../Assets/SteamVR/Input/ExampleJSON.meta | 8 + .../Assets/SteamVR/Input/Plugins.meta | 8 + .../SteamVR/Input/Plugins/JSON.NET.meta | 8 + .../Assets/SteamVR/InteractionSystem.meta | 8 + .../SteamVR/InteractionSystem/Core.meta | 8 + .../SteamVR/InteractionSystem/Core/Icons.meta | 8 + .../InteractionSystem/Core/Materials.meta | 8 + .../InteractionSystem/Core/Prefabs.meta | 8 + .../InteractionSystem/Core/Scripts.meta | 8 + .../InteractionSystem/Core/Shaders.meta | 8 + .../SteamVR/InteractionSystem/Hints.meta | 8 + .../InteractionSystem/Hints/Materials.meta | 8 + .../InteractionSystem/Hints/Prefabs.meta | 8 + .../InteractionSystem/Hints/Scripts.meta | 8 + .../InteractionSystem/Hints/Shaders.meta | 8 + .../InteractionSystem/Hints/Textures.meta | 8 + .../SteamVR/InteractionSystem/Longbow.meta | 8 + .../InteractionSystem/Longbow/Animators.meta | 8 + .../InteractionSystem/Longbow/Materials.meta | 8 + .../InteractionSystem/Longbow/Models.meta | 8 + .../Longbow/PhysicMaterials.meta | 8 + .../InteractionSystem/Longbow/Prefabs.meta | 8 + .../InteractionSystem/Longbow/Scripts.meta | 8 + .../InteractionSystem/Longbow/Sounds.meta | 8 + .../InteractionSystem/Longbow/Textures.meta | 8 + .../SteamVR/InteractionSystem/Poses.meta | 8 + .../SteamVR/InteractionSystem/Samples.meta | 8 + .../InteractionSystem/Samples/Animations.meta | 8 + .../InteractionSystem/Samples/Animators.meta | 8 + .../InteractionSystem/Samples/BuggyBuddy.meta | 8 + .../Samples/BuggyBuddy/Audio.meta | 8 + .../Samples/BuggyBuddy/Materials.meta | 8 + .../Samples/BuggyBuddy/Textures.meta | 8 + .../Samples/BuggyBuddy/Textures/dusty.meta | 8 + .../Samples/BuggyBuddy/UI.meta | 8 + .../Samples/BuggyBuddy/UI/BuggyUI.meta | 8 + .../InteractionSystem/Samples/Grenade.meta | 8 + .../Samples/Grenade/Materials.meta | 8 + .../Samples/Interactions_Example.meta | 8 + .../InteractionSystem/Samples/JoeJeff.meta | 8 + .../Samples/JoeJeff/Animation.meta | 8 + .../Samples/JoeJeff/Animator.meta | 8 + .../Samples/JoeJeff/Materials.meta | 8 + .../Samples/JoeJeff/Textures.meta | 8 + .../InteractionSystem/Samples/Materials.meta | 8 + .../InteractionSystem/Samples/Models.meta | 8 + .../Samples/Models/Materials.meta | 8 + .../InteractionSystem/Samples/Prefabs.meta | 8 + .../InteractionSystem/Samples/Scripts.meta | 8 + .../InteractionSystem/Samples/Squishy.meta | 8 + .../Samples/Squishy/Materials.meta | 8 + .../Samples/Squishy/Textures.meta | 8 + .../InteractionSystem/Samples/Textures.meta | 8 + .../SteamVR/InteractionSystem/SnapTurn.meta | 8 + .../InteractionSystem/SnapTurn/Materials.meta | 8 + .../SteamVR/InteractionSystem/Teleport.meta | 8 + .../InteractionSystem/Teleport/Materials.meta | 8 + .../InteractionSystem/Teleport/Models.meta | 8 + .../InteractionSystem/Teleport/Prefabs.meta | 8 + .../InteractionSystem/Teleport/Scripts.meta | 8 + .../InteractionSystem/Teleport/Shaders.meta | 8 + .../InteractionSystem/Teleport/Sounds.meta | 8 + .../InteractionSystem/Teleport/Textures.meta | 8 + UnityProject/Assets/SteamVR/Materials.meta | 8 + UnityProject/Assets/SteamVR/Models.meta | 8 + .../Assets/SteamVR/Models/Materials.meta | 8 + UnityProject/Assets/SteamVR/Plugins.meta | 8 + UnityProject/Assets/SteamVR/Prefabs.meta | 8 + UnityProject/Assets/SteamVR/Resources.meta | 8 + UnityProject/Assets/SteamVR/Scripts.meta | 8 + UnityProject/Assets/SteamVR/Textures.meta | 8 + .../Assets/SteamVR/WindowsHelper.meta | 8 + UnityProject/Assets/SteamVR_Resources.meta | 8 + .../Assets/SteamVR_Resources/Resources.meta | 8 + .../Assets/StreamingAssets/SteamVR.meta | 8 + 95 files changed, 2363 insertions(+), 807 deletions(-) rename UnityProject/Assets/{Plugins/Editor/JetBrains.meta => Scenes/Examples/VisualEffectGraph/Max Fun.meta} (77%) create mode 100644 UnityProject/Assets/Scenes/Examples/VisualEffectGraph/Max Fun/Scene Settings Profile.asset create mode 100644 UnityProject/Assets/Scenes/Examples/VisualEffectGraph/Max Fun/Scene Settings Profile.asset.meta rename UnityProject/Assets/{Shader.meta => SteamVR.meta} (77%) create mode 100644 UnityProject/Assets/SteamVR/Editor.meta create mode 100644 UnityProject/Assets/SteamVR/Extras.meta create mode 100644 UnityProject/Assets/SteamVR/Icon.meta create mode 100644 UnityProject/Assets/SteamVR/Input.meta create mode 100644 UnityProject/Assets/SteamVR/Input/BehaviourUnityEvents.meta create mode 100644 UnityProject/Assets/SteamVR/Input/Editor.meta create mode 100644 UnityProject/Assets/SteamVR/Input/Editor/Resources.meta create mode 100644 UnityProject/Assets/SteamVR/Input/Editor/Resources/Icons.meta create mode 100644 UnityProject/Assets/SteamVR/Input/ExampleJSON.meta create mode 100644 UnityProject/Assets/SteamVR/Input/Plugins.meta create mode 100644 UnityProject/Assets/SteamVR/Input/Plugins/JSON.NET.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Core.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Core/Icons.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Core/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Core/Prefabs.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Core/Scripts.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Core/Shaders.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Hints.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Hints/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Hints/Prefabs.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Hints/Scripts.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Hints/Shaders.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Hints/Textures.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Longbow.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Longbow/Animators.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Longbow/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Longbow/Models.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Longbow/PhysicMaterials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Longbow/Prefabs.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Longbow/Scripts.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Longbow/Sounds.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Longbow/Textures.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Poses.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Animations.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Animators.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/BuggyBuddy.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/BuggyBuddy/Audio.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/BuggyBuddy/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/BuggyBuddy/Textures.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/BuggyBuddy/Textures/dusty.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/BuggyBuddy/UI.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/BuggyBuddy/UI/BuggyUI.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Grenade.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Grenade/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Interactions_Example.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/JoeJeff.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/JoeJeff/Animation.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/JoeJeff/Animator.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/JoeJeff/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/JoeJeff/Textures.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Models.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Models/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Prefabs.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Scripts.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Squishy.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Squishy/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Squishy/Textures.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Samples/Textures.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/SnapTurn.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/SnapTurn/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Teleport.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Teleport/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Teleport/Models.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Teleport/Prefabs.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Teleport/Scripts.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Teleport/Shaders.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Teleport/Sounds.meta create mode 100644 UnityProject/Assets/SteamVR/InteractionSystem/Teleport/Textures.meta create mode 100644 UnityProject/Assets/SteamVR/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/Models.meta create mode 100644 UnityProject/Assets/SteamVR/Models/Materials.meta create mode 100644 UnityProject/Assets/SteamVR/Plugins.meta create mode 100644 UnityProject/Assets/SteamVR/Prefabs.meta create mode 100644 UnityProject/Assets/SteamVR/Resources.meta create mode 100644 UnityProject/Assets/SteamVR/Scripts.meta create mode 100644 UnityProject/Assets/SteamVR/Textures.meta create mode 100644 UnityProject/Assets/SteamVR/WindowsHelper.meta create mode 100644 UnityProject/Assets/SteamVR_Resources.meta create mode 100644 UnityProject/Assets/SteamVR_Resources/Resources.meta create mode 100644 UnityProject/Assets/StreamingAssets/SteamVR.meta diff --git a/UnityProject/.idea/.idea.UnityProject/.idea/contentModel.xml b/UnityProject/.idea/.idea.UnityProject/.idea/contentModel.xml index 3cab044..a71867d 100644 --- a/UnityProject/.idea/.idea.UnityProject/.idea/contentModel.xml +++ b/UnityProject/.idea/.idea.UnityProject/.idea/contentModel.xml @@ -9,11 +9,13 @@ + + @@ -84,7 +86,6 @@ - @@ -112,6 +113,9 @@ + + + diff --git a/UnityProject/.idea/.idea.UnityProject/.idea/indexLayout.xml b/UnityProject/.idea/.idea.UnityProject/.idea/indexLayout.xml index 44b83ea..10357be 100644 --- a/UnityProject/.idea/.idea.UnityProject/.idea/indexLayout.xml +++ b/UnityProject/.idea/.idea.UnityProject/.idea/indexLayout.xml @@ -23,7 +23,7 @@ Library/PackageCache/com.unity.test-framework@1.0.13 Library/PackageCache/com.unity.textmeshpro@1.4.1 Library/PackageCache/com.unity.textmeshpro@2.0.1 - Library/PackageCache/com.unity.visualeffectgraph@6.9.1-preview + Library/PackageCache/com.unity.visualeffectgraph@6.9.2-preview Library/PackageCache/com.unity.xr.legacyinputhelpers@2.0.2 Library/PackageCache/nuget.mono-cecil@0.1.5-preview Packages @@ -35,7 +35,6 @@ AudioSamples Library Logs - Temp obj diff --git a/UnityProject/.idea/.idea.UnityProject/.idea/workspace.xml b/UnityProject/.idea/.idea.UnityProject/.idea/workspace.xml index 78e031f..2dbf783 100644 --- a/UnityProject/.idea/.idea.UnityProject/.idea/workspace.xml +++ b/UnityProject/.idea/.idea.UnityProject/.idea/workspace.xml @@ -2,12 +2,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +