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

Merge pull request #45 from Vulpovile/datamodelv2

Browse Source 
Code refactor
This commit is contained in:
Vulpovile
2021-03-04 22:53:13 -08:00
committed by GitHub
parent 8bf27c6412 e044b606c1
commit 67381618de
88 changed files with 257 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dialogs.rc
View File

@@ -5,7 +5,7 @@
#include <windows.h>
#include <commctrl.h>
#include <richedit.h>
#include "resource.h"
#include "src/include/resource.h" //Should not have to do this...

347
G3DTest.vcproj
View File

@@ -144,6 +144,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="&quot;C:\Users\Andreja\Documents\C++\G3D-Fun\src\include&quot;"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
MinimalRebuild="false"
BasicRuntimeChecks="0"
@@ -235,182 +236,166 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath=".\Application.cpp"
RelativePath=".\src\source\Application.cpp"
>
</File>
<File
RelativePath=".\AudioPlayer.cpp"
RelativePath=".\src\source\AudioPlayer.cpp"
>
</File>
<File
RelativePath=".\ax.cpp"
RelativePath=".\src\source\ax.cpp"
>
</File>
<File
RelativePath=".\BrowserCallHandler.cpp"
RelativePath=".\src\source\BrowserCallHandler.cpp"
>
</File>
<File
RelativePath=".\CameraController.cpp"
RelativePath=".\src\source\CameraController.cpp"
>
</File>
<File
RelativePath=".\ErrorFunctions.cpp"
RelativePath=".\src\source\ErrorFunctions.cpp"
>
</File>
<File
RelativePath=".\Globals.cpp"
RelativePath=".\src\source\Globals.cpp"
>
</File>
<File
RelativePath=".\IEBrowser.cpp"
RelativePath=".\src\source\IEBrowser.cpp"
>
</File>
<File
RelativePath=".\IEDispatcher.cpp"
RelativePath=".\src\source\IEDispatcher.cpp"
>
</File>
<File
RelativePath="main.cpp"
>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions=""
/>
</FileConfiguration>
</File>
<File
RelativePath=".\Mouse.cpp"
RelativePath=".\src\source\main.cpp"
>
</File>
<File
RelativePath=".\propertyGrid.cpp"
RelativePath=".\src\source\Mouse.cpp"
>
</File>
<File
RelativePath=".\PropertyWindow.cpp"
RelativePath=".\src\source\propertyGrid.cpp"
>
</File>
<File
RelativePath=".\StringFunctions.cpp"
RelativePath=".\src\source\PropertyWindow.cpp"
>
</File>
<File
RelativePath=".\TextureHandler.cpp"
RelativePath=".\src\source\StringFunctions.cpp"
>
</File>
<File
RelativePath=".\WindowFunctions.cpp"
RelativePath=".\src\source\TextureHandler.cpp"
>
</File>
<File
RelativePath=".\src\source\WindowFunctions.cpp"
>
</File>
<Filter
Name="Instance"
Name="Tool"
>
<File
RelativePath=".\BaseButtonInstance.cpp"
RelativePath=".\src\source\Tool\ArrowTool.cpp"
>
</File>
<File
RelativePath=".\DataModelInstance.cpp"
>
</File>
<File
RelativePath=".\GroupInstance.cpp"
>
</File>
<File
RelativePath=".\GuiRoot.cpp"
>
</File>
<File
RelativePath=".\ImageButtonInstance.cpp"
>
</File>
<File
RelativePath=".\Instance.cpp"
>
</File>
<File
RelativePath=".\LevelInstance.cpp"
>
</File>
<File
RelativePath=".\PartInstance.cpp"
>
</File>
<File
RelativePath=".\PVInstance.cpp"
>
</File>
<File
RelativePath=".\TextButtonInstance.cpp"
>
</File>
<File
RelativePath=".\ToggleImageButtonInstance.cpp"
>
</File>
<File
RelativePath=".\WorkspaceInstance.cpp"
RelativePath=".\src\source\Tool\Tool.cpp"
>
</File>
</Filter>
<Filter
Name="Listeners"
Name="Listener"
>
<File
RelativePath=".\ButtonListener.cpp"
RelativePath=".\src\source\Listener\ButtonListener.cpp"
>
</File>
<File
RelativePath=".\CameraButtonListener.cpp"
RelativePath=".\src\source\Listener\CameraButtonListener.cpp"
>
</File>
<File
RelativePath=".\DeleteListener.cpp"
RelativePath=".\src\source\Listener\DeleteListener.cpp"
>
</File>
<File
RelativePath=".\GUDButtonListener.cpp"
RelativePath=".\src\source\Listener\GUDButtonListener.cpp"
>
</File>
<File
RelativePath=".\MenuButtonListener.cpp"
RelativePath=".\src\source\Listener\MenuButtonListener.cpp"
>
</File>
<File
RelativePath=".\ModeSelectionListener.cpp"
RelativePath=".\src\source\Listener\ModeSelectionListener.cpp"
>
</File>
<File
RelativePath=".\RotateButtonListener.cpp"
RelativePath=".\src\source\Listener\RotateButtonListener.cpp"
>
</File>
<File
RelativePath=".\ToolbarListener.cpp"
RelativePath=".\src\source\Listener\ToolbarListener.cpp"
>
</File>
</Filter>
<Filter
Name="Tools"
Name="DataModel"
>
<File
RelativePath=".\ArrowTool.cpp"
RelativePath=".\src\source\DataModel\BaseButtonInstance.cpp"
>
</File>
<File
RelativePath=".\Tool.cpp"
RelativePath=".\src\source\DataModel\DataModelInstance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\GroupInstance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\GuiRootInstance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\ImageButtonInstance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\Instance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\LevelInstance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\PartInstance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\PVInstance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\TextButtonInstance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\ToggleImageButtonInstance.cpp"
>
</File>
<File
RelativePath=".\src\source\DataModel\WorkspaceInstance.cpp"
>
</File>
</Filter>
@@ -420,198 +405,198 @@
Filter="h;hpp;hxx;hm;inl"
>
<File
RelativePath=".\Application.h"
RelativePath=".\src\include\Application.h"
>
</File>
<File
RelativePath=".\AudioPlayer.h"
RelativePath=".\src\include\AudioPlayer.h"
>
</File>
<File
RelativePath=".\ax.h"
RelativePath=".\src\include\ax.h"
>
</File>
<File
RelativePath=".\BrowserCallHandler.h"
RelativePath=".\src\include\BrowserCallHandler.h"
>
</File>
<File
RelativePath=".\CameraController.h"
RelativePath=".\src\include\CameraController.h"
>
</File>
<File
RelativePath=".\Demo.h"
RelativePath=".\src\include\Enum.h"
>
</File>
<File
RelativePath=".\Enum.h"
RelativePath=".\src\include\Enums.h"
>
</File>
<File
RelativePath=".\Enums.h"
RelativePath=".\src\include\ErrorFunctions.h"
>
</File>
<File
RelativePath=".\ErrorFunctions.h"
RelativePath=".\src\include\Globals.h"
>
</File>
<File
RelativePath=".\Globals.h"
RelativePath=".\src\include\IEBrowser.h"
>
</File>
<File
RelativePath=".\IEBrowser.h"
RelativePath=".\src\include\IEDispatcher.h"
>
</File>
<File
RelativePath=".\IEDispatcher.h"
RelativePath=".\src\include\Mouse.h"
>
</File>
<File
RelativePath=".\LevelInstance.h"
RelativePath=".\src\include\propertyGrid.h"
>
</File>
<File
RelativePath=".\Mouse.h"
RelativePath=".\src\include\PropertyWindow.h"
>
</File>
<File
RelativePath=".\propertyGrid.h"
RelativePath=".\src\include\resource.h"
>
</File>
<File
RelativePath=".\PropertyWindow.h"
RelativePath=".\src\include\StringFunctions.h"
>
</File>
<File
RelativePath=".\rapidxml\rapidxml.hpp"
RelativePath=".\src\include\TextureHandler.h"
>
</File>
<File
RelativePath=".\rapidxml\rapidxml_iterators.hpp"
RelativePath=".\src\include\win32Defines.h"
>
</File>
<File
RelativePath=".\rapidxml\rapidxml_print.hpp"
>
</File>
<File
RelativePath=".\rapidxml\rapidxml_utils.hpp"
>
</File>
<File
RelativePath=".\resource.h"
>
</File>
<File
RelativePath=".\RotateButtonListener.h"
>
</File>
<File
RelativePath=".\StringFunctions.h"
>
</File>
<File
RelativePath=".\TextureHandler.h"
>
</File>
<File
RelativePath=".\ToggleImageButtonInstance.h"
>
</File>
<File
RelativePath=".\win32Defines.h"
>
</File>
<File
RelativePath=".\WindowFunctions.h"
RelativePath=".\src\include\WindowFunctions.h"
>
</File>
<Filter
Name="Instance"
Name="RapidXML"
>
<File
RelativePath=".\BaseButtonInstance.h"
RelativePath=".\src\include\rapidxml\rapidxml.hpp"
>
</File>
<File
RelativePath=".\DataModelInstance.h"
RelativePath=".\src\include\rapidxml\rapidxml_iterators.hpp"
>
</File>
<File
RelativePath=".\GroupInstance.h"
RelativePath=".\src\include\rapidxml\rapidxml_print.hpp"
>
</File>
<File
RelativePath=".\GuiRoot.h"
>
</File>
<File
RelativePath=".\ImageButtonInstance.h"
>
</File>
<File
RelativePath=".\Instance.h"
>
</File>
<File
RelativePath=".\PartInstance.h"
>
</File>
<File
RelativePath=".\PVInstance.h"
>
</File>
<File
RelativePath=".\TextButtonInstance.h"
>
</File>
<File
RelativePath=".\WorkspaceInstance.h"
RelativePath=".\src\include\rapidxml\rapidxml_utils.hpp"
>
</File>
</Filter>
<Filter
Name="Listeners"
Name="Listener"
>
<File
RelativePath=".\ButtonListener.h"
RelativePath=".\src\include\Listener\ButtonListener.h"
>
</File>
<File
RelativePath=".\CameraButtonListener.h"
RelativePath=".\src\include\Listener\CameraButtonListener.h"
>
</File>
<File
RelativePath=".\DeleteListener.h"
RelativePath=".\src\include\Listener\DeleteListener.h"
>
</File>
<File
RelativePath=".\GUDButtonListener.h"
RelativePath=".\src\include\Listener\GUDButtonListener.h"
>
</File>
<File
RelativePath=".\MenuButtonListener.h"
RelativePath=".\src\include\Listener\MenuButtonListener.h"
>
</File>
<File
RelativePath=".\ModeSelectionListener.h"
RelativePath=".\src\include\Listener\ModeSelectionListener.h"
>
</File>
<File
RelativePath=".\ToolbarListener.h"
RelativePath=".\src\include\Listener\RotateButtonListener.h"
>
</File>
<File
RelativePath=".\src\include\Listener\ToolbarListener.h"
>
</File>
</Filter>
<Filter
Name="Tools"
Name="Tool"
>
<File
RelativePath=".\ArrowTool.h"
RelativePath=".\src\include\Tool\ArrowTool.h"
>
</File>
<File
RelativePath=".\Tool.h"
RelativePath=".\src\include\Tool\Tool.h"
>
</File>
</Filter>
<Filter
Name="DataModel"
>
<File
RelativePath=".\src\include\DataModel\BaseButtonInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\DataModelInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\GroupInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\GuiRootInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\ImageButtonInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\Instance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\LevelInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\PartInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\PVInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\TextButtonInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\ToggleImageButtonInstance.h"
>
</File>
<File
RelativePath=".\src\include\DataModel\WorkspaceInstance.h"
>
</File>
</Filter>

