Merge branch 'master' into MusicalProgrammer

2018-05-30 21:19:46 -04:00
parent cd0f1617cb
commit 828c0dcb41
16 changed files with 599 additions and 483 deletions
--- a/DataModelInstance.h
+++ b/DataModelInstance.h
@@ -0,0 +1,16 @@
+#pragma once
+#include "instance.h"
+#include "WorkspaceInstance.h"
+
+class DataModelInstance :
+	public Instance
+{
+public:
+	DataModelInstance(void);
+	~DataModelInstance(void);
+	WorkspaceInstance* getWorkspace();
+	Instance* getGuiRoot();
+	float mousex;
+	float mousey;
+	bool mouseButton1Down;
+};