diff --git a/Assets/Fungus/EditorResources.meta b/Assets/Fungus/EditorResources.meta new file mode 100644 index 00000000..81e8ab72 --- /dev/null +++ b/Assets/Fungus/EditorResources.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5ff164265158945c18b7d438b570ba22 +folderAsset: yes +timeCreated: 1478502248 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Resources/Icons.meta b/Assets/Fungus/EditorResources/Icons.meta similarity index 100% rename from Assets/Fungus/Resources/Icons.meta rename to Assets/Fungus/EditorResources/Icons.meta diff --git a/Assets/Fungus/EditorResources/Icons/Pro.meta b/Assets/Fungus/EditorResources/Icons/Pro.meta new file mode 100644 index 00000000..9dab8a98 --- /dev/null +++ b/Assets/Fungus/EditorResources/Icons/Pro.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 5e5a1319ef7f546a7affe3baabd5fba6 +folderAsset: yes +timeCreated: 1478502692 +licenseType: Free +DefaultImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/EditorResources/Icons/Pro/add.png b/Assets/Fungus/EditorResources/Icons/Pro/add.png new file mode 100644 index 00000000..23646d93 Binary files /dev/null and b/Assets/Fungus/EditorResources/Icons/Pro/add.png differ diff --git a/Assets/Fungus/Resources/Icons/right.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/add.png.meta similarity index 77% rename from Assets/Fungus/Resources/Icons/right.png.meta rename to Assets/Fungus/EditorResources/Icons/Pro/add.png.meta index 7c6971a5..422af796 100644 --- a/Assets/Fungus/Resources/Icons/right.png.meta +++ b/Assets/Fungus/EditorResources/Icons/Pro/add.png.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 -guid: b3dd8b25a62664f379cb3714060d4e33 +guid: 4e43c476b4a7a49a08c37378fb01ce99 +timeCreated: 1478502692 +licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -15,17 +17,17 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 + cubemapConvolutionSteps: 7 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 - maxTextureSize: 1024 + maxTextureSize: 2048 textureSettings: filterMode: -1 aniso: 1 @@ -35,18 +37,22 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 2 buildTargetSettings: [] spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/Fungus/EditorResources/Icons/Pro/add_small.png b/Assets/Fungus/EditorResources/Icons/Pro/add_small.png new file mode 100644 index 00000000..cf6b201e Binary files /dev/null and b/Assets/Fungus/EditorResources/Icons/Pro/add_small.png differ diff --git a/Assets/Fungus/Resources/Icons/ResizeHandle.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/add_small.png.meta similarity index 77% rename from Assets/Fungus/Resources/Icons/ResizeHandle.png.meta rename to Assets/Fungus/EditorResources/Icons/Pro/add_small.png.meta index 3e1acd01..4c2c0a2a 100644 --- a/Assets/Fungus/Resources/Icons/ResizeHandle.png.meta +++ b/Assets/Fungus/EditorResources/Icons/Pro/add_small.png.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 -guid: c8b63a574d777374a918f2900930e540 +guid: 64534dfaa17844231a9a9dd2df89d0db +timeCreated: 1478502692 +licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -15,17 +17,17 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 + cubemapConvolutionSteps: 7 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 - maxTextureSize: 1024 + maxTextureSize: 2048 textureSettings: filterMode: -1 aniso: 1 @@ -35,18 +37,22 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 2 buildTargetSettings: [] spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/Fungus/EditorResources/Icons/Pro/delete.png b/Assets/Fungus/EditorResources/Icons/Pro/delete.png new file mode 100644 index 00000000..5cba698b Binary files /dev/null and b/Assets/Fungus/EditorResources/Icons/Pro/delete.png differ diff --git a/Assets/Fungus/Resources/Icons/left.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/delete.png.meta similarity index 77% rename from Assets/Fungus/Resources/Icons/left.png.meta rename to Assets/Fungus/EditorResources/Icons/Pro/delete.png.meta index 546dd74e..da792108 100644 --- a/Assets/Fungus/Resources/Icons/left.png.meta +++ b/Assets/Fungus/EditorResources/Icons/Pro/delete.png.meta @@ -1,5 +1,7 @@ fileFormatVersion: 2 -guid: c0a7a4711d69249ab9dae1539a3247ee +guid: 29c4d29b1678042a5b3516c732ccc507 +timeCreated: 1478502692 +licenseType: Free TextureImporter: fileIDToRecycleName: {} serializedVersion: 2 @@ -15,17 +17,17 @@ TextureImporter: bumpmap: convertToNormalMap: 0 externalNormalMap: 0 - heightScale: .25 + heightScale: 0.25 normalMapFilter: 0 isReadable: 0 grayScaleToAlpha: 0 generateCubemap: 0 cubemapConvolution: 0 - cubemapConvolutionSteps: 8 + cubemapConvolutionSteps: 7 cubemapConvolutionExponent: 1.5 seamlessCubemap: 0 textureFormat: -3 - maxTextureSize: 1024 + maxTextureSize: 2048 textureSettings: filterMode: -1 aniso: 1 @@ -35,18 +37,22 @@ TextureImporter: lightmap: 0 rGBM: 0 compressionQuality: 50 + allowsAlphaSplitting: 0 spriteMode: 0 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 - spritePivot: {x: .5, y: .5} + spritePivot: {x: 0.5, y: 0.5} spriteBorder: {x: 0, y: 0, z: 0, w: 0} spritePixelsToUnits: 100 alphaIsTransparency: 1 + spriteTessellationDetail: -1 textureType: 2 buildTargetSettings: [] spriteSheet: + serializedVersion: 2 sprites: [] + outline: [] spritePackingTag: userData: assetBundleName: diff --git a/Assets/Fungus/EditorResources/Icons/Pro/down.png b/Assets/Fungus/EditorResources/Icons/Pro/down.png new file mode 100644 index 00000000..b84dbd53 Binary files /dev/null and b/Assets/Fungus/EditorResources/Icons/Pro/down.png differ diff --git a/Assets/Fungus/EditorResources/Icons/Pro/down.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/down.png.meta new file mode 100644 index 00000000..9dba1d7d --- /dev/null +++ b/Assets/Fungus/EditorResources/Icons/Pro/down.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 5a87a7d3683164a238377d948572805f +timeCreated: 1478502692 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + 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 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/EditorResources/Icons/Pro/duplicate.png b/Assets/Fungus/EditorResources/Icons/Pro/duplicate.png new file mode 100644 index 00000000..7a36f572 Binary files /dev/null and b/Assets/Fungus/EditorResources/Icons/Pro/duplicate.png differ diff --git a/Assets/Fungus/EditorResources/Icons/Pro/duplicate.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/duplicate.png.meta new file mode 100644 index 00000000..bbf8b3b3 --- /dev/null +++ b/Assets/Fungus/EditorResources/Icons/Pro/duplicate.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 2f17490d993c84bd7872ef6588ffba47 +timeCreated: 1478502692 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + 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 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/EditorResources/Icons/Pro/up.png b/Assets/Fungus/EditorResources/Icons/Pro/up.png new file mode 100644 index 00000000..e88161cc Binary files /dev/null and b/Assets/Fungus/EditorResources/Icons/Pro/up.png differ diff --git a/Assets/Fungus/EditorResources/Icons/Pro/up.png.meta b/Assets/Fungus/EditorResources/Icons/Pro/up.png.meta new file mode 100644 index 00000000..2371a0d0 --- /dev/null +++ b/Assets/Fungus/EditorResources/Icons/Pro/up.png.meta @@ -0,0 +1,59 @@ +fileFormatVersion: 2 +guid: 2a76a781db2994b33b83cd84b8835da7 +timeCreated: 1478502692 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + linearTexture: 1 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 7 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: 1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + 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 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 2 + buildTargetSettings: [] + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fungus/Resources/Icons/add.png b/Assets/Fungus/EditorResources/Icons/add.png similarity index 100% rename from Assets/Fungus/Resources/Icons/add.png rename to Assets/Fungus/EditorResources/Icons/add.png diff --git a/Assets/Fungus/Resources/Icons/add.png.meta b/Assets/Fungus/EditorResources/Icons/add.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/add.png.meta rename to Assets/Fungus/EditorResources/Icons/add.png.meta diff --git a/Assets/Fungus/Resources/Icons/add_small.png b/Assets/Fungus/EditorResources/Icons/add_small.png similarity index 100% rename from Assets/Fungus/Resources/Icons/add_small.png rename to Assets/Fungus/EditorResources/Icons/add_small.png diff --git a/Assets/Fungus/Resources/Icons/add_small.png.meta b/Assets/Fungus/EditorResources/Icons/add_small.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/add_small.png.meta rename to Assets/Fungus/EditorResources/Icons/add_small.png.meta diff --git a/Assets/Fungus/Resources/Icons/delete.png b/Assets/Fungus/EditorResources/Icons/delete.png similarity index 100% rename from Assets/Fungus/Resources/Icons/delete.png rename to Assets/Fungus/EditorResources/Icons/delete.png diff --git a/Assets/Fungus/Resources/Icons/delete.png.meta b/Assets/Fungus/EditorResources/Icons/delete.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/delete.png.meta rename to Assets/Fungus/EditorResources/Icons/delete.png.meta diff --git a/Assets/Fungus/Resources/Icons/down.png b/Assets/Fungus/EditorResources/Icons/down.png similarity index 100% rename from Assets/Fungus/Resources/Icons/down.png rename to Assets/Fungus/EditorResources/Icons/down.png diff --git a/Assets/Fungus/Resources/Icons/down.png.meta b/Assets/Fungus/EditorResources/Icons/down.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/down.png.meta rename to Assets/Fungus/EditorResources/Icons/down.png.meta diff --git a/Assets/Fungus/Resources/Icons/duplicate.png b/Assets/Fungus/EditorResources/Icons/duplicate.png similarity index 100% rename from Assets/Fungus/Resources/Icons/duplicate.png rename to Assets/Fungus/EditorResources/Icons/duplicate.png diff --git a/Assets/Fungus/Resources/Icons/duplicate.png.meta b/Assets/Fungus/EditorResources/Icons/duplicate.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/duplicate.png.meta rename to Assets/Fungus/EditorResources/Icons/duplicate.png.meta diff --git a/Assets/Fungus/Resources/Icons/up.png b/Assets/Fungus/EditorResources/Icons/up.png similarity index 100% rename from Assets/Fungus/Resources/Icons/up.png rename to Assets/Fungus/EditorResources/Icons/up.png diff --git a/Assets/Fungus/Resources/Icons/up.png.meta b/Assets/Fungus/EditorResources/Icons/up.png.meta similarity index 100% rename from Assets/Fungus/Resources/Icons/up.png.meta rename to Assets/Fungus/EditorResources/Icons/up.png.meta diff --git a/Assets/Fungus/Resources/Textures.meta b/Assets/Fungus/EditorResources/Textures.meta similarity index 100% rename from Assets/Fungus/Resources/Textures.meta rename to Assets/Fungus/EditorResources/Textures.meta diff --git a/Assets/Fungus/Resources/Textures/choice_node_off.png b/Assets/Fungus/EditorResources/Textures/choice_node_off.png similarity index 100% rename from Assets/Fungus/Resources/Textures/choice_node_off.png rename to Assets/Fungus/EditorResources/Textures/choice_node_off.png diff --git a/Assets/Fungus/Resources/Textures/choice_node_off.png.meta b/Assets/Fungus/EditorResources/Textures/choice_node_off.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/choice_node_off.png.meta rename to Assets/Fungus/EditorResources/Textures/choice_node_off.png.meta diff --git a/Assets/Fungus/Resources/Textures/choice_node_on.png b/Assets/Fungus/EditorResources/Textures/choice_node_on.png similarity index 100% rename from Assets/Fungus/Resources/Textures/choice_node_on.png rename to Assets/Fungus/EditorResources/Textures/choice_node_on.png diff --git a/Assets/Fungus/Resources/Textures/choice_node_on.png.meta b/Assets/Fungus/EditorResources/Textures/choice_node_on.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/choice_node_on.png.meta rename to Assets/Fungus/EditorResources/Textures/choice_node_on.png.meta diff --git a/Assets/Fungus/Resources/Textures/command_background.png b/Assets/Fungus/EditorResources/Textures/command_background.png similarity index 100% rename from Assets/Fungus/Resources/Textures/command_background.png rename to Assets/Fungus/EditorResources/Textures/command_background.png diff --git a/Assets/Fungus/Resources/Textures/command_background.png.meta b/Assets/Fungus/EditorResources/Textures/command_background.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/command_background.png.meta rename to Assets/Fungus/EditorResources/Textures/command_background.png.meta diff --git a/Assets/Fungus/Resources/Textures/event_node_off.png b/Assets/Fungus/EditorResources/Textures/event_node_off.png similarity index 100% rename from Assets/Fungus/Resources/Textures/event_node_off.png rename to Assets/Fungus/EditorResources/Textures/event_node_off.png diff --git a/Assets/Fungus/Resources/Textures/event_node_off.png.meta b/Assets/Fungus/EditorResources/Textures/event_node_off.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/event_node_off.png.meta rename to Assets/Fungus/EditorResources/Textures/event_node_off.png.meta diff --git a/Assets/Fungus/Resources/Textures/event_node_on.png b/Assets/Fungus/EditorResources/Textures/event_node_on.png similarity index 100% rename from Assets/Fungus/Resources/Textures/event_node_on.png rename to Assets/Fungus/EditorResources/Textures/event_node_on.png diff --git a/Assets/Fungus/Resources/Textures/event_node_on.png.meta b/Assets/Fungus/EditorResources/Textures/event_node_on.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/event_node_on.png.meta rename to Assets/Fungus/EditorResources/Textures/event_node_on.png.meta diff --git a/Assets/Fungus/Resources/Textures/play_big.png b/Assets/Fungus/EditorResources/Textures/play_big.png similarity index 100% rename from Assets/Fungus/Resources/Textures/play_big.png rename to Assets/Fungus/EditorResources/Textures/play_big.png diff --git a/Assets/Fungus/Resources/Textures/play_big.png.meta b/Assets/Fungus/EditorResources/Textures/play_big.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/play_big.png.meta rename to Assets/Fungus/EditorResources/Textures/play_big.png.meta diff --git a/Assets/Fungus/Resources/Textures/play_small.png b/Assets/Fungus/EditorResources/Textures/play_small.png similarity index 100% rename from Assets/Fungus/Resources/Textures/play_small.png rename to Assets/Fungus/EditorResources/Textures/play_small.png diff --git a/Assets/Fungus/Resources/Textures/play_small.png.meta b/Assets/Fungus/EditorResources/Textures/play_small.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/play_small.png.meta rename to Assets/Fungus/EditorResources/Textures/play_small.png.meta diff --git a/Assets/Fungus/Resources/Textures/process_node_off.png b/Assets/Fungus/EditorResources/Textures/process_node_off.png similarity index 100% rename from Assets/Fungus/Resources/Textures/process_node_off.png rename to Assets/Fungus/EditorResources/Textures/process_node_off.png diff --git a/Assets/Fungus/Resources/Textures/process_node_off.png.meta b/Assets/Fungus/EditorResources/Textures/process_node_off.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/process_node_off.png.meta rename to Assets/Fungus/EditorResources/Textures/process_node_off.png.meta diff --git a/Assets/Fungus/Resources/Textures/process_node_on.png b/Assets/Fungus/EditorResources/Textures/process_node_on.png similarity index 100% rename from Assets/Fungus/Resources/Textures/process_node_on.png rename to Assets/Fungus/EditorResources/Textures/process_node_on.png diff --git a/Assets/Fungus/Resources/Textures/process_node_on.png.meta b/Assets/Fungus/EditorResources/Textures/process_node_on.png.meta similarity index 100% rename from Assets/Fungus/Resources/Textures/process_node_on.png.meta rename to Assets/Fungus/EditorResources/Textures/process_node_on.png.meta diff --git a/Assets/Fungus/Resources/Icons/ResizeHandle.png b/Assets/Fungus/Resources/Icons/ResizeHandle.png deleted file mode 100644 index aedc1d2e..00000000 Binary files a/Assets/Fungus/Resources/Icons/ResizeHandle.png and /dev/null differ diff --git a/Assets/Fungus/Resources/Icons/left.png b/Assets/Fungus/Resources/Icons/left.png deleted file mode 100644 index 9891f504..00000000 Binary files a/Assets/Fungus/Resources/Icons/left.png and /dev/null differ diff --git a/Assets/Fungus/Resources/Icons/right.png b/Assets/Fungus/Resources/Icons/right.png deleted file mode 100644 index 416a491a..00000000 Binary files a/Assets/Fungus/Resources/Icons/right.png and /dev/null differ diff --git a/Assets/Fungus/Scripts/Editor/BlockEditor.cs b/Assets/Fungus/Scripts/Editor/BlockEditor.cs index 350e9268..db037c2c 100644 --- a/Assets/Fungus/Scripts/Editor/BlockEditor.cs +++ b/Assets/Fungus/Scripts/Editor/BlockEditor.cs @@ -41,11 +41,11 @@ namespace Fungus.EditorUtils protected virtual void OnEnable() { - upIcon = Resources.Load("Icons/up") as Texture2D; - downIcon = Resources.Load("Icons/down") as Texture2D; - addIcon = Resources.Load("Icons/add") as Texture2D; - duplicateIcon = Resources.Load("Icons/duplicate") as Texture2D; - deleteIcon = Resources.Load("Icons/delete") as Texture2D; + upIcon = FungusEditorResources.Up; + downIcon = FungusEditorResources.Down; + addIcon = FungusEditorResources.Add; + duplicateIcon = FungusEditorResources.Duplicate; + deleteIcon = FungusEditorResources.Delete; } public virtual void DrawBlockName(Flowchart flowchart) diff --git a/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs b/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs index 1a141553..117a7f40 100644 --- a/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs +++ b/Assets/Fungus/Scripts/Editor/CommandListAdaptor.cs @@ -213,7 +213,7 @@ namespace Fungus.EditorUtils string commandName = commandInfoAttr.CommandName; GUIStyle commandLabelStyle = new GUIStyle(GUI.skin.box); - commandLabelStyle.normal.background = FungusEditorResources.texCommandBackground; + commandLabelStyle.normal.background = FungusEditorResources.CommandBackground; int borderSize = 5; commandLabelStyle.border.top = borderSize; commandLabelStyle.border.bottom = borderSize; @@ -420,7 +420,7 @@ namespace Fungus.EditorUtils alpha = Mathf.Clamp01(alpha); GUI.color = new Color(1f, 1f, 1f, alpha); - GUI.Label(iconRect, FungusEditorResources.texPlaySmall, new GUIStyle()); + GUI.Label(iconRect, FungusEditorResources.PlaySmall, new GUIStyle()); GUI.color = storeColor; } diff --git a/Assets/Fungus/Scripts/Editor/FlowchartEditor.cs b/Assets/Fungus/Scripts/Editor/FlowchartEditor.cs index a02cd3f5..a05b6d2c 100644 --- a/Assets/Fungus/Scripts/Editor/FlowchartEditor.cs +++ b/Assets/Fungus/Scripts/Editor/FlowchartEditor.cs @@ -50,7 +50,7 @@ namespace Fungus.EditorUtils luaEnvironmentProp = serializedObject.FindProperty("luaEnvironment"); luaBindingNameProp = serializedObject.FindProperty("luaBindingName"); - addTexture = Resources.Load("Icons/add_small") as Texture2D; + addTexture = FungusEditorResources.AddSmall; } public override void OnInspectorGUI() diff --git a/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs b/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs index 9c49352f..c11ac1bd 100644 --- a/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs +++ b/Assets/Fungus/Scripts/Editor/FlowchartWindow.cs @@ -65,7 +65,7 @@ namespace Fungus.EditorUtils nodeStyle.alignment = TextAnchor.MiddleCenter; nodeStyle.wordWrap = true; - addTexture = Resources.Load("Icons/add_small") as Texture2D; + addTexture = FungusEditorResources.AddSmall; } protected virtual void OnInspectorUpdate() @@ -473,7 +473,7 @@ namespace Fungus.EditorUtils GUI.color = new Color(1f, 1f, 1f, alpha); } - if (GUI.Button(rect, FungusEditorResources.texPlayBig as Texture, new GUIStyle())) + if (GUI.Button(rect, FungusEditorResources.PlayBig, new GUIStyle())) { SelectBlock(flowchart, b); } @@ -855,8 +855,8 @@ namespace Fungus.EditorUtils if (block._EventHandler != null) { - offTex = FungusEditorResources.texEventNodeOff; - onTex = FungusEditorResources.texEventNodeOn; + offTex = FungusEditorResources.EventNodeOff; + onTex = FungusEditorResources.EventNodeOn; defaultColor = FungusConstants.DefaultEventBlockTint; } else @@ -876,14 +876,14 @@ namespace Fungus.EditorUtils if (uniqueList.Count > 1) { - offTex = FungusEditorResources.texChoiceNodeOff; - onTex = FungusEditorResources.texChoiceNodeOn; + offTex = FungusEditorResources.ChoiceNodeOff; + onTex = FungusEditorResources.ChoiceNodeOn; defaultColor = FungusConstants.DefaultChoiceBlockTint; } else { - offTex = FungusEditorResources.texProcessNodeOff; - onTex = FungusEditorResources.texProcessNodeOn; + offTex = FungusEditorResources.ProcessNodeOff; + onTex = FungusEditorResources.ProcessNodeOn; defaultColor = FungusConstants.DefaultProcessBlockTint; } } diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs index 9c35cc05..a3c9f948 100644 --- a/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResources.cs @@ -1,149 +1,115 @@ // This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). // It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) -using UnityEngine; +using UnityEngine; using UnityEditor; using System; +using System.IO; +using System.Linq; +using System.Collections.Generic; -namespace Fungus.EditorUtils +namespace Fungus.EditorUtils { - internal static class FungusEditorResources + internal static partial class FungusEditorResources { - - static FungusEditorResources() { - GenerateSpecialTextures(); - LoadResourceAssets(); - } - - private enum ResourceName - { - command_background = 0, - choice_node_off, - choice_node_on, - process_node_off, - process_node_on, - event_node_off, - event_node_on, - play_big, - play_small - } + private static Dictionary textures = new Dictionary(); + private static readonly string editorResourcesFolderName = "\"EditorResources\""; - private static string[] s_LightSkin = { - "command_background", - "choice_node_off", - "choice_node_on", - "process_node_off", - "process_node_on", - "event_node_off", - "event_node_on", - "play_big", - "play_small" - }; - - private static string[] s_DarkSkin = { - "command_background", - "choice_node_off", - "choice_node_on", - "process_node_off", - "process_node_on", - "event_node_off", - "event_node_on", - "play_big", - "play_small" - }; - - public static Texture2D texCommandBackground + static FungusEditorResources() { - get { return s_Cached[(int)ResourceName.command_background]; } + LoadTexturesFromNames(); } - public static Texture2D texEventNodeOn + private static void LoadTexturesFromNames() { - get { return s_Cached[(int)ResourceName.event_node_on]; } - } - - public static Texture2D texEventNodeOff - { - get { return s_Cached[(int)ResourceName.event_node_off]; } + var baseDirectories = AssetDatabase.FindAssets(editorResourcesFolderName).Select( + guid => AssetDatabase.GUIDToAssetPath(guid) + ).ToArray(); + + foreach (var name in resourceNames) + { + LoadTexturesFromGUIDs(AssetDatabase.FindAssets(name + " t:Texture2D", baseDirectories)); + } } - public static Texture2D texProcessNodeOn - { - get { return s_Cached[(int)ResourceName.process_node_on]; } - } - - public static Texture2D texProcessNodeOff + private static void LoadAllTexturesInFolder() { - get { return s_Cached[(int)ResourceName.process_node_off]; } + var rootGuid = AssetDatabase.FindAssets(editorResourcesFolderName)[0]; + var root = AssetDatabase.GUIDToAssetPath(rootGuid); + LoadTexturesFromGUIDs(AssetDatabase.FindAssets("t:Texture2D", new [] { root })); } - public static Texture2D texChoiceNodeOn + private static void LoadTexturesFromGUIDs(string[] guids) { - get { return s_Cached[(int)ResourceName.choice_node_on]; } - } - - public static Texture2D texChoiceNodeOff - { - get { return s_Cached[(int)ResourceName.choice_node_off]; } + var paths = guids.Select(guid => AssetDatabase.GUIDToAssetPath(guid)).OrderBy(path => path.ToLower().Contains("/pro/")); + + foreach (var path in paths) + { + if (path.ToLower().Contains("/pro/") && !EditorGUIUtility.isProSkin) + { + return; + } + var texture = AssetDatabase.LoadAssetAtPath(path, typeof(Texture2D)) as Texture2D; + textures[texture.name] = texture; + } } - public static Texture2D texPlayBig + [MenuItem("Tools/Fungus/Utilities/Update Editor Resources Script")] + private static void GenerateResourcesScript() { - get { return s_Cached[(int)ResourceName.play_big]; } - } + textures.Clear(); + LoadAllTexturesInFolder(); - public static Texture2D texPlaySmall - { - get { return s_Cached[(int)ResourceName.play_small]; } - } + var guid = AssetDatabase.FindAssets("FungusEditorResources t:MonoScript")[0]; + var relativePath = AssetDatabase.GUIDToAssetPath(guid).Replace("FungusEditorResources.cs", "FungusEditorResourcesGenerated.cs"); + var absolutePath = Application.dataPath + relativePath.Substring("Assets".Length); + + using (var writer = new StreamWriter(absolutePath)) + { + writer.WriteLine("// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus)."); + writer.WriteLine("// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)"); + writer.WriteLine(""); + writer.WriteLine("using UnityEngine;"); + writer.WriteLine(""); + writer.WriteLine("namespace Fungus.EditorUtils"); + writer.WriteLine("{"); + writer.WriteLine(" internal static partial class FungusEditorResources"); + writer.WriteLine(" {"); + writer.WriteLine(" private static readonly string[] resourceNames = new [] {"); + + foreach (var pair in textures) + { + writer.WriteLine(" \"" + pair.Key + "\","); + } - public static Texture2D texItemSplitter { get; private set; } - - private static void GenerateSpecialTextures() - { - var splitterColor = EditorGUIUtility.isProSkin - ? new Color(1f, 1f, 1f, 0.14f) - : new Color(0.59f, 0.59f, 0.59f, 0.55f) - ; - texItemSplitter = CreatePixelTexture("(Generated) Item Splitter", splitterColor); - } - - public static Texture2D CreatePixelTexture(string name, Color color) - { - var tex = new Texture2D(1, 1, TextureFormat.ARGB32, false, true); - tex.name = name; - tex.hideFlags = HideFlags.HideAndDontSave; - tex.filterMode = FilterMode.Point; - tex.SetPixel(0, 0, color); - tex.Apply(); - return tex; + writer.WriteLine(" };"); + writer.WriteLine(""); + + foreach (var pair in textures) + { + var name = pair.Key; + var pascalCase = string.Join("", name.Split(new [] { '_' }, StringSplitOptions.RemoveEmptyEntries).Select( + s => s.Substring(0, 1).ToUpper() + s.Substring(1)).ToArray() + ); + writer.WriteLine(" public static Texture2D " + pascalCase + " { get { return GetTexture(\"" + name + "\"); } }"); + } + + writer.WriteLine(" }"); + writer.WriteLine("}"); + } + + AssetDatabase.ImportAsset(relativePath); } - private static Texture2D[] s_Cached; - - public static void LoadResourceAssets() + private static Texture2D GetTexture(string name) { - var skin = EditorGUIUtility.isProSkin ? s_DarkSkin : s_LightSkin; - s_Cached = new Texture2D[skin.Length]; - - for (int i = 0; i < s_Cached.Length; ++i) + Texture2D texture; + if (!textures.TryGetValue(name, out texture)) { - s_Cached[i] = Resources.Load("Textures/" + skin[i]) as Texture2D; + Debug.LogWarning("Texture \"" + name + "\" not found!"); } - s_LightSkin = null; - s_DarkSkin = null; - } - - private static void GetImageSize(byte[] imageData, out int width, out int height) - { - width = ReadInt(imageData, 3 + 15); - height = ReadInt(imageData, 3 + 15 + 2 + 2); - } - - private static int ReadInt(byte[] imageData, int offset) - { - return (imageData[offset] << 8) | imageData[offset + 1]; + return texture; } } -} \ No newline at end of file +} diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs new file mode 100644 index 00000000..e2eab920 --- /dev/null +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs @@ -0,0 +1,44 @@ +// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). +// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) + +using UnityEngine; + +namespace Fungus.EditorUtils +{ + internal static partial class FungusEditorResources + { + private static readonly string[] resourceNames = new [] { + "add", + "add_small", + "delete", + "down", + "duplicate", + "up", + "choice_node_off", + "choice_node_on", + "command_background", + "event_node_off", + "event_node_on", + "play_big", + "play_small", + "process_node_off", + "process_node_on", + }; + + public static Texture2D Add { get { return GetTexture("add"); } } + public static Texture2D AddSmall { get { return GetTexture("add_small"); } } + public static Texture2D Delete { get { return GetTexture("delete"); } } + public static Texture2D Down { get { return GetTexture("down"); } } + public static Texture2D Duplicate { get { return GetTexture("duplicate"); } } + public static Texture2D Up { get { return GetTexture("up"); } } + public static Texture2D ChoiceNodeOff { get { return GetTexture("choice_node_off"); } } + public static Texture2D ChoiceNodeOn { get { return GetTexture("choice_node_on"); } } + public static Texture2D CommandBackground { get { return GetTexture("command_background"); } } + public static Texture2D EventNodeOff { get { return GetTexture("event_node_off"); } } + public static Texture2D EventNodeOn { get { return GetTexture("event_node_on"); } } + public static Texture2D PlayBig { get { return GetTexture("play_big"); } } + public static Texture2D PlaySmall { get { return GetTexture("play_small"); } } + public static Texture2D ProcessNodeOff { get { return GetTexture("process_node_off"); } } + public static Texture2D ProcessNodeOn { get { return GetTexture("process_node_on"); } } + } +} diff --git a/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs.meta b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs.meta new file mode 100644 index 00000000..6d6fd014 --- /dev/null +++ b/Assets/Fungus/Scripts/Editor/FungusEditorResourcesGenerated.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: f5119f9bdde234916bed657bdc751f76 +timeCreated: 1478502142 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: