Skip to content

Commit

Permalink
Fixed issue with levels reloading.
Browse files Browse the repository at this point in the history
  • Loading branch information
valyard committed Nov 25, 2013
1 parent ae08ca7 commit 41a38bb
Show file tree
Hide file tree
Showing 18 changed files with 17 additions and 16 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ EditorBuildSettings:
m_Scenes:
- enabled: 1
path: Assets/TouchScript/Examples/Advanced/Advanced.unity
- enabled: 1
path: Assets/TouchScript/Examples/Basic/Basic.unity
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 2 additions & 6 deletions TouchScript/GestureManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public static GestureManager Instance
#region Private variables

private static GestureManager instance;
// Flag to indicate that we are going out of Play Mode in the editor. Otherwise there might be a loop when while deinitializing other objects access TouchScript.Instance which recreates an instance of TouchManager and everything breaks.
private static bool shuttingDown = false;

// Upcoming changes
Expand Down Expand Up @@ -85,12 +86,7 @@ private void Awake()

private void OnDestroy()
{
shuttingDown = true;
}

private void OnApplicationQuit()
{
shuttingDown = true;
if (!Application.isLoadingLevel) shuttingDown = true;
}

#endregion
Expand Down
8 changes: 2 additions & 6 deletions TouchScript/TouchManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ public List<TouchPoint> TouchPoints
#region Private variables

private static TouchManager instance;
// Flag to indicate that we are going out of Play Mode in the editor. Otherwise there might be a loop when while deinitializing other objects access TouchScript.Instance which recreates an instance of TouchManager and everything breaks.
private static bool shuttingDown = false;

private float dpi = 72;
Expand Down Expand Up @@ -251,12 +252,7 @@ private void Update()

private void OnDestroy()
{
shuttingDown = true;
}

private void OnApplicationQuit()
{
shuttingDown = true;
if (!Application.isLoadingLevel) shuttingDown = true;
}

#endregion
Expand Down

0 comments on commit 41a38bb

Please sign in to comment.