Browse Source

Reorganised FungusLua scripts to match main Fungus project

master
Christopher 8 years ago
parent
commit
69d9d2e3c3
  1. 9
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components.meta
  2. 32
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs
  3. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs.meta
  4. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/InfoText.cs
  5. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/InfoText.cs.meta
  6. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs
  7. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs.meta
  8. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaEnvironment.cs
  9. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaEnvironment.cs.meta
  10. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs
  11. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs.meta
  12. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs
  13. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs.meta
  14. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs
  15. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs.meta
  16. 10
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/ExecuteHandlerEditor.cs
  17. 39
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/IExecuteHandler.cs
  18. 12
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/IExecuteHandler.cs.meta
  19. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/IStringSubstituter.cs
  20. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/IStringSubstituter.cs.meta
  21. 9
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils.meta
  22. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/FungusPrefs.cs
  23. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/FungusPrefs.cs.meta
  24. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/PODTypeFactory.cs
  25. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/PODTypeFactory.cs.meta
  26. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/StringSubstituter.cs
  27. 0
      Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/StringSubstituter.cs.meta

9
Assets/Fungus/Thirdparty/FungusLua/Scripts/Components.meta vendored

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 32aa86341f1dc41fa834e5e2e82d4ee6
folderAsset: yes
timeCreated: 1474292879
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

32
Assets/Fungus/Thirdparty/FungusLua/Scripts/ExecuteHandler.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs vendored

@ -15,38 +15,8 @@ namespace Fungus
/// <summary>
/// Executes an LuaScript component in the same gameobject when a condition occurs.
/// </summary>
public class ExecuteHandler : MonoBehaviour, IExecuteHandlerConfigurator
public class ExecuteHandler : MonoBehaviour, IExecuteHandler, IExecuteHandlerConfigurator
{
[Flags]
public enum ExecuteMethod
{
AfterPeriodOfTime = 1 << 0,
Start = 1 << 1,
Update = 1 << 2,
FixedUpdate = 1 << 3,
LateUpdate = 1 << 4,
OnDestroy = 1 << 5,
OnEnable = 1 << 6,
OnDisable = 1 << 7,
OnControllerColliderHit = 1 << 8,
OnParticleCollision = 1 << 9,
OnJointBreak = 1 << 10,
OnBecameInvisible = 1 << 11,
OnBecameVisible = 1 << 12,
OnTriggerEnter = 1 << 13,
OnTriggerExit = 1 << 14,
OnTriggerStay = 1 << 15,
OnCollisionEnter = 1 << 16,
OnCollisionExit = 1 << 17,
OnCollisionStay = 1 << 18,
OnTriggerEnter2D = 1 << 19,
OnTriggerExit2D = 1 << 20,
OnTriggerStay2D = 1 << 21,
OnCollisionEnter2D = 1 << 22,
OnCollisionExit2D = 1 << 23,
OnCollisionStay2D = 1 << 24,
}
[SerializeField] protected float executeAfterTime = 1f;
public virtual float ExecuteAfterTime { get { return executeAfterTime; } set { executeAfterTime = value; } }

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/ExecuteHandler.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/ExecuteHandler.cs.meta vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/InfoText.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/InfoText.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/InfoText.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/InfoText.cs.meta vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaBindings.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaBindings.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaBindings.cs.meta vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaEnvironment.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaEnvironment.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaEnvironment.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaEnvironment.cs.meta vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaScript.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaScript.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaScript.cs.meta vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaStore.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaStore.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaStore.cs.meta vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/LuaUtils.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Components/LuaUtils.cs.meta vendored

10
Assets/Fungus/Thirdparty/FungusLua/Scripts/Editor/ExecuteHandlerEditor.cs vendored

@ -37,17 +37,17 @@ namespace Fungus
var executeHandler = (ExecuteHandler)target;
EditorGUILayout.BeginHorizontal();
EditorGUILayout.PrefixLabel(new GUIContent("On Event"));
executeHandler.ExecuteMethods = (ExecuteHandler.ExecuteMethod)EditorGUILayout.EnumMaskField(executeHandler.ExecuteMethods,
EditorStyles.popup,
GUILayout.ExpandWidth(false));
executeHandler.ExecuteMethods = (ExecuteMethod)EditorGUILayout.EnumMaskField(executeHandler.ExecuteMethods,
EditorStyles.popup,
GUILayout.ExpandWidth(false));
EditorGUILayout.EndHorizontal();
if (executeHandler.IsExecuteMethodSelected(ExecuteHandler.ExecuteMethod.AfterPeriodOfTime))
if (executeHandler.IsExecuteMethodSelected(ExecuteMethod.AfterPeriodOfTime))
{
DrawOptionsForAfterPeriodOfTime(executeHandler);
}
if (executeHandler.IsExecuteMethodSelected(ExecuteHandler.ExecuteMethod.Update))
if (executeHandler.IsExecuteMethodSelected(ExecuteMethod.Update))
{
DrawOptionsForOnUpdate(executeHandler);
}

39
Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/IExecuteHandler.cs vendored

@ -0,0 +1,39 @@
using System;
namespace Fungus
{
[Flags]
public enum ExecuteMethod
{
AfterPeriodOfTime = 1 << 0,
Start = 1 << 1,
Update = 1 << 2,
FixedUpdate = 1 << 3,
LateUpdate = 1 << 4,
OnDestroy = 1 << 5,
OnEnable = 1 << 6,
OnDisable = 1 << 7,
OnControllerColliderHit = 1 << 8,
OnParticleCollision = 1 << 9,
OnJointBreak = 1 << 10,
OnBecameInvisible = 1 << 11,
OnBecameVisible = 1 << 12,
OnTriggerEnter = 1 << 13,
OnTriggerExit = 1 << 14,
OnTriggerStay = 1 << 15,
OnCollisionEnter = 1 << 16,
OnCollisionExit = 1 << 17,
OnCollisionStay = 1 << 18,
OnTriggerEnter2D = 1 << 19,
OnTriggerExit2D = 1 << 20,
OnTriggerStay2D = 1 << 21,
OnCollisionEnter2D = 1 << 22,
OnCollisionExit2D = 1 << 23,
OnCollisionStay2D = 1 << 24,
}
public interface IExecuteHandler
{
}
}

12
Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/IExecuteHandler.cs.meta vendored

@ -0,0 +1,12 @@
fileFormatVersion: 2
guid: 44e1eeb74f6a64c64af0891af83e1db1
timeCreated: 1474293118
licenseType: Free
MonoImporter:
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/IStringSubstituter.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/IStringSubstituter.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/IStringSubstituter.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Interfaces/IStringSubstituter.cs.meta vendored

9
Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils.meta vendored

@ -0,0 +1,9 @@
fileFormatVersion: 2
guid: 3305df777ff8d4b8ebdd1d764bb49da3
folderAsset: yes
timeCreated: 1474292903
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/FungusPrefs.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/FungusPrefs.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/FungusPrefs.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/FungusPrefs.cs.meta vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/PODTypeFactory.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/PODTypeFactory.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/PODTypeFactory.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/PODTypeFactory.cs.meta vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/StringSubstituter.cs → Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/StringSubstituter.cs vendored

0
Assets/Fungus/Thirdparty/FungusLua/Scripts/StringSubstituter.cs.meta → Assets/Fungus/Thirdparty/FungusLua/Scripts/Utils/StringSubstituter.cs.meta vendored

Loading…
Cancel
Save