diff --git a/Application.cpp b/Application.cpp index 80e9245..0f4a45e 100644 --- a/Application.cpp +++ b/Application.cpp @@ -20,7 +20,6 @@ #include #include "ax.h" #include -#include "IEBrowser.h" #include "PropertyWindow.h" #include #include "StringFunctions.h" @@ -135,10 +134,20 @@ Application::Application(HWND parentWindow) : _propWindow(NULL) { //: GApp(setti SetWindowLongPtr(_hWndMain,GWL_USERDATA,(LONG)this); SetWindowLongPtr(_hwndRenderer,GWL_USERDATA,(LONG)this); _propWindow = new PropertyWindow(0, 0, 200, 640, hThisInstance); - IEBrowser* webBrowser = new IEBrowser(_hwndToolbox); - webBrowser->navigateSyncURL(L"http://androdome.com/res/ClientToolbox.php"); + webBrowser = new IEBrowser(_hwndToolbox); + //webBrowser->navigateSyncURL(L"http://androdome.com/res/ClientToolbox.php"); + navigateToolbox(GetFileInPath("/content/page/controller.html")); + } +void Application::navigateToolbox(std::string path) +{ + int len = path.size() + 1; + wchar_t * nstr = new wchar_t[len]; + MultiByteToWideChar(0, 0, path.c_str(), len, nstr, len); + webBrowser->navigateSyncURL(nstr); + delete[] nstr; +} void Application::deleteInstance() { diff --git a/Application.h b/Application.h index 5835f21..2584550 100644 --- a/Application.h +++ b/Application.h @@ -4,6 +4,7 @@ #include "TextButtonInstance.h" #include "ImageButtonInstance.h" #include "CameraController.h" +#include "IEBrowser.h" //#include "GuiRoot.h" class TextButtonInstance; @@ -25,6 +26,7 @@ class Application { // : public GApp { virtual void onUserInput(UserInput* ui); virtual void onCleanup(); void clearInstances(); + void navigateToolbox(std::string); PartInstance* makePart(); void drawButtons(RenderDevice* rd); void drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c); @@ -72,6 +74,7 @@ class Application { // : public GApp { int _mode; GAppSettings _settings; double lightProjX, lightProjY, lightProjNear, lightProjFar; + IEBrowser* webBrowser; protected: Stopwatch m_graphicsWatch; Stopwatch m_logicWatch; diff --git a/content/page/color.html b/content/page/color.html new file mode 100644 index 0000000..8858292 Binary files /dev/null and b/content/page/color.html differ diff --git a/content/page/controller.html b/content/page/controller.html new file mode 100644 index 0000000..db7c5e8 --- /dev/null +++ b/content/page/controller.html @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/content/page/hopper.html b/content/page/hopper.html new file mode 100644 index 0000000..8858292 Binary files /dev/null and b/content/page/hopper.html differ diff --git a/content/page/surface.html b/content/page/surface.html new file mode 100644 index 0000000..8858292 Binary files /dev/null and b/content/page/surface.html differ