9
ShapeRenderer.cpp
View File

@@ -1,9 +0,0 @@
#include "ShapeRenderer.h"
ShapeRenderer::ShapeRenderer(void)
{
}
ShapeRenderer::~ShapeRenderer(void)
{
}

248
main.cpp
View File

@@ -1,248 +0,0 @@
/**
Licensed under GPLv2
Based on G3D 6.10 © 2000-2006 Morgan McGuire.
*/
// TODO: Move toolbar buttons with resized window.
#define _WIN32_WINNT 0x0400
#define _WIN32_WINDOWS 0x0400
#define WINVER 0x0400
#include <G3DAll.h>
#include <initguid.h>
#include <iomanip>
#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 <limits.h>
#include <mshtml.h>
#include <exdisp.h>
#include <vector>
#include <string>
#include "ax.h"
#include <cguid.h>
#include "IEBrowser.h"
#include "PropertyWindow.h"
#include <commctrl.h>
#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;
}

6
Application.h → src/include/Application.h
View File

@@ -1,12 +1,12 @@
#pragma once
#include <G3DAll.h>
#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"
#include "Tool.h"
#include "Tool/Tool.h"
//#include "GuiRoot.h"
class TextButtonInstance;

0
AudioPlayer.h → src/include/AudioPlayer.h
View File

