Use a temporary file to enable hot reloading on Windows

jacksondunstan · jacksondunstan · commit 156646df8a86 · 2018-02-16T15:51:19.000-08:00
diff --git a/Unity/Assets/NativeScript/Bindings.cs b/Unity/Assets/NativeScript/Bindings.cs
@@ -292,8 +292,9 @@ public ReusableWaitForSecondsRealtime(float time)
 		const string PLUGIN_PATH = "/Plugins/Editor/libNativeScript.so";
 #elif UNITY_EDITOR_WIN
 		const string PLUGIN_PATH = "/Plugins/Editor/NativeScript.dll";
+		const string PLUGIN_TEMP_PATH = "/Plugins/Editor/NativeScript_temp.dll";
 #endif
-		
+
 		enum InitMode : byte
 		{
 			FirstBoot,
@@ -1517,6 +1518,9 @@ IntPtr systemComponentModelDesignComponentRenameEventHandlerInvoke
 		/*END DELEGATE TYPES*/
 		
 		private static readonly string pluginPath = Application.dataPath + PLUGIN_PATH;
+#if UNITY_EDITOR_WIN
+		private static readonly string pluginTempPath = Application.dataPath + PLUGIN_TEMP_PATH;
+#endif
 		public static Exception UnhandledCppException;
 		public static SetCsharpExceptionDelegate SetCsharpException;
 		private static IntPtr memory;
@@ -1602,8 +1606,16 @@ ReusableWaitForSecondsRealtime poll
 		private static void OpenPlugin(InitMode initMode)
 		{
 #if UNITY_EDITOR
+			string loadPath;
+#if UNITY_EDITOR_WIN
+			// Copy native library to temporary file
+			File.Copy(pluginPath, pluginTempPath);
+			loadPath = pluginTempPath;
+#else
+			loadPath = pluginPath;
+#endif
 			// Open native library
-			libraryHandle = OpenLibrary(pluginPath);
+			libraryHandle = OpenLibrary(loadPath);
 			InitDelegate Init = GetDelegate<InitDelegate>(
 				libraryHandle,
 				"Init");
@@ -1967,6 +1979,9 @@ private static void ClosePlugin()
 #if UNITY_EDITOR
 			CloseLibrary(libraryHandle);
 			libraryHandle = IntPtr.Zero;
+#endif
+#if UNITY_EDITOR_WIN
+			File.Delete(pluginTempPath);
 #endif
 		}
 		
diff --git a/Unity/CppSource/Game/Game.cpp b/Unity/CppSource/Game/Game.cpp
@@ -97,7 +97,7 @@ void MyGame::MonoBehaviours::AnotherScript::Update()
 {
 	Transform transform = GetTransform();
 	Vector3 pos = transform.GetPosition();
-	const float speed = 1.2f;
+	const float speed = 0.0012f;
 	const float min = -1.5f;
 	const float max = 1.5f;
 	Vector3 offset(Time::GetDeltaTime() * speed * gameState->Dir, 0, 0);
@@ -106,11 +106,19 @@ void MyGame::MonoBehaviours::AnotherScript::Update()
 	{
 		gameState->Dir *= -1.0f;
 		newPos.x = max - (newPos.x - max);
+		if (newPos.x < min)
+		{
+			newPos.x = min;
+		}
 	}
 	else if (newPos.x < min)
 	{
 		gameState->Dir *= -1.0f;
 		newPos.x = min + (min - newPos.x);
+		if (newPos.x > max)
+		{
+			newPos.x = max;
+		}
 	}
 	transform.SetPosition(newPos);
 }

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ void MyGame::MonoBehaviours::AnotherScript::Update()`
`97`	`97`	`{`
`98`	`98`	`Transform transform = GetTransform();`
`99`	`99`	`Vector3 pos = transform.GetPosition();`
`100`		`- const float speed = 1.2f;`
	`100`	`+ const float speed = 0.0012f;`
`101`	`101`	`const float min = -1.5f;`
`102`	`102`	`const float max = 1.5f;`
`103`	`103`	`Vector3 offset(Time::GetDeltaTime() * speed * gameState->Dir, 0, 0);`
`@@ -106,11 +106,19 @@ void MyGame::MonoBehaviours::AnotherScript::Update()`
`106`	`106`	`{`
`107`	`107`	`gameState->Dir *= -1.0f;`
`108`	`108`	`newPos.x = max - (newPos.x - max);`
	`109`	`+ if (newPos.x < min)`
	`110`	`+ {`
	`111`	`+ newPos.x = min;`
	`112`	`+ }`
`109`	`113`	`}`
`110`	`114`	`else if (newPos.x < min)`
`111`	`115`	`{`
`112`	`116`	`gameState->Dir *= -1.0f;`
`113`	`117`	`newPos.x = min + (min - newPos.x);`
	`118`	`+ if (newPos.x > max)`
	`119`	`+ {`
	`120`	`+ newPos.x = max;`
	`121`	`+ }`
`114`	`122`	`}`
`115`	`123`	`transform.SetPosition(newPos);`
`116`	`124`	`}`