CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved some variables in datamodelinstance from public to private

Browse Source
This commit is contained in:
andreja6
2019-11-08 17:55:59 -08:00
parent f965c82b58
commit 4c51383bce
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Application.cpp
View File

@@ -696,13 +696,10 @@ void Application::onKeyPressed(int key)
{ {
deleteInstance(); deleteInstance();
} }
if (GetHoldKeyState(VK_RCONTROL)) if (GetHoldKeyState(VK_RCONTROL) && key=='O')
{
if (key=='O')
{ {
_dataModel->getOpen(); _dataModel->getOpen();
} }
}
} }
void Application::onKeyUp(int key) void Application::onKeyUp(int key)
{ {

6
DataModelInstance.h
View File

@@ -22,10 +22,7 @@ public:
bool readXMLFileStream(std::ifstream* file); bool readXMLFileStream(std::ifstream* file);
void drawMessage(RenderDevice*); void drawMessage(RenderDevice*);
WorkspaceInstance* getWorkspace(); WorkspaceInstance* getWorkspace();
WorkspaceInstance* workspace;
LevelInstance * level;
LevelInstance * getLevel(); LevelInstance * getLevel();
GuiRoot* guiRoot;
std::string message; std::string message;
std::string _loadedFileName; std::string _loadedFileName;
bool showMessage; bool showMessage;
@@ -51,4 +48,7 @@ private:
std::string _errMsg; std::string _errMsg;
bool _legacyLoad; bool _legacyLoad;
float _modY; float _modY;
WorkspaceInstance* workspace;
LevelInstance * level;
GuiRoot* guiRoot;
}; };