0
BrowserCallHandler.h → src/include/BrowserCallHandler.h
View File

2
CameraController.h → src/include/CameraController.h
View File

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

4
BaseButtonInstance.h → src/include/DataModel/BaseButtonInstance.h
View File

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

8
DataModelInstance.h → src/include/DataModel/DataModelInstance.h
View File

@@ -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;
};

0
GroupInstance.h → src/include/DataModel/GroupInstance.h
View File

6
GuiRoot.h → src/include/DataModel/GuiRootInstance.h
View File

@@ -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);

0
ImageButtonInstance.h → src/include/DataModel/ImageButtonInstance.h
View File

0
Instance.h → src/include/DataModel/Instance.h
View File

0
LevelInstance.h → src/include/DataModel/LevelInstance.h
View File

0
PVInstance.h → src/include/DataModel/PVInstance.h
View File

0
PartInstance.h → src/include/DataModel/PartInstance.h
View File

0
TextButtonInstance.h → src/include/DataModel/TextButtonInstance.h
View File

0
ToggleImageButtonInstance.h → src/include/DataModel/ToggleImageButtonInstance.h
View File

0
WorkspaceInstance.h → src/include/DataModel/WorkspaceInstance.h
View File

0
Enum.h → src/include/Enum.h
View File

0
Enums.h → src/include/Enums.h
View File

