Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 968 vs 969 for /trunk/Source Code/Scenes/Scene.cpp

Diff revisions: vs.
  @@ -2,6 +2,7 @@
2 2
3 3 #include "Headers/Scene.h"
4 4
5 + #include "Editor/Headers/Editor.h"
5 6 #include "Core/Headers/ParamHandler.h"
6 7 #include "Core/Headers/StringHelper.h"
7 8 #include "Core/Headers/XMLEntryData.h"
  @@ -29,7 +30,6 @@
29 30
30 31 #include "GUI/Headers/GUI.h"
31 32 #include "GUI/Headers/GUIConsole.h"
32 - #include "GUI/GUIEditor/Headers/GUIEditor.h"
33 33
34 34 #include "Dynamics/Entities/Units/Headers/Player.h"
35 35
  @@ -68,7 +68,7 @@
68 68
69 69 Scene::Scene(PlatformContext& context, ResourceCache& cache, SceneManager& parent, const stringImpl& name)
70 70 : Resource(ResourceType::DEFAULT, name),
71 - _context(context),
71 + PlatformContextComponent(context),
72 72 _parent(parent),
73 73 _resCache(cache),
74 74 _LRSpeedFactor(5.0f),
  @@ -80,7 +80,7 @@
80 80 {
81 81 _sceneTimerUS = 0UL;
82 82 _sceneState = MemoryManager_NEW SceneState(*this);
83 - _input = MemoryManager_NEW SceneInput(*this, _context.input());
83 + _input = MemoryManager_NEW SceneInput(*this, _context);
84 84 _sceneGraph = MemoryManager_NEW SceneGraph(*this);
85 85 _aiManager = MemoryManager_NEW AI::AIManager(*this, _context.kernel().taskPool());
86 86 _lightPool = MemoryManager_NEW LightPool(*this, _context.gfx());
  @@ -655,7 +655,7 @@
655 655
656 656 auto toggleEditor = [this](InputParams param) {
657 657 if (Config::Build::IS_DEBUG_BUILD) {
658 - _context.gui().getEditor().setVisible(!_context.gui().getEditor().isVisible());
658 + _context.editor().toggle(!_context.editor().running());
659 659 }
660 660 };
661 661