diff --git a/Scripts/Editor/NodeEditorGUI.cs b/Scripts/Editor/NodeEditorGUI.cs index eed85aa..5538cdc 100644 --- a/Scripts/Editor/NodeEditorGUI.cs +++ b/Scripts/Editor/NodeEditorGUI.cs @@ -161,13 +161,8 @@ public partial class NodeEditorWindow { GUILayout.BeginArea(new Rect(nodePos,new Vector2(nodeEditor.GetWidth(), 4000))); - GUI.color = new Color(0.29f, 0.31f, 0.32f,0.8f); - GUIStyle style = NodeEditorResources.styles.nodeContent; + GUIStyle style = NodeEditorResources.styles.nodeBody; GUILayout.BeginVertical(new GUIStyle(style)); - GUI.color = new Color(0.1f, 0.1f, 0.1f, 0.9f); - style = NodeEditorResources.styles.nodeFrame; - GUILayout.BeginVertical(new GUIStyle(style)); - GUI.color = Color.white; //Draw node contents Dictionary portHandlePoints; @@ -181,7 +176,6 @@ public partial class NodeEditorWindow { } } - GUILayout.EndVertical(); GUILayout.EndVertical(); //if (e.type == EventType.Repaint) node.rect.size = GUILayoutUtility.GetLastRect().size; diff --git a/Scripts/Editor/NodeEditorResources.cs b/Scripts/Editor/NodeEditorResources.cs index 77f0fac..77ef3e4 100644 --- a/Scripts/Editor/NodeEditorResources.cs +++ b/Scripts/Editor/NodeEditorResources.cs @@ -12,10 +12,8 @@ public static class NodeEditorResources { private static Texture2D _dot; public static Texture2D dotOuter { get { return _dotOuter != null ? _dotOuter : _dotOuter = Resources.Load("unec_dot_outer"); } } private static Texture2D _dotOuter; - public static Texture2D nodeFrame { get { return _nodeFrame != null ? _nodeFrame : _nodeFrame = Resources.Load("unec_nodeframe"); } } - private static Texture2D _nodeFrame; - public static Texture2D nodeFrameOuter { get { return _nodeFrameOuter != null ? _nodeFrameOuter : _nodeFrameOuter = Resources.Load("unec_nodeframe_outer"); } } - private static Texture2D _nodeFrameOuter; + public static Texture2D nodeBody { get { return _nodeBody != null ? _nodeBody : _nodeBody = Resources.Load("unec_node"); } } + private static Texture2D _nodeBody; //Grid colors private static Color backgroundColor = new Color(0.18f, 0.18f, 0.18f); @@ -28,7 +26,7 @@ public static class NodeEditorResources { public static Styles _styles = null; public class Styles { - public GUIStyle inputPort, outputPort, nodeHeader, nodeFrame, nodeContent; + public GUIStyle inputPort, outputPort, nodeHeader, nodeBody; public Styles() { GUIStyle baseStyle = new GUIStyle("Label"); @@ -47,13 +45,9 @@ public static class NodeEditorResources { nodeHeader.fontStyle = FontStyle.Bold; nodeHeader.normal.textColor = Color.white; - nodeFrame = new GUIStyle(); - nodeFrame.normal.background = nodeFrameOuter; - nodeFrame.border = new RectOffset(32, 32, 32, 32); - - nodeContent = new GUIStyle(); - nodeContent.normal.background = NodeEditorResources.nodeFrame; - nodeContent.border = new RectOffset(32, 32, 32, 32); + nodeBody = new GUIStyle(); + nodeBody.normal.background = NodeEditorResources.nodeBody; + nodeBody.border = new RectOffset(32, 32, 32, 32); } } diff --git a/Scripts/Editor/Resources/unec_node.psd b/Scripts/Editor/Resources/unec_node.psd index d658731..548a12d 100644 Binary files a/Scripts/Editor/Resources/unec_node.psd and b/Scripts/Editor/Resources/unec_node.psd differ diff --git a/Scripts/Editor/Resources/unec_node.psd.meta b/Scripts/Editor/Resources/unec_node.psd.meta index c252fdc..ddc85db 100644 --- a/Scripts/Editor/Resources/unec_node.psd.meta +++ b/Scripts/Editor/Resources/unec_node.psd.meta @@ -7,13 +7,11 @@ TextureImporter: serializedVersion: 4 mipmaps: mipMapMode: 0 - enableMipMap: 1 - sRGBTexture: 1 + enableMipMap: 0 + sRGBTexture: 0 linearTexture: 0 fadeOut: 0 borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -29,14 +27,11 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: - serializedVersion: 2 filterMode: -1 - aniso: -1 + aniso: 1 mipBias: -1 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 spriteMode: 0 @@ -47,9 +42,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 2 textureShape: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 @@ -63,11 +58,42 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + - buildTarget: Standalone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: iPhone + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: Android + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + - buildTarget: WebGL + maxTextureSize: 2048 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 spriteSheet: serializedVersion: 2 sprites: [] outline: [] - physicsShape: [] spritePackingTag: userData: assetBundleName: diff --git a/Scripts/Editor/Resources/unec_nodeframe.psd b/Scripts/Editor/Resources/unec_nodeframe.psd deleted file mode 100644 index b17f255..0000000 Binary files a/Scripts/Editor/Resources/unec_nodeframe.psd and /dev/null differ diff --git a/Scripts/Editor/Resources/unec_nodeframe.psd.meta b/Scripts/Editor/Resources/unec_nodeframe.psd.meta deleted file mode 100644 index 0676d07..0000000 --- a/Scripts/Editor/Resources/unec_nodeframe.psd.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: dc27da104f7cfb24f8ad84db914f015a -timeCreated: 1506974712 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapU: 1 - wrapV: 1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 2 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Android - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: WebGL - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Scripts/Editor/Resources/unec_nodeframe_outer.psd b/Scripts/Editor/Resources/unec_nodeframe_outer.psd deleted file mode 100644 index 187e227..0000000 Binary files a/Scripts/Editor/Resources/unec_nodeframe_outer.psd and /dev/null differ diff --git a/Scripts/Editor/Resources/unec_nodeframe_outer.psd.meta b/Scripts/Editor/Resources/unec_nodeframe_outer.psd.meta deleted file mode 100644 index 9020cf1..0000000 --- a/Scripts/Editor/Resources/unec_nodeframe_outer.psd.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 1608df194c29ecd4d818b3b68dcdbc54 -timeCreated: 1506974648 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 4 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 0 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapU: 1 - wrapV: 1 - wrapW: -1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 2 - textureShape: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - platformSettings: - - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Standalone - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: Android - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - - buildTarget: WebGL - maxTextureSize: 2048 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: