Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 976 vs 977 for /trunk/Source Code/Editor/Headers/Editor.h

Diff revisions: vs.
  @@ -50,6 +50,7 @@
50 50 class PanelManager;
51 51 class DisplayWindow;
52 52 class PlatformContext;
53 + class ApplicationOutput;
53 54 class ImwWindowManagerDivide;
54 55 FWD_DECLARE_MANAGED_CLASS(Texture);
55 56 FWD_DECLARE_MANAGED_CLASS(ShaderProgram);
  @@ -135,6 +136,7 @@
135 136
136 137 protected: // attorney
137 138 void renderDrawList(ImDrawData* pDrawData, I64 windowGUID);
139 + void drawOutputWindow();
138 140
139 141 private:
140 142 Theme _currentTheme;
  @@ -146,6 +148,7 @@
146 148 I64 _activeWindowGUID = -1;
147 149 std::unique_ptr<ImwWindowManagerDivide> _windowManager;
148 150 std::unique_ptr<PanelManager> _panelManager;
151 + std::unique_ptr<ApplicationOutput> _applicationOutput;
149 152
150 153 bool _running;
151 154 bool _sceneHovered;
  @@ -159,6 +162,7 @@
159 162 Time::ProfileTimer& _editorUpdateTimer;
160 163 Time::ProfileTimer& _editorRenderTimer;
161 164
165 + size_t _consoleCallbackIndex;
162 166 }; //Editor
163 167
164 168 namespace Attorney {
  @@ -177,6 +181,9 @@
177 181 static void setScenePreviewRect(Editor& editor, const vec4<I32>& rect, bool hovered) {
178 182 editor.setScenePreviewRect(rect, hovered);
179 183 }
184 + static void drawOutputWindow(Editor& editor) {
185 + editor.drawOutputWindow();
186 + }
180 187
181 188 friend class Divide::PanelManager;
182 189 };