0
ErrorFunctions.h → src/include/ErrorFunctions.h
View File

2
Globals.h → src/include/Globals.h
View File

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

0
IEBrowser.h → src/include/IEBrowser.h
View File

0
IEDispatcher.h → src/include/IEDispatcher.h
View File

2
ButtonListener.h → src/include/Listener/ButtonListener.h
View File

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

0
CameraButtonListener.h → src/include/Listener/CameraButtonListener.h
View File

0
DeleteListener.h → src/include/Listener/DeleteListener.h
View File

0
GUDButtonListener.h → src/include/Listener/GUDButtonListener.h
View File

0
MenuButtonListener.h → src/include/Listener/MenuButtonListener.h
View File

0
ModeSelectionListener.h → src/include/Listener/ModeSelectionListener.h
View File

0
RotateButtonListener.h → src/include/Listener/RotateButtonListener.h
View File

0
ToolbarListener.h → src/include/Listener/ToolbarListener.h
View File

4
Mouse.h → src/include/Mouse.h
View File

@@ -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;

2
PropertyWindow.h → src/include/PropertyWindow.h
View File

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

0
StringFunctions.h → src/include/StringFunctions.h
View File

0
TextureHandler.h → src/include/TextureHandler.h
View File

0
ArrowTool.h → src/include/Tool/ArrowTool.h
View File

0
Tool.h → src/include/Tool/Tool.h
View File

0
WindowFunctions.h → src/include/WindowFunctions.h
View File

0
ax.h → src/include/ax.h
View File

0
propertyGrid.h → src/include/propertyGrid.h
View File

0
rapidxml/license.txt → src/include/rapidxml/license.txt
View File

0
rapidxml/manual.html → src/include/rapidxml/manual.html
View File

0
rapidxml/rapidxml.hpp → src/include/rapidxml/rapidxml.hpp
View File

0
rapidxml/rapidxml_iterators.hpp → src/include/rapidxml/rapidxml_iterators.hpp
View File

0
rapidxml/rapidxml_print.hpp → src/include/rapidxml/rapidxml_print.hpp
View File

0
rapidxml/rapidxml_utils.hpp → src/include/rapidxml/rapidxml_utils.hpp
View File

0
resource.h → src/include/resource.h
View File

0
win32Defines.h → src/include/win32Defines.h
View File

28
Application.cpp → src/source/Application.cpp
View File

