diff --git a/.gitignore b/.gitignore
index e72ea95..dad01a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,49 @@
-StrangeRocks/Library/metadata
-StrangeRocks/Temp
+# =============== #
+# Unity generated #
+# =============== #
+Temp/
+Obj/
+UnityGenerated/
+Library/
+
+# ===================================== #
+# Visual Studio / MonoDevelop generated #
+# ===================================== #
+ExportedObj/
+*.svd
+*.userprefs
+*.csproj
+*.pidb
+*.suo
+*.sln
+*.user
+*.unityproj
+*.booproj
+
+# ============ #
+# OS generated #
+# ============ #
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+Icon?
+ehthumbs.db
+Thumbs.db
+
+# ==================== #
+# Unity Test Generated #
+# ==================== #
+test-results
+test-results.meta
+
+# ================ #
+# Project Specific #
+# ================ #
+
+# ====================== #
+# ignore submodules meta #
+# ====================== #
+StrangeRocks/Assets/UnityTestTools
+StrangeRocks/Assets/UnityTestTools.meta
\ No newline at end of file
diff --git a/StrangeRocks/Assembly-CSharp-vs.csproj b/StrangeRocks/Assembly-CSharp-vs.csproj
deleted file mode 100644
index ca05ea0..0000000
--- a/StrangeRocks/Assembly-CSharp-vs.csproj
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 10.0.20506
- 2.0
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}
- Library
- Properties
-
- Assembly-CSharp
- v3.5
- 512
- Assets
-
-
- true
- full
- false
- Temp\bin\Debug\
- DEBUG;TRACE;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_2;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_OSX
- prompt
- 4
- 0169
-
-
- pdbonly
- true
- Temp\bin\Release\
- TRACE
- prompt
- 4
- 0169
-
-
-
-
-
-
-
- /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll
-
-
- /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/StrangeRocks/Assembly-CSharp.csproj b/StrangeRocks/Assembly-CSharp.csproj
deleted file mode 100644
index ca05ea0..0000000
--- a/StrangeRocks/Assembly-CSharp.csproj
+++ /dev/null
@@ -1,246 +0,0 @@
-
-
-
- Debug
- AnyCPU
- 10.0.20506
- 2.0
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}
- Library
- Properties
-
- Assembly-CSharp
- v3.5
- 512
- Assets
-
-
- true
- full
- false
- Temp\bin\Debug\
- DEBUG;TRACE;UNITY_STANDALONE_OSX;ENABLE_MICROPHONE;ENABLE_TEXTUREID_MAP;ENABLE_AUDIO_FMOD;UNITY_STANDALONE;ENABLE_MONO;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_GENERICS;ENABLE_SUBSTANCE;INCLUDE_WP8SUPPORT;ENABLE_MOVIES;ENABLE_WWW;ENABLE_IMAGEEFFECTS;INCLUDE_METROSUPPORT;RENDER_SOFTWARE_CURSOR;ENABLE_NETWORK;ENABLE_PHYSICS;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_2D_PHYSICS;ENABLE_GAMECENTER;ENABLE_SHADOWS;ENABLE_AUDIO;ENABLE_NAVMESH_CARVING;ENABLE_DUCK_TYPING;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;UNITY_4_3_2;UNITY_4_3;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_OSX
- prompt
- 4
- 0169
-
-
- pdbonly
- true
- Temp\bin\Release\
- TRACE
- prompt
- 4
- 0169
-
-
-
-
-
-
-
- /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEngine.dll
-
-
- /Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.dll
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/StrangeRocks/Assets/Editor.meta b/StrangeRocks/Assets/Editor.meta
new file mode 100644
index 0000000..be343fe
--- /dev/null
+++ b/StrangeRocks/Assets/Editor.meta
@@ -0,0 +1,5 @@
+fileFormatVersion: 2
+guid: 78bf7294253314e0e9d8600181ca802a
+folderAsset: yes
+DefaultImporter:
+ userData:
diff --git a/StrangeRocks/Assets/Editor/strangerocks.meta b/StrangeRocks/Assets/Editor/strangerocks.meta
new file mode 100644
index 0000000..602741a
--- /dev/null
+++ b/StrangeRocks/Assets/Editor/strangerocks.meta
@@ -0,0 +1,5 @@
+fileFormatVersion: 2
+guid: b1a562e6b2bb440fb939d06218c3c047
+folderAsset: yes
+DefaultImporter:
+ userData:
diff --git a/StrangeRocks/Assets/Editor/strangerocks/main.meta b/StrangeRocks/Assets/Editor/strangerocks/main.meta
new file mode 100644
index 0000000..1f43663
--- /dev/null
+++ b/StrangeRocks/Assets/Editor/strangerocks/main.meta
@@ -0,0 +1,5 @@
+fileFormatVersion: 2
+guid: eb9c88064dbcd424b8463ac1727e87bf
+folderAsset: yes
+DefaultImporter:
+ userData:
diff --git a/StrangeRocks/Assets/Editor/strangerocks/main/controller.meta b/StrangeRocks/Assets/Editor/strangerocks/main/controller.meta
new file mode 100644
index 0000000..99e758c
--- /dev/null
+++ b/StrangeRocks/Assets/Editor/strangerocks/main/controller.meta
@@ -0,0 +1,5 @@
+fileFormatVersion: 2
+guid: d2e625074804a4a20aa92dc102f19411
+folderAsset: yes
+DefaultImporter:
+ userData:
diff --git a/StrangeRocks/Assets/Editor/strangerocks/main/controller/MainStartupCommandTest.cs b/StrangeRocks/Assets/Editor/strangerocks/main/controller/MainStartupCommandTest.cs
new file mode 100644
index 0000000..ed4b825
--- /dev/null
+++ b/StrangeRocks/Assets/Editor/strangerocks/main/controller/MainStartupCommandTest.cs
@@ -0,0 +1,63 @@
+//Test MainStartupCommand
+
+using System;
+using NUnit.Framework;
+using NSubstitute;
+using System.Collections;
+using strange.extensions.context.api;
+using strange.extensions.command.impl;
+using UnityEngine;
+
+namespace strange.examples.strangerocks.main.controller
+{
+ public class MainStartupCommandTest
+ {
+ MainStartupCommand _instance;
+
+ [SetUp]
+ public void SetUp()
+ {
+ _instance = new MainStartupCommand();
+ _instance.application = Substitute.For();
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ _instance = null;
+ }
+
+ [Test]
+ public void shouldBeCommand ()
+ {
+ Assert.True( _instance is Command );
+ }
+
+ [Test]
+ public void testExecuteShouldLoadUiLevel ()
+ {
+ _instance.Execute();
+
+ _instance.application.Received().LoadLevelAdditive ("ui");
+ }
+
+ [Test]
+ public void testExecuteShouldLoadGameLevel ()
+ {
+ _instance.Execute();
+
+ _instance.application.Received().LoadLevelAdditive ("game");
+ }
+
+ /** Fails
+ [Test]
+ public void shouldHaveContextViewGetterAndSetter ()
+ {
+ var fakeGameObject = new GameObject("test");
+ _instance.contextView = fakeGameObject;
+
+ Assert.AreEqual( fakeGameObject, _instance.contextView );
+ }
+ **/
+ }
+}
\ No newline at end of file
diff --git a/StrangeRocks/Assets/Editor/strangerocks/main/controller/MainStartupCommandTest.cs.meta b/StrangeRocks/Assets/Editor/strangerocks/main/controller/MainStartupCommandTest.cs.meta
new file mode 100644
index 0000000..fb7c7f6
--- /dev/null
+++ b/StrangeRocks/Assets/Editor/strangerocks/main/controller/MainStartupCommandTest.cs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b57f2f4572db4aa0909e39c93a10937
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
diff --git a/StrangeRocks/Assets/scripts/UnityEngine.meta b/StrangeRocks/Assets/scripts/UnityEngine.meta
new file mode 100644
index 0000000..78a152c
--- /dev/null
+++ b/StrangeRocks/Assets/scripts/UnityEngine.meta
@@ -0,0 +1,5 @@
+fileFormatVersion: 2
+guid: e0eda9e0cae89432384b9098503a9fa5
+folderAsset: yes
+DefaultImporter:
+ userData:
diff --git a/StrangeRocks/Assets/scripts/UnityEngine/IApplication.cs b/StrangeRocks/Assets/scripts/UnityEngine/IApplication.cs
new file mode 100644
index 0000000..b396c2a
--- /dev/null
+++ b/StrangeRocks/Assets/scripts/UnityEngine/IApplication.cs
@@ -0,0 +1,60 @@
+//UnityEngine.Application interface
+
+namespace UnityEngine
+{
+ public interface IApplication
+ {
+ string absoluteURL { get; }
+ ThreadPriority backgroundLoadingPriority { get; set; }
+ string dataPath { get; }
+ bool genuine { get; }
+ bool genuineCheckAvailable { get; }
+ NetworkReachability internetReachability { get; }
+ bool isEditor { get; }
+ bool isLoadingLevel { get; }
+ bool isPlaying { get; }
+ bool isWebPlayer { get; }
+ int levelCount { get; }
+ int loadedLevel { get; }
+ string loadedLevelName { get; }
+ string persistentDataPath { get; }
+ RuntimePlatform platform { get; }
+ bool runInBackground { get; set; }
+ string srcValue { get; }
+ int streamedBytes { get; }
+ string streamingAssetsPath { get; }
+ SystemLanguage systemLanguage { get; }
+ int targetFrameRate { get; set; }
+ string temporaryCachePath { get; }
+ string unityVersion { get; }
+ bool webSecurityEnabled { get; }
+ string webSecurityHostUrl { get; }
+
+ void CancelQuit ();
+ bool CanStreamedLevelBeLoaded (int levelIndex);
+ bool CanStreamedLevelBeLoaded (string levelName);
+ void CaptureScreenshot (string filename, int superSize);
+ void CaptureScreenshot (string filename);
+ void ExternalCall (string functionName, params object[] args);
+ void ExternalEval (string script);
+ float GetStreamProgressForLevel (string levelName);
+ float GetStreamProgressForLevel (int levelIndex);
+ bool HasProLicense ();
+ bool HasUserAuthorization (UserAuthorization mode);
+ void LoadLevel (string name);
+ void LoadLevel (int index);
+ void LoadLevelAdditive (string name);
+ void LoadLevelAdditive (int index);
+ AsyncOperation LoadLevelAdditiveAsync (string levelName);
+ AsyncOperation LoadLevelAdditiveAsync (int index);
+ AsyncOperation LoadLevelAsync (int index);
+ AsyncOperation LoadLevelAsync (string levelName);
+ void OpenURL (string url);
+ void Quit ();
+ void RegisterLogCallback (Application.LogCallback handler);
+ void RegisterLogCallbackThreaded (Application.LogCallback handler);
+ AsyncOperation RequestUserAuthorization (UserAuthorization mode);
+ }
+}
+
+
diff --git a/StrangeRocks/Assets/scripts/UnityEngine/IApplication.cs.meta b/StrangeRocks/Assets/scripts/UnityEngine/IApplication.cs.meta
new file mode 100644
index 0000000..1ce5775
--- /dev/null
+++ b/StrangeRocks/Assets/scripts/UnityEngine/IApplication.cs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 24d93bf7632b740b88408a45b86b562c
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
diff --git a/StrangeRocks/Assets/scripts/strangerocks/common/service.meta b/StrangeRocks/Assets/scripts/strangerocks/common/service.meta
new file mode 100644
index 0000000..cc252b2
--- /dev/null
+++ b/StrangeRocks/Assets/scripts/strangerocks/common/service.meta
@@ -0,0 +1,5 @@
+fileFormatVersion: 2
+guid: f8ad518a5ee854631a50d537730dc839
+folderAsset: yes
+DefaultImporter:
+ userData:
diff --git a/StrangeRocks/Assets/scripts/strangerocks/common/service/ApplicationWrapper.cs b/StrangeRocks/Assets/scripts/strangerocks/common/service/ApplicationWrapper.cs
new file mode 100644
index 0000000..df3021f
--- /dev/null
+++ b/StrangeRocks/Assets/scripts/strangerocks/common/service/ApplicationWrapper.cs
@@ -0,0 +1,320 @@
+//Wrap UnityEngine.Application to easier mocking
+
+using System;
+using UnityEngine;
+
+public class ApplicationWrapper : IApplication
+{
+ public ApplicationWrapper ()
+ {
+ }
+
+ public void CancelQuit ()
+ {
+ Application.CancelQuit();
+ }
+
+ public bool CanStreamedLevelBeLoaded (int levelIndex)
+ {
+ return Application.CanStreamedLevelBeLoaded( levelIndex );
+ }
+
+ public bool CanStreamedLevelBeLoaded (string levelName)
+ {
+ return Application.CanStreamedLevelBeLoaded( levelName );
+ }
+
+ public void CaptureScreenshot (string filename, int superSize)
+ {
+ Application.CaptureScreenshot( filename, superSize );
+ }
+
+ public void CaptureScreenshot (string filename)
+ {
+ Application.CaptureScreenshot( filename );
+ }
+
+ public void ExternalCall (string functionName, params object[] args)
+ {
+ Application.ExternalCall( functionName, args );
+ }
+
+ public void ExternalEval (string script)
+ {
+ Application.ExternalEval( script );
+ }
+
+ public float GetStreamProgressForLevel (string levelName)
+ {
+ return Application.GetStreamProgressForLevel( levelName );
+ }
+
+ public float GetStreamProgressForLevel (int levelIndex)
+ {
+ return Application.GetStreamProgressForLevel( levelIndex );
+ }
+
+ public bool HasProLicense ()
+ {
+ return Application.HasProLicense();
+ }
+
+ public bool HasUserAuthorization (UserAuthorization mode)
+ {
+ return Application.HasUserAuthorization( mode );
+ }
+
+ public void LoadLevel (string name)
+ {
+ Application.LoadLevel( name );
+ }
+
+ public void LoadLevel (int index)
+ {
+ Application.LoadLevel( index );
+ }
+
+ public void LoadLevelAdditive (string name)
+ {
+ Application.LoadLevelAdditive( name );
+ }
+
+ public void LoadLevelAdditive (int index)
+ {
+ Application.LoadLevelAdditive( index );
+ }
+
+ public AsyncOperation LoadLevelAdditiveAsync (string levelName)
+ {
+ return Application.LoadLevelAdditiveAsync( levelName );
+ }
+
+ public AsyncOperation LoadLevelAdditiveAsync (int index)
+ {
+ return Application.LoadLevelAdditiveAsync( index );
+ }
+
+ public AsyncOperation LoadLevelAsync (int index)
+ {
+ return Application.LoadLevelAsync( index );
+ }
+
+ public AsyncOperation LoadLevelAsync (string levelName)
+ {
+ return Application.LoadLevelAsync( levelName );
+ }
+
+ public void OpenURL (string url)
+ {
+ Application.OpenURL( url );
+ }
+
+ public void Quit ()
+ {
+ Application.Quit();
+ }
+
+ public void RegisterLogCallback (Application.LogCallback handler)
+ {
+ Application.RegisterLogCallback( handler );
+ }
+
+ public void RegisterLogCallbackThreaded (Application.LogCallback handler)
+ {
+ Application.RegisterLogCallbackThreaded( handler );
+ }
+
+ public AsyncOperation RequestUserAuthorization (UserAuthorization mode)
+ {
+ return Application.RequestUserAuthorization( mode );
+ }
+
+ public string absoluteURL {
+ get
+ {
+ return Application.absoluteURL;
+ }
+ }
+
+ public ThreadPriority backgroundLoadingPriority {
+ get
+ {
+ return Application.backgroundLoadingPriority;
+ }
+ set
+ {
+ Application.backgroundLoadingPriority = value;
+ }
+ }
+
+ public string dataPath {
+ get
+ {
+ return Application.dataPath;
+ }
+ }
+
+ public bool genuine {
+ get
+ {
+ return Application.genuine;
+ }
+ }
+
+ public bool genuineCheckAvailable {
+ get
+ {
+ return Application.genuineCheckAvailable;
+ }
+ }
+
+ public NetworkReachability internetReachability {
+ get
+ {
+ return Application.internetReachability;
+ }
+ }
+
+ public bool isEditor {
+ get
+ {
+ return Application.isEditor;
+ }
+ }
+
+ public bool isLoadingLevel {
+ get
+ {
+ return Application.isLoadingLevel;
+ }
+ }
+
+ public bool isPlaying {
+ get
+ {
+ return Application.isPlaying;
+ }
+ }
+
+ public bool isWebPlayer {
+ get
+ {
+ return Application.isWebPlayer;
+ }
+ }
+
+ public int levelCount {
+ get
+ {
+ return Application.levelCount;
+ }
+ }
+
+ public int loadedLevel {
+ get
+ {
+ return Application.loadedLevel;
+ }
+ }
+
+ public string loadedLevelName {
+ get
+ {
+ return Application.loadedLevelName;
+ }
+ }
+
+ public string persistentDataPath {
+ get
+ {
+ return Application.persistentDataPath;
+ }
+ }
+
+ public RuntimePlatform platform {
+ get
+ {
+ return Application.platform;
+ }
+ }
+
+ public bool runInBackground {
+ get
+ {
+ return Application.runInBackground;
+ }
+ set
+ {
+ Application.runInBackground = value;
+ }
+ }
+
+ public string srcValue {
+ get
+ {
+ return Application.srcValue;
+ }
+ }
+
+ public int streamedBytes {
+ get
+ {
+ return Application.streamedBytes;
+ }
+ }
+
+ public string streamingAssetsPath {
+ get
+ {
+ return Application.streamingAssetsPath;
+ }
+ }
+
+ public SystemLanguage systemLanguage {
+ get
+ {
+ return Application.systemLanguage;
+ }
+ }
+
+ public int targetFrameRate {
+ get
+ {
+ return Application.targetFrameRate;
+ }
+ set
+ {
+ Application.targetFrameRate = value;
+ }
+ }
+
+ public string temporaryCachePath {
+ get
+ {
+ return Application.temporaryCachePath;
+ }
+ }
+
+ public string unityVersion {
+ get
+ {
+ return Application.unityVersion;
+ }
+ }
+
+ public bool webSecurityEnabled {
+ get
+ {
+ return Application.webSecurityEnabled;
+ }
+ }
+
+ public string webSecurityHostUrl {
+ get
+ {
+ return Application.webSecurityHostUrl;
+ }
+ }
+
+}
+
diff --git a/StrangeRocks/Assets/scripts/strangerocks/common/service/ApplicationWrapper.cs.meta b/StrangeRocks/Assets/scripts/strangerocks/common/service/ApplicationWrapper.cs.meta
new file mode 100644
index 0000000..966b37f
--- /dev/null
+++ b/StrangeRocks/Assets/scripts/strangerocks/common/service/ApplicationWrapper.cs.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ba42a74d760d74d3da71f858d18a6dbc
+MonoImporter:
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
diff --git a/StrangeRocks/Assets/scripts/strangerocks/game/config/GameContext.cs b/StrangeRocks/Assets/scripts/strangerocks/game/config/GameContext.cs
index 8dd92a4..9a7476d 100644
--- a/StrangeRocks/Assets/scripts/strangerocks/game/config/GameContext.cs
+++ b/StrangeRocks/Assets/scripts/strangerocks/game/config/GameContext.cs
@@ -64,8 +64,6 @@ protected override void mapBindings ()
injectionBinder.Bind>().To>().ToSingleton().ToName(GameElement.MISSILE_POOL);
injectionBinder.Bind>().To>().ToSingleton().ToName(GameElement.ROCK_POOL);
-
-
//Signals (not bound to Commands)
//When a Signal isn't bound to a Command, it needs to be mapped, just like any other injected instance
injectionBinder.Bind ().ToSingleton ();
@@ -80,9 +78,6 @@ protected override void mapBindings ()
injectionBinder.Bind ().ToSingleton ();
}
-
-
-
//Commands
//All Commands get mapped to a Signal that Executes them.
if (Context.firstContext == this)
diff --git a/StrangeRocks/Assets/scripts/strangerocks/main/config/MainContext.cs b/StrangeRocks/Assets/scripts/strangerocks/main/config/MainContext.cs
index 01784dc..144ab84 100644
--- a/StrangeRocks/Assets/scripts/strangerocks/main/config/MainContext.cs
+++ b/StrangeRocks/Assets/scripts/strangerocks/main/config/MainContext.cs
@@ -21,6 +21,8 @@ protected override void mapBindings ()
{
injectionBinder.Bind ().To ().ToSingleton().CrossContext();
+ injectionBinder.Bind ().To().ToSingleton ();
+
injectionBinder.Bind ().ToSingleton ().CrossContext();
injectionBinder.Bind ().ToSingleton ().CrossContext();
injectionBinder.Bind ().ToSingleton ().CrossContext();
diff --git a/StrangeRocks/Assets/scripts/strangerocks/main/controller/MainStartupCommand.cs b/StrangeRocks/Assets/scripts/strangerocks/main/controller/MainStartupCommand.cs
index a5a9769..d3cb0f3 100644
--- a/StrangeRocks/Assets/scripts/strangerocks/main/controller/MainStartupCommand.cs
+++ b/StrangeRocks/Assets/scripts/strangerocks/main/controller/MainStartupCommand.cs
@@ -16,11 +16,13 @@ public class MainStartupCommand : Command
[Inject(ContextKeys.CONTEXT_VIEW)]
public GameObject contextView { get; set; }
+ [Inject]
+ public IApplication application { get; set; }
override public void Execute ()
{
- Application.LoadLevelAdditive ("ui");
- Application.LoadLevelAdditive ("game");
+ application.LoadLevelAdditive ("ui");
+ application.LoadLevelAdditive ("game");
}
}
}
diff --git a/StrangeRocks/Library/AnnotationManager b/StrangeRocks/Library/AnnotationManager
deleted file mode 100644
index 81d337e..0000000
Binary files a/StrangeRocks/Library/AnnotationManager and /dev/null differ
diff --git a/StrangeRocks/Library/AssetImportState b/StrangeRocks/Library/AssetImportState
deleted file mode 100644
index d193676..0000000
--- a/StrangeRocks/Library/AssetImportState
+++ /dev/null
@@ -1 +0,0 @@
-4;0;-1
\ No newline at end of file
diff --git a/StrangeRocks/Library/AssetServerCacheV3 b/StrangeRocks/Library/AssetServerCacheV3
deleted file mode 100644
index 3a1c07f..0000000
Binary files a/StrangeRocks/Library/AssetServerCacheV3 and /dev/null differ
diff --git a/StrangeRocks/Library/AssetVersioning.db b/StrangeRocks/Library/AssetVersioning.db
deleted file mode 100644
index 7c4c8d3..0000000
Binary files a/StrangeRocks/Library/AssetVersioning.db and /dev/null differ
diff --git a/StrangeRocks/Library/BuildPlayer.prefs b/StrangeRocks/Library/BuildPlayer.prefs
deleted file mode 100644
index e69de29..0000000
diff --git a/StrangeRocks/Library/BuildSettings.asset b/StrangeRocks/Library/BuildSettings.asset
deleted file mode 100644
index 801b123..0000000
Binary files a/StrangeRocks/Library/BuildSettings.asset and /dev/null differ
diff --git a/StrangeRocks/Library/CurrentLayout.dwlt b/StrangeRocks/Library/CurrentLayout.dwlt
deleted file mode 100644
index fcb1042..0000000
Binary files a/StrangeRocks/Library/CurrentLayout.dwlt and /dev/null differ
diff --git a/StrangeRocks/Library/CurrentMaximizeLayout.dwlt b/StrangeRocks/Library/CurrentMaximizeLayout.dwlt
deleted file mode 100644
index 9189759..0000000
Binary files a/StrangeRocks/Library/CurrentMaximizeLayout.dwlt and /dev/null differ
diff --git a/StrangeRocks/Library/EditorUserBuildSettings.asset b/StrangeRocks/Library/EditorUserBuildSettings.asset
deleted file mode 100644
index 58e9593..0000000
Binary files a/StrangeRocks/Library/EditorUserBuildSettings.asset and /dev/null differ
diff --git a/StrangeRocks/Library/EditorUserSettings.asset b/StrangeRocks/Library/EditorUserSettings.asset
deleted file mode 100644
index a99ebdd..0000000
Binary files a/StrangeRocks/Library/EditorUserSettings.asset and /dev/null differ
diff --git a/StrangeRocks/Library/FailedAssetImports.txt b/StrangeRocks/Library/FailedAssetImports.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/StrangeRocks/Library/InspectorExpandedItems.asset b/StrangeRocks/Library/InspectorExpandedItems.asset
deleted file mode 100644
index 161a2cd..0000000
Binary files a/StrangeRocks/Library/InspectorExpandedItems.asset and /dev/null differ
diff --git a/StrangeRocks/Library/MonoManager.asset b/StrangeRocks/Library/MonoManager.asset
deleted file mode 100644
index 0aacd3f..0000000
Binary files a/StrangeRocks/Library/MonoManager.asset and /dev/null differ
diff --git a/StrangeRocks/Library/ProjectSettings.asset b/StrangeRocks/Library/ProjectSettings.asset
deleted file mode 100644
index 8d34022..0000000
Binary files a/StrangeRocks/Library/ProjectSettings.asset and /dev/null differ
diff --git a/StrangeRocks/Library/ScriptAssemblies/Assembly-CSharp.dll b/StrangeRocks/Library/ScriptAssemblies/Assembly-CSharp.dll
deleted file mode 100755
index 3246680..0000000
Binary files a/StrangeRocks/Library/ScriptAssemblies/Assembly-CSharp.dll and /dev/null differ
diff --git a/StrangeRocks/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/StrangeRocks/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
deleted file mode 100644
index ce902a6..0000000
Binary files a/StrangeRocks/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and /dev/null differ
diff --git a/StrangeRocks/Library/ScriptAssemblies/CompilationCompleted.txt b/StrangeRocks/Library/ScriptAssemblies/CompilationCompleted.txt
deleted file mode 100644
index d25ad0d..0000000
--- a/StrangeRocks/Library/ScriptAssemblies/CompilationCompleted.txt
+++ /dev/null
@@ -1 +0,0 @@
-Completed
diff --git a/StrangeRocks/Library/ScriptMapper b/StrangeRocks/Library/ScriptMapper
deleted file mode 100644
index d421569..0000000
Binary files a/StrangeRocks/Library/ScriptMapper and /dev/null differ
diff --git a/StrangeRocks/Library/assetDatabase3 b/StrangeRocks/Library/assetDatabase3
deleted file mode 100644
index c7fe849..0000000
Binary files a/StrangeRocks/Library/assetDatabase3 and /dev/null differ
diff --git a/StrangeRocks/Library/expandedItems b/StrangeRocks/Library/expandedItems
deleted file mode 100644
index 6c7d6e6..0000000
Binary files a/StrangeRocks/Library/expandedItems and /dev/null differ
diff --git a/StrangeRocks/Library/guidmapper b/StrangeRocks/Library/guidmapper
deleted file mode 100644
index 60fc4cd..0000000
Binary files a/StrangeRocks/Library/guidmapper and /dev/null differ
diff --git a/StrangeRocks/StrangeRocks-csharp.sln b/StrangeRocks/StrangeRocks-csharp.sln
deleted file mode 100644
index d57fb1d..0000000
--- a/StrangeRocks/StrangeRocks-csharp.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{32A7D96F-A674-027C-0DE6-970E49CF9B71}") = "StrangeRocks", "Assembly-CSharp-vs.csproj", "{F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = Assembly-CSharp.csproj
- Policies = $0
- $0.TextStylePolicy = $1
- $1.FileWidth = 120
- $1.TabsToSpaces = False
- $1.EolMarker = Unix
- $1.inheritsSet = VisualStudio
- $1.inheritsScope = text/plain
- $1.scope = text/x-csharp
- $0.CSharpFormattingPolicy = $2
- $2.PropertyGetBraceStyle = NextLine
- $2.PropertySetBraceStyle = NextLine
- $2.StatementBraceStyle = NextLine
- $2.inheritsSet = Mono
- $2.inheritsScope = text/x-csharp
- $2.scope = text/x-csharp
- $0.TextStylePolicy = $3
- $3.FileWidth = 120
- $3.TabsToSpaces = False
- $3.EolMarker = Unix
- $3.inheritsSet = VisualStudio
- $3.inheritsScope = text/plain
- $3.scope = text/plain
- EndGlobalSection
-
-EndGlobal
diff --git a/StrangeRocks/StrangeRocks.sln b/StrangeRocks/StrangeRocks.sln
deleted file mode 100644
index 78460b2..0000000
--- a/StrangeRocks/StrangeRocks.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2008
-
-Project("{32A7D96F-A674-027C-0DE6-970E49CF9B71}") = "StrangeRocks", "Assembly-CSharp.csproj", "{F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F6BB23DB-5854-CF9A-EDF1-6ABB61BC4D7E}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = Assembly-CSharp.csproj
- Policies = $0
- $0.TextStylePolicy = $1
- $1.FileWidth = 120
- $1.TabsToSpaces = False
- $1.EolMarker = Unix
- $1.inheritsSet = VisualStudio
- $1.inheritsScope = text/plain
- $1.scope = text/x-csharp
- $0.CSharpFormattingPolicy = $2
- $2.PropertyGetBraceStyle = NextLine
- $2.PropertySetBraceStyle = NextLine
- $2.StatementBraceStyle = NextLine
- $2.inheritsSet = Mono
- $2.inheritsScope = text/x-csharp
- $2.scope = text/x-csharp
- $0.TextStylePolicy = $3
- $3.FileWidth = 120
- $3.TabsToSpaces = False
- $3.EolMarker = Unix
- $3.inheritsSet = VisualStudio
- $3.inheritsScope = text/plain
- $3.scope = text/plain
- EndGlobalSection
-
-EndGlobal