Browse Source

vignetting setup

Marcel 3 years ago
parent
commit
ba3a580ef0

+ 8 - 0
Assets/Scenes/MainScene.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 27b08c81852e5484daaee1e043d3ee08
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 34 - 4
Assets/Scenes/MainScene.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.2846213, g: 0.37121028, b: 0.49880686, a: 1}
+  m_IndirectSpecularColor: {r: 0.28462118, g: 0.3712101, b: 0.49880633, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -31623,6 +31623,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 451871745638313690, guid: 7327ba33dc61a6447b6a81bcb9d0c62c,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 451871745638313693, guid: 7327ba33dc61a6447b6a81bcb9d0c62c,
         type: 3}
       propertyPath: m_Name
@@ -31636,7 +31641,7 @@ PrefabInstance:
     - target: {fileID: 451871745638313693, guid: 7327ba33dc61a6447b6a81bcb9d0c62c,
         type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 7327ba33dc61a6447b6a81bcb9d0c62c, type: 3}
@@ -111484,6 +111489,29 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 452747132}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &453350359 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 451871745638313693, guid: 7327ba33dc61a6447b6a81bcb9d0c62c,
+    type: 3}
+  m_PrefabInstance: {fileID: 124935393}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &453350360
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 453350359}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  isGlobal: 1
+  priority: 0
+  blendDistance: 0
+  weight: 1
+  sharedProfile: {fileID: 11400000, guid: 23fd0ff76113fe84f87329d0a563113a, type: 2}
 --- !u!1001 &453790907
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -266092,12 +266120,14 @@ MonoBehaviour:
       colorBlindnessType: 0
       colorBlindnessStrength: 1
   m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2}
-  m_ShowToolkit: 0
+  m_ShowToolkit: 1
   m_ShowCustomSorter: 0
   breakBeforeColorGrading: 0
   m_BeforeTransparentBundles: []
   m_BeforeStackBundles: []
-  m_AfterStackBundles: []
+  m_AfterStackBundles:
+  - assemblyQualifiedName: SicknessReduction.Visual.Grayscale, Assembly-CSharp, Version=0.0.0.0,
+      Culture=neutral, PublicKeyToken=null
 --- !u!4 &1119372708 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 1121772855208284805, guid: a8075fecadfce7c4abe277fb835ca5c5,

+ 3 - 0
Assets/Scripts/SicknessReduction.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: b1f24d9a50ae496c93e865596be116a9
+timeCreated: 1610786628

+ 0 - 0
Assets/Scripts/ESPController.meta → Assets/Scripts/SicknessReduction/Haptic.meta


+ 2 - 3
Assets/Scripts/ESPController/DataBroker.cs → Assets/Scripts/SicknessReduction/Haptic/DataBroker.cs

@@ -1,12 +1,11 @@
-using System;
-using System.Net;
+using System.Net;
 using System.Threading.Tasks;
 using Makaretu.Dns;
 using MQTTnet;
 using MQTTnet.Server;
 using UnityEngine;
 
-namespace ESPController
+namespace SicknessReduction.Haptic
 {
     public class DataBroker : MonoBehaviour
     {

+ 0 - 0
Assets/Scripts/ESPController/DataBroker.cs.meta → Assets/Scripts/SicknessReduction/Haptic/DataBroker.cs.meta


+ 28 - 0
Assets/Scripts/SicknessReduction/Visual/DynamicVignetting.cs

@@ -0,0 +1,28 @@
+using System;
+using UnityEngine;
+
+namespace SicknessReduction.Visual
+{
+    public class DynamicVignetting : MonoBehaviour
+    {
+        //TODO: cite https://www.researchgate.net/publication/326760789_Assessing_vignetting_as_a_means_to_reduce_VR_sickness_during_amplified_head_rotations
+        //TODO: there is a patent for this (WTF) https://patents.google.com/patent/US9645395B2/en
+        //TODO: check Fernandes & Feiner
+
+        private float minRestriction = 0f; //from Fernandes & Feiner
+        private float maxRestriction = 80f; //from Fernandes & Feiner
+
+        private float angularVelocityThreshold = 20f; //deg/sec check in Fernandes & Feiner
+        //TODO: figure out what angular velocity means in my context
+
+        private void Start()
+        {
+            throw new NotImplementedException();
+        }
+
+        private void Update()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/SicknessReduction/Visual/DynamicVignetting.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 54acd1322ae34339be1bdea26a9b83fd
+timeCreated: 1610786704