Refactor DataModel

src/include/Application.h

@@ -1,8 +1,8 @@
 #pragma once
 #include <G3DAll.h>
 #include "PropertyWindow.h"
-#include "TextButtonInstance.h"
+#include "DataModel/TextButtonInstance.h"
-#include "ImageButtonInstance.h"
+#include "DataModel/ImageButtonInstance.h"
 #include "CameraController.h"
 #include "IEBrowser.h"
 #include "Mouse.h"

src/include/CameraController.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <G3DAll.h>
-#include "Instance.h"
+#include "DataModel/Instance.h"
 #include "Globals.h"
 #include <string>
 

src/include/DataModel/BaseButtonInstance.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "instance.h"
+#include "Instance.h"
 #include "Listener/ButtonListener.h"
 
 class ButtonListener;

src/include/Globals.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "DataModelInstance.h"
+#include "DataModel/DataModelInstance.h"
 
 
 class Application;

src/include/Mouse.h

@@ -1,7 +1,7 @@
 #pragma once
-#include "PartInstance.h"
+#include "DataModel/PartInstance.h"
 #pragma once
-#include "WorkspaceInstance.h"
+#include "DataModel/WorkspaceInstance.h"
 
 struct MousePoint{
 	Vector3 position;

src/include/PropertyWindow.h

@@ -1,5 +1,5 @@
 #pragma once
-#include "Instance.h"
+#include "DataModel/Instance.h"
 
 class PropertyWindow {
 public:

src/source/Application.cpp

@@ -1,12 +1,13 @@
 #include <G3DAll.h>
 #include <initguid.h>
 #include <iomanip>
-#include "Instance.h"
 #include "resource.h"
-#include "PartInstance.h"
+#include "DataModel/Instance.h"
-#include "TextButtonInstance.h"
+#include "DataModel/PartInstance.h"
-#include "ImageButtonInstance.h"
+#include "DataModel/TextButtonInstance.h"
-#include "DataModelInstance.h"
+#include "DataModel/ImageButtonInstance.h"
+#include "DataModel/DataModelInstance.h"
+#include "DataModel/GuiRootInstance.h"
 #include "CameraController.h"
 #include "AudioPlayer.h"
 #include "Globals.h"
@@ -23,7 +24,6 @@
 #include "PropertyWindow.h"
 #include <commctrl.h>
 #include "StringFunctions.h"
-#include "GuiRootInstance.h"
 
 #include "Listener/GUDButtonListener.h"
 #include "Listener/ModeSelectionListener.h"

src/source/CameraController.cpp

@@ -1,7 +1,7 @@
 #include "CameraController.h"
 #include "win32Defines.h"
 #include <iostream>
-#include "PartInstance.h"
+#include "DataModel/PartInstance.h"
 #include "Application.h"
 #include "AudioPlayer.h"
 

src/source/DataModel/BaseButtonInstance.cpp

@@ -1,4 +1,4 @@
-#include "BaseButtonInstance.h"
+#include "DataModel/BaseButtonInstance.h"
 #include "Globals.h"
 #include "Application.h"
 

src/source/DataModel/DataModelInstance.cpp

@@ -1,6 +1,6 @@
 #include <string>
-#include "GuiRootInstance.h"
+#include "DataModel/GuiRootInstance.h"
-#include "DataModelInstance.h"
+#include "DataModel/DataModelInstance.h"
 #include <fstream>
 #include <iostream>
 #include <sstream>

src/source/DataModel/GroupInstance.cpp

@@ -1,4 +1,4 @@
-#include "GroupInstance.h"
+#include "DataModel/GroupInstance.h"
 
 GroupInstance::GroupInstance(void)
 {

src/source/DataModel/GuiRootInstance.cpp

@@ -1,11 +1,12 @@
 #include <iomanip>
 #include <sstream>
 #include "G3DAll.h"
-#include "BaseButtonInstance.h"
+#include "DataModel/BaseButtonInstance.h"
-#include "TextButtonInstance.h"
+#include "DataModel/TextButtonInstance.h"
-#include "ImageButtonInstance.h"
+#include "DataModel/ImageButtonInstance.h"
-#include "ToggleImageButtonInstance.h"
+#include "DataModel/ToggleImageButtonInstance.h"
-#include "GuiRootInstance.h"
+#include "DataModel/GuiRootInstance.h"
+#include "DataModel/ImageButtonInstance.h"
 #include "Globals.h"
 #include "StringFunctions.h"
 
@@ -17,7 +18,6 @@
 #include "Listener/DeleteListener.h"
 #include "Listener/ToolbarListener.h"
 
-#include "ImageButtonInstance.h"
 
 ImageButtonInstance* GuiRootInstance::makeImageButton(G3D::TextureRef newImage = NULL, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
 {

src/source/DataModel/ImageButtonInstance.cpp

@@ -1,4 +1,4 @@
-#include "ImageButtonInstance.h"
+#include "DataModel/ImageButtonInstance.h"
 
 ImageButtonInstance::ImageButtonInstance(G3D::TextureRef newImage, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL)
 {

src/source/DataModel/Instance.cpp

@@ -1,6 +1,6 @@
 #define WINVER	0x0400
 #include <G3DAll.h>
-#include "Instance.h"
+#include "DataModel/Instance.h"
 
 
 

src/source/DataModel/LevelInstance.cpp

@@ -1,4 +1,4 @@
-#include "LevelInstance.h"
+#include "DataModel/LevelInstance.h"
 
 LevelInstance::LevelInstance(void)
 {

src/source/DataModel/PVInstance.cpp

@@ -1,4 +1,4 @@
-#include "PVInstance.h"
+#include "DataModel/PVInstance.h"
 
 PVInstance::PVInstance(void)
 {

src/source/DataModel/PartInstance.cpp

@@ -1,4 +1,4 @@
-#include "PartInstance.h"
+#include "DataModel/PartInstance.h"
 #include "Globals.h"
 #include <sstream>
 #include <iomanip>
@@ -1005,7 +1005,7 @@ void PartInstance::PropUpdate(LPPROPGRIDITEM &item)
 	}
 	if(strcmp(item->lpszPropName, "Anchored") == 0)
 	{
-		anchored=(bool)item->lpCurValue;
+		anchored= item->lpCurValue == TRUE;
 		changed=true;
 	}
 	else if(strcmp(item->lpszPropName, "Offset") == 0)

src/source/DataModel/TextButtonInstance.cpp

@@ -1,4 +1,4 @@
-#include "TextButtonInstance.h"
+#include "DataModel/TextButtonInstance.h"
 
 
 TextButtonInstance::TextButtonInstance(void)

src/source/DataModel/ToggleImageButtonInstance.cpp

@@ -1,4 +1,4 @@
-#include "ToggleImageButtonInstance.h"
+#include "DataModel/ToggleImageButtonInstance.h"
 
 ToggleImageButtonInstance::ToggleImageButtonInstance(G3D::TextureRef newImage,
 										 G3D::TextureRef overImage,

src/source/DataModel/WorkspaceInstance.cpp

@@ -1,4 +1,4 @@
-#include "WorkspaceInstance.h"
+#include "DataModel/WorkspaceInstance.h"
 
 
 WorkspaceInstance::WorkspaceInstance(void)

src/source/IEBrowser.cpp

@@ -62,7 +62,7 @@ HRESULT IEBrowser::doExternal(std::wstring funcName,
 	{
 		CHOOSECOLOR color;
 
-		DWORD rgbCurrent; //Will be dynamic later
+		DWORD rgbCurrent = 0xFFFFFFFF; //Will be dynamic later
 		ZeroMemory(&color, sizeof(CHOOSECOLOR)); 
 		color.lStructSize = sizeof(color);
 		color.hwndOwner = hwnd;