diff --git a/src/include/Application.h b/src/include/Application.h index 30c2fe3..b9529f9 100644 --- a/src/include/Application.h +++ b/src/include/Application.h @@ -1,8 +1,8 @@ #pragma once #include #include "PropertyWindow.h" -#include "TextButtonInstance.h" -#include "ImageButtonInstance.h" +#include "DataModel/TextButtonInstance.h" +#include "DataModel/ImageButtonInstance.h" #include "CameraController.h" #include "IEBrowser.h" #include "Mouse.h" diff --git a/src/include/CameraController.h b/src/include/CameraController.h index 88216ba..162adb7 100644 --- a/src/include/CameraController.h +++ b/src/include/CameraController.h @@ -1,7 +1,7 @@ #pragma once #include -#include "Instance.h" +#include "DataModel/Instance.h" #include "Globals.h" #include diff --git a/src/include/DataModel/BaseButtonInstance.h b/src/include/DataModel/BaseButtonInstance.h index d22f439..cd24eb8 100644 --- a/src/include/DataModel/BaseButtonInstance.h +++ b/src/include/DataModel/BaseButtonInstance.h @@ -1,5 +1,5 @@ #pragma once -#include "instance.h" +#include "Instance.h" #include "Listener/ButtonListener.h" class ButtonListener; diff --git a/src/include/Globals.h b/src/include/Globals.h index bf0c991..9b6c960 100644 --- a/src/include/Globals.h +++ b/src/include/Globals.h @@ -1,5 +1,5 @@ #pragma once -#include "DataModelInstance.h" +#include "DataModel/DataModelInstance.h" class Application; diff --git a/src/include/Mouse.h b/src/include/Mouse.h index 929fbf6..7ff08cf 100644 --- a/src/include/Mouse.h +++ b/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; diff --git a/src/include/PropertyWindow.h b/src/include/PropertyWindow.h index 6495ad8..53c5862 100644 --- a/src/include/PropertyWindow.h +++ b/src/include/PropertyWindow.h @@ -1,5 +1,5 @@ #pragma once -#include "Instance.h" +#include "DataModel/Instance.h" class PropertyWindow { public: diff --git a/src/source/Application.cpp b/src/source/Application.cpp index 4b6236f..4d9176f 100644 --- a/src/source/Application.cpp +++ b/src/source/Application.cpp @@ -1,12 +1,13 @@ #include #include #include -#include "Instance.h" #include "resource.h" -#include "PartInstance.h" -#include "TextButtonInstance.h" -#include "ImageButtonInstance.h" -#include "DataModelInstance.h" +#include "DataModel/Instance.h" +#include "DataModel/PartInstance.h" +#include "DataModel/TextButtonInstance.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 #include "StringFunctions.h" -#include "GuiRootInstance.h" #include "Listener/GUDButtonListener.h" #include "Listener/ModeSelectionListener.h" diff --git a/src/source/CameraController.cpp b/src/source/CameraController.cpp index 7e4a3cc..d8a4fdb 100644 --- a/src/source/CameraController.cpp +++ b/src/source/CameraController.cpp @@ -1,7 +1,7 @@ #include "CameraController.h" #include "win32Defines.h" #include -#include "PartInstance.h" +#include "DataModel/PartInstance.h" #include "Application.h" #include "AudioPlayer.h" diff --git a/src/source/DataModel/BaseButtonInstance.cpp b/src/source/DataModel/BaseButtonInstance.cpp index 2df06ef..0ccd0c8 100644 --- a/src/source/DataModel/BaseButtonInstance.cpp +++ b/src/source/DataModel/BaseButtonInstance.cpp @@ -1,4 +1,4 @@ -#include "BaseButtonInstance.h" +#include "DataModel/BaseButtonInstance.h" #include "Globals.h" #include "Application.h" diff --git a/src/source/DataModel/DataModelInstance.cpp b/src/source/DataModel/DataModelInstance.cpp index addb670..1ac2fdc 100644 --- a/src/source/DataModel/DataModelInstance.cpp +++ b/src/source/DataModel/DataModelInstance.cpp @@ -1,6 +1,6 @@ #include -#include "GuiRootInstance.h" -#include "DataModelInstance.h" +#include "DataModel/GuiRootInstance.h" +#include "DataModel/DataModelInstance.h" #include #include #include diff --git a/src/source/DataModel/GroupInstance.cpp b/src/source/DataModel/GroupInstance.cpp index 908e99f..959e191 100644 --- a/src/source/DataModel/GroupInstance.cpp +++ b/src/source/DataModel/GroupInstance.cpp @@ -1,4 +1,4 @@ -#include "GroupInstance.h" +#include "DataModel/GroupInstance.h" GroupInstance::GroupInstance(void) { diff --git a/src/source/DataModel/GuiRootInstance.cpp b/src/source/DataModel/GuiRootInstance.cpp index 3b56f2d..386ebc8 100644 --- a/src/source/DataModel/GuiRootInstance.cpp +++ b/src/source/DataModel/GuiRootInstance.cpp @@ -1,11 +1,12 @@ #include #include #include "G3DAll.h" -#include "BaseButtonInstance.h" -#include "TextButtonInstance.h" -#include "ImageButtonInstance.h" -#include "ToggleImageButtonInstance.h" -#include "GuiRootInstance.h" +#include "DataModel/BaseButtonInstance.h" +#include "DataModel/TextButtonInstance.h" +#include "DataModel/ImageButtonInstance.h" +#include "DataModel/ToggleImageButtonInstance.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) { diff --git a/src/source/DataModel/ImageButtonInstance.cpp b/src/source/DataModel/ImageButtonInstance.cpp index e0fc785..f57ef47 100644 --- a/src/source/DataModel/ImageButtonInstance.cpp +++ b/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) { diff --git a/src/source/DataModel/Instance.cpp b/src/source/DataModel/Instance.cpp index 37bbcf7..a74a1aa 100644 --- a/src/source/DataModel/Instance.cpp +++ b/src/source/DataModel/Instance.cpp @@ -1,6 +1,6 @@ #define WINVER 0x0400 #include -#include "Instance.h" +#include "DataModel/Instance.h" diff --git a/src/source/DataModel/LevelInstance.cpp b/src/source/DataModel/LevelInstance.cpp index de4463b..5d0fdb2 100644 --- a/src/source/DataModel/LevelInstance.cpp +++ b/src/source/DataModel/LevelInstance.cpp @@ -1,4 +1,4 @@ -#include "LevelInstance.h" +#include "DataModel/LevelInstance.h" LevelInstance::LevelInstance(void) { diff --git a/src/source/DataModel/PVInstance.cpp b/src/source/DataModel/PVInstance.cpp index 5dc627c..9058bf5 100644 --- a/src/source/DataModel/PVInstance.cpp +++ b/src/source/DataModel/PVInstance.cpp @@ -1,4 +1,4 @@ -#include "PVInstance.h" +#include "DataModel/PVInstance.h" PVInstance::PVInstance(void) { diff --git a/src/source/DataModel/PartInstance.cpp b/src/source/DataModel/PartInstance.cpp index bf84982..b8760ac 100644 --- a/src/source/DataModel/PartInstance.cpp +++ b/src/source/DataModel/PartInstance.cpp @@ -1,4 +1,4 @@ -#include "PartInstance.h" +#include "DataModel/PartInstance.h" #include "Globals.h" #include #include @@ -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) diff --git a/src/source/DataModel/TextButtonInstance.cpp b/src/source/DataModel/TextButtonInstance.cpp index 1529128..ae73feb 100644 --- a/src/source/DataModel/TextButtonInstance.cpp +++ b/src/source/DataModel/TextButtonInstance.cpp @@ -1,4 +1,4 @@ -#include "TextButtonInstance.h" +#include "DataModel/TextButtonInstance.h" TextButtonInstance::TextButtonInstance(void) diff --git a/src/source/DataModel/ToggleImageButtonInstance.cpp b/src/source/DataModel/ToggleImageButtonInstance.cpp index f59fdac..b14f794 100644 --- a/src/source/DataModel/ToggleImageButtonInstance.cpp +++ b/src/source/DataModel/ToggleImageButtonInstance.cpp @@ -1,4 +1,4 @@ -#include "ToggleImageButtonInstance.h" +#include "DataModel/ToggleImageButtonInstance.h" ToggleImageButtonInstance::ToggleImageButtonInstance(G3D::TextureRef newImage, G3D::TextureRef overImage, diff --git a/src/source/DataModel/WorkspaceInstance.cpp b/src/source/DataModel/WorkspaceInstance.cpp index 47fceec..46b2fae 100644 --- a/src/source/DataModel/WorkspaceInstance.cpp +++ b/src/source/DataModel/WorkspaceInstance.cpp @@ -1,4 +1,4 @@ -#include "WorkspaceInstance.h" +#include "DataModel/WorkspaceInstance.h" WorkspaceInstance::WorkspaceInstance(void) diff --git a/src/source/IEBrowser.cpp b/src/source/IEBrowser.cpp index 5bf843c..cb42c00 100644 --- a/src/source/IEBrowser.cpp +++ b/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;