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

Starting DataModel V2

Browse Source
This commit is contained in:
Vulpovile
2021-03-07 23:57:53 -08:00
parent 9d95a5b891
commit 28b1cd6634
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Installer/install_script.iss
View File

@@ -3,7 +3,7 @@
[Setup] [Setup]
AppName=Blocks3D AppName=Blocks3D
AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067} AppId={{4C5DF268-0208-4CDE-A7F0-65F7E2CB5067}
AppVersion=v0_0_104_3 AppVersion=v0_0_104_4
AppPublisherURL=http://blocks3d.com/ AppPublisherURL=http://blocks3d.com/
AppSupportURL=http://blocks3d.com/ AppSupportURL=http://blocks3d.com/
AppUpdatesURL=http://blocks3d.com/ AppUpdatesURL=http://blocks3d.com/

4
src/source/Application.cpp
View File

@@ -134,7 +134,7 @@ Application::Application(HWND parentWindow) : _propWindow(NULL) { //: GApp(setti
_propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance); _propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance);
webBrowser = new IEBrowser(_hwndToolbox); webBrowser = new IEBrowser(_hwndToolbox);
SetWindowLongPtr(_hwndToolbox,GWL_USERDATA,(LONG)webBrowser); SetProp(_hwndToolbox,"Browser",(HANDLE)webBrowser);
navigateToolbox("http://androdome.com/res/ClientToolbox.php"); navigateToolbox("http://androdome.com/res/ClientToolbox.php");
//navigateToolbox(GetFileInPath("/content/page/controller.html")); //navigateToolbox(GetFileInPath("/content/page/controller.html"));
//navigateToolbox(GetFileInPath("/content/page/controller.html")); //navigateToolbox(GetFileInPath("/content/page/controller.html"));
@@ -183,7 +183,7 @@ void Application::onInit() {
cameraController.setFrame(Vector3(0,2,10)); cameraController.setFrame(Vector3(0,2,10));
_dataModel = new DataModelInstance(); _dataModel = new DataModelInstance();
_dataModel->setParent(NULL); _dataModel->setParent(NULL);
_dataModel->name = "undefined"; _dataModel->setName("undefined");
_dataModel->font = g_fntdominant; _dataModel->font = g_fntdominant;
g_dataModel = _dataModel; g_dataModel = _dataModel;

2
src/source/DataModelV2/GuiRootInstance.cpp
View File

@@ -480,7 +480,7 @@ bool GuiRootInstance::mouseInGUI(G3D::RenderDevice* renderDevice,int x,int y)
} }
return false; return false;
} }
//Oh eww...
void GuiRootInstance::update() void GuiRootInstance::update()
{ {
Instance * obj6 = this->findFirstChild("Delete"); Instance * obj6 = this->findFirstChild("Delete");

2
src/source/ax.cpp
View File

@@ -505,7 +505,7 @@ HRESULT _stdcall AXClientSite :: Invoke(
EXCEPINFO FAR* pExcepInfo, EXCEPINFO FAR* pExcepInfo,
unsigned int FAR* puArgErr) unsigned int FAR* puArgErr)
{ {
IEBrowser * browser = (IEBrowser *)GetWindowLongPtr(Window,GWL_USERDATA); IEBrowser * browser = (IEBrowser *)GetProp(Window,"Browser");
return browser->doExternal(m_lastExternalName,dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return browser->doExternal(m_lastExternalName,dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
//return S_OK; //return S_OK;