Browse Source

Flowchart window graphics glitches on Unity 5.1 #118

master
chrisgregan 10 years ago
parent
commit
bcbbe814f1
  1. 6
      Assets/Fungus/Flowchart/Editor/CommandListAdaptor.cs
  2. 4
      Assets/Fungus/Flowchart/Editor/FlowchartEditor.cs
  3. 6
      Assets/Fungus/Flowchart/Editor/FlowchartWindow.cs
  4. BIN
      Assets/Fungus/Flowchart/Editor/Resources/Icons/add_small.png
  5. 55
      Assets/Fungus/Flowchart/Editor/Resources/Icons/add_small.png.meta
  6. 6
      Assets/Fungus/Flowchart/Editor/VariableListAdaptor.cs
  7. 4
      Assets/Fungus/Thirdparty/Reorderable List Field.meta
  8. 4
      Assets/Fungus/Thirdparty/Reorderable List Field/Editor.meta
  9. BIN
      Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.dll
  10. 2
      Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.dll.meta
  11. 120
      Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.xml
  12. 2
      Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.xml.meta
  13. 2
      Assets/Fungus/Thirdparty/Reorderable List Field/LICENSE.txt.meta
  14. 5
      Assets/Fungus/Thirdparty/Reorderable List Field/README.txt
  15. 2
      Assets/Fungus/Thirdparty/Reorderable List Field/README.txt.meta
  16. 28
      ProjectSettings/ProjectSettings.asset
  17. 2
      ProjectSettings/ProjectVersion.txt

6
Assets/Fungus/Flowchart/Editor/CommandListAdaptor.cs

@ -146,6 +146,12 @@ namespace Fungus
}
}
public void BeginGUI()
{}
public void EndGUI()
{}
public void DrawItemBackground(Rect position, int index) {
}

4
Assets/Fungus/Flowchart/Editor/FlowchartEditor.cs

@ -150,8 +150,10 @@ namespace Fungus
plusRect.width = plusWidth;
plusRect.height = plusHeight;
Texture2D addTexture = Resources.Load("Icons/add_small") as Texture2D;
if (!Application.isPlaying &&
GUI.Button(plusRect, FungusEditorResources.texAddButton))
GUI.Button(plusRect, addTexture))
{
GenericMenu menu = new GenericMenu ();
List<System.Type> types = FindAllDerivedTypes<Variable>();

6
Assets/Fungus/Flowchart/Editor/FlowchartWindow.cs

@ -146,8 +146,10 @@ namespace Fungus
GUILayout.BeginHorizontal();
GUILayout.Space(8);
if (GUILayout.Button(new GUIContent(FungusEditorResources.texAddButton, "Add a new block")))
Texture2D addTexture = Resources.Load("Icons/add_small") as Texture2D;
if (GUILayout.Button(new GUIContent(addTexture, "Add a new block")))
{
Vector2 newNodePosition = new Vector2(50 - flowchart.scrollPos.x,
50 - flowchart.scrollPos.y);

BIN
Assets/Fungus/Flowchart/Editor/Resources/Icons/add_small.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

55
Assets/Fungus/Flowchart/Editor/Resources/Icons/add_small.png.meta

@ -0,0 +1,55 @@
fileFormatVersion: 2
guid: 288aff1a0e5c14fd3a0039d24149df73
timeCreated: 1434110599
licenseType: Free
TextureImporter:
fileIDToRecycleName: {}
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
linearTexture: 0
correctGamma: 0
fadeOut: 0
borderMipMap: 0
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
generateCubemap: 0
cubemapConvolution: 0
cubemapConvolutionSteps: 8
cubemapConvolutionExponent: 1.5
seamlessCubemap: 0
textureFormat: -1
maxTextureSize: 2048
textureSettings:
filterMode: -1
aniso: -1
mipBias: -1
wrapMode: 1
nPOTScale: 0
lightmap: 0
rGBM: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
textureType: 8
buildTargetSettings: []
spriteSheet:
sprites: []
spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:

6
Assets/Fungus/Flowchart/Editor/VariableListAdaptor.cs

@ -82,6 +82,12 @@ namespace Fungus
_arrayProperty.ClearArray();
}
public void BeginGUI()
{}
public void EndGUI()
{}
public virtual void DrawItemBackground(Rect position, int index) {
}

4
Assets/Fungus/Thirdparty/Reorderable List Field.meta vendored

@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: bea54ab1d4ad9eb409c03de5db1cc29f
guid: fb90622e4c0c8488e807119925da3a7a
folderAsset: yes
timeCreated: 1432305941
timeCreated: 1434110041
licenseType: Free
DefaultImporter:
userData:

4
Assets/Fungus/Thirdparty/Reorderable List Field/Editor.meta vendored

@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 565e28841e875443795db667f141acf6
guid: 1351e3cf05fcef04cbafc172b277cd32
folderAsset: yes
timeCreated: 1432305941
timeCreated: 1434110041
licenseType: Free
DefaultImporter:
userData:

BIN
Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.dll vendored

Binary file not shown.

2
Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.dll.meta vendored

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: bb057d9f4d77f4e74b3802d8cc4d0f4a
guid: 21d076cb9a4ec214a8cb820e69657bc3
PluginImporter:
serializedVersion: 1
iconMap: {}

120
Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.xml vendored

@ -158,6 +158,11 @@
Add new element at end of list.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.GenericListAdaptor`1.BeginGUI">
<summary>
Occurs before any list items are drawn.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.GenericListAdaptor`1.CanDrag(System.Int32)">
<summary>
Determines whether an item can be reordered by dragging mouse.
@ -206,6 +211,11 @@
</summary>
<param name="index">Zero-based index of list element.</param>
</member>
<member name="M:Rotorz.ReorderableList.GenericListAdaptor`1.EndGUI">
<summary>
Occurs after all list items have been drawn.
</summary>
</member>
<member name="F:Rotorz.ReorderableList.GenericListAdaptor`1.FixedItemHeight">
<summary>
Fixed height of each list item.
@ -397,6 +407,11 @@
Add new element at end of list.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.IReorderableListAdaptor.BeginGUI">
<summary>
Occurs before any list items are drawn.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.IReorderableListAdaptor.CanDrag(System.Int32)">
<summary>
Determines whether an item can be reordered by dragging mouse.
@ -445,6 +460,11 @@
</summary>
<param name="index">Zero-based index of list element.</param>
</member>
<member name="M:Rotorz.ReorderableList.IReorderableListAdaptor.EndGUI">
<summary>
Occurs after all list items have been drawn.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.IReorderableListAdaptor.GetItemHeight(System.Int32)">
<summary>
Gets height of list item in pixels.
@ -473,6 +493,29 @@
</summary>
<param name="index">Zero-based index of list element.</param>
</member>
<member name="T:Rotorz.ReorderableList.IReorderableListDropTarget">
<summary>
Can be implemented along with <see cref="T:Rotorz.ReorderableList.IReorderableListAdaptor" /> when drop
insertion or ordering is desired.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.IReorderableListDropTarget.CanDropInsert(System.Int32)">
<summary>
Determines whether an item is being dragged and that it can be inserted
or moved by dropping somewhere into the reorderable list control.
</summary>
<param name="insertionIndex">Zero-based index of insertion.</param>
<returns>
A value of <c>true</c> if item can be dropped; otherwise <c>false</c>.
</returns>
</member>
<member name="M:Rotorz.ReorderableList.IReorderableListDropTarget.ProcessDropInsertion(System.Int32)">
<summary>
Processes the current drop insertion operation when <see cref="M:Rotorz.ReorderableList.IReorderableListDropTarget.CanDropInsert(System.Int32)" />
returns a value of <c>true</c> to process, accept or cancel.
</summary>
<param name="insertionIndex">Zero-based index of insertion.</param>
</member>
<member name="T:Rotorz.ReorderableList.ItemInsertedEventArgs">
<summary>
Arguments which are passed to <see cref="T:Rotorz.ReorderableList.ItemInsertedEventHandler" />.
@ -720,6 +763,21 @@
Gets or sets style used to draw background of list control.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListControl.CurrentItemTotalPosition">
<summary>
Gets the total position of the list item that is currently being drawn.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListControl.CurrentListControlID">
<summary>
Gets the control ID of the list that is currently being drawn.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListControl.CurrentListPosition">
<summary>
Gets the position of the list control that is currently being drawn.
</summary>
</member>
<member name="F:Rotorz.ReorderableList.ReorderableListControl.DefaultContextHandler">
<summary>
Default functionality to handle context command.
@ -796,6 +854,12 @@
<param name="drawEmpty">Delegate for drawing empty list.</param>
<param name="flags">Optional flags to pass into list field.</param>
</member>
<member name="M:Rotorz.ReorderableList.ReorderableListControl.DrawDropIndicator(UnityEngine.Rect)">
<summary>
Draws drop insertion indicator.
</summary>
<param name="position">Position if the drop indicator.</param>
</member>
<member name="M:Rotorz.ReorderableList.ReorderableListControl.DuplicateItem(Rotorz.ReorderableList.IReorderableListAdaptor,System.Int32)">
<summary>
Duplicate specified item and raises the event <see cref="E:Rotorz.ReorderableList.ReorderableListControl.ItemInserted" />.
@ -824,6 +888,23 @@
A value of <c>true</c> if command was known; otherwise <c>false</c>.
</returns>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListControl.HorizontalLineAtEnd">
<summary>
Gets or sets a boolean value indicating whether a horizontal line should be
shown below the last list item at the end of the list control.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListControl.HorizontalLineAtStart">
<summary>
Gets or sets a boolean value indicating whether a horizontal line should be
shown above the first list item at the start of the list control.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListControl.HorizontalLineColor">
<summary>
Gets or sets the color of the horizontal lines that appear between list items.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.ReorderableListControl.InsertItem(Rotorz.ReorderableList.IReorderableListAdaptor,System.Int32)">
<summary>
Insert item at specified index and raises the event <see cref="E:Rotorz.ReorderableList.ReorderableListControl.ItemInserted" />.
@ -1067,10 +1148,25 @@
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListGUI.CurrentItemIndex">
<summary>
Gets zero-based index of list item which is currently being drawn;
Gets the zero-based index of the list item that is currently being drawn;
or a value of -1 if no item is currently being drawn.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListGUI.CurrentItemTotalPosition">
<summary>
Gets the total position of the list item that is currently being drawn.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListGUI.CurrentListControlID">
<summary>
Gets the control ID of the list that is currently being drawn.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListGUI.CurrentListPosition">
<summary>
Gets the position of the list control that is currently being drawn.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.ReorderableListGUI.DefaultItemDrawer``1(UnityEngine.Rect,``0)">
<summary>
Default list item drawer implementation.
@ -1089,7 +1185,7 @@
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListGUI.IndexOfChangedItem">
<summary>
Gets or sets zero-based index of last item which was changed. A value of -1
Gets or sets the zero-based index of the last item that was changed. A value of -1
indicates that no item was changed by list.
</summary>
</member>
@ -1558,6 +1654,11 @@
Gets an alternative style for footer button.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListStyles.HorizontalLineColor">
<summary>
Gets color for the horizontal lines that appear between list items.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListStyles.ItemButton">
<summary>
Gets style for remove item button.
@ -1568,6 +1669,11 @@
Gets style for the background of a selected item.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListStyles.SelectionBackgroundColor">
<summary>
Gets color of background for a selected list item.
</summary>
</member>
<member name="P:Rotorz.ReorderableList.ReorderableListStyles.Title">
<summary>
Gets style for title header.
@ -1601,6 +1707,11 @@
Gets the underlying serialized array property.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.SerializedPropertyAdaptor.BeginGUI">
<summary>
Occurs before any list items are drawn.
</summary>
</member>
<member name="M:Rotorz.ReorderableList.SerializedPropertyAdaptor.CanDrag(System.Int32)">
<summary>
Determines whether an item can be reordered by dragging mouse.
@ -1649,6 +1760,11 @@
</summary>
<param name="index">Zero-based index of list element.</param>
</member>
<member name="M:Rotorz.ReorderableList.SerializedPropertyAdaptor.EndGUI">
<summary>
Occurs after all list items have been drawn.
</summary>
</member>
<member name="F:Rotorz.ReorderableList.SerializedPropertyAdaptor.FixedItemHeight">
<summary>
Fixed height of each list item.

2
Assets/Fungus/Thirdparty/Reorderable List Field/Editor/Editor.ReorderableList.xml.meta vendored

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 48cc0de1009c84307850c9db7ff3ddbf
guid: 087430efbff5ee54a8c8273aee1508fc
TextScriptImporter:
userData:
assetBundleName:

2
Assets/Fungus/Thirdparty/Reorderable List Field/LICENSE.txt.meta vendored

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5749b67c5a56148b5b02c47af97d9a0e
guid: 8fc66c8c3ee484548a40e9b4cb50f206
TextScriptImporter:
userData:
assetBundleName:

5
Assets/Fungus/Thirdparty/Reorderable List Field/README.txt vendored

@ -20,8 +20,11 @@ Features
- Subscribe to add/remove item events.
- Supports mixed item heights.
- Disable drag and/or removal on per-item basis.
- [Drop insertion](<https://youtu.be/gtdPvLaGTNI>) (for use with `UnityEditor.DragAndDrop`).
- Styles can be overridden on per-list basis if desired.
- Subclass list control to override context menu.
- Add drop-down to add menu (or instead of add menu).
- Helper functionality to build element adder menus.
- User guide (Asset Path/Support/User Guide.pdf).
- API reference documentation (Asset Path/Support/API Reference.chm).
@ -33,7 +36,7 @@ contains a compiled class library (DLL). This can be used by C# and UnityScript
developers. Minimal version of package does not include demonstration assets or
zip archive of image source resources.
- [Download RotorzReorderableList_v0.2.9 Package (requires Unity 4.3.4+)](<https://bitbucket.org/rotorz/reorderable-list-editor-field-for-unity/downloads/RotorzReorderableList_v0.2.9.unitypackage>)
- [Download RotorzReorderableList_v0.3.2 Package (requires Unity 4.3.4+)](<https://bitbucket.org/rotorz/reorderable-list-editor-field-for-unity/downloads/RotorzReorderableList_v0.3.2.unitypackage>)
If you would prefer to use the non-compiled source code version in your project,
copy the contents of this repository somewhere into your project.

2
Assets/Fungus/Thirdparty/Reorderable List Field/README.txt.meta vendored

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 105892fb1f05544458e6cefb7755f3f3
guid: d5735c08f13f43a44be11da81110e424
TextScriptImporter:
userData:
assetBundleName:

28
ProjectSettings/ProjectSettings.asset

@ -3,17 +3,14 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
serializedVersion: 7
AndroidProfiler: 0
defaultScreenOrientation: 2
targetDevice: 2
targetGlesGraphics: 1
targetIOSGraphics: -1
targetResolution: 0
accelerometerFrequency: 60
companyName: Fungus
productName: Sherlock
cloudProjectId:
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_ShowUnitySplashScreen: 1
@ -26,7 +23,6 @@ PlayerSettings:
m_ActiveColorSpace: 0
m_MTRendering: 1
m_MobileMTRendering: 0
m_UseDX11: 0
m_Stereoscopic3D: 0
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
@ -123,6 +119,7 @@ PlayerSettings:
iOSLaunchScreenCustomXibPath:
AndroidTargetDevice: 0
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
AndroidKeystoreName:
AndroidKeyaliasName:
AndroidTVCompatibility: 1
@ -143,6 +140,13 @@ PlayerSettings:
- m_BuildTarget: Android
m_StaticBatching: 1
m_DynamicBatching: 1
m_BuildTargetGraphicsAPIs:
- m_BuildTarget: WindowsStandaloneSupport
m_APIs: 01000000
m_Automatic: 0
- m_BuildTarget: AndroidPlayer
m_APIs: 08000000
m_Automatic: 0
webPlayerTemplate: APPLICATION:Default
m_TemplateCustomTags: {}
actionOnDotNetUnhandledException: 1
@ -204,6 +208,7 @@ PlayerSettings:
ps4ApplicationParam2: 0
ps4ApplicationParam3: 0
ps4ApplicationParam4: 0
ps4GarlicHeapSize: 2048
ps4Passcode: 5PN2qmWqBlQ9wQj99nsQzldVI5ZuGXbE
ps4pnSessions: 1
ps4pnPresence: 1
@ -258,6 +263,7 @@ PlayerSettings:
psp2InfoBarOnStartup: 0
psp2InfoBarColor: 0
psmSplashimage: {fileID: 0}
virtualRealitySupported: 0
spritePackerPolicy:
scriptingDefineSymbols: {}
metroPackageName: Fungus
@ -346,8 +352,7 @@ PlayerSettings:
blackberrySquareSplashScreen: {fileID: 0}
tizenProductDescription:
tizenProductURL:
tizenCertificatePath:
tizenCertificatePassword:
tizenSigningProfileName:
tizenGPSPermissions: 0
tizenMicrophonePermissions: 0
stvDeviceAddress:
@ -388,11 +393,18 @@ PlayerSettings:
iOS::Architecture: 2
iOS::ScriptingBackend: 0
boolPropertyNames:
- WebGL::analyzeBuildSize
- WebGL::dataCaching
WebGL::analyzeBuildSize: 0
WebGL::dataCaching: 0
stringPropertyNames:
- WebGL::emscriptenArgs
- WebGL::template
WebGL::emscriptenArgs:
WebGL::template: APPLICATION:Default
firstStreamedLevelWithResources: 0
firstStreamedSceneWithResources: 0
cloudProjectId:
projectId:
projectName:
organizationId:
cloudEnabled: 0

2
ProjectSettings/ProjectVersion.txt

@ -1,2 +1,2 @@
m_EditorVersion: 5.0.2f1
m_EditorVersion: 5.1.0f3
m_StandardAssetsVersion: 0

Loading…
Cancel
Save