Commit 156646d

committed

Use a temporary file to enable hot reloading on Windows

1 parent a04c190 commit 156646dCopy full SHA for 156646d

File tree

2 files changed

+26

-3

lines changed

Unity
- Assets/NativeScript
  - Bindings.cs
- CppSource/Game
  - Game.cpp

2 files changed

+26

-3

lines changed

`‎Unity/Assets/NativeScript/Bindings.cs‎`

Lines changed: 17 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -292,8 +292,9 @@ public ReusableWaitForSecondsRealtime(float time)`
`292`	`292`	`const string PLUGIN_PATH = "/Plugins/Editor/libNativeScript.so";`
`293`	`293`	`#elif UNITY_EDITOR_WIN`
`294`	`294`	`const string PLUGIN_PATH = "/Plugins/Editor/NativeScript.dll";`
	`295`	`+ const string PLUGIN_TEMP_PATH = "/Plugins/Editor/NativeScript_temp.dll";`
`295`	`296`	`#endif`
`296`		`-`
	`297`	`+`
`297`	`298`	`enum InitMode : byte`
`298`	`299`	`{`
`299`	`300`	`FirstBoot,`
`@@ -1517,6 +1518,9 @@ IntPtr systemComponentModelDesignComponentRenameEventHandlerInvoke`
`1517`	`1518`	`/END DELEGATE TYPES/`
`1518`	`1519`
`1519`	`1520`	`private static readonly string pluginPath = Application.dataPath + PLUGIN_PATH;`
	`1521`	`+#if UNITY_EDITOR_WIN`
	`1522`	`+ private static readonly string pluginTempPath = Application.dataPath + PLUGIN_TEMP_PATH;`
	`1523`	`+#endif`
`1520`	`1524`	`public static Exception UnhandledCppException;`
`1521`	`1525`	`public static SetCsharpExceptionDelegate SetCsharpException;`
`1522`	`1526`	`private static IntPtr memory;`
`@@ -1602,8 +1606,16 @@ ReusableWaitForSecondsRealtime poll`
`1602`	`1606`	`private static void OpenPlugin(InitMode initMode)`
`1603`	`1607`	`{`
`1604`	`1608`	`#if UNITY_EDITOR`
	`1609`	`+ string loadPath;`
	`1610`	`+#if UNITY_EDITOR_WIN`
	`1611`	`+ // Copy native library to temporary file`
	`1612`	`+ File.Copy(pluginPath, pluginTempPath);`
	`1613`	`+ loadPath = pluginTempPath;`
	`1614`	`+#else`
	`1615`	`+ loadPath = pluginPath;`
	`1616`	`+#endif`
`1605`	`1617`	`// Open native library`
`1606`		`- libraryHandle = OpenLibrary(pluginPath);`
	`1618`	`+ libraryHandle = OpenLibrary(loadPath);`
`1607`	`1619`	`InitDelegate Init = GetDelegate<InitDelegate>(`
`1608`	`1620`	`libraryHandle,`
`1609`	`1621`	`"Init");`
`@@ -1967,6 +1979,9 @@ private static void ClosePlugin()`
`1967`	`1979`	`#if UNITY_EDITOR`
`1968`	`1980`	`CloseLibrary(libraryHandle);`
`1969`	`1981`	`libraryHandle = IntPtr.Zero;`
	`1982`	`+#endif`
	`1983`	`+#if UNITY_EDITOR_WIN`
	`1984`	`+ File.Delete(pluginTempPath);`
`1970`	`1985`	`#endif`
`1971`	`1986`	`}`
`1972`	`1987`

`‎Unity/CppSource/Game/Game.cpp‎`

Lines changed: 9 additions & 1 deletion

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`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 156646d

File tree

2 files changed

2 files changed

`‎Unity/Assets/NativeScript/Bindings.cs‎`

`‎Unity/CppSource/Game/Game.cpp‎`

0 commit comments