fix 2019 errors
This commit is contained in:
parent
32bcffb23c
commit
4a679453af
8 changed files with 16 additions and 19 deletions
|
@ -1,12 +1,12 @@
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Scenes.Examples.Example1.script
|
namespace cylvester
|
||||||
{
|
{
|
||||||
public class BallMapping : MonoBehaviour
|
public class BallMapping : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField] private GameObject ball;
|
[SerializeField] private GameObject ball = null;
|
||||||
[SerializeField] private float mapToSize = 10f;
|
[SerializeField] private float mapToSize = 10f;
|
||||||
[SerializeField] private RmsAnalyzer analyzer;
|
[SerializeField] private RmsAnalyzer analyzer = null;
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace Scenes.Examples.Example1.script
|
namespace cylvester
|
||||||
{
|
{
|
||||||
public class RmsAnalyzer : MonoBehaviour
|
public class RmsAnalyzer : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,7 +5,7 @@ using UnityEngine.Rendering;
|
||||||
public class BokehBind : MonoBehaviour
|
public class BokehBind : MonoBehaviour
|
||||||
{
|
{
|
||||||
private Bloom bloom_;
|
private Bloom bloom_;
|
||||||
[SerializeField] Volume volume;
|
[SerializeField] Volume volume = null;
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
|
|
|
@ -3,7 +3,7 @@ using UnityEngine.Experimental.VFX;
|
||||||
|
|
||||||
public class FlareBind : MonoBehaviour
|
public class FlareBind : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField] private VisualEffect flareEffect;
|
[SerializeField] private VisualEffect flareEffect = null;
|
||||||
private static readonly string Spread = "spread";
|
private static readonly string Spread = "spread";
|
||||||
|
|
||||||
public void OnEnergyChanged(float energy)
|
public void OnEnergyChanged(float energy)
|
||||||
|
|
|
@ -3,7 +3,7 @@ using UnityEngine.Experimental.VFX;
|
||||||
|
|
||||||
public class SmokeBind : MonoBehaviour
|
public class SmokeBind : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField] private VisualEffect smokeEffect;
|
[SerializeField] private VisualEffect smokeEffect = null;
|
||||||
private static readonly string SmokeAnimSpeed = "smokeAnimSpeed";
|
private static readonly string SmokeAnimSpeed = "smokeAnimSpeed";
|
||||||
|
|
||||||
public void OnEnergyChanged(float energy)
|
public void OnEnergyChanged(float energy)
|
||||||
|
|
|
@ -9,9 +9,9 @@ namespace cylvester
|
||||||
|
|
||||||
public class PdSpectrumBind : MonoBehaviour
|
public class PdSpectrumBind : MonoBehaviour
|
||||||
{
|
{
|
||||||
[SerializeField] private PdBackend pdBackend;
|
[SerializeField] private PdBackend pdBackend = null;
|
||||||
[SerializeField] private Rect selection;
|
[SerializeField] private Rect selection = Rect.zero;
|
||||||
[SerializeField] private UnityFloatEvent energyChanged;
|
[SerializeField] private UnityFloatEvent energyChanged = null;
|
||||||
[SerializeField] private int channel = 0;
|
[SerializeField] private int channel = 0;
|
||||||
|
|
||||||
private ISpectrumGenerator spectrumGenerator_;
|
private ISpectrumGenerator spectrumGenerator_;
|
||||||
|
|
|
@ -5,23 +5,20 @@ namespace Visualizer
|
||||||
{
|
{
|
||||||
class IRPanelBehaviour : MonoBehaviour
|
class IRPanelBehaviour : MonoBehaviour
|
||||||
{
|
{
|
||||||
#pragma warning disable 649
|
[SerializeField] private KinectManagerBehaviour kinectManagerBehaviour = null;
|
||||||
[SerializeField] private KinectManagerBehaviour kinectManagerBehaviour;
|
[SerializeField] private GameObject panel = null;
|
||||||
[SerializeField] private GameObject panel;
|
|
||||||
#pragma warning restore 649
|
|
||||||
|
|
||||||
private Renderer renderer_;
|
private Renderer renderer_;
|
||||||
private Texture2D texture2D_;
|
private static readonly int BaseColorMap = Shader.PropertyToID("_BaseColorMap");
|
||||||
|
|
||||||
void Start()
|
void Start()
|
||||||
{
|
{
|
||||||
renderer_ = panel.GetComponent<Renderer>();
|
renderer_ = panel.GetComponent<Renderer>();
|
||||||
texture2D_ = new Texture2D(512, 512);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Update()
|
void Update()
|
||||||
{
|
{
|
||||||
renderer_.material.SetTexture("_BaseColorMap", kinectManagerBehaviour.KinectSensor.InfraredCamera.Data);
|
renderer_.material.SetTexture(BaseColorMap, kinectManagerBehaviour.KinectSensor.InfraredCamera.Data);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -6,8 +6,8 @@ namespace cylvester
|
||||||
{
|
{
|
||||||
private const int historySize = 32;
|
private const int historySize = 32;
|
||||||
|
|
||||||
[SerializeField] private PdBackend pdBackend;
|
[SerializeField] private PdBackend pdBackend = null;
|
||||||
[SerializeField] private GameObject spectrumPrefab;
|
[SerializeField] private GameObject spectrumPrefab = null;
|
||||||
[SerializeField, Range(1, 16)] private int channel = 1;
|
[SerializeField, Range(1, 16)] private int channel = 1;
|
||||||
|
|
||||||
private IPdArray spectrumArray_;
|
private IPdArray spectrumArray_;
|
||||||
|
|
Loading…
Reference in a new issue