Ver código fonte

Getting InspectorWindow to work

Marko Pintera 11 anos atrás
pai
commit
82ed9eeef6

+ 5 - 5
MBansheeEditor/Program.cs

@@ -10,12 +10,12 @@ namespace BansheeEditor
         {
             InspectorWindow window = EditorWindow.OpenWindow<InspectorWindow>();
 
-            //SceneObject newDbgObject = new SceneObject("NewDbgObject");
-            //newDbgObject.AddComponent<Debug_Component1>();
-            //newDbgObject.AddComponent<Debug_Component2>();
+            SceneObject newDbgObject = new SceneObject("NewDbgObject");
+            newDbgObject.AddComponent<Debug_Component1>();
+            newDbgObject.AddComponent<Debug_Component2>();
 
-            //window.SetObjectToInspect(newDbgObject);
-            //window.Refresh(); // TODO - This should be called N times per second
+            window.SetObjectToInspect(newDbgObject);
+            window.Refresh(); // TODO - This should be called N times per second
 
 
 

+ 1 - 1
SBansheeEditor/Include/BsScriptEditorWindow.h

@@ -8,7 +8,7 @@ namespace BansheeEngine
 {
 	class ScriptEditorWidget;
 
-	class BS_SCR_BED_EXPORT ScriptEditorWindow : public BansheeEngine::ScriptObject<ScriptEditorWindow>
+	class BS_SCR_BED_EXPORT ScriptEditorWindow : public ScriptObject<ScriptEditorWindow>
 	{
 		struct EditorWindowHandle
 		{

+ 2 - 2
SBansheeEditor/Source/BsScriptGUIFoldout.cpp

@@ -30,7 +30,7 @@ namespace BansheeEngine
 
 	void ScriptGUIFoldout::initMetaData()
 	{
-		metaData = ScriptMeta(BansheeEngineAssemblyName, "BansheeEngine", "GUIFoldout", &ScriptGUIFoldout::initRuntimeData);
+		metaData = ScriptMeta(BansheeEditorAssemblyName, "BansheeEditor", "GUIFoldout", &ScriptGUIFoldout::initRuntimeData);
 
 		MonoManager::registerScriptType(&metaData);
 	}
@@ -45,7 +45,7 @@ namespace BansheeEngine
 		metaData.scriptClass->addInternalCall("Internal_SetVisible", &ScriptGUIFoldout::internal_setVisible);
 		metaData.scriptClass->addInternalCall("Internal_SetParent", &ScriptGUIFoldout::internal_setParent);
 
-		onToggledThunk = (OnToggledThunkDef)metaData.scriptClass->getMethod("DoOnToggled").getThunk();
+		onToggledThunk = (OnToggledThunkDef)metaData.scriptClass->getMethod("DoOnToggled", 1).getThunk();
 	}
 
 	void ScriptGUIFoldout::destroy()