From fe2f8cf160c4df61a0a97fa7d3139859dc7acc25 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 12 Apr 2018 18:25:17 -0700 Subject: [PATCH 01/23] Added GUI instances Added toolbox dialog TODO: Port GUI buttons to instances --- Dialogs.aps | Bin 33540 -> 34384 bytes Dialogs.rc | 49 +++++++++++++++++++++++++++++++++++++++++ TextButtonInstance.cpp | 9 ++++++++ TextButtonInstance.h | 10 +++++++++ resource.h | 7 ++++-- 5 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 TextButtonInstance.cpp create mode 100644 TextButtonInstance.h diff --git a/Dialogs.aps b/Dialogs.aps index d3ba647e1e2bb1be62d66d75476047a95b8be503..b79ce96754075b4c617f09c2415d82ed62337688 100644 GIT binary patch delta 986 zcmZ`%O-NKx6#nj;8FjSc6{Mmz4*jSF#&b+l6MKI%QEe(L_T&nUVlS;&4PsxuNi>}mOLRf!Y?{)~(JQki z*Wc1(Az?e`A=p_)%8DkT;3z!Ljt(Z`sYEK~AU>S1qsc@nItaNWD=ojMzYt=9E}K_J zI?$%Iv4ou-a-5{;jA57hUBZ!5+J6eoz4XmIEPhhJTCUzMEss(Jw;Z5VD^xEj!*qs+ z(ssf~I&l_?fLQ@Q{jh2&Y}boU>a~|S(@Gm-=72Lg7#(QiyiFlcTB{WzS2*P3+Pofp z*PZ|K&=s+lJaCxJ^8#!Wi~vmy`ip=!!O;!e59p%!aYHaJu8QJLs(WnwVmZojMf9NH z1Ma~<7h-Htwg|e>3JsmGIo=BHjZuVA7yHx9NLFJ`gT=XBFqxIL5j>D5&>go=fZn(ZFOG;Z;Jo%d;c?JV(?%zyE`dhg$ayI2gC)W#L6%*4bhUCPw8tECvQ#Ne?m zj~V5mWm_MMl!oADPL@ZSGU&Y?DqCPuwP?}|1)6(-PxL)=L}_v9$xH)ghS`kKT%MN zgAEbY6h;tD4GsPQwFE9L_EV6C=Y`Mn_I=)3%spl2hA?#u)K}uz^$x=*dM(*|S`bnY z@cJ?j(}cK$L5iS+Go4Lb$w?*v#JClp3L1~YVUK%&Bm_jVm69*U5p;C*60t_#+5tt> zc{a$>mA;H$^s2v56vJzLLN)j6MMJM^m2!0_Ux8FI4G2&)jJm3o_jc<>QQa zGYwMRxmj_794_Hgp^_^5Yn-_now>4akOdIw+KsZLMZZ>}-4t2FqIEmr7kJklPn&7h Wx9Hvu`wN^r*mToe4Tb`t$>Kk|&R>`S diff --git a/Dialogs.rc b/Dialogs.rc index b346945..d43a6b4 100644 --- a/Dialogs.rc +++ b/Dialogs.rc @@ -46,6 +46,55 @@ END #endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_TOOLBOX DIALOGEX 0, 0, 368, 72 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + CONTROL "",IDC_AXBROWSER1,"{A8F8E829-06DA-11D2-8D70-00A0C98B28E2}",WS_TABSTOP,7,7,354,58 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_TOOLBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 361 + TOPMARGIN, 7 + BOTTOMMARGIN, 65 + END +END +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog Info +// + +IDD_TOOLBOX DLGINIT +BEGIN + IDC_AXBROWSER1, 0x376, 76, 0 +0x0000, 0x0000, 0xb293, 0x0000, 0x0048, 0x0000, 0x0003, 0x0008, 0xf20b, +0x4757, 0x0020, 0x0000, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, +0x0074, 0x0078, 0x36e1, 0x0000, 0x0003, 0x0008, 0xf20a, 0x4757, 0xffe0, +0xffff, 0x005f, 0x0065, 0x0078, 0x0074, 0x0065, 0x006e, 0x0074, 0x0079, +0x09b7, 0x0000, + 0 +END + #endif // English (U.S.) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp new file mode 100644 index 0000000..5361714 --- /dev/null +++ b/TextButtonInstance.cpp @@ -0,0 +1,9 @@ +#include "TextButtonInstance.h" + +TextButtonInstance::TextButtonInstance(void) +{ +} + +TextButtonInstance::~TextButtonInstance(void) +{ +} diff --git a/TextButtonInstance.h b/TextButtonInstance.h new file mode 100644 index 0000000..ed20a1d --- /dev/null +++ b/TextButtonInstance.h @@ -0,0 +1,10 @@ +#pragma once +#include "instance.h" + +class TextButtonInstance : + public Instance +{ +public: + TextButtonInstance(void); + ~TextButtonInstance(void); +}; diff --git a/resource.h b/resource.h index 3d988c8..1ba2fe9 100644 --- a/resource.h +++ b/resource.h @@ -2,15 +2,18 @@ // Microsoft Visual C++ generated include file. // Used by Dialogs.rc // +#define IDD_FORMVIEW 101 +#define IDD_TOOLBOX 101 #define IDD_ABOUT_DIALOG 102 +#define IDC_AXBROWSER1 1001 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 105 +#define _APS_NEXT_RESOURCE_VALUE 106 #define _APS_NEXT_COMMAND_VALUE 40004 -#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_CONTROL_VALUE 1002 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif From 5306ec6809122ff525b2c6bf8b23a650faac78ca Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 12 Apr 2018 19:25:17 -0700 Subject: [PATCH 02/23] Fixed include issues --- Dialogs.aps | Bin 34384 -> 34384 bytes Dialogs.rc | 8 ++++---- G3DTest.suo | Bin 14336 -> 14336 bytes G3DTest.vcproj | 12 ++++++++++++ Instance.h | 1 + PhysicalInstance.cpp | 1 - TextButtonInstance.cpp | 2 ++ main.cpp | 2 ++ resource.h | 4 ++-- 9 files changed, 23 insertions(+), 7 deletions(-) diff --git a/Dialogs.aps b/Dialogs.aps index b79ce96754075b4c617f09c2415d82ed62337688..499e801f159f1d646f5d3d53aa6a2898b518b14a 100644 GIT binary patch delta 53 zcmcc6!*rpCX@iX0WE(fB$;^z>%*G51n?u|ptQmbLuWhtswBP)^F_V$eZE|39Ia4>+ J=2OjWOaR&W5*Gjf delta 53 zcmcc6!*rpCX@iX0WM)QbW+MiM$x?1Io5S3~tQkEfuWhtswA%c?2s zApSQoP<`_S_RrjG48lOJ&}4pN?ag0={aM%;n1Osz5Px!s#Cc9eB_J1WR*9tlWM>}3 z&0i$XGeH&%Q zOfxXt=0B+mG@F4DL?8i><3VB~Kr8^nGC(W{#2_(wAXWil5C{iinBE8m25+!n6jTtT zC>kunz>owL0~wMG6{~@Y2?6O^sMs1H4e}`i!{i5o3Y*Uun6OQflVdcPe33l%P#c* diff --git a/G3DTest.vcproj b/G3DTest.vcproj index ecfb7d7..f73501d 100644 --- a/G3DTest.vcproj +++ b/G3DTest.vcproj @@ -262,6 +262,10 @@ RelativePath=".\PhysicalInstance.cpp" > + + + + + diff --git a/Instance.h b/Instance.h index 26cfbce..fe087c0 100644 --- a/Instance.h +++ b/Instance.h @@ -1,3 +1,4 @@ +#include #pragma once class Instance diff --git a/PhysicalInstance.cpp b/PhysicalInstance.cpp index e08b6e5..ba022a0 100644 --- a/PhysicalInstance.cpp +++ b/PhysicalInstance.cpp @@ -1,4 +1,3 @@ -#include #include "PhysicalInstance.h" bool canCollide = true; diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp index 5361714..13249ab 100644 --- a/TextButtonInstance.cpp +++ b/TextButtonInstance.cpp @@ -1,5 +1,7 @@ #include "TextButtonInstance.h" + + TextButtonInstance::TextButtonInstance(void) { } diff --git a/main.cpp b/main.cpp index 8fea3d3..dab0cf3 100644 --- a/main.cpp +++ b/main.cpp @@ -268,6 +268,8 @@ void Demo::onUserInput(UserInput* ui) { if(ui->keyPressed(SDLK_LSHIFT)) { app->debugController.setMoveRate(20); + + } else if(ui->keyReleased(SDLK_LSHIFT)) { diff --git a/resource.h b/resource.h index 1ba2fe9..edbb9ef 100644 --- a/resource.h +++ b/resource.h @@ -2,10 +2,10 @@ // Microsoft Visual C++ generated include file. // Used by Dialogs.rc // -#define IDD_FORMVIEW 101 #define IDD_TOOLBOX 101 #define IDD_ABOUT_DIALOG 102 #define IDC_AXBROWSER1 1001 +#define IDC_BUTTON1 1002 // Next default values for new objects // @@ -13,7 +13,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 106 #define _APS_NEXT_COMMAND_VALUE 40004 -#define _APS_NEXT_CONTROL_VALUE 1002 +#define _APS_NEXT_CONTROL_VALUE 1003 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif From 21684a6ea3f6b7f215b9a3019bf97f7f1592d56b Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 12 Apr 2018 22:44:51 -0700 Subject: [PATCH 03/23] Added properties to TextButtonInstance Why wont the go button become textured aaaaaaaaaaaaaaaa --- TextButtonInstance.cpp | 20 +++++++++++++++++++- TextButtonInstance.h | 5 +++++ main.cpp | 8 ++++---- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp index 13249ab..d191ec1 100644 --- a/TextButtonInstance.cpp +++ b/TextButtonInstance.cpp @@ -1,9 +1,27 @@ #include "TextButtonInstance.h" - +Vector2 boxBegin; +Vector2 boxEnd; +Vector2 fontLocationRelativeTo; +Color4 textColor; +Color4 textOutlineColor; +Color4 boxColor; +Color4 boxOutlineColor; +bool centeredWithinBox; +std::string title; +G3D::GFontRef font; TextButtonInstance::TextButtonInstance(void) { + boxBegin = Vector2(0,0); + boxEnd = Vector2(0,0); + fontLocationRelativeTo = Vector2(0,0); + centeredWithinBox = false; + title = "TextBox"; + textColor = Color4(1, 1, 1, 1); + textOutlineColor = Color4(0, 0, 0, 0); + boxColor = Color4(0.6F,0.6F,0.6F,0.4F); + boxOutlineColor = Color4(0, 0, 0, 0); } TextButtonInstance::~TextButtonInstance(void) diff --git a/TextButtonInstance.h b/TextButtonInstance.h index ed20a1d..d7dbf88 100644 --- a/TextButtonInstance.h +++ b/TextButtonInstance.h @@ -7,4 +7,9 @@ class TextButtonInstance : public: TextButtonInstance(void); ~TextButtonInstance(void); + Vector2 boxBegin; + Vector2 boxEnd; + Vector2 fontLocationRelativeTo; + bool centeredWithinBox; + std::string title; }; diff --git a/main.cpp b/main.cpp index dab0cf3..e71d808 100644 --- a/main.cpp +++ b/main.cpp @@ -455,12 +455,12 @@ void Demo::onGraphics(RenderDevice* rd) { - //rd->pushState(); + rd->pushState(); - //rd->setTexture(0, go); + rd->setTexture(0, go); - /*rd->enableAlphaWrite(); + rd->enableAlphaWrite(); rd->setTexCoord(0, Vector2(0.0F, 0.0F)); rd->setTexCoord(0, Vector2(1.0F, 0.0F)); rd->setTexCoord(0, Vector2(0.0F, 1.0F)); @@ -473,7 +473,7 @@ void Demo::onGraphics(RenderDevice* rd) { rd->sendVertex(Vector2(10,85)); rd->endPrimitive(); rd->setTexture(0, NULL); - //rd->popState();*/ + rd->popState(); app->renderDevice->pop2D(); From 7d623bb99d757863e5098fcad5c2c22ef6ed1275 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Fri, 13 Apr 2018 14:14:35 -0700 Subject: [PATCH 04/23] Added Over and Out options on text buttons --- TextButtonInstance.cpp | 11 +++++++++++ TextButtonInstance.h | 13 +++++++++++++ main.cpp | 9 ++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp index d191ec1..69b405b 100644 --- a/TextButtonInstance.cpp +++ b/TextButtonInstance.cpp @@ -6,9 +6,18 @@ Color4 textColor; Color4 textOutlineColor; Color4 boxColor; Color4 boxOutlineColor; +Color4 textColorOvr; +Color4 textOutlineColorOvr; +Color4 boxColorOvr; +Color4 boxOutlineColorOvr; +Color4 textColorDn; +Color4 textOutlineColorDn; +Color4 boxColorDn; +Color4 boxOutlineColorDn; bool centeredWithinBox; std::string title; G3D::GFontRef font; +int textSize; TextButtonInstance::TextButtonInstance(void) @@ -22,6 +31,8 @@ TextButtonInstance::TextButtonInstance(void) textOutlineColor = Color4(0, 0, 0, 0); boxColor = Color4(0.6F,0.6F,0.6F,0.4F); boxOutlineColor = Color4(0, 0, 0, 0); + textSize = 12; + } TextButtonInstance::~TextButtonInstance(void) diff --git a/TextButtonInstance.h b/TextButtonInstance.h index d7dbf88..f606862 100644 --- a/TextButtonInstance.h +++ b/TextButtonInstance.h @@ -10,6 +10,19 @@ public: Vector2 boxBegin; Vector2 boxEnd; Vector2 fontLocationRelativeTo; + Color4 textColor; + Color4 textOutlineColor; + Color4 boxColor; + Color4 boxOutlineColor; + Color4 textColorOvr; + Color4 textOutlineColorOvr; + Color4 boxColorOvr; + Color4 boxOutlineColorOvr; + Color4 textColorDn; + Color4 textOutlineColorDn; + Color4 boxColorDn; + Color4 boxOutlineColorDn; bool centeredWithinBox; std::string title; + G3D::GFontRef font; }; diff --git a/main.cpp b/main.cpp index e71d808..23aa7dc 100644 --- a/main.cpp +++ b/main.cpp @@ -235,6 +235,11 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) { } +void readMouseGUIInput() +{ + +} + void Demo::onUserInput(UserInput* ui) { if (ui->keyPressed(SDLK_ESCAPE)) { // Even when we aren't in debug mode, quit on escape. @@ -299,10 +304,12 @@ void Demo::onUserInput(UserInput* ui) { message = "FPS has been set to " + Convert(FPSVal[index]); setDesiredFrameRate(FPSVal[index]); } - + readMouseGUIInput(); // Add other key handling here } + + std::string ExePath() { char buffer[MAX_PATH]; GetModuleFileName( NULL, buffer, MAX_PATH ); From b12c7531794e0f3f9137a3d30f5cca9f9ae3fd3f Mon Sep 17 00:00:00 2001 From: andreja6 Date: Fri, 13 Apr 2018 20:09:20 -0700 Subject: [PATCH 05/23] Added visible and float booleans --- G3DTest.suo | Bin 14336 -> 14336 bytes TextButtonInstance.cpp | 9 +++++++-- TextButtonInstance.h | 4 ++++ main.cpp | 10 ++++++++++ 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/G3DTest.suo b/G3DTest.suo index 540815454e3c9457b2d6f5cac4160a8ef6fdebcd..f7e4e0cf04b508a0a0a5bc27b5ad5a73f2e33c95 100644 GIT binary patch delta 2555 zcmcguTWnNS6g{`ScbMtSw4Lc=+Ufg6OQ)~t)M6_*wlhUat4wJtL@;*RRCyK3qY4

Z7t0=t??tIb@93louX_QVl#kt#Zb;wPe6z2B9NB6xb}D70oRRuwuX%z%j?6p9S^;j{ygPEr3j| zDE7o*JPAwzbe@)Yj<0V!T04N97P}jI4%lP0=PkV-`haEg?Pu_I;4OP3$EI>X+s(Z= zm>08i{pe52sfHF=#D3k(8_CghafUkOpfe^*dY3FaW5x>jIWjxw$ELbQW+R)aWw$F=vx(*jOQLu&>5bTw8-qC6X)B_onnU`)Hs*?W3Xy9%- z^R7}oYETWSqpCw~QnPBenw7BcV$vU#uYG=b)mN{% zHG@g$sXr<=Xa-}rIMZ8g_R4bggjPYu7((CYslzo7>)}~-=NBKr%y%HpvV4b{F(b^0 zm!_>9*bR?qtRpVzh5=b@ct}32^J+Qre&?i-2fyv2tqOY%VYP#50Z*=aj~bS>O=HKd z1p7I2rSWl_cwm!b#4wGSq_oNDKqpWO1c9vIYS@(f0do9y0HACD$T@%!fa!qbJ7$t4 zXfOjQj{|h%@oxht(*QYEhZ%svbR@@$z_g_71IQ5{0IVnVzXT}X0OXiF-vX5HfUMv5CZp7k78i#8$>M&uIF`K||AWIBap7Eso7N9z3e;7S{oL3p*e?Eso8zc(|a?LwA!PuHi8Y z{TVdd4BlNdAir8%A?#%>^06mSe0yz8m#$MW(I76bwUoej!4vny4Q+=#-lFCBuv0e7$*<+6#ydcHlJJ$ z7D|0nwVZEjlye@h^tMgQ3;s2o6IjPxv5t5@fVhuC&!E3Uv7+07DH&+$lSKPddj6H? zXXIp0WnT+uhAxE%&&90*cwbRCHP&0kVsbvM~Nd-Dz)N)a% zWT36?*#BCTFtcpQu!>he-K&L{D=Pgp}jNO&2Y(tl!xQKj;x zt6~UOO%I+Cl*e`zLMw>VXvZ^%|B?`XFk+}hdr`M|1;qiTUPk)mq8>74(9mVfJ|au2 z*Wg-<-ma6q>$M{0hHV0FZ{t4i9k!W^Gt7)x?zR318rU?RhSLvntEx%rE2_=^w8e6} OmdifZF7&Y)QvLz%_4Ks> delta 2295 zcmah~OHi9t6uvj)4+-HBLP%&yc}D`_(Ll&pr!8rr4+@r`XmNZ2TBMFMq7Ah`6>vK3 zbnL?BOsDI*a6x^Rr5y!fMjfYG>-bnXx^t?d8#+^66ue8dN`6z~H9pbQuR_|0!9<~Acie+6#5z9S>Pxz2GD05`WWy$?F$3-A(9(q%5t26J_Wo=d+~PeVVg_aFs3i# zC8@lm!6TMQQF}y|5WYKky=Hh*?xbPIjLV!^b0=lhzFkuJ{SNH}otL5WlZFFUp=qTG z`eh}5*IR`-T8S?1lqXzlmVW8lvP%+yZh6n`6_2Y?J7qc0Dc71COLO5miX%Lro=`8~PDjppF8DnIj$AmVC|IvT;GZHs>g4{3wH@5{_qn6t80F{p!NjD7Gsxj0pMz%GfpM7k~^ ze*bRyF1A;0R(o@B|I!)imvB>15~0JhHzv<8q1C2HDV7j9UVsPS&9K(UF)<=Q70?W1 z{n|06!~k-604s&EA0X!f4gk!FJ&2HnmvF^_*$(5InkR|2!v_&hW-4irUZn;sK?_*%jD3#Z>DVa{Es zE-5O6!HcC7s)M2%F1u16Eicg4@{*@SYxH!VtxAi>7fCmEJK1=-obAX!KB!@tYV1Yz zf8Ew9YmLZl^!ii;MPx+XCoykbwfxi)l8>9bGTk&PiH1=bZyAzzn(AQZ$z1c;?8S4@ zLvT0GLY)=nB+nNH7z_$u19A-jUj+)Q+B_Fp@KM#G#$h{vJ|HX3>>#VF^o)w5o?}YN zeBB$GUs0e41s`6Fv|iLQ)EbdXtqsT@7Q=tU$-wk&T6iktLFXJgc+ZoyxVe>aZ+y8n z@+_M%fXS2PF_ii82h*;20jq?qjKYQ50^}G%J`EIBU)GO(iGHmX2ZdJx*T*Kd-y)OHY)1Sr!^_2t3QL=t z>H)}c4HJjb3uMmNi instances; +static std::vector instances_2D; static Instance* dataModel; static GFontRef fntdominant = NULL; static GFontRef fntlighttrek = NULL; @@ -102,6 +104,14 @@ PhysicalInstance* makePart() return part; } +TextButtonInstance* makeTextButton() +{ + TextButtonInstance* part = new TextButtonInstance(); + instances.push_back(part); + instances_2D.push_back(part); + return part; +} + void Demo::onInit() { // Called before Demo::run() beings From acfd499cfbb2478b1063b2f26795cf713d8e9ae2 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 18 Apr 2018 19:56:48 -0700 Subject: [PATCH 06/23] GO BUTTON TEXTURE! YES! --- G3DTest.suo | Bin 14336 -> 14848 bytes PhysicalInstance.cpp | 2 ++ main.cpp | 48 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/G3DTest.suo b/G3DTest.suo index f7e4e0cf04b508a0a0a5bc27b5ad5a73f2e33c95..e4a1d0d773efea43e76344d6595f9c391b56b536 100644 GIT binary patch delta 734 zcma)3L2DC16n<|qv)OI7Nt3KeqqS+RMQx02ZL|tn3hF_LCPEMOASkFHR`IZ6jZuUC z0qFxz9=&-{_vpbwkD^8@h=QPa6H$-|=92ZzuAv@0xbW?K-#2gG%zLkKx#2!KC3-gi zK*#s}oL(OvCtQ+c9HwEJkAJ-Ae7O2{6(hX0oTr*ROe?WTnvjxy$+DSbn-BVQcVz35 zC23K;k!RTRs>UqZXPKR2EHdbR^kD89lN#eXqt3X&xXI{v?dTC>&$TN^EB5{;@mJ#3=g0}{(P=ITz}&RMX8je6`Zp>TA%nPM^pA8Ca z^;aW`i-XN!-2+Wjie)sEgL5_xYD%rKN-!t4P%&_TBQ}NS3qMfadoc5fz7+Ry=$0Mt z|MX!9sn026ot|Yj5=|Bfr?LUCwDhr!EFK~yqP5o xu^b7cJ3WU&Gy4L2FB$ryVtQRV^cyRow*3GA delta 562 zcmYLF%}X0W6n`^2v-#LnqZ^VeNYpB{G}?S9RYZ#t4;7R|SW0^+w0NMb9$9Hj!^~L{VGg4CwQ|ZZIuGe5DbdhGMnx>-=;6|VR zpG*@Kc;9y{2MP766gfa>Ke%@!M=z6WW!?l{rorVilC#lVxw;`$8(UMq|BT5YqUng{ zJsaP;qZq!dan_I4coF?V4gZL85EgEk=sw?C#hbAi@}9rC#J!?}Cu3R6PQ9P4Kn1E4 z^Ar`>q?+XlfCJye;}X8m654AP8PO7!KPNO+SMa;IEp!`yf+kYmaMVQTzpk0Uh)PXE VqI%22kvr)zLm~SsrJPcz^AFjkm&*VE diff --git a/PhysicalInstance.cpp b/PhysicalInstance.cpp index ba022a0..5b3a068 100644 --- a/PhysicalInstance.cpp +++ b/PhysicalInstance.cpp @@ -26,3 +26,5 @@ PhysicalInstance::~PhysicalInstance(void) } + + diff --git a/main.cpp b/main.cpp index 6ec16b6..c466bd3 100644 --- a/main.cpp +++ b/main.cpp @@ -380,7 +380,7 @@ void Demo::onGraphics(RenderDevice* rd) { app->renderDevice->setAmbientLightColor(Color3(1,1,1)); Draw::axes(CoordinateFrame(Vector3(0, 0, 0)), app->renderDevice); - + Draw::sphere(G3D::Sphere(Vector3(0,0,0),3), rd, Color3::red(), Color4::clear()); //makeFlag(Vector3(1, 0.5, 0.5), rd); @@ -470,26 +470,54 @@ void Demo::onGraphics(RenderDevice* rd) { //app->debugFont->draw2D("Dynamica 2004-2005 Simulation Client version " + VERSION + str, Vector2(0,0), 20, Color3::white(), Color3::black()); //app->debugFont->draw2D("Debug Mode Enabled", Vector2(0,30), 20, Color3::white(), Color3::black()); - + rd->pushState(); - rd->setTexture(0, go); - + /*rd->setTexture(0, go); + rd->enableAlphaWrite(); - rd->setTexCoord(0, Vector2(0.0F, 0.0F)); - rd->setTexCoord(0, Vector2(1.0F, 0.0F)); - rd->setTexCoord(0, Vector2(0.0F, 1.0F)); - rd->setTexCoord(0, Vector2(1.0F, 1.0F)); - rd->setTextureCombineMode(0, RenderDevice::CombineMode::TEX_ADD); + //rd->setTexCoord(0, Vector2(0.0F, 0.0F)); + //rd->setTexCoord(0, Vector2(1.0F, 0.0F)); + //rd->setTexCoord(0, Vector2(0.0F, 1.0F)); + //rd->setTexCoord(0, Vector2(1.0F, 1.0F)); + //rd->setTextureCombineMode(0, RenderDevice::CombineMode::TEX_ADD); + rd->beginPrimitive(RenderDevice::QUADS); rd->sendVertex(Vector2(10,25)); rd->sendVertex(Vector2(70,25)); rd->sendVertex(Vector2(70,85)); rd->sendVertex(Vector2(10,85)); rd->endPrimitive(); - rd->setTexture(0, NULL); + rd->setTexture(0, NULL);*/ + + + int texid = go->getOpenGLID(); + rd->beforePrimitive(); + + //glColor3d(255,255,255); + + glEnable( GL_TEXTURE_2D ); + glEnable(GL_BLEND);// you enable blending function + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glBindTexture( GL_TEXTURE_2D, texid); + //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); + glBegin( GL_QUADS ); + glTexCoord2d(0.0,0.0); + glVertex2f( 10, 25 ); + glTexCoord2d( 1.0,0.0 ); + glVertex2f( 70, 25 ); + glTexCoord2d( 1.0,1.0 ); + glVertex2f( 70, 85 ); + glTexCoord2d( 0.0,1.0 ); + glVertex2f( 10, 85 ); + glEnd(); + + glDisable( GL_TEXTURE_2D ); + + rd->afterPrimitive(); + rd->popState(); From 4526fa68dfc5f4511e40e44799cad5ddb5a64def Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 18 Apr 2018 20:39:36 -0700 Subject: [PATCH 07/23] Added mouseover testing, will be moved to instances --- main.cpp | 38 ++++++++++++++++++++++++++++++++++---- 1 file changed, 34 insertions(+), 4 deletions(-) diff --git a/main.cpp b/main.cpp index c466bd3..5ad45ab 100644 --- a/main.cpp +++ b/main.cpp @@ -37,6 +37,11 @@ static int SCOREVAL = 0; static int sep = 125; static int spacing = 25; static G3D::TextureRef go = NULL; +static G3D::TextureRef go_ovr = NULL; +static float mousex = 0; +static float mousey = 0; +static int go_id = 0; +static int go_ovr_id; /** This simple demo applet uses the debug mode as the regular rendering mode so you can fly around the scene. @@ -314,6 +319,8 @@ void Demo::onUserInput(UserInput* ui) { message = "FPS has been set to " + Convert(FPSVal[index]); setDesiredFrameRate(FPSVal[index]); } + mousex = ui->getMouseX(); + mousey = ui->getMouseY(); readMouseGUIInput(); // Add other key handling here } @@ -361,6 +368,22 @@ void makeFlag(Vector3 &vec, RenderDevice* &rd) //rd->popState(); } + + +bool mouseInArea(float point1x, float point1y, float point2x, float point2y) +{ + + + if(mousex >= point1x && mousey >= point1y) + { + if(mousex < point2x && mousey < point2y) + { + return true; + } + } + return false; +} + void Demo::onGraphics(RenderDevice* rd) { LightingParameters lighting(G3D::toSeconds(11, 00, 00, AM)); app->renderDevice->setProjectionAndCameraMatrix(app->debugCamera); @@ -492,16 +515,20 @@ void Demo::onGraphics(RenderDevice* rd) { rd->endPrimitive(); rd->setTexture(0, NULL);*/ - - int texid = go->getOpenGLID(); + rd->beforePrimitive(); - //glColor3d(255,255,255); + glEnable( GL_TEXTURE_2D ); glEnable(GL_BLEND);// you enable blending function glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glBindTexture( GL_TEXTURE_2D, texid); + + if(mouseInArea(10,25,70,85)) + glBindTexture( GL_TEXTURE_2D, go_ovr_id); + else + glBindTexture( GL_TEXTURE_2D, go_id); + //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); glBegin( GL_QUADS ); glTexCoord2d(0.0,0.0); @@ -531,6 +558,9 @@ void App::main() { debugController.setActive(false); // Load objects here go = Texture::fromFile(GetFileInPath("/content/images/Run.png")); + go_ovr = Texture::fromFile(GetFileInPath("/content/images/Run_ovr.png")); + go_id = go->getOpenGLID(); + go_ovr_id = go_ovr->getOpenGLID(); fntdominant = GFont::fromFile(GetFileInPath("/content/font/dominant.fnt")); fntlighttrek = GFont::fromFile(GetFileInPath("/content/font/lighttrek.fnt")); sky = Sky::create(NULL, ExePath() + "/content/sky/"); From 33e3aeb16ef483c6f63849a5bc0125fe108bf630 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 18 Apr 2018 20:42:15 -0700 Subject: [PATCH 08/23] Commented out useless function --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 5ad45ab..4f5e197 100644 --- a/main.cpp +++ b/main.cpp @@ -321,7 +321,7 @@ void Demo::onUserInput(UserInput* ui) { } mousex = ui->getMouseX(); mousey = ui->getMouseY(); - readMouseGUIInput(); + //readMouseGUIInput(); // Add other key handling here } From 0a2b508290765b8dea194c9bae0a1f485640aece Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 18 Apr 2018 22:50:31 -0700 Subject: [PATCH 09/23] Added down state -Added mouse down state -Commented out useless function -Added temporary default value to ovr_id -Added temporary images go_dn and go_dn_id -Removed debug spacing increase and decrease key press code (causes crashes by design and was useless) --- main.cpp | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/main.cpp b/main.cpp index 4f5e197..d9005c8 100644 --- a/main.cpp +++ b/main.cpp @@ -38,10 +38,13 @@ static int sep = 125; static int spacing = 25; static G3D::TextureRef go = NULL; static G3D::TextureRef go_ovr = NULL; +static G3D::TextureRef go_dn = NULL; static float mousex = 0; static float mousey = 0; static int go_id = 0; -static int go_ovr_id; +static int go_ovr_id = 0; +static int go_dn_id = 0; +static bool mouseButton1Down = false; /** This simple demo applet uses the debug mode as the regular rendering mode so you can fly around the scene. @@ -250,10 +253,10 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) { } -void readMouseGUIInput() -{ +//void readMouseGUIInput() +//{ -} +//} void Demo::onUserInput(UserInput* ui) { if (ui->keyPressed(SDLK_ESCAPE)) { @@ -265,20 +268,6 @@ void Demo::onUserInput(UserInput* ui) { { app->debugController.setActive(true); } - if(ui->keyPressed(SDLK_KP_PLUS)) - { - spacing++; - messageTime = System::time(); - message = "Spacing set to " + Convert(spacing); - } - if(ui->keyPressed(SDLK_KP_MINUS)) - { - spacing--; - messageTime = System::time(); - message = "Spacing set to " + Convert(spacing); - - OnError(3423); - } else if(ui->keyReleased(SDL_RIGHT_MOUSE_KEY)) { app->debugController.setActive(false); @@ -321,6 +310,7 @@ void Demo::onUserInput(UserInput* ui) { } mousex = ui->getMouseX(); mousey = ui->getMouseY(); + mouseButton1Down = ui->keyDown(SDL_LEFT_MOUSE_KEY); //readMouseGUIInput(); // Add other key handling here } @@ -525,7 +515,12 @@ void Demo::onGraphics(RenderDevice* rd) { glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); if(mouseInArea(10,25,70,85)) - glBindTexture( GL_TEXTURE_2D, go_ovr_id); + { + if(mouseButton1Down) + glBindTexture( GL_TEXTURE_2D, go_dn_id); + else + glBindTexture( GL_TEXTURE_2D, go_ovr_id); + } else glBindTexture( GL_TEXTURE_2D, go_id); @@ -559,7 +554,9 @@ void App::main() { // Load objects here go = Texture::fromFile(GetFileInPath("/content/images/Run.png")); go_ovr = Texture::fromFile(GetFileInPath("/content/images/Run_ovr.png")); + go_dn = Texture::fromFile(GetFileInPath("/content/images/Run_dn.png")); go_id = go->getOpenGLID(); + go_dn_id = go_dn->getOpenGLID(); go_ovr_id = go_ovr->getOpenGLID(); fntdominant = GFont::fromFile(GetFileInPath("/content/font/dominant.fnt")); fntlighttrek = GFont::fromFile(GetFileInPath("/content/font/lighttrek.fnt")); From 8a780d6f0b2507fb23ba0dfa1e1bfa57cdc3a9c1 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 18 Apr 2018 23:53:32 -0700 Subject: [PATCH 10/23] Added some images --- content/font/comics-small.fnt | Bin 0 -> 6381 bytes content/font/comics.fnt | Bin 0 -> 15248 bytes content/font/terminal.fnt | Bin 0 -> 5744 bytes content/images/Run2.png | Bin 0 -> 2459 bytes content/images/rico16c.png | Bin 0 -> 1412 bytes content/images/rico256c.png | Bin 0 -> 1593 bytes main.cpp | 24 +++++++++++++++++++++++- 7 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 content/font/comics-small.fnt create mode 100644 content/font/comics.fnt create mode 100644 content/font/terminal.fnt create mode 100644 content/images/Run2.png create mode 100644 content/images/rico16c.png create mode 100644 content/images/rico256c.png diff --git a/content/font/comics-small.fnt b/content/font/comics-small.fnt new file mode 100644 index 0000000000000000000000000000000000000000..f454ce2252ca627d2aec732e9e9b332049c0a65d GIT binary patch literal 6381 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 literal 0 HcmV?d00001 diff --git a/content/font/comics.fnt b/content/font/comics.fnt new file mode 100644 index 0000000000000000000000000000000000000000..6b71c7e9c6142a35b87a8104d14db3f545150934 GIT binary patch literal 15248 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 literal 0 HcmV?d00001 diff --git a/content/font/terminal.fnt b/content/font/terminal.fnt new file mode 100644 index 0000000000000000000000000000000000000000..08b0afcff24276f6dd4a033dcf18d9cd113959ba GIT binary patch literal 5744 zcmbW5c{J3I*T?OWWvo%r5EZ4Y+4CXftCXb@*`+8#We=ZWh)_ct*`}mO3(CF?Sw;(z zkaY%G!k8KBXUu0lpQqM&imYL+&o;7BQ*EXy5Fi| z8$o;~^xU%{+t0*H=kfHiXQlHJ&MNXdhHP(d*%hNkR8Z-&mv5*q8h%PEQ@ivHb6m0> zesgsflK>(O==HZWI(rT{y-L4x_h0za(8W;<0!Lu&xOC7Ro(5+(A|^dIIqBHxUPuf1 zZ#UKh-7=o;rKJNkI>`T>P*MRl_yN_Z0S_Uz{|*RLaFR#sIJu*LM}-H?{r_y^K+Q)` zrRJ9LoW7UO|FR`^Eni@?GJq5l9x|Y%`$R2^+D2O%OSdCszx{Y?$X?mfreROuVrEt5 z2uk~DxN>Mu3K-Bd{K-ey%z32RTnev$M1T$#kR5J-g!hDrnvOtZ{ z3Nd?H-qt9GDY;4t*LnuX*)OxWq0!?^6ZQ=&53@U@m+PeS0*hwc_K&)I>YI#DM&+D@ z&~d1EDbsHXjA`*vLI#fP%b_X7Z(G29-?u^;hcuF0i@L&|SrI@|>;WFssqI!nzWC)* zSxyu~n3$U3z^4vKv_o$_Vx$wL;wJ5sMsV&>rA1(>^LPVEw0(LO8hlfaC6^^ z=hhBY!`M>{4IR#toP0;-W?Op7HX6`vR&mcTS~bMDTa)MZLOZPZ-?{5>*Qocz^}{*neJPq z=Zuf+#zt)h-07L7lyPm8^YMD{mhGmvPBe<@5v{YvP!k1^Eiijlvsr?~Zc5$8*svNi zYkzgj$haOpeUNEfRK3R6B!N2i2mgT>4W2+9-lK6v--qfQAkj82%eJ?64-MZN%$5Ie(1UIUCIyJ8@QQf z%_iQvd{1UoW7d==l{e1abgEK{mi$F!^J^{d+m3(MA#4$vEK&|$pwGs@b6zqfHpA?nb$HZ#=f+hDSXZHSJq+i+feNiNGaC1#9VYyEB5^ zx+mvFAxy@BlXI*SddRJjYQCK!RY)1M7*PfV^fP+x{w_b0KR@05Gqzm7!hEF}d40_brM3DZCwD zb@P`E)V>)N3`8$IWQ%d^_PdZzElPEahHXc>hBG?R>Z9kBA57`@fJ=U_)R29d7c^uMlK9s3Dzp02F&_=L zNQY$(ui)e2N#n%HR$>zuX&%NViA{3ot3nPI1Pf8YyyjIa zg~6baJf-FWqWHMfJ4vl)lLN(IBCU@*`;{ItkP-<@qUY}bf3PP+Dip%HM3Y16j?{v$ zfl3oMJu?RCsCY?i*;5;gOM0VV=5_}->%Krg-O>@N^BS`*?-Px=5s5}fC2#6z{Ts&$ zE+%jF^3j9TO$+Y#TECA_MYE()RhWZ9Qa=H$PXcsOl>f;xLu1e=7866k7NI z=6_+qnJa-J^ZAJH?*Nan)Ch*>Bw@n79}=WI=B@)f-2D$|gYj!UG>HG;jO$2S*4rzm z#wP-NktX51t0|(7h6>i=3SR`$e-BZFxez`W4|bm_us{mM*VWwMy*G)sRHjIgQES@_B}DFe3i-)$$2r(&xV5sm{#nn9q0M-tIs{j!HXcRIg& zBT?3yI^~gDMNx}5vF%K|IPf&Ah0&EnueeOQqe)+jgR81qAvxXVxldWRUELGrwcO)) z46B#tPriu9#Xm={neX@i{Haqsh)s$IF2-keg5&H0!4@cZKxUd|8ABY?%fFbHkJCQi zx*BWQ{;~UZcu=l3q`j_j@mSG>9U1$05_tZeu8S-V(=T($q1UHB(Yn&A>%Zlu`cEkf zNoXsmoM;+rxZR0e29LCmZj2a6Q|wuK!e~Z})g5V7Z4b2&yL_&s@3f|B`>mP?s^=$k z+`;(gppTX5oN!r<_Uy&DTEP8srfcCsQ ztL7fqYOzE*&kUB}%tMWJdl7u@hb2-jO|B1J+6N@;+Xz0#9qA$_y%9gK44!Fr6h!~{ z>OhQEDe5sun1So0gW;oE{%GAiM_8Jo;FQc0Yq=)`U0l6XVgv;b=c@Q3F~^J&V5S1p zrnYvM?O9m8zPPcrMJ|c-S28TCM+IARk2+DG|3ob7NR4}3TX?0T%(aoGud8TA$V6i7 zcg~`UOUtC|y&|qs8fx|V$|&2~p$++UkVxd}!7!pl47eu}0mtJntvRI1k3`pzJFoM; z72LMH`Di8LMfVqpJLAjLXY*HPx!PPC#(mo~$r zA19GQ!A?zhAF4WabBiGY-(~+fH&6n{JHR8e)Ql9MR{uxo_RRH&6&+ho zdFTbdxCg>38Rcf^uQb}td2wFvO{07~h_(SQ32)t_SQ%;~t$HCl(S$$FM{`tf7OgJu zYS>)9T)t;8$?&vLVB*5A6sqDBnLw5)&(H`v`)WHx`m$ol!3?~7o0OVWn_V-Pcu&Wn zf-tO`9IYtJ zgk`>NC^*NSr4(GicI`NmF+AA&$TdGB1owQ3tQO;T8JXxe z%zlsrn)Y09HZ~GWb#}JI_}yfweeBv64=4cl>8MIy5f^v^j?DwG%v(|`k|2-bI^pAw> zu`x;?y8J8KG566&#XstIxO}9m=F{1Y7kfB?X(`&6Dug$GE zn429eiPEq5;47b-*1b&tsj&Up(+gZRu;DH-OAp4t)0UQeb#sCq58BDX^qfwGi*0l| z(^H(SpckyyjXZJ>isg9Ed>Hu+J~g(^86inWS4u#pu+%y*scQVHE4@saiOIoU1f1wv zUR@jKS%x`9%8qW|=QB@G*$lfX)K-PJToZ;YWX?csh(zkGgy( z9}Q{R>#?fqmp)m3U(wZ9N2`*$T2Qmy-pVkv#+FqSM*lvcs?4|tk(NQ`8o%TNj75ky zL+PqcCv~{9AkXsm{2aMeY-dO>9;?Hgf^GCWApOg`d{4u6C?PX4=5A18BFy!h|FyD6 zh;wWz@)#hI!}R%gbKhVUwWHJM@E9+XGDUta6nE@>p|QEh$LA}&)Jx(IYnttN9y^$g zH;+bCrDEwrwA_r}jk}OUiQ2u$RbAsFK5jSC98OS2nZbe8c%ieYyusF&Tk2T5jmYPh z0;W9aO#MCs%?w*xY*$pt+JpO)1-ques?|kfw+|G4#`QcEj+;!V@Mr%cX zxQcg=QjW%Zb|9S8O|a?_l zN4&YWLeL3rlO!g6RA)Sr1xDQO%(d)9o~q4rpcjm@Fwibn8Ml9pNI>&Er`=rg4+sk2 zx~6ftQ=^`frEHeLMN*{|*U1!Y{8q47b*i^pDj)`QAA65-+L(5HCLIZH8>F|nPmwVW zUdu7^s(^>@B`r&|dmm_j7#4!km}H~6IIw{4`{`FjTn1VZpIKIJ-mw2IEMggbw-h=s zpnp9?fF_6f!0X9V^cRIis*&b~h?U+GYbvQ_gx=2t&&QrIK)Z=VbUzF3%|#C6q5J1s zXx0U&U(GQefF;TTZf%|YjgCOUn%S-ljmKzjZGa`{p~?U7JKAuL1L%Njum8SUrYJrx z$1{GO>wrAhQBz(tjFT-hIN@Am8lK9rvyIvyY01%dXFdf?EurcFbi)a@cp%w@?6pWu zGJ<4B(Qn?d$#Zruhf$d=9;*>_bwyB~I5!&%o_1mF@go|J=tXKD0QLc;ot1BbN|CHH;wk`%KrSPu%xW6 zI{QnP$eZ6vor&s;b$mO>KGE%Uq`n_cO9d7sdrr}u&m*GqhYGIj{~uoE>tRn?CY!Ab z>x7vkVMT$c*u=%Gm+#q_V$wvkY1@p14UC_&439yqRk+|qW{qWRal#M7bkwtjx_vCI zOTU$9R#>6{ zKt0POb2e4cMsaSh&(Q5>RpRJm;`RGU&Ti<<6y-p|7Oqb@+@QFFOGzH&MoRFiGsK1{ z9J`5fBI)PVQ>T@DuS6cbkGe$Ydf?V}Rho8iuiX%J7jzP@->^%Goc-H;YEun`-wCFj zvF&621L-d)3@Fvdl$l^l#OYCq?q;F^Bb*IulNg^)o|xz_04}G{mcls)S8z#a|J`Gp zU`>?_6S#l5h5tYxMQ_RbEzYDdfqj8v#+R@s7vCd3pkM_~JF2Gz~d(}^#{#Xi3{ zcR?7PJx`JH!Zgi^N;3Oasjbu_)*R>d*l%;#j#B-@AJjgPGBdzP)wfqSmdS1`Y`l_E zoHUTXoSP=DL`JJ1 z9vhfHb#n(H_QTfPFK2&YXTGz)2gJk)BWM zMPJ4rR=sYD2)-!Alk5)G_#{eU26ct2_Z6vQ$eH~CJ#H~? z&uUTO15M=7ieCtUkpBf2_J|&$$qr*MrBp(ljVLsNI9p4DooNpB9|tLOBPb;V6+CM^ zFT-PeX}`GEu1KEEH&!O(hvw=ZjhnyI+NU;UEzP|euVM`Q3Y=5-{Kv0Q5N#C*7C_VDlw;j@IR$Vu-WfxqmpFzW1PKqisNBFI}<$IG!Stl0eLLg`9vrZ z8jd=Zigj>saB^}&p-|pf?AZtpSfm#$25X<_3roXcL-0Of0eBxje}Dgw(2&3gLReUM zOms|gax$Qqfz0C|`xMB90>&?(3<7Rg0zPyb9i~n{4@&F++g82QMZE&8$MpP}g9S}6 zxn_hy9ZIFy9SEF(5T($5QTeu~W{dak8k|N~u=c&spIh-zst>f>*Rm96T@iSu@{&n& zxREIQKv#sRkZ8>fhVnw80y4BcUcZm1-$yzqCLZXGHtkI~(VJ*7m~!#~#Xcj@i57G| zn_yezZ(m6~S59&%i*e$_xYJ2)oCGfh8Ou(DRfjwA;+*-3u=aR(XCk6A)svTksi6eX z$Pu*oh^$0h1tlhn5>2Nd#Hq-8=|0z}7X(yvdj_U0(^o|IyH^;&q+Vjv0_rkCnsSM? zxe?9z!M6$`TMNU4#nJr26h4F8&P?m9I6IOK8_RJS$c0IAkdF&d_p{s|>F%OHp z`-?9Qm7*sZzE4=VN6es6c4QCx(xZx?iSmG%s&EM>zQ2n2m>V&}Bad>^db!b)HRPw) zqvz`r$7>U(>nSsQ;ve#)ghI^4w#9(qfJ~{}H@PtURX=D(2?+H_LQ;TD7_7bjch0!F!-WKiX zOu3ror5XG4z~y6~*d9(w_mw*Fw8s(U%5|Z=)Evj$iB&~i-ekEMoH*>XPu(lD8eCe*4|o+fvzi`sQ+5kGqH3str03=3 z=jW9l)Vh#AW9_K#%CS5SL*_nOh#i?!Vl}S~6;;|<1kX}uZ*F+2S?}vw)0p_T{g#@J zOm)h)Xz@bwQPtdKE1$nt&Dme@$Jo}^H?5YQ8w9+$6Dh@4BkoF`Tz=^}lPTC~M4+c% z^^y{#;R=v~eh&{zL5qLm_#G5?96PfN5BqI|ThUQ-ulC2$z4Cz~v9Rgr8l+C9Dmq;h zW+hp)YVs?=aSkvk(3#qguH2081oyZYrKY}dx8bLmCK z?g|1Mh)MWoPY32O9D~`T<-XH+Y1}`G)1}xzVJ3}a!JKMap_;uPKIP=RBR!uo+rR%q zit6x@Y|U&-^fU~+C&A6fJ&J8t{iydK1-TQR^2O!o(K4eqZ6-N;svfLgQHIZKEZlm1 z>$Iufuati=mw;bVv(3yiC) zI+?m5{MNR&tfx8r}*& zz>PjiCqoC@5QyF^GoO#L1l*hc0{Xz2l8TDXxRuxV!-o-3;Di!oO z?EcD29}*Yd?+9G*Q!_Aa6>m5|MA_QUv>uaR4=9paR$P>IBrU=%^FLlEIiPGH%JCH%hLxQ4=cY{)11Q2+1%p~eN#ZvACeow{bhBJ-#8X24exuFApXw3X+G@S zaY=z^rVhS4B=}|0juQc0@AvrqWWOin_VyOY-Q7RHq+jnZ{i_qbr?`ZP%zX9jUm)N} J`(`^F?LRV88j}D3 literal 0 HcmV?d00001 diff --git a/content/images/rico16c.png b/content/images/rico16c.png new file mode 100644 index 0000000000000000000000000000000000000000..03d6118431dd78556921e8e6f4608c8f765641e3 GIT binary patch literal 1412 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`)Ym%P6kOPdj$D1 zFjT2BFf=qXF#P-vq+c>Hlo~KFyh>nTu$sZZAf7)d{-_%R12aQ_Plzi}4^Yj50|%C! z`f%XRf&afh{QnOW7zLvtFd{-AWPj{^1_nlkk|4ieV9FoKfFbxhJFwhf;4JWnEM{Qf z764(!waR--fr64Ht`Q}{`DrEPiAAXl1&Nt?C3<k6!GHcFVdQ I&MBb@0Io2PHlo~KFyh>nTu$sZZAf7)d{-_%R12aQ_Plzi}&jJUB0}2d4 zl@Amc4k$Q0P;fW^6iIM+;Nb8e!C^r{!-0f`2MG-e8X6WXII!TrfddT<2NpCuXlQt_ z0LVD-03>waz?}of{sYYz1*0J_ltSR}3w1LF21bUGAiv=MBO5RTe`g1l8w{KU9+AZi z4BP@B%(zy0Zz)hvvcxr_Bsf2(>(p*OW(6t3{=b>>UIzT(jj0S5`OYes^({DZ>rVQw z+=v&lHdh7o7@YVbT@nsx*D_1&SJY>eZb<*ke_+S03ib(Wxm+jSK7P&olK(~S-%Jx` zN3~26XPC2~XqCXF<9Sb8f=l!r`c8dYcvv=IV)}yfn(fyDs@8R14e^_CDD~3Ga0UCD z+?@tLPcNA)%)R%sUHJlo192PsuH6Jb9cY1XK;a7Q0Bg4GuEwl;M8!5R!-Fk-ka)l s;j(GHX0*a=F^&n7)`m0O7Th>RzO8y%$c#gQQ$Tsn)78&qol`;+0KgXj2><{9 literal 0 HcmV?d00001 diff --git a/main.cpp b/main.cpp index d9005c8..ce9fb0c 100644 --- a/main.cpp +++ b/main.cpp @@ -258,6 +258,17 @@ void Demo::onSimulation(RealTime rdt, SimTime sdt, SimTime idt) { //} +double getOSVersion() { + OSVERSIONINFO osvi; + + ZeroMemory(&osvi, sizeof(OSVERSIONINFO)); + osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + + GetVersionEx(&osvi); + std::string version = Convert(osvi.dwMajorVersion) + "." + Convert(osvi.dwMinorVersion); + return ::atof(version.c_str()); +} + void Demo::onUserInput(UserInput* ui) { if (ui->keyPressed(SDLK_ESCAPE)) { // Even when we aren't in debug mode, quit on escape. @@ -297,6 +308,14 @@ void Demo::onUserInput(UserInput* ui) { app->setDebugMode(!app->debugMode()); } } + if(ui->keyDown(SDLK_LCTRL)) + { + if(ui->keyPressed('v')) + { + messageTime = System::time(); + message = convert(getOSVersion()); + } + } if(ui->keyPressed(SDLK_F8)) { index++; @@ -581,7 +600,10 @@ int main(int argc, char** argv) { //settings.useNetwork = false; //settings.window.width = 1024; //settings.window.height = 768; - settings.window.defaultIconFilename = GetFileInPath("/content/images/rico.png"); + if(getOSVersion > 5.0) + settings.window.defaultIconFilename = GetFileInPath("/content/images/rico.png"); + else + settings.window.defaultIconFilename = GetFileInPath("/content/images/rico256c.png"); settings.window.resizable = true; App app = App(settings); From 8889494848656f638040381334768adfc1014844 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 18 Apr 2018 23:55:21 -0700 Subject: [PATCH 11/23] Removed unneded font --- content/font/terminal.fnt | Bin 5744 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 content/font/terminal.fnt diff --git a/content/font/terminal.fnt b/content/font/terminal.fnt deleted file mode 100644 index 08b0afcff24276f6dd4a033dcf18d9cd113959ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5744 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 Date: Wed, 18 Apr 2018 23:56:10 -0700 Subject: [PATCH 12/23] Removed broken image --- content/images/Run2.png | Bin 2459 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 content/images/Run2.png diff --git a/content/images/Run2.png b/content/images/Run2.png deleted file mode 100644 index 2ac55a0b7081fcba48c9858d5406429b0ac11fee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2459 zcmd^=`#%%U;UEzP|euVM`Q3Y=5-{Kv0Q5N#C*7C_VDlw;j@IR$Vu-WfxqmpFzW1PKqisNBFI}<$IG!Stl0eLLg`9vrZ z8jd=Zigj>saB^}&p-|pf?AZtpSfm#$25X<_3roXcL-0Of0eBxje}Dgw(2&3gLReUM zOms|gax$Qqfz0C|`xMB90>&?(3<7Rg0zPyb9i~n{4@&F++g82QMZE&8$MpP}g9S}6 zxn_hy9ZIFy9SEF(5T($5QTeu~W{dak8k|N~u=c&spIh-zst>f>*Rm96T@iSu@{&n& zxREIQKv#sRkZ8>fhVnw80y4BcUcZm1-$yzqCLZXGHtkI~(VJ*7m~!#~#Xcj@i57G| zn_yezZ(m6~S59&%i*e$_xYJ2)oCGfh8Ou(DRfjwA;+*-3u=aR(XCk6A)svTksi6eX z$Pu*oh^$0h1tlhn5>2Nd#Hq-8=|0z}7X(yvdj_U0(^o|IyH^;&q+Vjv0_rkCnsSM? zxe?9z!M6$`TMNU4#nJr26h4F8&P?m9I6IOK8_RJS$c0IAkdF&d_p{s|>F%OHp z`-?9Qm7*sZzE4=VN6es6c4QCx(xZx?iSmG%s&EM>zQ2n2m>V&}Bad>^db!b)HRPw) zqvz`r$7>U(>nSsQ;ve#)ghI^4w#9(qfJ~{}H@PtURX=D(2?+H_LQ;TD7_7bjch0!F!-WKiX zOu3ror5XG4z~y6~*d9(w_mw*Fw8s(U%5|Z=)Evj$iB&~i-ekEMoH*>XPu(lD8eCe*4|o+fvzi`sQ+5kGqH3str03=3 z=jW9l)Vh#AW9_K#%CS5SL*_nOh#i?!Vl}S~6;;|<1kX}uZ*F+2S?}vw)0p_T{g#@J zOm)h)Xz@bwQPtdKE1$nt&Dme@$Jo}^H?5YQ8w9+$6Dh@4BkoF`Tz=^}lPTC~M4+c% z^^y{#;R=v~eh&{zL5qLm_#G5?96PfN5BqI|ThUQ-ulC2$z4Cz~v9Rgr8l+C9Dmq;h zW+hp)YVs?=aSkvk(3#qguH2081oyZYrKY}dx8bLmCK z?g|1Mh)MWoPY32O9D~`T<-XH+Y1}`G)1}xzVJ3}a!JKMap_;uPKIP=RBR!uo+rR%q zit6x@Y|U&-^fU~+C&A6fJ&J8t{iydK1-TQR^2O!o(K4eqZ6-N;svfLgQHIZKEZlm1 z>$Iufuati=mw;bVv(3yiC) zI+?m5{MNR&tfx8r}*& zz>PjiCqoC@5QyF^GoO#L1l*hc0{Xz2l8TDXxRuxV!-o-3;Di!oO z?EcD29}*Yd?+9G*Q!_Aa6>m5|MA_QUv>uaR4=9paR$P>IBrU=%^FLlEIiPGH%JCH%hLxQ4=cY{)11Q2+1%p~eN#ZvACeow{bhBJ-#8X24exuFApXw3X+G@S zaY=z^rVhS4B=}|0juQc0@AvrqWWOin_VyOY-Q7RHq+jnZ{i_qbr?`ZP%zX9jUm)N} J`(`^F?LRV88j}D3 From acbe509c05e42577a74521dea5ac16c918e98dff Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 00:15:16 -0700 Subject: [PATCH 13/23] Fixed errors Changed bit depth --- content/images/rico16c.png | Bin 1412 -> 484 bytes content/images/rico256c.png | Bin 1593 -> 792 bytes main.cpp | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/images/rico16c.png b/content/images/rico16c.png index 03d6118431dd78556921e8e6f4608c8f765641e3..264bcf862e1f87a17af791ba0a00bbf7fbbc1cbf 100644 GIT binary patch delta 376 zcmV-;0f+vC3*-Zk83+ad0047(di0SYJ`(^5a7bBm000XQ000XQ0h0LxrIU&TCw~Do zNklpR-v; z>lGFBW*M(nRM4An`1l;B>HTU8%*Y22ajCF*gq2*oIW&Mic~sD37Z&2O00QyS04Z&* zP`?-HdpH0zsN%{1=~yvkbi#8#NRi7XtCF60dhS+*EWFcG4H&l$3Q&Q0a&Be z8T$$b8=C-X2x`+12g|+RFHju-^%$V^#K_?Q_s8!6=%0{ph|TpL^vtt2L>NH68K^gO zkNBc6*#Hr!_b|P|^vweZ%wycf_1owYKwv(@>$(LHn78>G&<1n)H4l0Z2Th<2mh$VK zqTeqF-hiN18@R%KLk4I4xLAWWfI>|~wE@uvq)?ZmN{pyEDAY4{3mIw-3iZfWH4GnA WS$2#8MAjVu0000Hlo~KFyh>nTu$sZZAf7)d{-_%R12aQ_Plzi}4^Yj50|%C! z`f%XRf&afh{QnOW7zLvtFd{-AWPj{^1_nlkk|4ieV9FoKfFbxhJFwhf;4JWnEM{Qf z764(!waR--fr64Ht`Q}{`DrEPiAAXl1&Nt?C3<k6!GHcFVdQ I&MBb@0Io2PwaHfx9MXtYnVS^{`jmpW%dSe3jpkdpsp4@HlJiZV<5Jkf%CF1-^=>7u9u2+ zwbT^=s203f2!fzi@>LRqbs+(W$bSIPqLG;|3p&IujR>(ZR{+-W2EcO&fH~~ekT|IT z;T_)rz?{P8Xw(vmjecEKlas@&J-^-q+;kp101#U^B6T5lpaw|AM0zOzVptn3kIPyB zXgwkTo}*byeE^Jc{NU@{0Vso8ikqkuO(7bb)QL-;HXxF;{#>hH0hGr3uYX;XHn96; z02({MNwO=p(2aX}Tn3q&pK@`38-Rrzfbp$0jw+1VdN()t8sMZDB>)~)+%L#&#=wx9 znd3UxR6iI?c*a=%6%+v1rU$^;Xbsx{nla6rrkm(z01R>fB#r=h#}HqQ3ji|6mN~`z za0ne2+^YcK9nV#aLud(5AAfPj0NexiV&oKbfSdz^R-8*P$YJdW@+Sc8{!pj~L1hSA zmJL8lz!zxe2moRd0AzPT;BzZJY9>VXa{!wS0a{6W3Bb)cBNZHn;67^u3?x$-fW|zM zcMx-@PTc_(dlSIhuL8K@3D<*2%U1xT&D0}z`3xceFF_0}#~}dQI)9Ix1J*H`sX(~4 zP8bAhqGO&r^K8I7Bx*b*dBG0Ew)+{2JDycwcg0S`ngsC;NC1v+33x~^Qv!`DSwV>g z2LQYhgm+`B=|1xE{G-2DsfFb`iLoc07*qoLHlo~KFyh>nTu$sZZAf7)d{-_%R12aQ_Plzi}&jJUB0}2d4 zl@Amc4k$Q0P;fW^6iIM+;Nb8e!C^r{!-0f`2MG-e8X6WXII!TrfddT<2NpCuXlQt_ z0LVD-03>waz?}of{sYYz1*0J_ltSR}3w1LF21bUGAiv=MBO5RTe`g1l8w{KU9+AZi z4BP@B%(zy0Zz)hvvcxr_Bsf2(>(p*OW(6t3{=b>>UIzT(jj0S5`OYes^({DZ>rVQw z+=v&lHdh7o7@YVbT@nsx*D_1&SJY>eZb<*ke_+S03ib(Wxm+jSK7P&olK(~S-%Jx` zN3~26XPC2~XqCXF<9Sb8f=l!r`c8dYcvv=IV)}yfn(fyDs@8R14e^_CDD~3Ga0UCD z+?@tLPcNA)%)R%sUHJlo192PsuH6Jb9cY1XK;a7Q0Bg4GuEwl;M8!5R!-Fk-ka)l s;j(GHX0*a=F^&n7)`m0O7Th>RzO8y%$c#gQQ$Tsn)78&qol`;+0KgXj2><{9 diff --git a/main.cpp b/main.cpp index ce9fb0c..033b35c 100644 --- a/main.cpp +++ b/main.cpp @@ -313,7 +313,7 @@ void Demo::onUserInput(UserInput* ui) { if(ui->keyPressed('v')) { messageTime = System::time(); - message = convert(getOSVersion()); + message = Convert(getOSVersion()); } } if(ui->keyPressed(SDLK_F8)) @@ -600,7 +600,7 @@ int main(int argc, char** argv) { //settings.useNetwork = false; //settings.window.width = 1024; //settings.window.height = 768; - if(getOSVersion > 5.0) + if(getOSVersion() > 5.0) settings.window.defaultIconFilename = GetFileInPath("/content/images/rico.png"); else settings.window.defaultIconFilename = GetFileInPath("/content/images/rico256c.png"); From 3e4c1283472a30fe619a0701cf67e9307e87fe11 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 17:18:26 -0700 Subject: [PATCH 14/23] Added bare bones TextButton rendering (Yes, it took that many lines of code) --- G3DTest.suo | Bin 14848 -> 15872 bytes G3DTest.vcproj | 8 +++ ImageButtonInstance.cpp | 21 ++++++++ ImageButtonInstance.h | 10 ++++ TextButtonInstance.cpp | 5 +- TextButtonInstance.h | 1 + main.cpp | 116 ++++++++++++++++++++++++++++++++++++---- 7 files changed, 151 insertions(+), 10 deletions(-) create mode 100644 ImageButtonInstance.cpp create mode 100644 ImageButtonInstance.h diff --git a/G3DTest.suo b/G3DTest.suo index e4a1d0d773efea43e76344d6595f9c391b56b536..8a3723781d65793cdca3298ca3bf3e2557de258d 100644 GIT binary patch delta 348 zcmZoDX{edtz{s@G@i-%k374}{qadJM@x1-EAY-Uy@^7(oOQ z;0CfmVw^y%3l%qnitz$z9yBo!*90nN3Zy}L`GD9Ai1mQjf`LH@EC}M*05J$S0ex&T LIe}vV5GMivOF%<$ delta 133 zcmZpuX(*ZCz{t4K@i-&PzyJULPv&7tVEnf+a5Cd0mK?qZxgvMVuU}?lW?*1AAiuea z#gmbZK?ukZn9OgiJ-I=EW%CbK7A6*;#{Zi*4hyh>Rf>Zpzeog3J|b(dxkS>RW%6Mb g!_8l0d&DM3aJWo%G2Jscfx~6<5z{}+lfyV10J_;P!vFvP diff --git a/G3DTest.vcproj b/G3DTest.vcproj index f73501d..aeacc36 100644 --- a/G3DTest.vcproj +++ b/G3DTest.vcproj @@ -234,6 +234,10 @@ RelativePath=".\Dialogs.rc" > + + @@ -271,6 +275,10 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > + + diff --git a/ImageButtonInstance.cpp b/ImageButtonInstance.cpp new file mode 100644 index 0000000..8b16f19 --- /dev/null +++ b/ImageButtonInstance.cpp @@ -0,0 +1,21 @@ +#include "ImageButtonInstance.h" +G3D::TextureRef image = NULL; +int openGLID = 0; +G3D::TextureRef image_ovr = NULL; +int openGLID_ovr = 0; +G3D::TextureRef image_dn = NULL; +int openGLID_dn = 0; +ImageButtonInstance::ImageButtonInstance(G3D::TextureRef newImage = NULL, G3D::TextureRef overImage = NULL, G3D::TextureRef downImage = NULL) +{ + + image = newImage; + openGLID = image->getOpenGLID(); + image_ovr = overImage; + openGLID_ovr = image_ovr->getOpenGLID(); + image_dn = downImage; + openGLID_dn = image_dn->getOpenGLID(); +} + +ImageButtonInstance::~ImageButtonInstance(void) +{ +} diff --git a/ImageButtonInstance.h b/ImageButtonInstance.h new file mode 100644 index 0000000..139b2b3 --- /dev/null +++ b/ImageButtonInstance.h @@ -0,0 +1,10 @@ +#pragma once +#include "instance.h" + +class ImageButtonInstance : + public Instance +{ +public: + ImageButtonInstance(G3D::TextureRef,G3D::TextureRef,G3D::TextureRef); + ~ImageButtonInstance(void); +}; diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp index b388b17..033429a 100644 --- a/TextButtonInstance.cpp +++ b/TextButtonInstance.cpp @@ -20,6 +20,7 @@ G3D::GFontRef* font; int textSize; bool floatBottom; bool floatRight; +bool floatCenter; bool visible; TextButtonInstance::TextButtonInstance(void) @@ -36,10 +37,12 @@ TextButtonInstance::TextButtonInstance(void) textSize = 12; floatBottom = false; floatRight = false; + floatCenter = false; visible = true; + className = "TextButtonInstance"; } TextButtonInstance::~TextButtonInstance(void) { -} +} \ No newline at end of file diff --git a/TextButtonInstance.h b/TextButtonInstance.h index 1ac5ed1..acdc068 100644 --- a/TextButtonInstance.h +++ b/TextButtonInstance.h @@ -28,5 +28,6 @@ public: bool floatBottom; bool floatRight; bool visible; + int textSize; }; diff --git a/main.cpp b/main.cpp index 033b35c..44d49da 100644 --- a/main.cpp +++ b/main.cpp @@ -120,17 +120,81 @@ TextButtonInstance* makeTextButton() return part; } + +void initGUI() +{ + TextButtonInstance* button = makeTextButton(); + button->boxBegin = Vector2(0, -24); + button->boxEnd = Vector2(80, 0); + button->floatBottom = true; + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3(0,255,255); + button->textOutlineColor = Color4::clear(); + button->title = "Hopper"; + button->fontLocationRelativeTo = Vector2(10, 5); + + button = makeTextButton(); + button->boxBegin = Vector2(0, -48); + button->boxEnd = Vector2(80, -24); + button->floatBottom = true; + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3(0,255,255); + button->textOutlineColor = Color4::clear(); + button->title = "Controller"; + button->fontLocationRelativeTo = Vector2(10, 5); + + button = makeTextButton(); + button->boxBegin = Vector2(0, -72); + button->boxEnd = Vector2(80, -48); + button->floatBottom = true; + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3(0,255,255); + button->textOutlineColor = Color4::clear(); + button->title = "Color"; + button->fontLocationRelativeTo = Vector2(10, 5); + + button = makeTextButton(); + button->boxBegin = Vector2(0, -96); + button->boxEnd = Vector2(80, -72); + button->floatBottom = true; + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3(0,255,255); + button->textOutlineColor = Color4::clear(); + button->title = "Surface"; + button->fontLocationRelativeTo = Vector2(10, 5); + + button = makeTextButton(); + button->boxBegin = Vector2(0, -120); + button->boxEnd = Vector2(80, -96); + button->floatBottom = true; + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3(0,255,255); + button->textOutlineColor = Color4::clear(); + button->title = "Model"; + button->fontLocationRelativeTo = Vector2(10, 5); +} + void Demo::onInit() { // Called before Demo::run() beings + + dataModel = new Instance(); //dataModel->name = "undefined"; dataModel->parent = NULL; + initGUI(); + PhysicalInstance* test = makePart(); test->parent = dataModel; test->color = Color3(0.2F,0.3F,1); test->size = Vector3(24,1,24); + test = makePart(); @@ -208,7 +272,9 @@ void Demo::onInit() { + GApplet::onInit(); + } @@ -270,6 +336,7 @@ double getOSVersion() { } void Demo::onUserInput(UserInput* ui) { + if (ui->keyPressed(SDLK_ESCAPE)) { // Even when we aren't in debug mode, quit on escape. endApplet = true; @@ -393,6 +460,36 @@ bool mouseInArea(float point1x, float point1y, float point2x, float point2y) return false; } + +void drawButtons(RenderDevice* rd) +{ + for(size_t i = 0; i < instances_2D.size(); i++) + { + Instance* instance = instances_2D.at(i); + if(instance->className == "TextButtonInstance" && instance->parent == dataModel) + { + TextButtonInstance* tbi = (TextButtonInstance*)instance; + Vector3 point1; + Vector3 point2; + if(tbi->floatBottom) + { + point1 = Vector3(tbi->boxBegin.x, rd->getHeight() + tbi->boxBegin.y,0); + point2 = Vector3(tbi->boxEnd.x, rd->getHeight() + tbi->boxEnd.y,0); + + } + else + { + point1 = Vector3(tbi->boxBegin.x, tbi->boxBegin.y,0); + point2 = Vector3(tbi->boxEnd.x, tbi->boxEnd.y,0); + } + Draw::box(Box(point1, point2), rd, tbi->boxColor, tbi->boxOutlineColor); + Vector2 RelativeTo = Vector2(point1.x + tbi->fontLocationRelativeTo.x, point1.y + tbi->fontLocationRelativeTo.y); + tbi->font->draw2D(rd, tbi->title, RelativeTo, tbi->textSize, tbi->textColor, tbi->textOutlineColor); + + } + } +} + void Demo::onGraphics(RenderDevice* rd) { LightingParameters lighting(G3D::toSeconds(11, 00, 00, AM)); app->renderDevice->setProjectionAndCameraMatrix(app->debugCamera); @@ -412,7 +509,6 @@ void Demo::onGraphics(RenderDevice* rd) { app->renderDevice->setAmbientLightColor(Color3(1,1,1)); Draw::axes(CoordinateFrame(Vector3(0, 0, 0)), app->renderDevice); - Draw::sphere(G3D::Sphere(Vector3(0,0,0),3), rd, Color3::red(), Color4::clear()); //makeFlag(Vector3(1, 0.5, 0.5), rd); @@ -421,7 +517,6 @@ void Demo::onGraphics(RenderDevice* rd) { app->renderDevice->setLight(0, GLight::directional(lighting.lightDirection, lighting.lightColor)); app->renderDevice->setAmbientLightColor(lighting.ambient); - //Draw::box(G3D::Box(Vector3(4.0/2,1.0/2,2.0/2),Vector3(0,0,0)), rd, Color3::gray(), Color4(0,0,0,0)); for(size_t i = 0; i < instances.size(); i++) { Instance* instance = instances.at(i); @@ -434,8 +529,7 @@ void Demo::onGraphics(RenderDevice* rd) { } } - //Draw::cylinder(G3D::Cylinder::Cylinder(Vector3(0,5,0),Vector3(0,10,0),1),app->renderDevice,Color4(0,0,1,0.5),Color4(0,0,0,0)); - + app->renderDevice->disableLighting(); @@ -460,14 +554,12 @@ void Demo::onGraphics(RenderDevice* rd) { fntdominant->draw2D(rd, "Timer: " + Convert(TIMERVAL), Vector2(rd->getWidth() - 120, 0+offset), 20, Color3::fromARGB(0x81C518), Color3::black()); fntdominant->draw2D(rd, "Score: " + Convert(SCOREVAL), Vector2(rd->getWidth() - 120, 25+offset), 20, Color3::fromARGB(0x81C518), Color3::black()); - //fntlighttrek->draw2D(rd, "Button: " + button, Vector2(10,30 + offset), 15, Color3::white(), Color3::black()); //GUI Boxes Draw::box(G3D::Box(Vector3(0,offset,0),Vector3(80,330+offset,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0)); - Draw::box(G3D::Box(Vector3(0,rd->getHeight() - 120,0),Vector3(80,rd->getHeight(),0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0)); - + //Draw::box(G3D::Box(Vector3(0,rd->getHeight() - 120,0),Vector3(80,rd->getHeight(),0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0)); Draw::box(G3D::Box(Vector3(rd->getWidth() - 120,rd->getHeight() - 120,0),Vector3(rd->getWidth(),rd->getHeight(),0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0,0,0,0)); @@ -478,12 +570,13 @@ void Demo::onGraphics(RenderDevice* rd) { fntlighttrek->draw2D(rd, "CameraMenu", Vector2(rd->getWidth()-(fntlighttrek->get2DStringBounds("CameraMenu", 14).x+1),rd->getHeight() - 120), 14, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F)); + /* fntlighttrek->draw2D(rd, "Model", Vector2(10,rd->getHeight() - (120 - spacing*0)), 12, Color3(0,255,255), Color4(0,0,0,0)); fntlighttrek->draw2D(rd, "Surface", Vector2(10,rd->getHeight() - (120 - spacing*1)), 12, Color3(0,255,255), Color4(0,0,0,0)); fntlighttrek->draw2D(rd, "Color", Vector2(10,rd->getHeight() - (120 - spacing*2)), 12, Color3(0,255,255), Color4(0,0,0,0)); fntlighttrek->draw2D(rd, "Controller", Vector2(10,rd->getHeight() - (120 - spacing*3)), 12, Color3(0,255,255), Color4(0,0,0,0)); fntlighttrek->draw2D(rd, "Hopper", Vector2(10,rd->getHeight() - (120 - spacing*4)), 12, Color3(0,255,255), Color4(0,0,0,0)); - + */ //Top menu fntlighttrek->draw2D(rd,"File", Vector2(10+0*sep,0), 16, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F)); @@ -561,6 +654,7 @@ void Demo::onGraphics(RenderDevice* rd) { rd->popState(); + drawButtons(rd); app->renderDevice->pop2D(); } @@ -605,9 +699,13 @@ int main(int argc, char** argv) { else settings.window.defaultIconFilename = GetFileInPath("/content/images/rico256c.png"); settings.window.resizable = true; - + settings.writeLicenseFile = false; + + //SDLWindow wind = SDLWindow(settings.window); App app = App(settings); //app.window()->setIcon(ExePath() + "/content/images/rico.png"); + messageTime = System::time(); + message = app.window()->getAPIName(); app.run(); return 0; } \ No newline at end of file From 067a744cdaaa05f2c2a6b41df868ba493fee00e7 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 17:19:02 -0700 Subject: [PATCH 15/23] Changed className TextButtonInstance to TextButton to match naming convention --- TextButtonInstance.cpp | 2 +- main.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp index 033429a..e9d32ec 100644 --- a/TextButtonInstance.cpp +++ b/TextButtonInstance.cpp @@ -39,7 +39,7 @@ TextButtonInstance::TextButtonInstance(void) floatRight = false; floatCenter = false; visible = true; - className = "TextButtonInstance"; + className = "TextButton"; } diff --git a/main.cpp b/main.cpp index 44d49da..84448e5 100644 --- a/main.cpp +++ b/main.cpp @@ -466,7 +466,7 @@ void drawButtons(RenderDevice* rd) for(size_t i = 0; i < instances_2D.size(); i++) { Instance* instance = instances_2D.at(i); - if(instance->className == "TextButtonInstance" && instance->parent == dataModel) + if(instance->className == "TextButton" && instance->parent == dataModel) { TextButtonInstance* tbi = (TextButtonInstance*)instance; Vector3 point1; From b900e918b4dcf320fee66834c8b371f9aaa4fb30 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 18:03:12 -0700 Subject: [PATCH 16/23] Converted most menu buttons to TextButton, No longer hard coded Removed useless values MUCH faster now! --- main.cpp | 109 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 67 insertions(+), 42 deletions(-) diff --git a/main.cpp b/main.cpp index 84448e5..1defb9f 100644 --- a/main.cpp +++ b/main.cpp @@ -34,8 +34,6 @@ static int FPSVal[8] = {10, 20, 30, 60, 120, 240, INT_MAX,1}; static int index = 2; static float TIMERVAL = 60.0F; static int SCOREVAL = 0; -static int sep = 125; -static int spacing = 25; static G3D::TextureRef go = NULL; static G3D::TextureRef go_ovr = NULL; static G3D::TextureRef go_dn = NULL; @@ -132,7 +130,7 @@ void initGUI() button->textColor = Color3(0,255,255); button->textOutlineColor = Color4::clear(); button->title = "Hopper"; - button->fontLocationRelativeTo = Vector2(10, 5); + button->fontLocationRelativeTo = Vector2(10, 3); button = makeTextButton(); button->boxBegin = Vector2(0, -48); @@ -143,7 +141,7 @@ void initGUI() button->textColor = Color3(0,255,255); button->textOutlineColor = Color4::clear(); button->title = "Controller"; - button->fontLocationRelativeTo = Vector2(10, 5); + button->fontLocationRelativeTo = Vector2(10, 3); button = makeTextButton(); button->boxBegin = Vector2(0, -72); @@ -154,7 +152,7 @@ void initGUI() button->textColor = Color3(0,255,255); button->textOutlineColor = Color4::clear(); button->title = "Color"; - button->fontLocationRelativeTo = Vector2(10, 5); + button->fontLocationRelativeTo = Vector2(10, 3); button = makeTextButton(); button->boxBegin = Vector2(0, -96); @@ -165,7 +163,7 @@ void initGUI() button->textColor = Color3(0,255,255); button->textOutlineColor = Color4::clear(); button->title = "Surface"; - button->fontLocationRelativeTo = Vector2(10, 5); + button->fontLocationRelativeTo = Vector2(10, 3); button = makeTextButton(); button->boxBegin = Vector2(0, -120); @@ -174,9 +172,69 @@ void initGUI() button->parent = dataModel; button->font = fntlighttrek; button->textColor = Color3(0,255,255); - button->textOutlineColor = Color4::clear(); + button->boxOutlineColor = Color3(0,255,255); button->title = "Model"; - button->fontLocationRelativeTo = Vector2(10, 5); + button->fontLocationRelativeTo = Vector2(10, 3); + + button = makeTextButton(); + button->boxBegin = Vector2(0, 0); + button->boxEnd = Vector2(125, 25); + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3::white(); + button->boxColor = Color4::clear(); + button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F); + button->title = "File"; + button->textSize = 16; + button->fontLocationRelativeTo = Vector2(10, 0); + + button = makeTextButton(); + button->boxBegin = Vector2(125, 0); + button->boxEnd = Vector2(250, 25); + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3::white(); + button->boxColor = Color4::clear(); + button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F); + button->title = "Edit"; + button->textSize = 16; + button->fontLocationRelativeTo = Vector2(10, 0); + + button = makeTextButton(); + button->boxBegin = Vector2(250, 0); + button->boxEnd = Vector2(375, 25); + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3::white(); + button->boxColor = Color4::clear(); + button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F); + button->title = "View"; + button->textSize = 16; + button->fontLocationRelativeTo = Vector2(10, 0); + + button = makeTextButton(); + button->boxBegin = Vector2(375, 0); + button->boxEnd = Vector2(500, 25); + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3::white(); + button->boxColor = Color4::clear(); + button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F); + button->title = "Insert"; + button->textSize = 16; + button->fontLocationRelativeTo = Vector2(10, 0); + + button = makeTextButton(); + button->boxBegin = Vector2(500, 0); + button->boxEnd = Vector2(625, 25); + button->parent = dataModel; + button->font = fntlighttrek; + button->textColor = Color3::white(); + button->boxColor = Color4::clear(); + button->textOutlineColor = Color4(0.5F,0.5F,0.5F,0.5F); + button->title = "Format"; + button->textSize = 16; + button->fontLocationRelativeTo = Vector2(10, 0); } void Demo::onInit() { @@ -434,14 +492,7 @@ void makeFlag(Vector3 &vec, RenderDevice* &rd) parray.push(Vector2(up.x-1, up.y-.5)); parray.push(Vector2(up.x, up.y-1)); Draw::poly2D(parray, rd, Color3::blue()); - //rd->pushState(); - //rd->beginPrimitive(RenderDevice::QUADS); - //rd->setColor(Color4(0,0,1,1)); - // rd->sendVertex(up); - // rd->sendVertex(Vector3(up.x-1, up.y-1, up.z)); - // rd->sendVertex(Vector3(up.x, up.y-2, up.z)); - //rd->endPrimitive(); - //rd->popState(); + //I know how i will approach this now } @@ -578,12 +629,6 @@ void Demo::onGraphics(RenderDevice* rd) { fntlighttrek->draw2D(rd, "Hopper", Vector2(10,rd->getHeight() - (120 - spacing*4)), 12, Color3(0,255,255), Color4(0,0,0,0)); */ - //Top menu - fntlighttrek->draw2D(rd,"File", Vector2(10+0*sep,0), 16, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F)); - fntlighttrek->draw2D(rd,"Edit", Vector2(10+1*sep,0), 16, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F)); - fntlighttrek->draw2D(rd,"View", Vector2(10+2*sep,0), 16, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F)); - fntlighttrek->draw2D(rd,"Insert", Vector2(10+3*sep,0), 16, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F)); - fntlighttrek->draw2D(rd,"Format", Vector2(10+4*sep,0), 16, Color3::white(), Color4(0.5F,0.5F,0.5F,0.5F)); //Tools menu Draw::box(G3D::Box(Vector3(5, 165+offset,0),Vector3(75, 165+offset,0)),rd,Color4(0.6F,0.6F,0.6F,0.4F), Color4(0.6F,0.6F,0.6F,0.4F)); @@ -598,26 +643,6 @@ void Demo::onGraphics(RenderDevice* rd) { rd->pushState(); - - /*rd->setTexture(0, go); - - - rd->enableAlphaWrite(); - //rd->setTexCoord(0, Vector2(0.0F, 0.0F)); - //rd->setTexCoord(0, Vector2(1.0F, 0.0F)); - //rd->setTexCoord(0, Vector2(0.0F, 1.0F)); - //rd->setTexCoord(0, Vector2(1.0F, 1.0F)); - //rd->setTextureCombineMode(0, RenderDevice::CombineMode::TEX_ADD); - - rd->beginPrimitive(RenderDevice::QUADS); - rd->sendVertex(Vector2(10,25)); - rd->sendVertex(Vector2(70,25)); - rd->sendVertex(Vector2(70,85)); - rd->sendVertex(Vector2(10,85)); - rd->endPrimitive(); - rd->setTexture(0, NULL);*/ - - rd->beforePrimitive(); From 8d53e8ff0f8e82a476c517bfd9d9368cae5fc2cb Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 18:07:48 -0700 Subject: [PATCH 17/23] Removed useless debug comments and code --- main.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/main.cpp b/main.cpp index 1defb9f..9bead55 100644 --- a/main.cpp +++ b/main.cpp @@ -325,8 +325,6 @@ void Demo::onInit() { setDesiredFrameRate(FPSVal[index]); app->debugCamera.setPosition(Vector3(0, 2, 10)); app->debugCamera.lookAt(Vector3(0, 2, 0)); - //std::string str = "Dynamica Duomillenium 5 Version " + VERSION + Convert(VNUM); - //title = dataModel->name; @@ -715,22 +713,14 @@ App::~App() { int main(int argc, char** argv) { GAppSettings settings; - //settings.debugFontName = "lighttrek.fnt"; - //settings.useNetwork = false; - //settings.window.width = 1024; - //settings.window.height = 768; if(getOSVersion() > 5.0) settings.window.defaultIconFilename = GetFileInPath("/content/images/rico.png"); else settings.window.defaultIconFilename = GetFileInPath("/content/images/rico256c.png"); settings.window.resizable = true; settings.writeLicenseFile = false; - - //SDLWindow wind = SDLWindow(settings.window); App app = App(settings); //app.window()->setIcon(ExePath() + "/content/images/rico.png"); - messageTime = System::time(); - message = app.window()->getAPIName(); app.run(); return 0; } \ No newline at end of file From acd87e351bd8ce4566b5c7665e560ea5bfdc5657 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 18:17:19 -0700 Subject: [PATCH 18/23] Made test work on offset --- main.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/main.cpp b/main.cpp index 9bead55..741388b 100644 --- a/main.cpp +++ b/main.cpp @@ -659,16 +659,15 @@ void Demo::onGraphics(RenderDevice* rd) { else glBindTexture( GL_TEXTURE_2D, go_id); - //glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); glBegin( GL_QUADS ); glTexCoord2d(0.0,0.0); - glVertex2f( 10, 25 ); + glVertex2f( 10, 0+offset ); glTexCoord2d( 1.0,0.0 ); - glVertex2f( 70, 25 ); + glVertex2f( 70, 0+offset ); glTexCoord2d( 1.0,1.0 ); - glVertex2f( 70, 85 ); + glVertex2f( 70, 65+offset ); glTexCoord2d( 0.0,1.0 ); - glVertex2f( 10, 85 ); + glVertex2f( 10, 65+offset ); glEnd(); glDisable( GL_TEXTURE_2D ); From 09fa95d4a0490401067463613717c1206433bc92 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 19:40:15 -0700 Subject: [PATCH 19/23] Added dialog --- Dialogs.aps | Bin 34384 -> 35036 bytes Dialogs.rc | 33 +++++++++++++++++++++++++++++++++ main.cpp | 1 + resource.h | 14 ++++++++++---- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/Dialogs.aps b/Dialogs.aps index 499e801f159f1d646f5d3d53aa6a2898b518b14a..02bfebf527769d63da67061abe317cd1c86ba025 100644 GIT binary patch delta 844 zcmZ`%OKTHR6h3#7Ch9^XRMR$9Qi6h5!X!=FC?c88Oq$V2CePA^b`Z=$3|2t}L1|vo zRg}iN&CZpJiY0%*LYE4aZe7&9Ep7yHGoE{Anr!sKIrH7~edjeZdtKpMPuNsE(;Gk! z(pR=0zg#3c^l8&HOO z@EmGfI&@rjj_VFxoepcLyg!t1z;zL>JMz%g=6RZKbxD^>trVN+SS%oLrmX>s&f;Ah z#_BwFht9MY&Z-#oqp`Duc8hMcf+R+Z?e!eX3ZvP!7wsV;zIT8F*KLBkF25`N(RK|` z`$c$$FXJh4efqUMz@O9VM8@`S0Q{y~ornNU`e!}**76GJCcWN>`q-Q7BDCVd$0mJb zT@>mq`o@~Nyo*GteZ1A^8}PR1vS{fJ{b1enbrF7MaE@Nu2oQ^|wx_~um!H=Eclir> CH^Kq{ delta 288 zcmcaJk?BGY(*zgh3(X9ZA2?`kEU0l}oH6;WQ{`kuNAbzioV6L%Ctr0|W_-8#r?U~` z#6!}IW}B;Ar5PtPGfJBqGXR03TSUC4i*tN%NRX$utAA(+gQ0AWV3XXe7Vybv@}K4&Ahwhd;A8#f&kf_Auk1ghtBU&pMVeoYyYKv<1Y}W19ms=tjfjUF~vAQyM4VYL{a30E)CUP3~(kp6uJf4dx0oPmb$w JW(1P0QUF Date: Thu, 19 Apr 2018 20:30:30 -0700 Subject: [PATCH 20/23] put drawButton in its class, and not in main loop --- TextButtonInstance.cpp | 21 +++++++++++++++++++++ TextButtonInstance.h | 5 +++-- main.cpp | 22 +++------------------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/TextButtonInstance.cpp b/TextButtonInstance.cpp index e9d32ec..de70aff 100644 --- a/TextButtonInstance.cpp +++ b/TextButtonInstance.cpp @@ -45,4 +45,25 @@ TextButtonInstance::TextButtonInstance(void) TextButtonInstance::~TextButtonInstance(void) { +} + +void TextButtonInstance::drawObj(RenderDevice* rd) +{ + Vector3 point1; + Vector3 point2; + if(floatBottom) + { + point1 = Vector3(boxBegin.x, rd->getHeight() + boxBegin.y,0); + point2 = Vector3(boxEnd.x, rd->getHeight() + boxEnd.y,0); + + } + else + { + point1 = Vector3(boxBegin.x, boxBegin.y,0); + point2 = Vector3(boxEnd.x, boxEnd.y,0); + } + Draw::box(Box(point1, point2), rd, boxColor, boxOutlineColor); + Vector2 RelativeTo = Vector2(point1.x + fontLocationRelativeTo.x, point1.y + fontLocationRelativeTo.y); + font->draw2D(rd, title, RelativeTo, textSize, textColor, textOutlineColor); + } \ No newline at end of file diff --git a/TextButtonInstance.h b/TextButtonInstance.h index acdc068..b574872 100644 --- a/TextButtonInstance.h +++ b/TextButtonInstance.h @@ -29,5 +29,6 @@ public: bool floatRight; bool visible; int textSize; - -}; + void drawObj(G3D::RenderDevice*); + +}; \ No newline at end of file diff --git a/main.cpp b/main.cpp index d8329e8..27b982c 100644 --- a/main.cpp +++ b/main.cpp @@ -519,23 +519,7 @@ void drawButtons(RenderDevice* rd) if(instance->className == "TextButton" && instance->parent == dataModel) { TextButtonInstance* tbi = (TextButtonInstance*)instance; - Vector3 point1; - Vector3 point2; - if(tbi->floatBottom) - { - point1 = Vector3(tbi->boxBegin.x, rd->getHeight() + tbi->boxBegin.y,0); - point2 = Vector3(tbi->boxEnd.x, rd->getHeight() + tbi->boxEnd.y,0); - - } - else - { - point1 = Vector3(tbi->boxBegin.x, tbi->boxBegin.y,0); - point2 = Vector3(tbi->boxEnd.x, tbi->boxEnd.y,0); - } - Draw::box(Box(point1, point2), rd, tbi->boxColor, tbi->boxOutlineColor); - Vector2 RelativeTo = Vector2(point1.x + tbi->fontLocationRelativeTo.x, point1.y + tbi->fontLocationRelativeTo.y); - tbi->font->draw2D(rd, tbi->title, RelativeTo, tbi->textSize, tbi->textColor, tbi->textOutlineColor); - + tbi->drawObj(rd); } } } @@ -666,9 +650,9 @@ void Demo::onGraphics(RenderDevice* rd) { glTexCoord2d( 1.0,0.0 ); glVertex2f( 70, 0+offset ); glTexCoord2d( 1.0,1.0 ); - glVertex2f( 70, 65+offset ); + glVertex2f( 70, 60+offset ); glTexCoord2d( 0.0,1.0 ); - glVertex2f( 10, 65+offset ); + glVertex2f( 10, 60+offset ); glEnd(); glDisable( GL_TEXTURE_2D ); From 8fc8549a6cf4f7ba3b652d2818766eabd9d08a82 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 20:42:11 -0700 Subject: [PATCH 21/23] Added deprication notice to debug mode --- main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 27b982c..077b923 100644 --- a/main.cpp +++ b/main.cpp @@ -428,7 +428,7 @@ void Demo::onUserInput(UserInput* ui) { if(app->debugMode()) message = "Debug Mode Disabled"; else - message = "Debug Mode Enabled"; + message = "Debug Mode Enabled, Soon to be depricated"; app->setDebugMode(!app->debugMode()); } } From 2445d076a167fde533d179c35d9bf9a82d5127a3 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 21:36:31 -0700 Subject: [PATCH 22/23] Reset Solution --- Dialogs.aps | Bin 35036 -> 0 bytes Dialogs.rc | 191 --------- G3DTest.opt | Bin 53760 -> 0 bytes G3DTest.plg | 32 -- G3DTest.suo | Bin 15872 -> 0 bytes G3DTest.sln => G3D_Application.sln | 40 +- G3DTest.dsp => G3D_New.dsp | 242 ++++++----- G3DTest.dsw => G3D_New.dsw | 58 +-- G3DTest.vcproj => G3D_New.vcproj | 653 +++++++++++++++-------------- main.cpp | 5 +- resource.h | 25 -- 11 files changed, 530 insertions(+), 716 deletions(-) delete mode 100644 Dialogs.aps delete mode 100644 Dialogs.rc delete mode 100644 G3DTest.opt delete mode 100644 G3DTest.plg delete mode 100644 G3DTest.suo rename G3DTest.sln => G3D_Application.sln (54%) rename G3DTest.dsp => G3D_New.dsp (77%) rename G3DTest.dsw => G3D_New.dsw (84%) rename G3DTest.vcproj => G3D_New.vcproj (67%) delete mode 100644 resource.h diff --git a/Dialogs.aps b/Dialogs.aps deleted file mode 100644 index 02bfebf527769d63da67061abe317cd1c86ba025..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35036 zcmd6Qdz@@XUFUD|AP`8*%3~2wZ%Dvom&87&duF;Lnw;)FJ=5Ht?oM~lojdVLdrfXg z;F{pQ1mXg2h%Z#w%`W?qeMCfd7Xfzxc`6Zw6%={OQ=ZDh7rO!hL17p7`u+W?>eR35 zR8P?TXFH#{>8bCx>eTDhpL4Z8iJ+bH(7cTaNW_K7R7nC!N0X)b;eftK;z6Z^kp^-yqQ{4r$w>oQ8PWHLkjqK~c^T0UgkY7I z1~N0Et3%Xerh(jy=o$+xCX>-(IGrPx4P<46?r3UjFxu~O-W$lphb`eLg z7O;N!lxAO$HjvUH+rxf|W}1$QUMXOsJ)(gH=fmsDWq*HM?4a5Bd5zYHwlp{x9xY9x zjeLZ6#$^y$8IHG1oNPox3vA7X(`h-AaBeUz?qQ2fX2Wv4SZ+^d*U@FFSD?b5rG7Q_ zcscEa(a_@-K{W16I-WGnepoF+C}F&f#-5AYe$wKjY_kuGcs zYzub8V$!X3iG0>**rVI!Xu31$ zhm4$F;u%%i%W|h%_WR~l!Bd*_Upxz=_Z0neiPz6QrbRFH@TB_$lR@?RB8hc+nG|a< z9F>?Q_Bi`!EqbL7olMKI3C`$MJ{T=Lmk04Y^J*VHFOJyYCjELCyeyKCz zJM9+>TZn>w!vkElWp6UwuS(LT-&Amk*>k5DN+--3J$jSJP`As$%(hL|=+iwO+nMby z2g4a&6s~}*L2r(+QJFdHx9eDLu#A4Ejx`OI(_89T%V14<<^q-l!~OY|8Qmy*~=aTF3OJJfjaN41G}Q zB+u!CDtOm)p}a{S@}UC^b%xxc5BuOLvST`VzD^&B!k44r_^^qzL4Op3^J&?`BGcfT z^ihw`%4u2HOtk4^0bmymWtMm7;~trpBfO@*pap%xgS+GY#5|@;pY*}A(gpYEQxd#~ zLQeLoA*|V;PwVhvHY>(v{LPvfeMV!wV%{tIrYf2_eO6-&9v5Yi!9B3qq|en*SxX4o zqCeH>d^#GMs%Wm$p9#W4xh&G9Osxiep$aaKT5>C+FG?uS3_MMhM-4ltFZpn8R9PC8 zS*uC+dSG{M=ZCD-qAyE$Z!%u+27nVZNv+dYsu(6@gT5*u{c=!XQK-0^^ff_b4}mGh zRMdKdzAnK$j4pj}M&FR&!DP0B1?B*cmIrJ!=$iseP@%)|9P1?4SXdm>nF^D4f_tCL z6*;yMw8rx_$20HCWbCRu$JDbHq1)Wf%OT3l&&@GOo)t2tGt6kS#jvywXwlgf0SR~g zP@H4nIcLqz@k={j;C;0dUlaL0zXoG{!ZR8_yot;|uuiZGpC&T@pc=|gF>#x8K?22e zXy6uISc9*dOm>D+?k1+uZ%g9XA({j>=prdMPl8L{J#@`5gbfEh*dx3R+np~fFr$Zf za8_2~EqbUAFLoCb^~$x8n}>OHzJpQCwNM+C{BVzrirH4_v5dY$VM8;3wzHfb;e-3- z0&}jkW;<)rBRzs{RGMW)J8RLSJkaG`inLKXTc_`=DoW}CRXE(iDifVfe)rk^u83G1 z4Tv_?@0RCa?Sbu~?@S$3>m?d-(?JKlsA1VgFaf=bcamVV=$K|8OLks0uQnL#^h0TeNnnGX7{RKC zwKi!Pq1Z83E!1k$4@dA~QuUHnhmLy`+d^J^?VxbOMaets0W3~*!ZT#f<$2Ly8Qtiy zqPG|x!B&Yacoxs;NgnT+$=I$Xk#du6@+eOdCeaq%?1N!7*p;;<`0Mm!4-96L>trhm zV1u6G0la_m7Vs1RY?DrUOtx%XJcG6A7LS>Io)q4o9lF({60?{qxS*#-u-ywPPM3bn zb9hasupXWAm^>UywI$cP&3T_rd%_N;HEuPmp?E1}a#+%Bp3xs-v7*2MJ>7%d;bNzl zYP{2+XLwweSjHZ#(&%J#yXT0#AxI*pANR2AAUK_}zu2Fe(WcX)XL`o&`0#kLH}>c{ zJzQ<@B?j zgn5mVVFqU+}n2h0_1Cxp67WO;mX;#zS~Y`GiK8IZQ=p`Ps9jJO=tFe(yEB|#RZ(1z2 zrMa-Sd1;N+AL5N1?1~*`kip>ct2K&QQo_MjnDW5>^0HN=y%`34^RyPdyv9O{ne~}Z zY@J@Qnx>N5pkMPm*usa?g-J`E28+lmYcR@&!sE3LmTzn!d6nXdBW`Jy3X&F92(R(D zt#u4q*mRGL$#symGkUG(V0niZ3Y~E-Lv_~9>2)5p@0%kYUj}9N5&?>5VCh8N*BwHt07z#SXfa;TPH8q~G+oe~PBG=}jpLh9_)H%x)lS zcj%rJi5EZUFq&D=Z>5;1R8*ZAY}#FVv*&D;u%YOsx+z(Ye%o_kI!|%>^gEtoOOMXb zD`ut#w@Z49C-~x`LFH5%QA}1Yse}r$N-IqgIjb}wcABf;NaAQ?O>@IyUf-z4YuHYVh zD1vzat;SD`kROilaxyUaD(NF0DrOj#s&?)+=%W#)+qs+3$0C@=&&haX283=-ACGYK zuF0UP`EHXw5fNl$^(nOIlMw-x>a4Sath-L1s^dKvd1P&$bvNjb>-fC4UGA`l5eaP4 zpE$yNIqAW+($ zSPf;J{yL<{8HgzcmDywuj@-cjGnjd2b8Iue8j@i?v9BTqZ#M9mL}4SZ@e;|k>2E@s zuOHoAb4(h48xpy`@$AK9VOExTyP&U!lu5tai`TX}CX8={G(Mn_oD}kQkN$VaosZ#& z-^PGhn`QELpZ-rs=8+$Bm2BC@ay$f$SJF2_mhCtpYe0V&vQShk@e1@BJ5cACO8#%i zLH#c64!)i}>|@V_bg7;rIhyU-T{wnK!*z0kd%!sHO{d0_r<3`RjVajAne^oi&O1$7 z3%NY*NzY2u5B9-lg={I%VuoE5_HFj@>vVQV;zA8d*PlBZbWVs5$LMtEHH#&eM>=0; zlg}=2Sy%)BQrKJ+8x@8YacA)?2@*MdUU?y&X=Z07U|Ok4w<66VBtL8g25j2`(SV7vcC)5Uc*`zBS z3F9iJBRq>wGEvJ18v`doGg|kdT^{#E zY6NsOi#F-|YN)kR=ZzLU{w(&I!r?r^nV<4oQyMq@$i-e8+Y_$Y_gx(4(e7#DB=xIvrD(-AFO8K|kaHv17V34UBHm6FtfX za50ujG1|2B5HBB1V++=yANH7Rb&(iWWXFA|$+vPrGb5+#J;Rj1oYdu1apvF#kIEX! z9`I$bMNe{IPuc>5fVlaajn3vKJ;j4N#THKE?IX#~W}8lWK-`;f)}qe}*r6Zw;IZ;batQf$(X#ZWol6R1U}Vn{Lw zr@-k5*fWW3(9oPHvOnsl4=FH<1b8WL{N9Z6Kcb$U(`Gzo9eohejKzi`r< z^ph!Ej1!Ev>8E0R0&iUvze7Kp!d-kAQlFc`O`X7!`g1Y51H%QE3pUiBcUTuY0`zk} zX=gky+)yogzQ=>Pqq8n8xj}b1!mK*z!F%|Tz?<{}2M=*B9f$n-<`H;$ju-S7L)4t} zW2i+hbWl&WQvBwde#t`lrY%d(%p;yItAB$X5N_5~?r%+c?bm3o5;kLBs#jlBB zc{tB7oN=6Tcx_DJr~6XF3-G!W!5pvue}hNn`!HYbNW-IdW!WaZ(SsaA zRv@scXY?io40{Xq{2)B1dwjT^AQ9Z8-}1rc*dsz)^kx?d!y8g(S2~*kaK^fs=j)sF zy9r!O8VtATZ3%d4GsBDyz1=aoOKiYOaYr`uX1hhd?-1Bn+@r12lGl?ZiufK+G4BE& zBH=^#g16|sF^)CY-UK_JsktP9MAqqjF==ny=M~tN*@2YkuYZ`JxHWx=PW%2CXRo$7 zeuYQ0=>sX;C(xk}#sqQS+Y?+!qM#4OjNv%qbm_w}$1wbZdi0T);*#;CKK)TlvQLsb zHKuM$`e;mYDVci;hBly&#Wd8eJ8V6`k#hQYOn`f2GU5fM?Co*rnm!Rzx{L9^wIJTj zPbP5KMRDjsfF`?7~@WveBW>d89j$qg1HJg8tM84`GQiR`wDex#!-YQTbmX zj!g{qm~xOoss}E>zp68wsk+2=`!5#N7ly&-2onntgq6`~!uZPX3 zG@bGVDqwB;aspeb6G9~pV1LDPxT2R;^n(7n4u!G1^i@x>HRu!Q(btk_m`0!erp7We zg}X*G!1-DFTTe2tysUCU3jkCkfdZ-wD!a$ya8D_1<;H@p6ay5)~I;+NDW3V^d zl`un}?Kv=T8Kd?9h7Y!I!A&5(v=Yv+`)MAwIkN$;mbfzD3Og?V;eZ^NqZS6w>HZq; z504D_07Q5Hx^gC-p%Tup2WSeGn3I8dTm58LwCMZ<33Hv|;O433z&yoUXQQqn^r zj;lG-iUWG6#?jZNNLG+($7TyauTDUuSk7fyb=)*OM3j@=g z)UIR(=FsoZ1oo;*-N^}DU%xPlJ|gBJA>YifhCWggtm72v@u?%z1I-gR=urtGHuaOi z*dF01;c5HM1c`GdZVB>zMQU&?NmEz|-nnyP2a!s*TRo~%y zE&6Agz@s`JxZ^GW7aNRhCY^Qq=bARhMXla8FJ8jTZ_wj34R@gUsuLTpaef{97`fUE zx8f#UaW>y$$Bh>J`#DGo$mbsX8)^u=Q^NI~e|{)@Kcii^F>xbCVw^dnL*dCvgkpxW zq3hW5=XI5UZ&jF}ho}==zQ+GhTWlCP3z;vECt!@tK7eiCWli1^2V-h%(16y^!~UZ6MP zDO`rr|6k?n8In_-FK&;w;wS8fSFCY3x6@ht1s~nx&=2*m=z#iH^t=^aj)ODliDKl3 zSA|2`62hZ{?El3oO)GlWir^fJx;W_;LN<}~Oss+O>U{9=aXGK7mGf)tJkfW(!H^dq zqczA-&^c7stq_WRIrv_h(1v~7_k(*7&SOqtRxWVy1gk>+1uqU?Z&^3L?c=?Hj0FSZ z32mBh=5kEi{33?^4u3am&d@ETf|XlJ(&K~4aHoj>Dx*`xIE;1NhfMkZfZgAr?ODpBQf)8*646=b5E*!&QxIyXvcW5Ov$yt zI5yu1v8c2~m^Sx0zTd&-C@D)?!$3WjcTHR}^e-4iBY+=dt+|p~Z&@6*)s=CCsu5f+ zI5lnPjndsi=HPjoD zYmhS(%NrY(JTfHLq6UWKBHbh}X!rCE$RDB}rk*=dD6l_`DS(;qz8#-RE6_ zDWA6j@fs_iw*u-uZw1CaZw19ZZw1wS-U^F--ZjYkylas2dB;HI^NxYavn@*qHwHyM z?<&#?f2qRL{?dw&_Lo*LRDdQmpL!a#KJ_%{eCkQm`P7qOF*lq8PKd)lc{CPky#`72@H|UIro%t6vu|~WiH84(rE{G8?wg&VowRI5_?Ku9g`Qktu@W)@`53Y+Zgu+6A`iU6)?scS8c6QtGjWvIlaAuW zo>Zt7ds4x&+>^S)naDUi5PPbD?qDQWJWfU`JQRBh0WJ2Vkh<8D0skCidimwb+vh<(UB|*Ol0l z3J=Ae6cC6#nQ-2;!&vMtYC|5%HMp3MIPWbtuBODEOe(zXQL0X|jKGM=!>9^&b!*J? z?ygXoLF~ySlNNjOnDlRRxE2}X14R*r(zq(ORvqNROF`Aeo}&1?$*g?3cz|m)P67!> zVo!){*2~oyz-r=Sv8Or=lM&Bo{9>`#Q-XkcG^h;9QR-Zs2359;>e20x;Q~+oxsSv;sT(1_TdOjz&6G=%0 zF*$cyD@xv1pB2udhNa7RxO!VzN-9V*1)TN|WFre`4+a4l2VMi zl#~LKQc?<+1zbu>N^w$BQVN#+38xcENhwA`N=l)1DJccYdRP@5H)a*;h662EgS$>C z3d_#8!#OM^l}N==aM-PqlB#H{rKA+aYG5R!q>?1*Ta^lw8Z4nSTbGhbCQ+A?(loZE z!F?P`Nohi*z><)XO7ap?Qi_KWE-59YC@Z9-6vI|xN=izx>QYiQkQ1u(tYrUbhEm)( zPD@Ft6qtcSe6f_2V$`IhY8Xz_RZ>zluqGu{V{r6PN~%UN$L9hmsTwCGB~>G7DXAK$ zrKD=0due!HU@55@LBE^UG~}AWRH2rVs>OD%EK5n%Kz_D)ZqT~61G&M$j~?(=>O>-5 zB^;yIHkC>dpOExAEqY~BQ4&&8D$Dk1mZY?w)H=CJDk&vZPpqP;1fn=;DJezpWecUG z>Xe$4l%lxTGM1836#Jl>l$56M)aLGOWH>z^V_ISe=jUS>-NY-DWRQ}I3EUa05do*? zW1Oeenv_&bvM;+oc+FB$G09bk+i|j#RLn_BNyV&KN-D;=Oj=4R#v>`I7>=Z*VmOkL zieY_TKErwW7*|qK3aUv-#h7kq9DR>rKGE)Ui?VLe%#w6XN-9pECM6XUP^r%LD^gMk zJdlz~;GvXMMYsM5aQ2EIU6sOrc^!6aX+dqC8c85q@*frwUksuF%~Z# zgD@A@q@*J9N-3#`cc7G1#7#*_MU;c3q#`mTThdZebslRoM9Ngbgu$XpzJ7FfWhtpB zy_A$xL|G*z710iql8U$oOG!oK6;e_WYlW0l#7as@MI6-cfl^WteU+3{L_1hY%2`;= z3veG&Qc=oSvle`lIh2x$NL;8uN-DzBQc@Ag+BK3=QW5oAk&=p{tdNq5Soa|%bs#&E zlB&2hDX9wi7Nn#iZY(7g!PYLuiv@S*jHRR^7Fr8KY#=2SF)&BOQc@8Er)VLa7v1Gz zDXEH=l9GzSNJ=V(dH#>2q+&`^N-8E{6c44OVnVRG${{5c6H-!AF^3aLNJ%MLaJ(&& zl3GOzq@-4n0x2m)Vwa>GgVA@2wexUp#19~L7U&G9B+PN?l+HknRM#0uQP@Jpn_$)% zsNs>$Koa)}sQJbfB+?L&!yC>ZZHiJ|>o3d=bclM_9#hvDs8L)pJ~wKK8099=8CaQ8 zs54Nb#X18uLS1K|Mu~I=Qh2B{kYZFNhR#3=j|2jOA;B~Omew_$fm%vYGKtPoF?^2H zQe}>zBhVR8PtZC8Dp*Si1ihlJGoWJCbp{m3ri!%Az)F(Tk-Q=1Jdf+XVN&jtBEL!6 zOvD1Na(&!;URY;9J&o~%&On0U_N%Njkbpy-fds+%0;DkJFpw*Z%Y@b$P$`&xQV9hF z&01mME&pIJh;;^3(hdq^2hDA3Q0ok+1QZ&k5exv9Wsa{0Is+=Hq|U$!ywVv^xEw2C zSC`Z8RxN?T0cvT2=xdK$b_Fm@8jD|7}F=Rlo-fEViw zgkW7~Ai&c)0|8}~&OnM3>kI@OtXQSBz*xLIs*a0CZu%+0-O^_=nMp$ zq|QLVP^pAE0|5(pF?+vIXCUBcy9w(I1Yngws520AT+K;WDdbe6v%!mlsHQUzB(PFv zAYiT183;&R7_95K^NPB6*;OOqbjkXCD|H5fgqVkf0-b??V6AH4)pZ6^#G1}Pip2Hk z-3hESkYd?EBGef;h#24XSF0?p6LZ&pwa!40bVQaGhuUz!Iap^Ppqk`rIs*aczH|l- zB1`_DGZ1iG1qKZaoq>R48+e7zK#FR|R`bZX-|^obD`$buK#<02oq>S1T4x}j9iTG+ zp8D&6S4gSpfw;ra!p{PK&iyF<9pcZM_h^J$_kDyAuIeKiKF}RFN50^nQzuT}dfTb% zPh5#h^$)}E2gf(J#C7~jZocLElegV);?Sdy-*`I`yYi+-UvNIsIr~1-Vn&!3j(9i1 z4&mp_nRD@TBffHNB++_=Fhj34HYbF??ySpV$_Jf* z6=iwLwrS04kq&>H4#Pj7OwV7FGWE~~e}%-je&?v)r=xa*kMJIfoL@*^u)Go4{5Z55 zf{*Yn5#ARqFK#ci0cwPQN<3=_1&Xn}GXu0f;kRA<#@I+gnPWa$x5M-o(^pyT;^Ck) z@Wb!hd4`UZ2!Ha}e9lD;y72Sx{Vp5+JpBJ3l^4|}reAViPRJYnIHbvWG5ztRgdMYC zasF;Losr`F4Z!D5%zuIjuJMg_2|+!>^`CnsKTOyC=ksSj{p^uV;{~rF;e; zvbS{z--Pa8OKK!tDSw7ZIr}>0Gkl71H@ph2*v~xTaq1{ydgOjF9y4JrZqeEyrpMm zrM&^4AZI8JkSgxnI8&UsI8}TBxaP!_qQLy0+1awnC7xN?2S`=lZqxA6Ug2ed!k(mpu2J|NM7W6js4)g

zt+B>PdG_!$TFf+$$0`o{hxO09ckcgnj>XH-F6E=jp1v>gNsSfZGE$GN9i*?ZckpoBIyN_t!{(q_({EEUW%}!=bsuFV3Xc=I zNT2#ErA=X$IG!e>GW|K!ALYI7_1#RT*_qV~x8B`c-`Ko$>8-Vm_3M{zUG1-tZs5!5 z_N<#GbdUrgAOwVf5D)@FKnMr{As_^VfDjM@Lf}vl_}!fK!7qPZxBiS-wb!28sG7<- zRArOQ3IQRoKY{s&|Iv{dz5Nl%r$Rso2mv7=1cZPP5CTF#2nYcoAOwyK0h#|hGF2%B z5dt$4uyN<_n{QmFTU#Xv0U;m+gn$qb0zyCt2mv7=1cZPP5CTV>fXx3L@d}pW34whG z?6>}U3oDW%tV^bK(N*CEtUsn_1x!{S&$j;fd5W}Le|!zA=&xC~vEIIq_4hZh3OmJW z=-I<5tmdAkJ?r}CuTu2%Z~=sA`jfv7{=4}Y>3@%sDa*fV1z78z;^!u)YY^|@*#QUQ zf8g?8+mrr0)_>Q_<=u_dK&9zTU+>gjU4MJy;@;njrA^Nv8=X$R+y7JhiXZ5Q(LBEu zn|o=Z9Njxz#&Y^X?_4i2@m=j?XVRBC)5y1RU>Wr!f&IRzj&EX@oF4p%8#@ulWy&Xp&w<&kIoL~@KD`7rj*~( zsxbh?EOj}X7R{aJnIEK_mHl3>va@~^{O`nCsTPet@tczu2+XW9U*+$toIGg4yovoJM8*`D=y#UY3 zic1&-o-;-sUkRCcsx=q`t`s{=0U&9Zs29-^BL6}sUl4)T!g z6s;6pdq-ss+mO4|Rqw{*H1nN%T;>{+j6in=xQUy`n}G;kCYkvQIfN1*=bTmvr+m4E<42_mW>n5RvcMX*Gji+c5t-kUf~iw zl?{F4CKz<$2;R?6@<73nvxmSgSLox!7hX6saS-rMv*Be!gSN{>+sac77gWKz1wU4d zGHh>e!b%&%m!s$@%E|l@+YxF;vA%T)?kDhR%yxAK=U6d#cYrta9aK!8bqXD7QmOVr z^kfcO*>6@jo1$f<<8+5TUuX}s=SR04_**VAj3pQ>Ig1*aDEEC69bMt%iA|=9D)i9A z^2p~sS;NB!k@Jz+)njqn3F1^&mcFx%vo4&(Y{L<8Wi0(Z>&{xPpE@y4_}KPUG*g^# z>S#1Wf^0kJ8q_cb`Y{djTx6|~EJDL}KdXRkbwx`@-KJyKPc`VWMFnixCS$3O5sE9` z&UQpdxy2)^y`c7Kef5&&W<@YP6IFl z#l=!Igpu!Rwjp#Ae^&=HOhYV^BOZ)1je&sgj-@k>^Q__|uuVLx&00zg(j+sQh1$w+ z-KBBX%UUfIlTgfjR}=FB8Fh_Hv|*0yvsM!)(&wGXB2F9-(F`@vpbPSVpJZ#mJy*@% z*q$F^dW6e*dEL>kyzZ!@ZurJrG(!h7J1kM#-L0Bzn9L7U&@3)vLrimWrL$=gfp5c; zdD*?cXTG)vfpOJbco5>o3PhR`TI7>wS8wr34{x_z8Sa zvwr`J-%Q^7@W(&hr+>Li5CTF#2nYcoAOwy$f$9B!`@g+y)q+>KM*Jd(-%f5q~{0*2iGSFn)#{|^8Ce{*>LAFZ{0@Ss>% zyBefd0(Ucr2h)cF9vKfO1rY*5KnMr{As_^VfDjM@LO=)z0U;m+Wd0A&7L)bAdmcI_ z>woF_W&9Gx!$1GGhIft(tlaYOqb+k_M|kov-hXm~QYqhmvWBJi@jk{&Pz zOL+f`jbm!itnYvM8KqICPrFYV4*LF?Cr$6s<{9 diff --git a/G3DTest.plg b/G3DTest.plg deleted file mode 100644 index 5c210ef..0000000 --- a/G3DTest.plg +++ /dev/null @@ -1,32 +0,0 @@ - - -

