diff --git a/Assets/5. Transfer Function/Materials/VolumeRendering3.mat b/Assets/5. Transfer Function/Materials/VolumeRendering3.mat index d406288..85733ec 100644 --- a/Assets/5. Transfer Function/Materials/VolumeRendering3.mat +++ b/Assets/5. Transfer Function/Materials/VolumeRendering3.mat @@ -32,9 +32,9 @@ - _BlendDst: 10 - _BlendSrc: 5 - _Intensity: 1 - - _Iteration: 2000 + - _Iteration: 500 - _MaxX: 1 - - _MaxY: 1 + - _MaxY: 0.802 - _MaxZ: 1 - _MinX: 0 - _MinY: 0 diff --git a/Assets/5. Transfer Function/Scenes/Transfer Function.unity b/Assets/5. Transfer Function/Scenes/Transfer Function.unity index 47a77ca..a9cd5e2 100644 --- a/Assets/5. Transfer Function/Scenes/Transfer Function.unity +++ b/Assets/5. Transfer Function/Scenes/Transfer Function.unity @@ -422,10 +422,6 @@ m_Script: {fileID: 11500000, guid: ade87100a2e14fa4e818d9571b0aff1b, type: 3} m_Name: m_EditorClassIdentifier: - start_point_vec: {x: 0, y: 0, z: 0} - center_points_vec: [] - prefabOBJ: {fileID: 510536687663676710, guid: da85052efecd4f14580a44a59eea8e29, - type: 3} --- !u!114 &1000675183 MonoBehaviour: m_ObjectHideFlags: 0 @@ -755,33 +751,33 @@ m_EditorClassIdentifier: gradient: serializedVersion: 2 - key0: {r: 0, g: 0, b: 0, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0.5566038, g: 0.1891897, b: 0.04463333, a: 0.19471103} + key0: {r: 0, g: 0, b: 0, a: 0} + key1: {r: 0.10123711, g: 0.18569952, b: 0.23584908, a: 1} + key2: {r: 0.5566038, g: 0.1891897, b: 0.04463333, a: 0} key3: {r: 0.86274517, g: 0.73333335, b: 1, a: 0.6901961} key4: {r: 0.86274517, g: 0.73333335, b: 1, a: 0} key5: {r: 0.86274517, g: 0.73333335, b: 1, a: 1} key6: {r: 0, g: 0, b: 0, a: 1} key7: {r: 0, g: 0, b: 0, a: 1} ctime0: 0 - ctime1: 65535 + ctime1: 36114 ctime2: 44341 ctime3: 50650 ctime4: 65535 ctime5: 65535 ctime6: 0 ctime7: 0 - atime0: 70 - atime1: 65535 - atime2: 65535 + atime0: 33709 + atime1: 36149 + atime2: 40227 atime3: 43260 atime4: 52916 atime5: 65535 atime6: 65535 atime7: 65535 m_Mode: 0 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + m_NumColorKeys: 5 + m_NumAlphaKeys: 6 updateTextureInEveryFrame: 1 --- !u!1 &2108303124 GameObject: diff --git a/Assets/Scripts/Camera_udp.cs b/Assets/Scripts/Camera_udp.cs index ad4a3ae..0badb19 100644 --- a/Assets/Scripts/Camera_udp.cs +++ b/Assets/Scripts/Camera_udp.cs @@ -75,6 +75,9 @@ var reader = new StreamReader(Application.dataPath + "/setting.json"); ; data_str = reader.ReadToEnd(); var inputJson = JsonUtility.FromJson(data_str); + + var patient_t = GameObject.Find("Patient"); + patient_t.transform.localScale = new Vector3(inputJson.x_scale, inputJson.y_scale, inputJson.z_scale); start_point_vec = decodeStr2Vec3(inputJson.center_points_vec[0]); foreach (var points_str in inputJson.center_points_vec) @@ -96,6 +99,8 @@ else Debug.Log("ヌル!!!"); + + //foreach (var center_vec in sortedWorldVertices) //{ // GameObject obj = Instantiate(prefabOBJ, center_vec, Quaternion.identity); @@ -270,12 +275,14 @@ { if (0.0f < insertionDistance && posIndex != sortedWorldVertices.Count - 1) { + Debug.Log("前進"); float nearestDistance = (light_source.transform.position - sortedWorldVertices[posIndex + 1]).magnitude; if (insertionDistance <= nearestDistance) { light_source.transform.LookAt(sortedWorldVertices[posIndex + 1]); light_source.transform.Translate(0.0f, 0.0f, insertionDistance); + virtul_endscope.transform.position = light_source.transform.position; } else { @@ -319,6 +326,8 @@ { light_source.transform.LookAt(sortedWorldVertices[posIndex + 1]); light_source.transform.Translate(0.0f, 0.0f, -insertionDistance); + virtul_endscope.transform.position = light_source.transform.position; + Debug.Log("バック"); } else { diff --git a/InitUnitySettings/main.py b/InitUnitySettings/main.py index c890960..75752c5 100644 --- a/InitUnitySettings/main.py +++ b/InitUnitySettings/main.py @@ -14,6 +14,7 @@ parser.add_argument("--magnification_ratio", type=int, default=4, help='ダブルクリック時の拡大倍率(偶数のほうがいいかも)') parser.add_argument("--window_low", type=float, default=-500.0, help="ウィンドウサイズの下限") parser.add_argument("--window_high", type=float, default=500.0, help="ウィンドウサイズの上限") +parser.add_argument("--median_filter", action="store_true", help="メジアンフィルタを") args = parser.parse_args()