From 12843a08907cf91466613b70471f3a27e582c5f2 Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Thu, 4 Mar 2021 21:48:29 -0800 Subject: [PATCH] Code directory changes --- G3DTest.vcproj | 425 ++++++++---------- ShapeRenderer.cpp | 9 - main.cpp | 248 ---------- Application.h => src/include/Application.h | 0 ArrowTool.h => src/include/ArrowTool.h | 0 AudioPlayer.h => src/include/AudioPlayer.h | 0 .../include/BaseButtonInstance.h | 0 .../include/BrowserCallHandler.h | 0 .../include/ButtonListener.h | 0 .../include/CameraButtonListener.h | 0 .../include/CameraController.h | 0 .../include/DataModelInstance.h | 8 +- .../include/DeleteListener.h | 0 Enum.h => src/include/Enum.h | 0 Enums.h => src/include/Enums.h | 0 .../include/ErrorFunctions.h | 0 .../include/GUDButtonListener.h | 0 Globals.h => src/include/Globals.h | 0 .../include/GroupInstance.h | 0 GuiRoot.h => src/include/GuiRootInstance.h | 6 +- IEBrowser.h => src/include/IEBrowser.h | 0 IEDispatcher.h => src/include/IEDispatcher.h | 0 .../include/ImageButtonInstance.h | 0 Instance.h => src/include/Instance.h | 0 .../include/LevelInstance.h | 0 .../include/MenuButtonListener.h | 0 .../include/ModeSelectionListener.h | 0 Mouse.h => src/include/Mouse.h | 0 PVInstance.h => src/include/PVInstance.h | 0 PartInstance.h => src/include/PartInstance.h | 0 .../include/PropertyWindow.h | 0 .../include/RotateButtonListener.h | 0 .../include/StringFunctions.h | 0 .../include/TextButtonInstance.h | 0 .../include/TextureHandler.h | 0 .../include/ToggleImageButtonInstance.h | 0 Tool.h => src/include/Tool.h | 0 .../include/ToolbarListener.h | 0 .../include/WindowFunctions.h | 0 .../include/WorkspaceInstance.h | 0 ax.h => src/include/ax.h | 0 propertyGrid.h => src/include/propertyGrid.h | 0 .../include/rapidxml}/license.txt | 0 .../include/rapidxml}/manual.html | 0 .../include/rapidxml}/rapidxml.hpp | 0 .../include/rapidxml}/rapidxml_iterators.hpp | 0 .../include/rapidxml}/rapidxml_print.hpp | 0 .../include/rapidxml}/rapidxml_utils.hpp | 0 resource.h => src/include/resource.h | 0 win32Defines.h => src/include/win32Defines.h | 0 Application.cpp => src/source/Application.cpp | 8 +- ArrowTool.cpp => src/source/ArrowTool.cpp | 0 AudioPlayer.cpp => src/source/AudioPlayer.cpp | 0 .../source/BaseButtonInstance.cpp | 0 .../source/BrowserCallHandler.cpp | 0 .../source/ButtonListener.cpp | 0 .../source/CameraButtonListener.cpp | 0 .../source/CameraController.cpp | 0 .../source/DataModelInstance.cpp | 6 +- .../source/DeleteListener.cpp | 0 .../source/ErrorFunctions.cpp | 0 .../source/GUDButtonListener.cpp | 0 Globals.cpp => src/source/Globals.cpp | 0 .../source/GroupInstance.cpp | 0 GuiRoot.cpp => src/source/GuiRootInstance.cpp | 24 +- IEBrowser.cpp => src/source/IEBrowser.cpp | 0 .../source/IEDispatcher.cpp | 0 .../source/ImageButtonInstance.cpp | 0 Instance.cpp => src/source/Instance.cpp | 0 .../source/LevelInstance.cpp | 0 .../source/MenuButtonListener.cpp | 0 .../source/ModeSelectionListener.cpp | 0 Mouse.cpp => src/source/Mouse.cpp | 0 PVInstance.cpp => src/source/PVInstance.cpp | 0 .../source/PartInstance.cpp | 0 .../source/PropertyWindow.cpp | 0 .../source/RotateButtonListener.cpp | 0 .../source/StringFunctions.cpp | 0 .../source/TextButtonInstance.cpp | 0 .../source/TextureHandler.cpp | 0 .../source/ToggleImageButtonInstance.cpp | 0 Tool.cpp => src/source/Tool.cpp | 0 .../source/ToolbarListener.cpp | 0 .../source/WindowFunctions.cpp | 0 .../source/WorkspaceInstance.cpp | 0 ax.cpp => src/source/ax.cpp | 0 .../source/propertyGrid.cpp | 0 87 files changed, 224 insertions(+), 510 deletions(-) delete mode 100644 ShapeRenderer.cpp delete mode 100644 main.cpp rename Application.h => src/include/Application.h (100%) rename ArrowTool.h => src/include/ArrowTool.h (100%) rename AudioPlayer.h => src/include/AudioPlayer.h (100%) rename BaseButtonInstance.h => src/include/BaseButtonInstance.h (100%) rename BrowserCallHandler.h => src/include/BrowserCallHandler.h (100%) rename ButtonListener.h => src/include/ButtonListener.h (100%) rename CameraButtonListener.h => src/include/CameraButtonListener.h (100%) rename CameraController.h => src/include/CameraController.h (100%) rename DataModelInstance.h => src/include/DataModelInstance.h (92%) rename DeleteListener.h => src/include/DeleteListener.h (100%) rename Enum.h => src/include/Enum.h (100%) rename Enums.h => src/include/Enums.h (100%) rename ErrorFunctions.h => src/include/ErrorFunctions.h (100%) rename GUDButtonListener.h => src/include/GUDButtonListener.h (100%) rename Globals.h => src/include/Globals.h (100%) rename GroupInstance.h => src/include/GroupInstance.h (100%) rename GuiRoot.h => src/include/GuiRootInstance.h (87%) rename IEBrowser.h => src/include/IEBrowser.h (100%) rename IEDispatcher.h => src/include/IEDispatcher.h (100%) rename ImageButtonInstance.h => src/include/ImageButtonInstance.h (100%) rename Instance.h => src/include/Instance.h (100%) rename LevelInstance.h => src/include/LevelInstance.h (100%) rename MenuButtonListener.h => src/include/MenuButtonListener.h (100%) rename ModeSelectionListener.h => src/include/ModeSelectionListener.h (100%) rename Mouse.h => src/include/Mouse.h (100%) rename PVInstance.h => src/include/PVInstance.h (100%) rename PartInstance.h => src/include/PartInstance.h (100%) rename PropertyWindow.h => src/include/PropertyWindow.h (100%) rename RotateButtonListener.h => src/include/RotateButtonListener.h (100%) rename StringFunctions.h => src/include/StringFunctions.h (100%) rename TextButtonInstance.h => src/include/TextButtonInstance.h (100%) rename TextureHandler.h => src/include/TextureHandler.h (100%) rename ToggleImageButtonInstance.h => src/include/ToggleImageButtonInstance.h (100%) rename Tool.h => src/include/Tool.h (100%) rename ToolbarListener.h => src/include/ToolbarListener.h (100%) rename WindowFunctions.h => src/include/WindowFunctions.h (100%) rename WorkspaceInstance.h => src/include/WorkspaceInstance.h (100%) rename ax.h => src/include/ax.h (100%) rename propertyGrid.h => src/include/propertyGrid.h (100%) rename {rapidxml => src/include/rapidxml}/license.txt (100%) rename {rapidxml => src/include/rapidxml}/manual.html (100%) rename {rapidxml => src/include/rapidxml}/rapidxml.hpp (100%) rename {rapidxml => src/include/rapidxml}/rapidxml_iterators.hpp (100%) rename {rapidxml => src/include/rapidxml}/rapidxml_print.hpp (100%) rename {rapidxml => src/include/rapidxml}/rapidxml_utils.hpp (100%) rename resource.h => src/include/resource.h (100%) rename win32Defines.h => src/include/win32Defines.h (100%) rename Application.cpp => src/source/Application.cpp (99%) rename ArrowTool.cpp => src/source/ArrowTool.cpp (100%) rename AudioPlayer.cpp => src/source/AudioPlayer.cpp (100%) rename BaseButtonInstance.cpp => src/source/BaseButtonInstance.cpp (100%) rename BrowserCallHandler.cpp => src/source/BrowserCallHandler.cpp (100%) rename ButtonListener.cpp => src/source/ButtonListener.cpp (100%) rename CameraButtonListener.cpp => src/source/CameraButtonListener.cpp (100%) rename CameraController.cpp => src/source/CameraController.cpp (100%) rename DataModelInstance.cpp => src/source/DataModelInstance.cpp (99%) rename DeleteListener.cpp => src/source/DeleteListener.cpp (100%) rename ErrorFunctions.cpp => src/source/ErrorFunctions.cpp (100%) rename GUDButtonListener.cpp => src/source/GUDButtonListener.cpp (100%) rename Globals.cpp => src/source/Globals.cpp (100%) rename GroupInstance.cpp => src/source/GroupInstance.cpp (100%) rename GuiRoot.cpp => src/source/GuiRootInstance.cpp (95%) rename IEBrowser.cpp => src/source/IEBrowser.cpp (100%) rename IEDispatcher.cpp => src/source/IEDispatcher.cpp (100%) rename ImageButtonInstance.cpp => src/source/ImageButtonInstance.cpp (100%) rename Instance.cpp => src/source/Instance.cpp (100%) rename LevelInstance.cpp => src/source/LevelInstance.cpp (100%) rename MenuButtonListener.cpp => src/source/MenuButtonListener.cpp (100%) rename ModeSelectionListener.cpp => src/source/ModeSelectionListener.cpp (100%) rename Mouse.cpp => src/source/Mouse.cpp (100%) rename PVInstance.cpp => src/source/PVInstance.cpp (100%) rename PartInstance.cpp => src/source/PartInstance.cpp (100%) rename PropertyWindow.cpp => src/source/PropertyWindow.cpp (100%) rename RotateButtonListener.cpp => src/source/RotateButtonListener.cpp (100%) rename StringFunctions.cpp => src/source/StringFunctions.cpp (100%) rename TextButtonInstance.cpp => src/source/TextButtonInstance.cpp (100%) rename TextureHandler.cpp => src/source/TextureHandler.cpp (100%) rename ToggleImageButtonInstance.cpp => src/source/ToggleImageButtonInstance.cpp (100%) rename Tool.cpp => src/source/Tool.cpp (100%) rename ToolbarListener.cpp => src/source/ToolbarListener.cpp (100%) rename WindowFunctions.cpp => src/source/WindowFunctions.cpp (100%) rename WorkspaceInstance.cpp => src/source/WorkspaceInstance.cpp (100%) rename ax.cpp => src/source/ax.cpp (100%) rename propertyGrid.cpp => src/source/propertyGrid.cpp (100%) diff --git a/G3DTest.vcproj b/G3DTest.vcproj index 036c122..3401df2 100644 --- a/G3DTest.vcproj +++ b/G3DTest.vcproj @@ -144,6 +144,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - -#include -#include -#include "Instance.h" -#include "resource.h" -#include "PartInstance.h" -#include "TextButtonInstance.h" -#include "ImageButtonInstance.h" -#include "DataModelInstance.h" -#include "CameraController.h" -#include "AudioPlayer.h" -#include "Globals.h" -#include "Application.h" -#include "win32Defines.h" -#include "WindowFunctions.h" -#include -#include -#include -#include -#include -#include "ax.h" -#include -#include "IEBrowser.h" -#include "PropertyWindow.h" -#include -#include "ErrorFunctions.h" - -#if G3D_VER < 61000 - #error Requires G3D 6.10 -#endif -HWND hwnd; - -HRESULT hresult; -OLECHAR dat = ((OLECHAR)"SayHello"); -OLECHAR * szMember = &dat; -DISPID dispid; -DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; -EXCEPINFO excepinfo; -UINT nArgErr; - -LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - Application *app = (Application *)GetWindowLongPtr(hwnd, GWL_USERDATA); - if (app==NULL) - { - return DefWindowProc(hwnd, msg, wParam, lParam); - } - switch(msg) - { - case WM_KEYDOWN: - if ((HIWORD(lParam)&0x4000)==0) // single key press - { - app->onKeyPressed(wParam); - } - break; - case WM_KEYUP: - { - app->onKeyUp(wParam); - } - break; - case WM_MOUSEWHEEL: - app->onMouseWheel(LOWORD(lParam),HIWORD(lParam),HIWORD(wParam)); - break; - case WM_SIZE: - app->resizeWithParent(hwnd); - break; - case WM_ACTIVATE: - if(wParam > WA_INACTIVE) app->setFocus(false); - else app->setFocus(true); - default: - { - return DefWindowProc(hwnd, msg, wParam, lParam); - } - } - return 0; -} - -LRESULT CALLBACK ToolboxProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - //Application *app = (Application *)GetWindowLongPtr(hwnd, GWL_USERDATA); - MessageBox(NULL, (LPCSTR)wParam, (LPCSTR)lParam, 1); - //if (app==NULL) - //{ - //return DefWindowProc(hwnd, msg, wParam, lParam); - //} - switch(msg) - { - case WM_SIZE: - break; - default: - { - return DefWindowProc(hwnd, msg, wParam, lParam); - } - } - return 0; -} - -LRESULT CALLBACK G3DProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -{ - Application *app = (Application *)GetWindowLongPtr(hwnd, GWL_USERDATA); - if (app==NULL) - { - return DefWindowProc(hwnd, msg, wParam, lParam); - } - switch(msg) - { - case WM_QUIT: - app->QuitApp(); - break; - case WM_DESTROY: - app->QuitApp(); - break; - case WM_LBUTTONDOWN: - app->onMouseLeftPressed(hwnd,LOWORD(lParam),HIWORD(lParam)); - break; - case WM_LBUTTONUP: - app->onMouseLeftUp(app->getRenderDevice(),LOWORD(lParam),HIWORD(lParam)); - break; - case WM_RBUTTONDOWN: - app->onMouseRightPressed(LOWORD(lParam),HIWORD(lParam)); - break; - case WM_RBUTTONUP: - app->onMouseRightUp(LOWORD(lParam),HIWORD(lParam)); - break; - case WM_MOUSEMOVE: - app->onMouseMoved(LOWORD(lParam),HIWORD(lParam)); - break; - case WM_KEYDOWN: - if ((HIWORD(lParam)&0x4000)==0) // single key press - { - app->onKeyPressed(wParam); - } - break; - case WM_KEYUP: - { - app->onKeyUp(wParam); - } - break; - case WM_SYSKEYDOWN: - if ((HIWORD(lParam)&0x4000)==0) // single key press - { - app->onKeyPressed(wParam); - } - break; - case WM_SYSKEYUP: - { - app->onKeyUp(wParam); - } - case WM_SIZE: - { - app->onGraphics(app->getRenderDevice()); - } - break; - default: - { - return DefWindowProc(hwnd, msg, wParam, lParam); - } - } - - return 0; -} - -int main(int argc, char** argv) { - try{ - hresult = OleInitialize(NULL); - -/* IInternetSecurityManager *pSecurityMgr; - IInternetZoneManager *pZoneMgr; - LPCWSTR site1 = SysAllocString(L"http://www.androdome.com"); - - hr = CoCreateInstance(CLSID_InternetSecurityManager, NULL, CLSCTX_INPROC_SERVER, IID_IInternetSecurityManager, (void**)&pSecurityMgr); - - pSecurityMgr->SetZoneMapping((DWORD)2, site1, (DWORD)0); // 2 = Trusted Site, site1 is the URL to add, and 0 is to create the entry. -*/ - - - - if (!AXRegister()) - return 0; - - - INITCOMMONCONTROLSEX icc; -// WNDCLASSEX wcx; - - /* Initialize common controls. Also needed for MANIFEST's */ - - icc.dwSize = sizeof(icc); - icc.dwICC = ICC_WIN95_CLASSES/*|ICC_COOL_CLASSES|ICC_DATE_CLASSES| - ICC_PAGESCROLLER_CLASS|ICC_USEREX_CLASSES*/; - InitCommonControlsEx(&icc); - - AudioPlayer::init(); - /* GAppSettings settings; - settings.window.resizable = true; - settings.writeLicenseFile = false; - settings.window.center = true; */ - HMODULE hThisInstance = GetModuleHandle(NULL); - - if (!createWindowClass("mainHWND",WndProc,hThisInstance)) - return false; - if (!createWindowClass("toolboxHWND",ToolboxProc,hThisInstance)) - return false; - if (!createWindowClass("G3DWindow",G3DProc,hThisInstance)) - return false; - - HWND hwndMain = CreateWindowEx( - WS_EX_ACCEPTFILES, - "mainHWND", - "Main test", - WS_OVERLAPPEDWINDOW, - CW_USEDEFAULT, - CW_USEDEFAULT, - 800, - 660, - NULL, // parent - NULL, // menu - hThisInstance, - NULL - ); - if(hwndMain == NULL) - { - MessageBox(NULL, "Critical error loading: Failed to create HWND, must exit", (g_PlaceholderName + " Crash").c_str() , MB_OK); - return 0; - } - SendMessage(hwndMain, WM_SETICON, ICON_BIG,(LPARAM)LoadImage(GetModuleHandle(NULL), (LPCSTR)MAKEINTRESOURCEW(IDI_ICON1), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR | LR_DEFAULTSIZE)); - - - Application app = Application(hwndMain); - app.run(); - } - catch(...) - { - OnError(-1); - } - return 0; -} diff --git a/Application.h b/src/include/Application.h similarity index 100% rename from Application.h rename to src/include/Application.h diff --git a/ArrowTool.h b/src/include/ArrowTool.h similarity index 100% rename from ArrowTool.h rename to src/include/ArrowTool.h diff --git a/AudioPlayer.h b/src/include/AudioPlayer.h similarity index 100% rename from AudioPlayer.h rename to src/include/AudioPlayer.h diff --git a/BaseButtonInstance.h b/src/include/BaseButtonInstance.h similarity index 100% rename from BaseButtonInstance.h rename to src/include/BaseButtonInstance.h diff --git a/BrowserCallHandler.h b/src/include/BrowserCallHandler.h similarity index 100% rename from BrowserCallHandler.h rename to src/include/BrowserCallHandler.h diff --git a/ButtonListener.h b/src/include/ButtonListener.h similarity index 100% rename from ButtonListener.h rename to src/include/ButtonListener.h diff --git a/CameraButtonListener.h b/src/include/CameraButtonListener.h similarity index 100% rename from CameraButtonListener.h rename to src/include/CameraButtonListener.h diff --git a/CameraController.h b/src/include/CameraController.h similarity index 100% rename from CameraController.h rename to src/include/CameraController.h diff --git a/DataModelInstance.h b/src/include/DataModelInstance.h similarity index 92% rename from DataModelInstance.h rename to src/include/DataModelInstance.h index c143a05..fb0d19a 100644 --- a/DataModelInstance.h +++ b/src/include/DataModelInstance.h @@ -3,9 +3,9 @@ #include "LevelInstance.h" #include "PartInstance.h" #include "rapidxml/rapidxml.hpp" -#include "GuiRoot.h" +#include "GuiRootInstance.h" -class GuiRoot; +class GuiRootInstance; class DataModelInstance : public Instance @@ -27,7 +27,7 @@ public: std::string _loadedFileName; bool showMessage; G3D::GFontRef font; - GuiRoot* getGuiRoot(); + GuiRootInstance* getGuiRoot(); //float mousex; //float mousey; //Vector2 getMousePos(); @@ -52,6 +52,6 @@ private: float _modY; WorkspaceInstance* workspace; LevelInstance * level; - GuiRoot* guiRoot; + GuiRootInstance* guiRoot; bool running; }; diff --git a/DeleteListener.h b/src/include/DeleteListener.h similarity index 100% rename from DeleteListener.h rename to src/include/DeleteListener.h diff --git a/Enum.h b/src/include/Enum.h similarity index 100% rename from Enum.h rename to src/include/Enum.h diff --git a/Enums.h b/src/include/Enums.h similarity index 100% rename from Enums.h rename to src/include/Enums.h diff --git a/ErrorFunctions.h b/src/include/ErrorFunctions.h similarity index 100% rename from ErrorFunctions.h rename to src/include/ErrorFunctions.h diff --git a/GUDButtonListener.h b/src/include/GUDButtonListener.h similarity index 100% rename from GUDButtonListener.h rename to src/include/GUDButtonListener.h diff --git a/Globals.h b/src/include/Globals.h similarity index 100% rename from Globals.h rename to src/include/Globals.h diff --git a/GroupInstance.h b/src/include/GroupInstance.h similarity index 100% rename from GroupInstance.h rename to src/include/GroupInstance.h diff --git a/GuiRoot.h b/src/include/GuiRootInstance.h similarity index 87% rename from GuiRoot.h rename to src/include/GuiRootInstance.h index a19339f..5f916d0 100644 --- a/GuiRoot.h +++ b/src/include/GuiRootInstance.h @@ -5,11 +5,11 @@ class ImageButtonInstance; class TextButtonInstance; -class GuiRoot : public Instance +class GuiRootInstance : public Instance { public: - GuiRoot(); - GuiRoot::~GuiRoot(); + GuiRootInstance(); + GuiRootInstance::~GuiRootInstance(); TextButtonInstance* makeTextButton(); void drawButtons(RenderDevice* rd); ImageButtonInstance* makeImageButton(G3D::TextureRef newImage, G3D::TextureRef overImage, G3D::TextureRef downImage, G3D::TextureRef disableImage); diff --git a/IEBrowser.h b/src/include/IEBrowser.h similarity index 100% rename from IEBrowser.h rename to src/include/IEBrowser.h diff --git a/IEDispatcher.h b/src/include/IEDispatcher.h similarity index 100% rename from IEDispatcher.h rename to src/include/IEDispatcher.h diff --git a/ImageButtonInstance.h b/src/include/ImageButtonInstance.h similarity index 100% rename from ImageButtonInstance.h rename to src/include/ImageButtonInstance.h diff --git a/Instance.h b/src/include/Instance.h similarity index 100% rename from Instance.h rename to src/include/Instance.h diff --git a/LevelInstance.h b/src/include/LevelInstance.h similarity index 100% rename from LevelInstance.h rename to src/include/LevelInstance.h diff --git a/MenuButtonListener.h b/src/include/MenuButtonListener.h similarity index 100% rename from MenuButtonListener.h rename to src/include/MenuButtonListener.h diff --git a/ModeSelectionListener.h b/src/include/ModeSelectionListener.h similarity index 100% rename from ModeSelectionListener.h rename to src/include/ModeSelectionListener.h diff --git a/Mouse.h b/src/include/Mouse.h similarity index 100% rename from Mouse.h rename to src/include/Mouse.h diff --git a/PVInstance.h b/src/include/PVInstance.h similarity index 100% rename from PVInstance.h rename to src/include/PVInstance.h diff --git a/PartInstance.h b/src/include/PartInstance.h similarity index 100% rename from PartInstance.h rename to src/include/PartInstance.h diff --git a/PropertyWindow.h b/src/include/PropertyWindow.h similarity index 100% rename from PropertyWindow.h rename to src/include/PropertyWindow.h diff --git a/RotateButtonListener.h b/src/include/RotateButtonListener.h similarity index 100% rename from RotateButtonListener.h rename to src/include/RotateButtonListener.h diff --git a/StringFunctions.h b/src/include/StringFunctions.h similarity index 100% rename from StringFunctions.h rename to src/include/StringFunctions.h diff --git a/TextButtonInstance.h b/src/include/TextButtonInstance.h similarity index 100% rename from TextButtonInstance.h rename to src/include/TextButtonInstance.h diff --git a/TextureHandler.h b/src/include/TextureHandler.h similarity index 100% rename from TextureHandler.h rename to src/include/TextureHandler.h diff --git a/ToggleImageButtonInstance.h b/src/include/ToggleImageButtonInstance.h similarity index 100% rename from ToggleImageButtonInstance.h rename to src/include/ToggleImageButtonInstance.h diff --git a/Tool.h b/src/include/Tool.h similarity index 100% rename from Tool.h rename to src/include/Tool.h diff --git a/ToolbarListener.h b/src/include/ToolbarListener.h similarity index 100% rename from ToolbarListener.h rename to src/include/ToolbarListener.h diff --git a/WindowFunctions.h b/src/include/WindowFunctions.h similarity index 100% rename from WindowFunctions.h rename to src/include/WindowFunctions.h diff --git a/WorkspaceInstance.h b/src/include/WorkspaceInstance.h similarity index 100% rename from WorkspaceInstance.h rename to src/include/WorkspaceInstance.h diff --git a/ax.h b/src/include/ax.h similarity index 100% rename from ax.h rename to src/include/ax.h diff --git a/propertyGrid.h b/src/include/propertyGrid.h similarity index 100% rename from propertyGrid.h rename to src/include/propertyGrid.h diff --git a/rapidxml/license.txt b/src/include/rapidxml/license.txt similarity index 100% rename from rapidxml/license.txt rename to src/include/rapidxml/license.txt diff --git a/rapidxml/manual.html b/src/include/rapidxml/manual.html similarity index 100% rename from rapidxml/manual.html rename to src/include/rapidxml/manual.html diff --git a/rapidxml/rapidxml.hpp b/src/include/rapidxml/rapidxml.hpp similarity index 100% rename from rapidxml/rapidxml.hpp rename to src/include/rapidxml/rapidxml.hpp diff --git a/rapidxml/rapidxml_iterators.hpp b/src/include/rapidxml/rapidxml_iterators.hpp similarity index 100% rename from rapidxml/rapidxml_iterators.hpp rename to src/include/rapidxml/rapidxml_iterators.hpp diff --git a/rapidxml/rapidxml_print.hpp b/src/include/rapidxml/rapidxml_print.hpp similarity index 100% rename from rapidxml/rapidxml_print.hpp rename to src/include/rapidxml/rapidxml_print.hpp diff --git a/rapidxml/rapidxml_utils.hpp b/src/include/rapidxml/rapidxml_utils.hpp similarity index 100% rename from rapidxml/rapidxml_utils.hpp rename to src/include/rapidxml/rapidxml_utils.hpp diff --git a/resource.h b/src/include/resource.h similarity index 100% rename from resource.h rename to src/include/resource.h diff --git a/win32Defines.h b/src/include/win32Defines.h similarity index 100% rename from win32Defines.h rename to src/include/win32Defines.h diff --git a/Application.cpp b/src/source/Application.cpp similarity index 99% rename from Application.cpp rename to src/source/Application.cpp index de15824..a3f6cf3 100644 --- a/Application.cpp +++ b/src/source/Application.cpp @@ -23,14 +23,14 @@ #include "PropertyWindow.h" #include #include "StringFunctions.h" -#include "GuiRoot.h" +#include "GuiRootInstance.h" #include "GUDButtonListener.h" #include "ModeSelectionListener.h" #include "DeleteListener.h" #include "CameraButtonListener.h" #include "RotateButtonListener.h" -//#define LEGACY_LOAD_G3DFUN_LEVEL +#define LEGACY_LOAD_G3DFUN_LEVEL //Ray testRay; //static int cursorid = 0; //static int cursorOvrid = 0; @@ -709,9 +709,7 @@ void Application::onGraphics(RenderDevice* rd) { rd->afterPrimitive(); - - - Draw::sphere(G3D::Sphere(mouse.getPosition(), 1), rd, Color3::cyan(), Color4::clear()); + Draw::box(G3D::Box(mouse.getPosition()-Vector3(2,0.5F,1),mouse.getPosition()+Vector3(2,0.5F,1)), rd, Color3::cyan(), Color4::clear()); if(g_selectedInstances.size() > 0) { for(size_t i = 0; i < g_selectedInstances.size(); i++) diff --git a/ArrowTool.cpp b/src/source/ArrowTool.cpp similarity index 100% rename from ArrowTool.cpp rename to src/source/ArrowTool.cpp diff --git a/AudioPlayer.cpp b/src/source/AudioPlayer.cpp similarity index 100% rename from AudioPlayer.cpp rename to src/source/AudioPlayer.cpp diff --git a/BaseButtonInstance.cpp b/src/source/BaseButtonInstance.cpp similarity index 100% rename from BaseButtonInstance.cpp rename to src/source/BaseButtonInstance.cpp diff --git a/BrowserCallHandler.cpp b/src/source/BrowserCallHandler.cpp similarity index 100% rename from BrowserCallHandler.cpp rename to src/source/BrowserCallHandler.cpp diff --git a/ButtonListener.cpp b/src/source/ButtonListener.cpp similarity index 100% rename from ButtonListener.cpp rename to src/source/ButtonListener.cpp diff --git a/CameraButtonListener.cpp b/src/source/CameraButtonListener.cpp similarity index 100% rename from CameraButtonListener.cpp rename to src/source/CameraButtonListener.cpp diff --git a/CameraController.cpp b/src/source/CameraController.cpp similarity index 100% rename from CameraController.cpp rename to src/source/CameraController.cpp diff --git a/DataModelInstance.cpp b/src/source/DataModelInstance.cpp similarity index 99% rename from DataModelInstance.cpp rename to src/source/DataModelInstance.cpp index c3a4b25..addb670 100644 --- a/DataModelInstance.cpp +++ b/src/source/DataModelInstance.cpp @@ -1,5 +1,5 @@ #include -#include "GuiRoot.h" +#include "GuiRootInstance.h" #include "DataModelInstance.h" #include #include @@ -15,7 +15,7 @@ DataModelInstance::DataModelInstance(void) { Instance::Instance(); workspace = new WorkspaceInstance(); - guiRoot = new GuiRoot(); + guiRoot = new GuiRootInstance(); level = new LevelInstance(); //children.push_back(workspace); //children.push_back(level); @@ -601,7 +601,7 @@ void DataModelInstance::setMousePos(Vector2 pos) mousex=pos.x; mousey=pos.y; }*/ -GuiRoot* DataModelInstance::getGuiRoot() +GuiRootInstance* DataModelInstance::getGuiRoot() { return guiRoot; } diff --git a/DeleteListener.cpp b/src/source/DeleteListener.cpp similarity index 100% rename from DeleteListener.cpp rename to src/source/DeleteListener.cpp diff --git a/ErrorFunctions.cpp b/src/source/ErrorFunctions.cpp similarity index 100% rename from ErrorFunctions.cpp rename to src/source/ErrorFunctions.cpp diff --git a/GUDButtonListener.cpp b/src/source/GUDButtonListener.cpp similarity index 100% rename from GUDButtonListener.cpp rename to src/source/GUDButtonListener.cpp diff --git a/Globals.cpp b/src/source/Globals.cpp similarity index 100% rename from Globals.cpp rename to src/source/Globals.cpp diff --git a/GroupInstance.cpp b/src/source/GroupInstance.cpp similarity index 100% rename from GroupInstance.cpp rename to src/source/GroupInstance.cpp diff --git a/GuiRoot.cpp b/src/source/GuiRootInstance.cpp similarity index 95% rename from GuiRoot.cpp rename to src/source/GuiRootInstance.cpp index 4bef3a1..7550631 100644 --- a/GuiRoot.cpp +++ b/src/source/GuiRootInstance.cpp @@ -5,7 +5,7 @@ #include "TextButtonInstance.h" #include "ImageButtonInstance.h" #include "ToggleImageButtonInstance.h" -#include "GuiRoot.h" +#include "GuiRootInstance.h" #include "Globals.h" #include "StringFunctions.h" @@ -19,7 +19,7 @@ #include "ImageButtonInstance.h" -ImageButtonInstance* GuiRoot::makeImageButton(G3D::TextureRef newImage = NULL, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL) +ImageButtonInstance* GuiRootInstance::makeImageButton(G3D::TextureRef newImage = NULL, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL, G3D::TextureRef disableImage = NULL) { ImageButtonInstance* part = new ImageButtonInstance(newImage,overImage, downImage, disableImage); // instances.push_back(part); @@ -27,13 +27,13 @@ ImageButtonInstance* GuiRoot::makeImageButton(G3D::TextureRef newImage = NULL, G return part; } -TextButtonInstance* GuiRoot::makeTextButton() +TextButtonInstance* GuiRootInstance::makeTextButton() { TextButtonInstance* part = new TextButtonInstance(); return part; } ToolbarListener * toolbar; -GuiRoot::GuiRoot() : _message(""), _messageTime(0) +GuiRootInstance::GuiRootInstance() : _message(""), _messageTime(0) { toolbar = new ToolbarListener(); toolbar->doDelete = false; @@ -409,7 +409,7 @@ GuiRoot::GuiRoot() : _message(""), _messageTime(0) } -void GuiRoot::drawButtons(RenderDevice* rd) +void GuiRootInstance::drawButtons(RenderDevice* rd) { rd->pushState(); rd->beforePrimitive(); @@ -418,15 +418,15 @@ void GuiRoot::drawButtons(RenderDevice* rd) rd->popState(); } -void GuiRoot::setDebugMessage(std::string msg, G3D::RealTime msgTime) +void GuiRootInstance::setDebugMessage(std::string msg, G3D::RealTime msgTime) { _messageTime = msgTime; _message = msg; } -//void GuiRoot::render(G3D::RenderDevice* renderDevice) {} +//void GuiRootInstance::render(G3D::RenderDevice* renderDevice) {} -void GuiRoot::renderGUI(G3D::RenderDevice* rd, double fps) +void GuiRootInstance::renderGUI(G3D::RenderDevice* rd, double fps) { //TODO--Move these to their own instance @@ -463,7 +463,7 @@ void GuiRoot::renderGUI(G3D::RenderDevice* rd, double fps) render(rd); } -bool GuiRoot::mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y) +bool GuiRootInstance::mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y) { std::vector instances_2D = g_dataModel->getGuiRoot()->getAllChildren(); for(size_t i = 0; i < instances_2D.size(); i++) @@ -479,7 +479,7 @@ bool GuiRoot::mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y) return false; } -void GuiRoot::update() +void GuiRootInstance::update() { Instance * obj6 = this->findFirstChild("Delete"); Instance * obj = this->findFirstChild("Duplicate"); @@ -515,12 +515,12 @@ void GuiRoot::update() } } -GuiRoot::~GuiRoot() +GuiRootInstance::~GuiRootInstance() { delete toolbar; } -void GuiRoot::onMouseLeftUp(G3D::RenderDevice* renderDevice, int x,int y) +void GuiRootInstance::onMouseLeftUp(G3D::RenderDevice* renderDevice, int x,int y) { std::vector instances_2D = this->getAllChildren(); for(size_t i = 0; i < instances_2D.size(); i++) diff --git a/IEBrowser.cpp b/src/source/IEBrowser.cpp similarity index 100% rename from IEBrowser.cpp rename to src/source/IEBrowser.cpp diff --git a/IEDispatcher.cpp b/src/source/IEDispatcher.cpp similarity index 100% rename from IEDispatcher.cpp rename to src/source/IEDispatcher.cpp diff --git a/ImageButtonInstance.cpp b/src/source/ImageButtonInstance.cpp similarity index 100% rename from ImageButtonInstance.cpp rename to src/source/ImageButtonInstance.cpp diff --git a/Instance.cpp b/src/source/Instance.cpp similarity index 100% rename from Instance.cpp rename to src/source/Instance.cpp diff --git a/LevelInstance.cpp b/src/source/LevelInstance.cpp similarity index 100% rename from LevelInstance.cpp rename to src/source/LevelInstance.cpp diff --git a/MenuButtonListener.cpp b/src/source/MenuButtonListener.cpp similarity index 100% rename from MenuButtonListener.cpp rename to src/source/MenuButtonListener.cpp diff --git a/ModeSelectionListener.cpp b/src/source/ModeSelectionListener.cpp similarity index 100% rename from ModeSelectionListener.cpp rename to src/source/ModeSelectionListener.cpp diff --git a/Mouse.cpp b/src/source/Mouse.cpp similarity index 100% rename from Mouse.cpp rename to src/source/Mouse.cpp diff --git a/PVInstance.cpp b/src/source/PVInstance.cpp similarity index 100% rename from PVInstance.cpp rename to src/source/PVInstance.cpp diff --git a/PartInstance.cpp b/src/source/PartInstance.cpp similarity index 100% rename from PartInstance.cpp rename to src/source/PartInstance.cpp diff --git a/PropertyWindow.cpp b/src/source/PropertyWindow.cpp similarity index 100% rename from PropertyWindow.cpp rename to src/source/PropertyWindow.cpp diff --git a/RotateButtonListener.cpp b/src/source/RotateButtonListener.cpp similarity index 100% rename from RotateButtonListener.cpp rename to src/source/RotateButtonListener.cpp diff --git a/StringFunctions.cpp b/src/source/StringFunctions.cpp similarity index 100% rename from StringFunctions.cpp rename to src/source/StringFunctions.cpp diff --git a/TextButtonInstance.cpp b/src/source/TextButtonInstance.cpp similarity index 100% rename from TextButtonInstance.cpp rename to src/source/TextButtonInstance.cpp diff --git a/TextureHandler.cpp b/src/source/TextureHandler.cpp similarity index 100% rename from TextureHandler.cpp rename to src/source/TextureHandler.cpp diff --git a/ToggleImageButtonInstance.cpp b/src/source/ToggleImageButtonInstance.cpp similarity index 100% rename from ToggleImageButtonInstance.cpp rename to src/source/ToggleImageButtonInstance.cpp diff --git a/Tool.cpp b/src/source/Tool.cpp similarity index 100% rename from Tool.cpp rename to src/source/Tool.cpp diff --git a/ToolbarListener.cpp b/src/source/ToolbarListener.cpp similarity index 100% rename from ToolbarListener.cpp rename to src/source/ToolbarListener.cpp diff --git a/WindowFunctions.cpp b/src/source/WindowFunctions.cpp similarity index 100% rename from WindowFunctions.cpp rename to src/source/WindowFunctions.cpp diff --git a/WorkspaceInstance.cpp b/src/source/WorkspaceInstance.cpp similarity index 100% rename from WorkspaceInstance.cpp rename to src/source/WorkspaceInstance.cpp diff --git a/ax.cpp b/src/source/ax.cpp similarity index 100% rename from ax.cpp rename to src/source/ax.cpp diff --git a/propertyGrid.cpp b/src/source/propertyGrid.cpp similarity index 100% rename from propertyGrid.cpp rename to src/source/propertyGrid.cpp