-
Build Log

-

---------------------Configuration: G3DTest - Win32 Debug--------------------
-

-
Command Lines

-Creating temporary file "C:\Users\Andreja\AppData\Local\Temp\RSPFD70.tmp" with contents
-[
-/nologo /MLd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Fp"Debug/G3DTest.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c 
-"C:\USERS\ANDREJA\G3D\G3DTest\main.cpp"
-]
-Creating command line "cl.exe @C:\Users\Andreja\AppData\Local\Temp\RSPFD70.tmp" 
-Creating temporary file "C:\Users\Andreja\AppData\Local\Temp\RSPFD71.tmp" with contents
-[
-kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/G3DTest.pdb" /debug /machine:I386 /out:"Debug/G3DTest.exe" /pdbtype:sept 
-.\Debug\main.obj
-]
-Creating command line "link.exe @C:\Users\Andreja\AppData\Local\Temp\RSPFD71.tmp"
-
Output Window

-Compiling...
-main.cpp
-Linking...
-
-
-
-
Results

-G3DTest.exe - 0 error(s), 0 warning(s)
-
- - diff --git a/G3DTest.suo b/G3DTest.suo deleted file mode 100644 index 8a3723781d65793cdca3298ca3bf3e2557de258d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15872 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 diff --git a/G3DTest.sln b/G3D_Application.sln similarity index 54% rename from G3DTest.sln rename to G3D_Application.sln index cc42e7a..4d13571 100644 --- a/G3DTest.sln +++ b/G3D_Application.sln @@ -1,20 +1,20 @@ - -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual Studio 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "G3DTest", "G3DTest.vcproj", "{6C4D6EEF-B1D1-456A-B850-92CAB17124BE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug|Win32.ActiveCfg = Debug|Win32 - {6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Debug|Win32.Build.0 = Debug|Win32 - {6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release|Win32.ActiveCfg = Release|Win32 - {6C4D6EEF-B1D1-456A-B850-92CAB17124BE}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "G3D_New", "G3D_New.vcproj", "{583B17DE-1A0C-4070-801A-021DC0C84B0C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {583B17DE-1A0C-4070-801A-021DC0C84B0C}.Debug|Win32.ActiveCfg = Debug|Win32 + {583B17DE-1A0C-4070-801A-021DC0C84B0C}.Debug|Win32.Build.0 = Debug|Win32 + {583B17DE-1A0C-4070-801A-021DC0C84B0C}.Release|Win32.ActiveCfg = Release|Win32 + {583B17DE-1A0C-4070-801A-021DC0C84B0C}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/G3DTest.dsp b/G3D_New.dsp similarity index 77% rename from G3DTest.dsp rename to G3D_New.dsp index 4ada96f..e658867 100644 --- a/G3DTest.dsp +++ b/G3D_New.dsp @@ -1,105 +1,137 @@ -# Microsoft Developer Studio Project File - Name="G3DTest" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Application" 0x0101 - -CFG=G3DTest - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "G3DTest.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "G3DTest.mak" CFG="G3DTest - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "G3DTest - Win32 Release" (based on "Win32 (x86) Application") -!MESSAGE "G3DTest - Win32 Debug" (based on "Win32 (x86) Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -MTL=midl.exe -RSC=rc.exe - -!IF "$(CFG)" == "G3DTest - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c -# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x1009 /d "NDEBUG" -# ADD RSC /l 0x1009 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 - -!ELSEIF "$(CFG)" == "G3DTest - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c -# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 -# ADD BASE RSC /l 0x1009 /d "_DEBUG" -# ADD RSC /l 0x1009 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "G3DTest - Win32 Release" -# Name "G3DTest - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=.\main.cpp -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project +# Microsoft Developer Studio Project File - Name="G3D_New" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=G3D_New - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "G3D_New.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "G3D_New.mak" CFG="G3D_New - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "G3D_New - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "G3D_New - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "G3D_New - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x1009 /d "NDEBUG" +# ADD RSC /l 0x1009 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 + +!ELSEIF "$(CFG)" == "G3D_New - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x1009 /d "_DEBUG" +# ADD RSC /l 0x1009 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "G3D_New - Win32 Release" +# Name "G3D_New - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\ImageButtonInstance.h +# End Source File +# Begin Source File + +SOURCE=.\Instance.h +# End Source File +# Begin Source File + +SOURCE=.\PhysicalInstance.h +# End Source File +# Begin Source File + +SOURCE=.\TextButtonInstance.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\ImageButtonInstance.cpp +# End Source File +# Begin Source File + +SOURCE=.\Instance.cpp +# End Source File +# Begin Source File + +SOURCE=.\main.cpp +# End Source File +# Begin Source File + +SOURCE=.\PhysicalInstance.cpp +# End Source File +# Begin Source File + +SOURCE=.\TextButtonInstance.cpp +# End Source File +# End Group +# End Target +# End Project diff --git a/G3DTest.dsw b/G3D_New.dsw similarity index 84% rename from G3DTest.dsw rename to G3D_New.dsw index 90964d3..91db04b 100644 --- a/G3DTest.dsw +++ b/G3D_New.dsw @@ -1,29 +1,29 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "G3DTest"=.\G3DTest.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "G3D_New"=.\G3D_New.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/G3DTest.vcproj b/G3D_New.vcproj similarity index 67% rename from G3DTest.vcproj rename to G3D_New.vcproj index aeacc36..26a2f31 100644 --- a/G3DTest.vcproj +++ b/G3D_New.vcproj @@ -1,311 +1,342 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main.cpp b/main.cpp index 077b923..da4b56d 100644 --- a/main.cpp +++ b/main.cpp @@ -11,7 +11,6 @@ @author Morgan McGuire, matrix@graphics3d.com */ #include -#include "resource.h" #include "Instance.h" #include "PhysicalInstance.h" #include "TextButtonInstance.h" @@ -347,7 +346,7 @@ void OnError(int err, std::string msg = "") std::string emsg = "An unexpected error has occured and DUOM 5 has to quit. We're sorry!" + msg; clearInstances(); //DialogBox(NULL, MAKEINTRESOURCE(IDD_DIALOG1), NULL, NULL); - MessageBox(NULL, emsg.c_str(),"Dynamica Crash", MB_OK); + MessageBoxA(NULL, emsg.c_str(),"Dynamica Crash", MB_OK); exit(err); } @@ -462,7 +461,7 @@ void Demo::onUserInput(UserInput* ui) { std::string ExePath() { char buffer[MAX_PATH]; - GetModuleFileName( NULL, buffer, MAX_PATH ); + GetModuleFileNameA( NULL, buffer, MAX_PATH ); std::string::size_type pos = std::string( buffer ).find_last_of( "\\/" ); return std::string( buffer ).substr( 0, pos); } diff --git a/resource.h b/resource.h deleted file mode 100644 index 2612c21..0000000 --- a/resource.h +++ /dev/null @@ -1,25 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Dialogs.rc -// -#define IDD_TOOLBOX 101 -#define IDD_ABOUT_DIALOG 102 -#define IDR_MENU1 107 -#define IDD_PROPPAGE_SMALL 108 -#define IDC_AXBROWSER1 1001 -#define IDC_SAVE 1004 -#define IDC_LOAD 1005 -#define IDC_LOAD2 1006 -#define ID_FILE_SAVE40004 40004 -#define ID_FILE_QUIT 40005 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 109 -#define _APS_NEXT_COMMAND_VALUE 40006 -#define _APS_NEXT_CONTROL_VALUE 1005 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif From 113115b6dfe99026a611e445eb77f70a0eaebf51 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 21:41:03 -0700 Subject: [PATCH 23/23] Changed the way releases compile --- G3D_New.vcproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/G3D_New.vcproj b/G3D_New.vcproj index 26a2f31..86afd95 100644 --- a/G3D_New.vcproj +++ b/G3D_New.vcproj @@ -73,7 +73,7 @@ />