Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 1caab07

Browse files
Seeing what happens if we don't serialize textures at all
# Conflicts: # src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs
1 parent 8143fa9 commit 1caab07

File tree

2 files changed

+5
-46
lines changed

2 files changed

+5
-46
lines changed

src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,6 @@
77

88
namespace GitHub.Unity
99
{
10-
[Serializable]
11-
public class SerializableTexture2D
12-
{
13-
[SerializeField] private byte[] bytes;
14-
[SerializeField] private int height;
15-
[SerializeField] private int width;
16-
[SerializeField] private TextureFormat format;
17-
[SerializeField] private bool mipmap;
18-
[SerializeField] private Texture2D texture;
19-
20-
public Texture2D Texture
21-
{
22-
get
23-
{
24-
if (texture == null)
25-
{
26-
texture = new Texture2D(width, height, format, mipmap);
27-
texture.LoadRawTextureData(bytes);
28-
texture.Apply();
29-
}
30-
return texture;
31-
}
32-
set
33-
{
34-
texture = value;
35-
bytes = value.GetRawTextureData();
36-
height = value.height;
37-
width = value.width;
38-
format = value.format;
39-
mipmap = value.mipmapCount > 1;
40-
}
41-
}
42-
}
43-
4410
class Utility : ScriptableObject
4511
{
4612
public static Texture2D GetIcon(string filename, string filename2x = "")

src/UnityExtension/Assets/Editor/GitHub.Unity/UI/TreeControl.cs

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,10 @@ public class Tree
1717
[SerializeField] public Rect Margin = new Rect();
1818
[SerializeField] public Rect Padding = new Rect();
1919

20-
[SerializeField] private SerializableTexture2D activeNodeIcon = new SerializableTexture2D();
21-
public Texture2D ActiveNodeIcon { get { return activeNodeIcon.Texture; } set { activeNodeIcon.Texture = value; } }
22-
23-
[SerializeField] private SerializableTexture2D nodeIcon = new SerializableTexture2D();
24-
public Texture2D NodeIcon { get { return nodeIcon.Texture; } set { nodeIcon.Texture = value; } }
25-
26-
[SerializeField] private SerializableTexture2D folderIcon = new SerializableTexture2D();
27-
public Texture2D FolderIcon { get { return folderIcon.Texture; } set { folderIcon.Texture = value; } }
28-
29-
[SerializeField] private SerializableTexture2D rootFolderIcon = new SerializableTexture2D();
30-
public Texture2D RootFolderIcon { get { return rootFolderIcon.Texture; } set { rootFolderIcon.Texture = value; } }
20+
[SerializeField] public Texture2D ActiveNodeIcon;
21+
[SerializeField] public Texture2D NodeIcon;
22+
[SerializeField] public Texture2D FolderIcon;
23+
[SerializeField] public Texture2D RootFolderIcon;
3124

3225
[SerializeField] public GUIStyle FolderStyle;
3326
[SerializeField] public GUIStyle TreeNodeStyle;
@@ -160,7 +153,7 @@ public Rect Render(Rect rect, Vector2 scroll, Action<TreeNode> singleClick = nul
160153
for (; i < nodes.Count; i++)
161154
{
162155
var node = nodes[i];
163-
ResetNodeIcons(node);
156+
// ResetNodeIcons(node);
164157

165158
if (node.Level > level && !node.IsHidden)
166159
{

0 commit comments

Comments
 (0)