Properly create managed resource for StringTable

MBansheeEditor/ProjectLibrary.cs

@@ -237,7 +237,7 @@ namespace BansheeEditor
     // Note: Must be the same as C++ enum ScriptResourceType
     public enum ResourceType
     {
-        Texture, SpriteTexture, Mesh, Font, Shader, Material, Prefab, PlainText, ScriptCode, Undefined
+        Texture, SpriteTexture, Mesh, Font, Shader, Material, Prefab, PlainText, ScriptCode, StringTable, Undefined
     }
 
     public class LibraryEntry : ScriptObject

MBansheeEngine/StringTable.cs

@@ -8,9 +8,10 @@ namespace BansheeEngine
 {
     public sealed class StringTable : Resource
     {
-        // For internal use by the runtime
-        private StringTable()
-        { }
+        public StringTable()
+        {
+            Internal_CreateInstance(this);
+        }
 
         public int GetNumStrings()
         {
@@ -51,6 +52,9 @@ namespace BansheeEngine
             return value;
         }
 
+        [MethodImpl(MethodImplOptions.InternalCall)]
+        private static extern void Internal_CreateInstance(StringTable instance);
+
         [MethodImpl(MethodImplOptions.InternalCall)]
         private static extern int Internal_GetNumStrings(IntPtr thisPtr);
         [MethodImpl(MethodImplOptions.InternalCall)]

SBansheeEngine/Include/BsScriptResource.h

@@ -7,7 +7,7 @@ namespace BansheeEngine
 {
 	enum class ScriptResourceType
 	{
-		Texture, SpriteTexture, Mesh, Font, Shader, Material, Prefab, PlainText, ScriptCode, Undefined
+		Texture, SpriteTexture, Mesh, Font, Shader, Material, Prefab, PlainText, ScriptCode, StringTable, Undefined
 	};
 
 	class BS_SCR_BE_EXPORT ScriptResourceBase : public PersistentScriptObjectBase

SBansheeEngine/Include/BsScriptStringTable.h

@@ -19,6 +19,8 @@ namespace BansheeEngine
 		HStringTable getStringTableHandle() const { return mTable; }
 
 	private:
+		static void internal_CreateInstance(MonoObject* instance);
+
 		static UINT32 internal_GetNumStrings(ScriptStringTable* thisPtr);
 		static MonoArray* internal_GetIdentifiers(ScriptStringTable* thisPtr);
 

SBansheeEngine/Source/BsScriptResource.cpp

@@ -38,6 +38,8 @@ namespace BansheeEngine
 			return ScriptResourceType::Font;
 		case TID_Prefab:
 			return ScriptResourceType::Prefab;
+		case TID_StringTable:
+			return ScriptResourceType::StringTable;
 		case TID_PlainText:
 			return ScriptResourceType::PlainText;
 		case TID_ScriptCode:
@@ -65,6 +67,8 @@ namespace BansheeEngine
 			return TID_Material;
 		case ScriptResourceType::Prefab:
 			return TID_Prefab;
+		case ScriptResourceType::StringTable:
+			return TID_StringTable;
 		case ScriptResourceType::PlainText:
 			return TID_PlainText;
 		case ScriptResourceType::ScriptCode:

SBansheeEngine/Source/BsScriptResourceManager.cpp

@@ -259,7 +259,9 @@ namespace BansheeEngine
 		MonoClass* stringTableClass = ScriptAssemblyManager::instance().getStringTableClass();
 		MonoObject* monoInstance = stringTableClass->createInstance();
 
-		return createScriptStringTable(monoInstance, resourceHandle);
+		// Managed constructor will call ::create(MonoObject*, const HStringTable&) internally so we just need
+		// to retrieve the created object
+		return ScriptStringTable::toNative(monoInstance);
 	}
 
 	ScriptStringTable* ScriptResourceManager::createScriptStringTable(MonoObject* instance, const HStringTable& resourceHandle)
@@ -390,6 +392,10 @@ namespace BansheeEngine
 			return createScriptScriptCode(static_resource_cast<ScriptCode>(resource));
 		case TID_Shader:
 			return createScriptShader(static_resource_cast<Shader>(resource));
+		case TID_Prefab:
+			return createScriptPrefab(static_resource_cast<Prefab>(resource));
+		case TID_StringTable:
+			return createScriptStringTable(static_resource_cast<StringTable>(resource));
 		case TID_Material:
 			return createScriptMaterial(static_resource_cast<Material>(resource));
 		case TID_Mesh:

SBansheeEngine/Source/BsScriptStringTable.cpp

@@ -25,6 +25,13 @@ namespace BansheeEngine
 		metaData.scriptClass->addInternalCall("Internal_GetStringDefault", &ScriptStringTable::internal_GetStringDefault);
 	}
 
+	void ScriptStringTable::internal_CreateInstance(MonoObject* instance)
+	{
+		HStringTable stringTable = StringTable::create();
+
+		ScriptResourceManager::instance().createScriptStringTable(instance, stringTable);
+	}
+
 	UINT32 ScriptStringTable::internal_GetNumStrings(ScriptStringTable* thisPtr)
 	{
 		return (UINT32)thisPtr->getStringTableHandle()->getIdentifiers().size();