From ac6e75668beec48afad2b2a5490cd892932bcb00 Mon Sep 17 00:00:00 2001 From: Thor Brigsted Date: Sun, 8 Oct 2017 13:36:54 +0200 Subject: [PATCH] NodeGraph changes should now be saving correctly. Needs improvemend. Also improved layout of Color and AnimationCurve --- Examples/NodeToy/NodeGraphExample.asset | Bin 7592 -> 7608 bytes Scripts/Editor/NodeEditor.cs | 15 ++- Scripts/Editor/NodeEditorAction.cs | 3 +- Scripts/Editor/NodeEditorWindow.cs | 3 + Scripts/Editor/Resources/unec_node.png | Bin 0 -> 20154 bytes ...{unec_node.psd.meta => unec_node.png.meta} | 20 ++-- .../{unec_node.psd => unec_node_workfile.psd} | Bin 33838 -> 33860 bytes .../Resources/unec_node_workfile.psd.meta | 98 ++++++++++++++++++ 8 files changed, 124 insertions(+), 15 deletions(-) create mode 100644 Scripts/Editor/Resources/unec_node.png rename Scripts/Editor/Resources/{unec_node.psd.meta => unec_node.png.meta} (87%) rename Scripts/Editor/Resources/{unec_node.psd => unec_node_workfile.psd} (96%) create mode 100644 Scripts/Editor/Resources/unec_node_workfile.psd.meta diff --git a/Examples/NodeToy/NodeGraphExample.asset b/Examples/NodeToy/NodeGraphExample.asset index 7fa3bace72d9f021ca63eb99cd339a2358978119..5e27b6b03825dafc97e79fe05e801f2544e31294 100644 GIT binary patch delta 249 zcmZ2sy~CP=fkBd)fkAf1MvejrRU1YI1||juhKdwXo{g`jGj0HK&H(v9VTMnusuT_< z&tPoWJXa!^k)4T|@kr8y&6B@NK2v0vbeO^6{b2?M4`&btsb&S@%)Elq5+KdMFj-Gl zZL*EDgFxXjW&4P~Om;rr+V)@xK}iXRJ!d2A=REyscSAnP9)!VK7#e^y2s1c9G1z4w z*MUIm>p=T;?uqsftESjbZj{oQd_lT~kzsPG%zU98KZ-0jpP0(X22_?`S^{*#!g94*y2`HhT*kVdq< Y!za0^j7WO Create editor window diff --git a/Scripts/Editor/Resources/unec_node.png b/Scripts/Editor/Resources/unec_node.png new file mode 100644 index 0000000000000000000000000000000000000000..a8aa5342c4f1372bfdbb950bdb5d8bf190abae12 GIT binary patch literal 20154 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 Q(IY@?Emv6Nnfq+}2W&%nSO5S3 literal 0 HcmV?d00001 diff --git a/Scripts/Editor/Resources/unec_node.psd.meta b/Scripts/Editor/Resources/unec_node.png.meta similarity index 87% rename from Scripts/Editor/Resources/unec_node.psd.meta rename to Scripts/Editor/Resources/unec_node.png.meta index ddc85db..979e6f9 100644 --- a/Scripts/Editor/Resources/unec_node.psd.meta +++ b/Scripts/Editor/Resources/unec_node.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 526e7d4dc27d75e41b5d751e4d390d8b -timeCreated: 1506975350 +guid: 2fea1dcb24935ef4ca514d534eb6aa3d +timeCreated: 1507454532 licenseType: Free TextureImporter: fileIDToRecycleName: {} @@ -12,6 +12,8 @@ TextureImporter: linearTexture: 0 fadeOut: 0 borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 mipMapFadeDistanceStart: 1 mipMapFadeDistanceEnd: 3 bumpmap: @@ -27,10 +29,13 @@ TextureImporter: textureFormat: 1 maxTextureSize: 2048 textureSettings: + serializedVersion: 2 filterMode: -1 aniso: 1 mipBias: -1 - wrapMode: 1 + wrapU: 1 + wrapV: 1 + wrapW: 1 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -66,14 +71,6 @@ TextureImporter: 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 @@ -94,6 +91,7 @@ TextureImporter: serializedVersion: 2 sprites: [] outline: [] + physicsShape: [] spritePackingTag: userData: assetBundleName: diff --git a/Scripts/Editor/Resources/unec_node.psd b/Scripts/Editor/Resources/unec_node_workfile.psd similarity index 96% rename from Scripts/Editor/Resources/unec_node.psd rename to Scripts/Editor/Resources/unec_node_workfile.psd index e830e32b80ceaca1606dfd01fd2a4abfa2fe20d1..3cfbd76a4e682ec0c85e8bed8bea6e565f2c21cb 100644 GIT binary patch delta 441 zcmZ42!E~g9X@a7tpM{gBFAEC;2#CutMlmo;tGZ9rlaVn``W-J@e*1^>#XPmQM!8yG zbt)ibRty`{3YjKv2;rXmh^d;(BE-vZ0xQL2{C%ZjzCy zfo@`oiLq`{vXOyqs)f0UVM>arxv8b;WFHoNtHhN2q*SYv{N&6OtAdRDlKkR~`~oXO zixeZX6jLMJ#AJg+T|>iEb6v~CR5RTq(-cb!OCz%+qg0d4%UPOPh_lF#(;C@$;ug|8i-+P zKy+?tjsi?2$Q&48s;_5Y1ae^J!o)W-CC9U{l~wmkG+Ay=PoKaDVOMPan-RqXVb9(i In|)CN00F0kLI3~& delta 394 zcmX@o!L+V}X@a7wg@u!+FAEC;2=L1=Mlmo;tGdfDF)%PCGBAMURKaor>gyDv+EurB zzPWMu%f;Qb4$>zYLT6(q%RqWZE);1={o=0u!>gNB{u#dul@f diff --git a/Scripts/Editor/Resources/unec_node_workfile.psd.meta b/Scripts/Editor/Resources/unec_node_workfile.psd.meta new file mode 100644 index 0000000..3ca0437 --- /dev/null +++ b/Scripts/Editor/Resources/unec_node_workfile.psd.meta @@ -0,0 +1,98 @@ +fileFormatVersion: 2 +guid: 2267efa6e1e349348ae0b28fb659a6e2 +timeCreated: 1507454532 +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: