From d36f9df272c8515706d4381d79d27432c217390d Mon Sep 17 00:00:00 2001 From: andreja6 Date: Mon, 9 Mar 2020 18:58:08 -0700 Subject: [PATCH] Added pages --- Application.cpp | 15 ++++++++++++--- Application.h | 3 +++ content/page/color.html | Bin 0 -> 2088 bytes content/page/controller.html | 21 +++++++++++++++++++++ content/page/hopper.html | Bin 0 -> 2088 bytes content/page/surface.html | Bin 0 -> 2088 bytes 6 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 content/page/color.html create mode 100644 content/page/controller.html create mode 100644 content/page/hopper.html create mode 100644 content/page/surface.html 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 0000000000000000000000000000000000000000..88582929609379f5ff75e75564ae44f5675b222e GIT binary patch literal 2088 zcmZ`)2{=@H8=o;_87)kvq&vEnkh&vWF^DYL?%0zIB4spoGIlYQB{E?~DK$dbKDUNK z_879=!r0dgH&mE0F_yUcj{2U5Joo#b=Q;2BpY#6y=Xrnc`~F@_3i%STh3~U6hHr;R#E?4FS9m09_2E{suNez&C*1JP!!8f4iHvi;ue-E`XpA;_daU ztJtGKQJ9ZeW0CdVhuU2L)x6#)j~E)d`8xrzqz)e-7qz>uFP-CWj&X&#QW{5tUo*+v z3ePw3VYFu^E|QmpU5`0<1{k|I*Ba1@oU~**u(hbyx2Ydf8GAyV%=xWm)qZ6=fZ>-| zEg#ID94D8ZmT<$#YUfp6lxEfH)GZ$Id@jlCcN4&^Po~pT22pVD`MKHGjU1l5Y*0Mb zgMfjHv6`de3;K>tFsuaIDs0auG|)J%9-sK78!T75J#!CF<+|aATjaHKiNxS{<r0nFG_xZGn`*Kblu5m=wjv^GX{MC9Tg0Kn8xRlf zaFU)wAR~;^6}ud{KKA#R(OQE(y*@);90R8Zz2pUpoawUj(kpi~y&;N5s(iIzM3k&- z9E4OjHAi#vkGRvLVYd)Xwe`(k0#(Jq2PIU-l$3()&i-eQ9z%*JQha|E@!8GJ6>*-A z-1Htx{9hy1ugnBT7Y2oWNP}Eqa@n0zy`es(_ANA*V%>+*v}tjxiCA${6cw^R@qBOz zu(KKe^IkjHGpv<{Gq{57d#iEBE4b>yB3E5sq+p*T_bRh^rJ}XUD?UL5t8{J*rn*8G ztr>F^S>|IE-fKNj81@b6fAy(88{L&9<0Vv8<6kGb=tg02R5b_l$o3p$e!G!Pbs>91 zx(FFXFYc3ET(E3ZP+(+&+gz3$7+6>DJdMmmKPo??7Y}bNNLiXyf{lnWrj?JIBn82~ zhW?`UF7j-609MBTB-rs*Q&=-cDY>BdWj#;(Qes@^`)g?j(8Uz3$y2?CgA>*|i=g_L zDj^}Owrf$*mNt$WdA&ycq(5tu)vE0`zG3zpiuyUPONyWXCXml3KyC#9>y0D0Y}Wp@ zWL@7II>IsR^#p&`tWG#w>b{LvS0h3wWF8+RiV>`W_Dyu0*rli66%z5lcd91z;attJ zaU)gltaH)Y3&Kw)>=B<2jmw7z_m`8X?~a)S53ZK;Q>S^;vO3poO>iTBr0+sn_{JrP zXJS(OtaBg@gaDa8UO)}0r))FTB!{A;m?4QU>7wP8Wx}r(rQ_&?`M>UK9O8Sh=SxR~u;%NZSulo2t91g=Cjl(%25bP1KydfD67YiwC7~NSyJLbQ4d(Xp zUWgWuO^}r}MEd!~LQc@BDQDMLGalg+8O1c`H7Csn?>`GZpB?d&*IPu2UXM4Oa!i$E zb>(O^xx1S2`72v25A(KUGsSjYeQ?1;Hg!}nM`gG!NX>yZMO3xAdP(XN+9(5)jV9Ii zZ~}Ihz!{fr65X;Wg~-y54z5Nno~L^+C$mRhf;?ngONxCyLoVQ``xTa>Ygfv=sX;x( z8SJ&5z;G2xHgodv=wUJFnp{LR>P4o-SX`v>VouFdnzZ!H-k&4yKe}(u8HgGI1%WnI zG=LE5h5H_N4CTURTgS5h*`K&}Ps6vz)XeQ9HoMz3-7C#5U)8hTvV=93r01Sj7@|*C z?^q2}uQpY{3bxyPfL)Ou;6enB-bR}YL_%LZtmu!U_)kyDJDRCE&xkSoADtl>hY;G1 zQk)c`tkZ9DmjXGeyq)^^z^7h0@{ez8>5a=mrw-fd>fF`EFYN`Ze2S2Q*_>k?Igfe~ zfqx_&lKcgI=2oF{wfq7S3RVubhd=a1zlpDlp(uc5Dkd*G zbsJc%7+6q7>n{?uPanXy8^q2yDY(;X*(r BU>yJe literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..88582929609379f5ff75e75564ae44f5675b222e GIT binary patch literal 2088 zcmZ`)2{=@H8=o;_87)kvq&vEnkh&vWF^DYL?%0zIB4spoGIlYQB{E?~DK$dbKDUNK z_879=!r0dgH&mE0F_yUcj{2U5Joo#b=Q;2BpY#6y=Xrnc`~F@_3i%STh3~U6hHr;R#E?4FS9m09_2E{suNez&C*1JP!!8f4iHvi;ue-E`XpA;_daU ztJtGKQJ9ZeW0CdVhuU2L)x6#)j~E)d`8xrzqz)e-7qz>uFP-CWj&X&#QW{5tUo*+v z3ePw3VYFu^E|QmpU5`0<1{k|I*Ba1@oU~**u(hbyx2Ydf8GAyV%=xWm)qZ6=fZ>-| zEg#ID94D8ZmT<$#YUfp6lxEfH)GZ$Id@jlCcN4&^Po~pT22pVD`MKHGjU1l5Y*0Mb zgMfjHv6`de3;K>tFsuaIDs0auG|)J%9-sK78!T75J#!CF<+|aATjaHKiNxS{<r0nFG_xZGn`*Kblu5m=wjv^GX{MC9Tg0Kn8xRlf zaFU)wAR~;^6}ud{KKA#R(OQE(y*@);90R8Zz2pUpoawUj(kpi~y&;N5s(iIzM3k&- z9E4OjHAi#vkGRvLVYd)Xwe`(k0#(Jq2PIU-l$3()&i-eQ9z%*JQha|E@!8GJ6>*-A z-1Htx{9hy1ugnBT7Y2oWNP}Eqa@n0zy`es(_ANA*V%>+*v}tjxiCA${6cw^R@qBOz zu(KKe^IkjHGpv<{Gq{57d#iEBE4b>yB3E5sq+p*T_bRh^rJ}XUD?UL5t8{J*rn*8G ztr>F^S>|IE-fKNj81@b6fAy(88{L&9<0Vv8<6kGb=tg02R5b_l$o3p$e!G!Pbs>91 zx(FFXFYc3ET(E3ZP+(+&+gz3$7+6>DJdMmmKPo??7Y}bNNLiXyf{lnWrj?JIBn82~ zhW?`UF7j-609MBTB-rs*Q&=-cDY>BdWj#;(Qes@^`)g?j(8Uz3$y2?CgA>*|i=g_L zDj^}Owrf$*mNt$WdA&ycq(5tu)vE0`zG3zpiuyUPONyWXCXml3KyC#9>y0D0Y}Wp@ zWL@7II>IsR^#p&`tWG#w>b{LvS0h3wWF8+RiV>`W_Dyu0*rli66%z5lcd91z;attJ zaU)gltaH)Y3&Kw)>=B<2jmw7z_m`8X?~a)S53ZK;Q>S^;vO3poO>iTBr0+sn_{JrP zXJS(OtaBg@gaDa8UO)}0r))FTB!{A;m?4QU>7wP8Wx}r(rQ_&?`M>UK9O8Sh=SxR~u;%NZSulo2t91g=Cjl(%25bP1KydfD67YiwC7~NSyJLbQ4d(Xp zUWgWuO^}r}MEd!~LQc@BDQDMLGalg+8O1c`H7Csn?>`GZpB?d&*IPu2UXM4Oa!i$E zb>(O^xx1S2`72v25A(KUGsSjYeQ?1;Hg!}nM`gG!NX>yZMO3xAdP(XN+9(5)jV9Ii zZ~}Ihz!{fr65X;Wg~-y54z5Nno~L^+C$mRhf;?ngONxCyLoVQ``xTa>Ygfv=sX;x( z8SJ&5z;G2xHgodv=wUJFnp{LR>P4o-SX`v>VouFdnzZ!H-k&4yKe}(u8HgGI1%WnI zG=LE5h5H_N4CTURTgS5h*`K&}Ps6vz)XeQ9HoMz3-7C#5U)8hTvV=93r01Sj7@|*C z?^q2}uQpY{3bxyPfL)Ou;6enB-bR}YL_%LZtmu!U_)kyDJDRCE&xkSoADtl>hY;G1 zQk)c`tkZ9DmjXGeyq)^^z^7h0@{ez8>5a=mrw-fd>fF`EFYN`Ze2S2Q*_>k?Igfe~ zfqx_&lKcgI=2oF{wfq7S3RVubhd=a1zlpDlp(uc5Dkd*G zbsJc%7+6q7>n{?uPanXy8^q2yDY(;X*(r BU>yJe literal 0 HcmV?d00001 diff --git a/content/page/surface.html b/content/page/surface.html new file mode 100644 index 0000000000000000000000000000000000000000..88582929609379f5ff75e75564ae44f5675b222e GIT binary patch literal 2088 zcmZ`)2{=@H8=o;_87)kvq&vEnkh&vWF^DYL?%0zIB4spoGIlYQB{E?~DK$dbKDUNK z_879=!r0dgH&mE0F_yUcj{2U5Joo#b=Q;2BpY#6y=Xrnc`~F@_3i%STh3~U6hHr;R#E?4FS9m09_2E{suNez&C*1JP!!8f4iHvi;ue-E`XpA;_daU ztJtGKQJ9ZeW0CdVhuU2L)x6#)j~E)d`8xrzqz)e-7qz>uFP-CWj&X&#QW{5tUo*+v z3ePw3VYFu^E|QmpU5`0<1{k|I*Ba1@oU~**u(hbyx2Ydf8GAyV%=xWm)qZ6=fZ>-| zEg#ID94D8ZmT<$#YUfp6lxEfH)GZ$Id@jlCcN4&^Po~pT22pVD`MKHGjU1l5Y*0Mb zgMfjHv6`de3;K>tFsuaIDs0auG|)J%9-sK78!T75J#!CF<+|aATjaHKiNxS{<r0nFG_xZGn`*Kblu5m=wjv^GX{MC9Tg0Kn8xRlf zaFU)wAR~;^6}ud{KKA#R(OQE(y*@);90R8Zz2pUpoawUj(kpi~y&;N5s(iIzM3k&- z9E4OjHAi#vkGRvLVYd)Xwe`(k0#(Jq2PIU-l$3()&i-eQ9z%*JQha|E@!8GJ6>*-A z-1Htx{9hy1ugnBT7Y2oWNP}Eqa@n0zy`es(_ANA*V%>+*v}tjxiCA${6cw^R@qBOz zu(KKe^IkjHGpv<{Gq{57d#iEBE4b>yB3E5sq+p*T_bRh^rJ}XUD?UL5t8{J*rn*8G ztr>F^S>|IE-fKNj81@b6fAy(88{L&9<0Vv8<6kGb=tg02R5b_l$o3p$e!G!Pbs>91 zx(FFXFYc3ET(E3ZP+(+&+gz3$7+6>DJdMmmKPo??7Y}bNNLiXyf{lnWrj?JIBn82~ zhW?`UF7j-609MBTB-rs*Q&=-cDY>BdWj#;(Qes@^`)g?j(8Uz3$y2?CgA>*|i=g_L zDj^}Owrf$*mNt$WdA&ycq(5tu)vE0`zG3zpiuyUPONyWXCXml3KyC#9>y0D0Y}Wp@ zWL@7II>IsR^#p&`tWG#w>b{LvS0h3wWF8+RiV>`W_Dyu0*rli66%z5lcd91z;attJ zaU)gltaH)Y3&Kw)>=B<2jmw7z_m`8X?~a)S53ZK;Q>S^;vO3poO>iTBr0+sn_{JrP zXJS(OtaBg@gaDa8UO)}0r))FTB!{A;m?4QU>7wP8Wx}r(rQ_&?`M>UK9O8Sh=SxR~u;%NZSulo2t91g=Cjl(%25bP1KydfD67YiwC7~NSyJLbQ4d(Xp zUWgWuO^}r}MEd!~LQc@BDQDMLGalg+8O1c`H7Csn?>`GZpB?d&*IPu2UXM4Oa!i$E zb>(O^xx1S2`72v25A(KUGsSjYeQ?1;Hg!}nM`gG!NX>yZMO3xAdP(XN+9(5)jV9Ii zZ~}Ihz!{fr65X;Wg~-y54z5Nno~L^+C$mRhf;?ngONxCyLoVQ``xTa>Ygfv=sX;x( z8SJ&5z;G2xHgodv=wUJFnp{LR>P4o-SX`v>VouFdnzZ!H-k&4yKe}(u8HgGI1%WnI zG=LE5h5H_N4CTURTgS5h*`K&}Ps6vz)XeQ9HoMz3-7C#5U)8hTvV=93r01Sj7@|*C z?^q2}uQpY{3bxyPfL)Ou;6enB-bR}YL_%LZtmu!U_)kyDJDRCE&xkSoADtl>hY;G1 zQk)c`tkZ9DmjXGeyq)^^z^7h0@{ez8>5a=mrw-fd>fF`EFYN`Ze2S2Q*_>k?Igfe~ zfqx_&lKcgI=2oF{wfq7S3RVubhd=a1zlpDlp(uc5Dkd*G zbsJc%7+6q7>n{?uPanXy8^q2yDY(;X*(r BU>yJe literal 0 HcmV?d00001