Selaa lähdekoodia

add more event to main editor handlers

MonkeyFirst 10 vuotta sitten
vanhempi
sitoutus
99ad65844f

+ 61 - 3
bin/Data/Scripts/Editor/EditorEventsHandlers.as

@@ -1,4 +1,4 @@
-// Editor main handlers (add your's local handler in proper main handler to prevent losing events)
+// Editor main handlers (add yours local handler in proper main handler to prevent losing events)
 
 void EditorSubscribeToEvents() 
 {
@@ -8,18 +8,33 @@ void EditorSubscribeToEvents()
     SubscribeToEvent("MouseMove", "EditorMainHandleMouseMove");
     SubscribeToEvent("MouseWheel", "EditorMainHandleMouseWheel");
     SubscribeToEvent("MouseButtonDown", "EditorMainHandleMouseButtonDown");
-        
+    SubscribeToEvent("MouseButtonUp", "EditorMainHandleMouseButtonUp");
+    
+    SubscribeToEvent("PostRenderUpdate", "EditorMainHandlePostRenderUpdate");
+    
+    SubscribeToEvent("UIMouseClick", "EditorMainHandleUIMouseClick");
+    SubscribeToEvent("UIMouseClickEnd", "EditorMainHandleUIMouseClickEnd");
+    
+    SubscribeToEvent("BeginViewUpdate", "EditorMainHandleBeginViewUpdate");
+    SubscribeToEvent("EndViewUpdate", "EditorMainHandleEndViewUpdate");
+    SubscribeToEvent("BeginViewRender", "EditorMainHandleBeginViewRender");
+    SubscribeToEvent("EndViewRender", "EditorMainHandleEndViewRender");
+    
 }
 
 void EditorMainHandleKeyDown(StringHash eventType, VariantMap& eventData) 
 {
+    // EditorUI.as handler
+    HandleKeyDown(eventType, eventData);
+    
     // EditorColorWheel.as handler
     HandleColorWheelKeyDown(eventType, eventData);
 }
 
 void EditorMainHandleKeyUp(StringHash eventType, VariantMap& eventData) 
 {
-
+    // EditorUI.as handler
+    UnfadeUI();
 }
 
 void EditorMainHandleMouseMove(StringHash eventType, VariantMap& eventData) 
@@ -54,6 +69,49 @@ void EditorMainHandleMouseButtonDown(StringHash eventType, VariantMap& eventData
         
 }
 
+void EditorMainHandleMouseButtonUp(StringHash eventType, VariantMap& eventData) 
+{
+    // EditorUI.as handler
+    UnfadeUI();
+               
+}
+
+void EditorMainHandlePostRenderUpdate(StringHash eventType, VariantMap& eventData)
+{
+    // EditorView.as handler
+    HandlePostRenderUpdate();
+} 
+
+void EditorMainHandleUIMouseClick(StringHash eventType, VariantMap& eventData) 
+{
+    // EditorView.as handler
+    ViewMouseClick();
+}
+
+void EditorMainHandleUIMouseClickEnd(StringHash eventType, VariantMap& eventData) 
+{
+    // EditorView.as handler
+    ViewMouseClickEnd();
+}
 
+void EditorMainHandleBeginViewUpdate(StringHash eventType, VariantMap& eventData) 
+{
+    // EditorView.as handler
+    HandleBeginViewUpdate(eventType, eventData);
+}
 
+void EditorMainHandleEndViewUpdate(StringHash eventType, VariantMap& eventData) 
+{
+    // EditorView.as handler
+    HandleEndViewUpdate(eventType, eventData);
+}
 
+void EditorMainHandleBeginViewRender(StringHash eventType, VariantMap& eventData) 
+{
+    HandleBeginViewRender(eventType, eventData);
+}
+
+void EditorMainHandleEndViewRender(StringHash eventType, VariantMap& eventData)
+{
+    HandleEndViewRender(eventType, eventData);
+} 

+ 3 - 3
bin/Data/Scripts/Editor/EditorUI.as

@@ -93,9 +93,9 @@ void CreateUI()
 
     SubscribeToEvent("ScreenMode", "ResizeUI");
     SubscribeToEvent("MenuSelected", "HandleMenuSelected");
-    SubscribeToEvent("KeyDown", "HandleKeyDown");
-    SubscribeToEvent("KeyUp", "UnfadeUI");
-    SubscribeToEvent("MouseButtonUp", "UnfadeUI");
+    //SubscribeToEvent("KeyDown", "HandleKeyDown");
+    //SubscribeToEvent("KeyUp", "UnfadeUI");
+    //SubscribeToEvent("MouseButtonUp", "UnfadeUI");
     SubscribeToEvent("ChangeLanguage", "HandleChangeLanguage");
     
     SubscribeToEvent("WheelChangeColor", "HandleWheelChangeColor");

+ 7 - 7
bin/Data/Scripts/Editor/EditorView.as

@@ -475,14 +475,14 @@ void CreateCamera()
     // Note: the camera is not inside the scene, so that it is not listed, and does not get deleted
     ResetCamera();
 
-    SubscribeToEvent("PostRenderUpdate", "HandlePostRenderUpdate");
-    SubscribeToEvent("UIMouseClick", "ViewMouseClick");
+    //SubscribeToEvent("PostRenderUpdate", "HandlePostRenderUpdate");
+    //SubscribeToEvent("UIMouseClick", "ViewMouseClick");
     //SubscribeToEvent("MouseMove", "ViewMouseMove"); 
-    SubscribeToEvent("UIMouseClickEnd", "ViewMouseClickEnd");
-    SubscribeToEvent("BeginViewUpdate", "HandleBeginViewUpdate");
-    SubscribeToEvent("EndViewUpdate", "HandleEndViewUpdate");
-    SubscribeToEvent("BeginViewRender", "HandleBeginViewRender");
-    SubscribeToEvent("EndViewRender", "HandleEndViewRender");
+    //SubscribeToEvent("UIMouseClickEnd", "ViewMouseClickEnd");
+    //SubscribeToEvent("BeginViewUpdate", "HandleBeginViewUpdate");
+    //SubscribeToEvent("EndViewUpdate", "HandleEndViewUpdate");
+    //SubscribeToEvent("BeginViewRender", "HandleBeginViewRender");
+    //SubscribeToEvent("EndViewRender", "HandleEndViewRender");
 
     // Set initial renderpath if defined
     SetRenderPath(renderPathName);