Skip to content

Commit daea746

Browse files
committed
More URP shaders + cleanup
1 parent 252c2a5 commit daea746

29 files changed

+645
-571
lines changed

Assets/Editor/TransferFunction2DEditorWindow.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private void SetInitialPosition()
4141

4242
private void OnEnable()
4343
{
44-
tfGUIMat = Resources.Load<Material>("TransferFunction2DGUIMat");
44+
tfGUIMat = new Material(ShaderFactory.GetTransferFunction2DShader());
4545

4646
volRendObject = SelectionHelper.GetSelectedVolumeObject();
4747
if (volRendObject == null)
Lines changed: 37 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,12 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1001 &100100000
4-
Prefab:
5-
m_ObjectHideFlags: 1
6-
serializedVersion: 2
7-
m_Modification:
8-
m_TransformParent: {fileID: 0}
9-
m_Modifications: []
10-
m_RemovedComponents: []
11-
m_ParentPrefab: {fileID: 0}
12-
m_RootGameObject: {fileID: 1421014454734012}
13-
m_IsPrefabParent: 1
143
--- !u!1 &1421014454734012
154
GameObject:
165
m_ObjectHideFlags: 0
17-
m_PrefabParentObject: {fileID: 0}
18-
m_PrefabInternal: {fileID: 100100000}
19-
serializedVersion: 5
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
2010
m_Component:
2111
- component: {fileID: 4724992415272182}
2212
- component: {fileID: 33427715445158024}
@@ -31,40 +21,59 @@ GameObject:
3121
m_IsActive: 1
3222
--- !u!4 &4724992415272182
3323
Transform:
34-
m_ObjectHideFlags: 1
35-
m_PrefabParentObject: {fileID: 0}
36-
m_PrefabInternal: {fileID: 100100000}
24+
m_ObjectHideFlags: 0
25+
m_CorrespondingSourceObject: {fileID: 0}
26+
m_PrefabInstance: {fileID: 0}
27+
m_PrefabAsset: {fileID: 0}
3728
m_GameObject: {fileID: 1421014454734012}
29+
serializedVersion: 2
3830
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3931
m_LocalPosition: {x: 0, y: 0, z: 0}
4032
m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
33+
m_ConstrainProportionsScale: 0
4134
m_Children: []
4235
m_Father: {fileID: 0}
43-
m_RootOrder: 0
4436
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
--- !u!33 &33427715445158024
38+
MeshFilter:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_GameObject: {fileID: 1421014454734012}
44+
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
4545
--- !u!23 &23453273908375442
4646
MeshRenderer:
47-
m_ObjectHideFlags: 1
48-
m_PrefabParentObject: {fileID: 0}
49-
m_PrefabInternal: {fileID: 100100000}
47+
m_ObjectHideFlags: 0
48+
m_CorrespondingSourceObject: {fileID: 0}
49+
m_PrefabInstance: {fileID: 0}
50+
m_PrefabAsset: {fileID: 0}
5051
m_GameObject: {fileID: 1421014454734012}
5152
m_Enabled: 1
5253
m_CastShadows: 1
5354
m_ReceiveShadows: 1
5455
m_DynamicOccludee: 1
56+
m_StaticShadowCaster: 0
5557
m_MotionVectors: 1
5658
m_LightProbeUsage: 1
5759
m_ReflectionProbeUsage: 1
60+
m_RayTracingMode: 2
61+
m_RayTraceProcedural: 0
62+
m_RayTracingAccelStructBuildFlagsOverride: 0
63+
m_RayTracingAccelStructBuildFlags: 1
64+
m_SmallMeshCulling: 1
5865
m_RenderingLayerMask: 4294967295
66+
m_RendererPriority: 0
5967
m_Materials:
60-
- {fileID: 2100000, guid: 445fc0932bb5aab4b94f7548208708e1, type: 2}
68+
- {fileID: 0}
6169
m_StaticBatchInfo:
6270
firstSubMesh: 0
6371
subMeshCount: 0
6472
m_StaticBatchRoot: {fileID: 0}
6573
m_ProbeAnchor: {fileID: 0}
6674
m_LightProbeVolumeOverride: {fileID: 0}
6775
m_ScaleInLightmap: 1
76+
m_ReceiveGI: 1
6877
m_PreserveUVs: 0
6978
m_IgnoreNormalsForChartDetection: 0
7079
m_ImportantGI: 0
@@ -77,21 +86,17 @@ MeshRenderer:
7786
m_SortingLayerID: 0
7887
m_SortingLayer: 0
7988
m_SortingOrder: 0
80-
--- !u!33 &33427715445158024
81-
MeshFilter:
82-
m_ObjectHideFlags: 1
83-
m_PrefabParentObject: {fileID: 0}
84-
m_PrefabInternal: {fileID: 100100000}
85-
m_GameObject: {fileID: 1421014454734012}
86-
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
89+
m_AdditionalVertexStreams: {fileID: 0}
8790
--- !u!114 &114161471332523336
8891
MonoBehaviour:
89-
m_ObjectHideFlags: 1
90-
m_PrefabParentObject: {fileID: 0}
91-
m_PrefabInternal: {fileID: 100100000}
92+
m_ObjectHideFlags: 0
93+
m_CorrespondingSourceObject: {fileID: 0}
94+
m_PrefabInstance: {fileID: 0}
95+
m_PrefabAsset: {fileID: 0}
9296
m_GameObject: {fileID: 1421014454734012}
9397
m_Enabled: 1
9498
m_EditorHideFlags: 0
9599
m_Script: {fileID: 11500000, guid: b390ddcd0262e354e90a0e15e43abf50, type: 3}
96100
m_Name:
97101
m_EditorClassIdentifier:
102+
targetObject: {fileID: 0}

Assets/Resources/TransferFunction2DGUIMat.mat

Lines changed: 0 additions & 97 deletions
This file was deleted.

Assets/Resources/TransferFunction2DGUIMat.mat.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Assets/Resources/TransferFunctionGUIMat.mat

Lines changed: 0 additions & 97 deletions
This file was deleted.

Assets/Resources/TransferFunctionGUIMat.mat.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)