@@ -1,12 +1,13 @@
#include <G3DAll.h>
#include <initguid.h>
#include <iomanip>
#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,14 +24,13 @@
#include "PropertyWindow.h"
#include <commctrl.h>
#include "StringFunctions.h"
#include "GuiRoot.h"
#include "GUDButtonListener.h"
#include "ModeSelectionListener.h"
#include "DeleteListener.h"
#include "CameraButtonListener.h"
#include "RotateButtonListener.h"
//#define LEGACY_LOAD_G3DFUN_LEVEL
#include "Listener/GUDButtonListener.h"
#include "Listener/ModeSelectionListener.h"
#include "Listener/DeleteListener.h"
#include "Listener/CameraButtonListener.h"
#include "Listener/RotateButtonListener.h"
#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++)

0
AudioPlayer.cpp → src/source/AudioPlayer.cpp
View File

0
BrowserCallHandler.cpp → src/source/BrowserCallHandler.cpp
View File

2
CameraController.cpp → src/source/CameraController.cpp
View File

@@ -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"

2
BaseButtonInstance.cpp → src/source/DataModel/BaseButtonInstance.cpp
View File

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

8
DataModelInstance.cpp → src/source/DataModel/DataModelInstance.cpp
View File

@@ -1,6 +1,6 @@
#include <string>
#include "GuiRoot.h"
#include "DataModelInstance.h"
#include "DataModel/GuiRootInstance.h"
#include "DataModel/DataModelInstance.h"
#include <fstream>
#include <iostream>
#include <sstream>
@@ -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;
}

2
GroupInstance.cpp → src/source/DataModel/GroupInstance.cpp
View File

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

48
GuiRoot.cpp → src/source/DataModel/GuiRootInstance.cpp
View File

@@ -1,25 +1,25 @@
#include <iomanip>
#include <sstream>
#include "G3DAll.h"
#include "BaseButtonInstance.h"
#include "TextButtonInstance.h"
#include "ImageButtonInstance.h"
#include "ToggleImageButtonInstance.h"
#include "GuiRoot.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"
#include "GUDButtonListener.h"
#include "ModeSelectionListener.h"
#include "MenuButtonListener.h"
#include "RotateButtonListener.h"
#include "CameraButtonListener.h"
#include "DeleteListener.h"
#include "ToolbarListener.h"
#include "Listener/GUDButtonListener.h"
#include "Listener/ModeSelectionListener.h"
#include "Listener/MenuButtonListener.h"
#include "Listener/RotateButtonListener.h"
#include "Listener/CameraButtonListener.h"
#include "Listener/DeleteListener.h"
#include "Listener/ToolbarListener.h"
#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<Instance*> 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<Instance*> instances_2D = this->getAllChildren();
for(size_t i = 0; i < instances_2D.size(); i++)

2
ImageButtonInstance.cpp → src/source/DataModel/ImageButtonInstance.cpp
View File

