Procházet zdrojové kódy

Getting everything to compile after C# ProjectLibrary additions

Marko Pintera před 10 roky
rodič
revize
d75a4d76ab

+ 1 - 1
BansheeEditor/Source/BsProjectLibrary.cpp

@@ -755,7 +755,7 @@ namespace BansheeEngine
 		}
 		}
 	}
 	}
 
 
-	void ProjectLibrary::reimport(const Path& path, const ImportOptionsPtr& importOptions = nullptr, bool forceReimport = false)
+	void ProjectLibrary::reimport(const Path& path, const ImportOptionsPtr& importOptions, bool forceReimport)
 	{
 	{
 		LibraryEntry* entry = findEntry(path);
 		LibraryEntry* entry = findEntry(path);
 		if (entry != nullptr)
 		if (entry != nullptr)

+ 2 - 13
SBansheeEditor/Include/BsScriptImportOptions.h

@@ -3,10 +3,11 @@
 #include "BsScriptEditorPrerequisites.h"
 #include "BsScriptEditorPrerequisites.h"
 #include "BsScriptObject.h"
 #include "BsScriptObject.h"
 #include "BsPixelData.h"
 #include "BsPixelData.h"
+#include "BsGpuProgram.h"
 
 
 namespace BansheeEngine
 namespace BansheeEngine
 {
 {
-	class BS_SCR_BED_EXPORT ScriptImportOptionsBase : ScriptObjectBase
+	class BS_SCR_BED_EXPORT ScriptImportOptionsBase : public ScriptObjectBase
 	{
 	{
 	public:
 	public:
 		SPtr<ImportOptions> getImportOptions() const { return mImportOptions; }
 		SPtr<ImportOptions> getImportOptions() const { return mImportOptions; }
@@ -103,16 +104,4 @@ namespace BansheeEngine
 
 
 		ScriptGpuProgramImportOptions(MonoObject* instance);
 		ScriptGpuProgramImportOptions(MonoObject* instance);
 	};
 	};
-
-	class BS_SCR_BED_EXPORT ScriptCharRange : public ScriptObject <ScriptCharRange>
-	{
-	public:
-		SCRIPT_OBJ(BansheeEditorAssemblyName, "BansheeEditor", "Color")
-
-		static Color unbox(MonoObject* obj);
-		static MonoObject* box(const Color& value);
-
-	private:
-		ScriptCharRange(MonoObject* instance);
-	};
 }
 }

+ 1 - 7
SBansheeEditor/Source/BsScriptImportOptions.cpp

@@ -9,6 +9,7 @@
 #include "BsFontImportOptions.h"
 #include "BsFontImportOptions.h"
 #include "BsGpuProgramImportOptions.h"
 #include "BsGpuProgramImportOptions.h"
 #include "BsRenderer.h"
 #include "BsRenderer.h"
+#include "BsScriptFont.h"
 #include "BsRTTIType.h"
 #include "BsRTTIType.h"
 
 
 using namespace std::placeholders;
 using namespace std::placeholders;
@@ -20,13 +21,6 @@ namespace BansheeEngine
 		UINT32 start, end;
 		UINT32 start, end;
 	};
 	};
 
 
-	ScriptCharRange::ScriptCharRange(MonoObject* instance)
-		:ScriptObject(instance)
-	{ }
-
-	void ScriptCharRange::initRuntimeData()
-	{ }
-
 	ScriptImportOptionsBase::ScriptImportOptionsBase(MonoObject* instance)
 	ScriptImportOptionsBase::ScriptImportOptionsBase(MonoObject* instance)
 		:ScriptObjectBase(instance)
 		:ScriptObjectBase(instance)
 	{ }
 	{ }

+ 3 - 0
SBansheeEditor/Source/BsScriptProjectLibrary.cpp

@@ -19,6 +19,9 @@ using namespace std::placeholders;
 
 
 namespace BansheeEngine
 namespace BansheeEngine
 {
 {
+	ScriptProjectLibrary::OnEntryChangedThunkDef ScriptProjectLibrary::OnEntryAddedThunk;
+	ScriptProjectLibrary::OnEntryChangedThunkDef ScriptProjectLibrary::OnEntryRemovedThunk;
+
 	HEvent ScriptProjectLibrary::mOnEntryAddedConn;
 	HEvent ScriptProjectLibrary::mOnEntryAddedConn;
 	HEvent ScriptProjectLibrary::mOnEntryRemovedConn;
 	HEvent ScriptProjectLibrary::mOnEntryRemovedConn;
 
 

+ 9 - 0
SBansheeEngine/Include/BsScriptFont.h

@@ -25,4 +25,13 @@ namespace BansheeEngine
 
 
 		HFont mFont;
 		HFont mFont;
 	};
 	};
+
+	class BS_SCR_BE_EXPORT ScriptCharRange : public ScriptObject <ScriptCharRange>
+	{
+	public:
+		SCRIPT_OBJ(BansheeEngineAssemblyName, "BansheeEngine", "CharRange")
+
+	private:
+		ScriptCharRange(MonoObject* instance);
+	};
 }
 }

+ 7 - 0
SBansheeEngine/Source/BsScriptFont.cpp

@@ -31,4 +31,11 @@ namespace BansheeEngine
 	{
 	{
 		mFont = static_resource_cast<Font>(resource);
 		mFont = static_resource_cast<Font>(resource);
 	}
 	}
+
+	ScriptCharRange::ScriptCharRange(MonoObject* instance)
+		:ScriptObject(instance)
+	{ }
+
+	void ScriptCharRange::initRuntimeData()
+	{ }
 }
 }