Made XplicitNgine secret instance of DataModel

This commit is contained in:
Vulpovile
2022-10-02 11:24:05 -07:00
parent d3f9b74ba1
commit 226f2adda4
7 changed files with 62 additions and 42 deletions

View File

@@ -7,7 +7,6 @@
#include "IEBrowser.h"
#include "Mouse.h"
#include "Tool/Tool.h"
#include "XplicitNgine/XplicitNgine.h"
//#include "GuiRoot.h"
class TextButtonInstance;
@@ -76,7 +75,6 @@ class Application { // : public GApp {
HWND _buttonTest;
HWND _hwndRenderer;
DataModelInstance* _dataModel;
XplicitNgine* _xplicitNgine;
G3D::TextureRef shadowMap;
std::string _title;
bool _dragging;

View File

@@ -4,6 +4,7 @@
#include "PartInstance.h"
#include "rapidxml/rapidxml.hpp"
#include "GuiRootInstance.h"
#include "XplicitNgine/XplicitNgine.h"
class GuiRootInstance;
@@ -23,6 +24,7 @@ public:
void drawMessage(RenderDevice*);
WorkspaceInstance* getWorkspace();
LevelInstance * getLevel();
XplicitNgine * getEngine();
std::string message;
std::string _loadedFileName;
bool showMessage;
@@ -38,6 +40,7 @@ public:
void clearLevel();
void toggleRun();
bool isRunning();
void resetEngine();
#if _DEBUG
void modXMLLevel(float modY);
#endif
@@ -54,4 +57,5 @@ private:
LevelInstance * level;
GuiRootInstance* guiRoot;
bool running;
XplicitNgine * xplicitNgine;
};

View File

@@ -1,8 +1,9 @@
#pragma once
#include <ode/ode.h>
#include "DatamodelV2/Instance.h"
#include "DatamodelV2/PartInstance.h"
class XplicitNgine
class XplicitNgine : Instance
{
public:
XplicitNgine();