@@ -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)
{

2
Instance.cpp → src/source/DataModel/Instance.cpp
View File

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

2
LevelInstance.cpp → src/source/DataModel/LevelInstance.cpp
View File

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

7
PVInstance.cpp → src/source/DataModel/PVInstance.cpp
View File

@@ -1,4 +1,4 @@
#include "PVInstance.h"
#include "DataModel/PVInstance.h"
PVInstance::PVInstance(void)
{
@@ -42,6 +42,7 @@ static TCHAR* enumStr(int controller)
case Enum::Controller::Flee:
return "Joypad2";
}
return "None";
}
static Enum::Controller::Value strEnum(TCHAR * tval)
@@ -93,11 +94,11 @@ void PVInstance::PropUpdate(LPPROPGRIDITEM &pItem)
{
if(strcmp(pItem->lpszPropName, "NameShown") == 0)
{
nameShown = (bool)pItem->lpCurValue;
nameShown = pItem->lpCurValue == TRUE;
}
if(strcmp(pItem->lpszPropName, "ControllerFlagShown") == 0)
{
controllerFlagShown = (bool)pItem->lpCurValue;
controllerFlagShown = pItem->lpCurValue == TRUE;
}
if(strcmp(pItem->lpszPropName, "Controller") == 0)
{

4
PartInstance.cpp → src/source/DataModel/PartInstance.cpp
View File

@@ -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)

2
TextButtonInstance.cpp → src/source/DataModel/TextButtonInstance.cpp
View File

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

2
ToggleImageButtonInstance.cpp → src/source/DataModel/ToggleImageButtonInstance.cpp
View File

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

2
WorkspaceInstance.cpp → src/source/DataModel/WorkspaceInstance.cpp
View File

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

0
ErrorFunctions.cpp → src/source/ErrorFunctions.cpp
View File

0
Globals.cpp → src/source/Globals.cpp
View File

2
IEBrowser.cpp → src/source/IEBrowser.cpp
View File

@@ -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;

0
IEDispatcher.cpp → src/source/IEDispatcher.cpp
View File

4
ButtonListener.cpp → src/source/Listener/ButtonListener.cpp
View File

@@ -1,5 +1,5 @@
#include "BaseButtonInstance.h"
#include "ButtonListener.h"
#include "DataModel/BaseButtonInstance.h"
#include "Listener/ButtonListener.h"
ButtonListener::ButtonListener()

2
CameraButtonListener.cpp → src/source/Listener/CameraButtonListener.cpp
View File

@@ -1,4 +1,4 @@
#include "CameraButtonListener.h"
#include "Listener/CameraButtonListener.h"
#include "Globals.h"
#include "AudioPlayer.h"
#include "Application.h"

2
DeleteListener.cpp → src/source/Listener/DeleteListener.cpp
View File

@@ -1,4 +1,4 @@
#include "DeleteListener.h"
#include "Listener/DeleteListener.h"
#include "Globals.h"
#include "Application.h"

2
GUDButtonListener.cpp → src/source/Listener/GUDButtonListener.cpp
View File

@@ -2,7 +2,7 @@
#include "Application.h"
#include "Globals.h"
#include "AudioPlayer.h"
#include "GUDButtonListener.h"
#include "Listener/GUDButtonListener.h"
void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button)
{

4
MenuButtonListener.cpp → src/source/Listener/MenuButtonListener.cpp
View File

@@ -1,5 +1,5 @@
#include "MenuButtonListener.h"
#include "toggleimagebuttoninstance.h"
#include "Listener/MenuButtonListener.h"
#include "DataModel/ToggleImageButtonInstance.h"
#include "Globals.h"
void MenuButtonListener::onButton1MouseClick(BaseButtonInstance* button)
{

6
ModeSelectionListener.cpp → src/source/Listener/ModeSelectionListener.cpp
View File

@@ -1,8 +1,8 @@
#include "Globals.h"
#include "Instance.h"
#include "ModeSelectionListener.h"
#include "DataModel/Instance.h"
#include "Listener/ModeSelectionListener.h"
#include "Application.h"
#include "ArrowTool.h"
#include "Tool/ArrowTool.h"
void ModeSelectionListener::onButton1MouseClick(BaseButtonInstance* button)
{

4
RotateButtonListener.cpp → src/source/Listener/RotateButtonListener.cpp
View File

@@ -1,5 +1,5 @@
#include "BaseButtonInstance.h"
#include "RotateButtonListener.h"
#include "DataModel/BaseButtonInstance.h"
#include "Listener/RotateButtonListener.h"
#include "Globals.h"
#include "AudioPlayer.h"

2
ToolbarListener.cpp → src/source/Listener/ToolbarListener.cpp
View File

@@ -1,4 +1,4 @@
#include "ToolbarListener.h"
#include "Listener/ToolbarListener.h"
#include "Globals.h"
#include "StringFunctions.h"
#include "Application.h"

0
Mouse.cpp → src/source/Mouse.cpp
View File

0
PropertyWindow.cpp → src/source/PropertyWindow.cpp
View File

0
StringFunctions.cpp → src/source/StringFunctions.cpp
View File

0
TextureHandler.cpp → src/source/TextureHandler.cpp
View File

2
ArrowTool.cpp → src/source/Tool/ArrowTool.cpp
View File

@@ -1,4 +1,4 @@
#include "ArrowTool.h"
#include "Tool/ArrowTool.h"
#include "Application.h"
ArrowTool::ArrowTool(void)

2
Tool.cpp → src/source/Tool/Tool.cpp
View File

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

0
WindowFunctions.cpp → src/source/WindowFunctions.cpp
View File

0
ax.cpp → src/source/ax.cpp
View File

0
propertyGrid.cpp → src/source/propertyGrid.cpp
View File