Merge pull request mlavik1#19 from mlavik1/volumeserialisation

mlavik1#18: Serialise volume data

Author: mlavik1

Assets/Editor/TransferFunctionEditorWindow.cs

@@ -13,6 +13,7 @@ public class TransferFunctionEditorWindow : EditorWindow
         private int selectedColPointIndex = -1;
 
         private VolumeRenderedObject volRendObject = null;
+        private Texture2D histTex = null;
 
         [MenuItem("Volume Rendering/1D Transfer Function")]
         public static void ShowWindow()
@@ -76,8 +77,11 @@ private void OnGUI()
             // TODO:
             tf.GenerateTexture();
 
+            if(histTex == null)
+                histTex = HistogramTextureGenerator.GenerateHistogramTexture(volRendObject.dataset);
+
             tfGUIMat.SetTexture("_TFTex", tf.GetTexture());
-            tfGUIMat.SetTexture("_HistTex", tf.histogramTexture);
+            tfGUIMat.SetTexture("_HistTex", histTex);
             Graphics.DrawTexture(bgRect, tf.GetTexture(), tfGUIMat);
 
             Texture2D tfTexture = tf.GetTexture();

Assets/Scripts/TransferFunction/TransferFunction.cs

@@ -1,28 +1,23 @@
 using UnityEngine;
 using System.Collections.Generic;
+using System;
 
 namespace UnityVolumeRendering
 {
-    public class TransferFunction
+    [Serializable]
+    public class TransferFunction : ScriptableObject
     {
+        [SerializeField]
         public List<TFColourControlPoint> colourControlPoints = new List<TFColourControlPoint>();
+        [SerializeField]
         public List<TFAlphaControlPoint> alphaControlPoints = new List<TFAlphaControlPoint>();
 
-        public Texture2D histogramTexture = null;
-
         private Texture2D texture = null;
-        Color[] tfCols;
+        private Color[] tfCols;
 
         private const int TEXTURE_WIDTH = 512;
         private const int TEXTURE_HEIGHT = 2;
 
-        public TransferFunction()
-        {
-            TextureFormat texformat = SystemInfo.SupportsTextureFormat(TextureFormat.RGBAHalf) ? TextureFormat.RGBAHalf : TextureFormat.RGBAFloat;
-            texture = new Texture2D(TEXTURE_WIDTH, TEXTURE_HEIGHT, texformat, false);
-            tfCols = new Color[TEXTURE_WIDTH * TEXTURE_HEIGHT];
-        }
-
         public void AddControlPoint(TFColourControlPoint ctrlPoint)
         {
             colourControlPoints.Add(ctrlPoint);
@@ -43,6 +38,9 @@ public Texture2D GetTexture()
 
         public void GenerateTexture()
         {
+            if (texture == null)
+                CreateTexture();
+
             List<TFColourControlPoint> cols = new List<TFColourControlPoint>(colourControlPoints);
             List<TFAlphaControlPoint> alphas = new List<TFAlphaControlPoint>(alphaControlPoints);
 
@@ -96,5 +94,12 @@ public void GenerateTexture()
             texture.SetPixels(tfCols);
             texture.Apply();
         }
+
+        private void CreateTexture()
+        {
+            TextureFormat texformat = SystemInfo.SupportsTextureFormat(TextureFormat.RGBAHalf) ? TextureFormat.RGBAHalf : TextureFormat.RGBAFloat;
+            texture = new Texture2D(TEXTURE_WIDTH, TEXTURE_HEIGHT, texformat, false);
+            tfCols = new Color[TEXTURE_WIDTH * TEXTURE_HEIGHT];
+        }
     }
 }

Assets/Scripts/TransferFunction/TransferFunction2D.cs

@@ -1,10 +1,12 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 namespace UnityVolumeRendering
 {
-    public class TransferFunction2D
+    [Serializable]
+    public class TransferFunction2D : ScriptableObject
     {
         [System.Serializable]
         public struct TF2DBox
@@ -15,19 +17,14 @@ public struct TF2DBox
             public Rect rect;
         }
 
+        [SerializeField]
         public List<TF2DBox> boxes = new List<TF2DBox>();
 
         private Texture2D texture = null;
 
         private const int TEXTURE_WIDTH = 512;
         private const int TEXTURE_HEIGHT = 512;
 
-        public TransferFunction2D()
-        {
-            TextureFormat texformat = SystemInfo.SupportsTextureFormat(TextureFormat.RGBAHalf) ? TextureFormat.RGBAHalf : TextureFormat.RGBAFloat;
-            texture = new Texture2D(TEXTURE_WIDTH, TEXTURE_HEIGHT, texformat, false);
-        }
-
         public void AddBox(float x, float y, float width, float height, Color colour, float alpha)
         {
             TF2DBox box = new TF2DBox();
@@ -42,11 +39,23 @@ public void AddBox(float x, float y, float width, float height, Color colour, fl
 
         public Texture2D GetTexture()
         {
+            if(texture == null)
+                GenerateTexture();
+
             return texture;
         }
 
+        private void CreateTexture()
+        {
+            TextureFormat texformat = SystemInfo.SupportsTextureFormat(TextureFormat.RGBAHalf) ? TextureFormat.RGBAHalf : TextureFormat.RGBAFloat;
+            texture = new Texture2D(TEXTURE_WIDTH, TEXTURE_HEIGHT, texformat, false);
+        }
+
         public void GenerateTexture()
         {
+            if (texture == null)
+                CreateTexture();
+
             Color[] cols = new Color[TEXTURE_WIDTH * TEXTURE_HEIGHT];
             for (int iX = 0; iX < TEXTURE_WIDTH; iX++)
             {

Assets/Scripts/VolumeData/VolumeDataset.cs

@@ -3,9 +3,12 @@
 
 namespace UnityVolumeRendering
 {
-    public class VolumeDataset
+    [Serializable]
+    public class VolumeDataset : ScriptableObject
     {
+        [SerializeField]
         public int[] data = null;
+        [SerializeField]
         public int dimX, dimY, dimZ;
 
         private int minDataValue = int.MaxValue;

Assets/Scripts/VolumeObject/MaterialFactory.cs

@@ -0,0 +1,21 @@
+using UnityEngine;
+
+namespace UnityVolumeRendering
+{
+    public class MaterialFactory
+    {
+        public static Material CreateMaterialDVR(VolumeDataset dataset)
+        {
+            Shader shader = Shader.Find("VolumeRendering/DirectVolumeRenderingShader");
+            Material material = new Material(shader);
+
+            const int noiseDimX = 512;
+            const int noiseDimY = 512;
+            Texture2D noiseTexture = NoiseTextureGenerator.GenerateNoiseTexture(noiseDimX, noiseDimY);
+            material.SetTexture("_NoiseTex", noiseTexture);
+            material.SetTexture("_DataTex", dataset.GetDataTexture());
+
+            return material;
+        }
+    }
+}

Assets/Scripts/VolumeObject/MaterialFactory.cs.meta

@@ -30,8 +30,6 @@ public static VolumeRenderedObject CreateObject(VolumeDataset dataset)
             Texture2D tfTexture = tf.GetTexture();
             volObj.transferFunction = tf;
 
-            tf.histogramTexture = HistogramTextureGenerator.GenerateHistogramTexture(dataset);
-
             TransferFunction2D tf2D = TransferFunctionDatabase.CreateTransferFunction2D();
             volObj.transferFunction2D = tf2D;