From 7fad41ff535a27d607e87e3fa1a28c50ec4eb8a7 Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 11 Apr 2018 11:16:41 -0700 Subject: [PATCH 1/5] Removed CLR due to crashing --- G3DTest.suo | Bin 14336 -> 14336 bytes G3DTest.vcproj | 5 +++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/G3DTest.suo b/G3DTest.suo index e46d4b1455d16b52883229c3a4fcf97b7a9be106..d43a575171b11017441b928e54fffe15cac197d6 100644 GIT binary patch delta 259 zcmZoDXeii_!@~OEp6>Mnn+sWj`B@bh7#M^m^BZe#{vzzpI{C1i;p7s@fXPSX3^sp} z^k-#blmse}1}i9$@8M+hnCz%(%^bpzy4hZ{g^`Ux3MkDFlAioUD}+%V%qr0a8o*+} zS^<kYZq*Tqq!{0&)n52Lk9iGJs;gdgtd)?lW;=6qtP3M4gd$@^2Gs(GZ}7I}o!1 tu?G+{0 Date: Wed, 11 Apr 2018 11:49:48 -0700 Subject: [PATCH 2/5] Created dialogs resource --- .gitignore | 1 + DialogTest.resx | 110 ++++++++++++++++++++++++++++++++++++++++++++++++ Dialogs.aps | Bin 0 -> 33008 bytes Dialogs.rc | 63 +++++++++++++++++++++++++++ G3DTest.vcproj | 8 ++++ main.cpp | 3 ++ resource.h | 15 +++++++ 7 files changed, 200 insertions(+) create mode 100644 DialogTest.resx create mode 100644 Dialogs.aps create mode 100644 Dialogs.rc create mode 100644 resource.h diff --git a/.gitignore b/.gitignore index be51269..8de655f 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ log.txt *.suo G3DTest.suo G3DTest.suo +stderr.txt diff --git a/DialogTest.resx b/DialogTest.resx new file mode 100644 index 0000000..de824e1 --- /dev/null +++ b/DialogTest.resx @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Dialogs.aps b/Dialogs.aps new file mode 100644 index 0000000000000000000000000000000000000000..ec56471a0f15b9a1310292360b26e2b8e56dd6d4 GIT binary patch literal 33008 zcmd6QdAMv>Rp)vMDnU?`p%qXQ2$*z}Sm#vLy;T7Xr>f4m_xP&n6g9m2?(<2RFL}XW zOz=G-s0fO7J9OJ^xBY25A!0Y8c7rlSKpa}oh=MZ8s3K0-tqh`qqVc!(aQ50m-ROVj z``*jD`}f;xk7o~S?X@lu(Utgf@4fmD{^|Yqc>HuV{v6T~jqv|_?>%MkD;{kAL1&*! zbn^}8H}#}RB7LU6T%~GNmu|AzPIW>N2G-^TD<*9aLsYH~OfqOb4}@(vu9dZkp-3UaU|{ z3><)w0jlZoi0j@#Ev7VXQ=4MFoo$duVLf0Izm)DoAp;<#K@RIliD6nyi*c#I&R|NF z0ax|8ayvPm7c&eSm)Ge{=|F;2eYVs>JNXpfh91spimKG}1Dz+EQf+{PWxZIGOO?(8 z#?3u#ux448^Y!+yS)QY7#H>JvKU@5$`|(B%O2-l!?88*CbO#$ak%%NDt+nfYewc4RW}6qEe62MpbI z!CAxC^G@baDY_YAN?%LICWo1fGK)^~@}S&n=^TH%+gUZ9HsdW;le#KbYb-UL4n0Ld z^?Xu~i*>WyVo5>=l>2~g37|37ERAJ!A;9Jv{zQ>2r&|MPHC}Rm1MAXL1FSj2^9WFn zuq>jEt|H5lrz@a7-4;Nni+Q23J$jnLR^_5ta{Z}8x6`SjI=ihWSdtct?Ydr1`Ku_o zwa<50J(-rXaxjH#4d5f)yHVjOI&KRDCaskqnEm5jPObolwl-( z)}^nCGbXu9Kj$ZJ3pJ`4#^7ZRS)gCGt8%^JH5-NZ>E!}k*7(W=x<{`FP@QX^UKyls zCpAV^&9SUApjUTAmtw4|v7CN6 z#(Em-(yzo=Ut>M`zcIF_u|EB3jO}Y|k6s^R1C8y|8)9szu>t*BjG;$V#|-J$6QJpt zg6>IxrfWv@8wt?#&6wVp08Qsi=r79~(D*>ABspw5UI4$f5SM+8Dm6LkC9Z$n@Ha1DU^5V?Jl*#Qm4s1dWTD1pgMYz=Y4u- zkiMPP^V2%h9{p|zt`_CEE=0J(AmW#45l^D>wJ-{3q$}At!dmOSVr}#`=LkoJZ z12^+YqpLBZ_qpU{X_LqFewBQLMm9(764vd|AIS7#xh&>-{mr@=eL!O4Vl^%%x+}Ul z{h`Fxye_Ik2G785mp&Mw>MWtq9{rI-SBq(_yQ15tKUN4Y<;AEm!_@20U$n{PSwrq+ z^p`4?cLv_3%Co8mdO3aArSqVwqfwdly7UnTY*uD}$a+2cs7fC<^EF=pSfCcwr;oKc zbjlumT%}CPs=%R8aQEr26{7AC*kW`?^*i(lmCVcN)+J~3NtIkR%NY)s6^d2`>~-i< z3TV)w^?ZeMk{v7@j_KYOQ{M#7KDAfmxJJ+^-mf{I{$857?eZL3@CBexXiSa|Mt%Ixu5vtQtQH5*?S^?pDE<9xz98W-N> z3sOul2cIq~|G)_4Qgq%fJt%=)eNhe9iag_`STn$ zEtUtR!!r7Ofz^5e9b`E@!X;12HTGOJnuDxMk8}v8QK^p=gRDo7a=?ghDQb)cS)ab3 z?I_h3=)!u2Qzj;z`q@?Y3j<`dMh4uQYOYG4TB+S*8aG#zi;r4r~FeSfKB2ZZ1pskyMA^$Rot&7#^shJNIM*T(y z&Tzvxtfy+vtFnp;2TjV=>0&&_VZ2$Y4YZmRGQe0>E0GVB8t&1TJ2+f#kiAc*9ln|K9OfBj>$^u&2lG{3 zNzF2v+2qA`-fYX|64$Td3_hA-Wb)$Zv9KhliyEA{H;YBHT%&;U?6_R4p`cOXa1eR2 zW41b_fRxkHk!Ix#-5tv5(#lab*bqWOkJgS*&!M%#7m4K|MVmwdCX zpmCxLj-mEk-WN5N(X9?E#_ReFu1c)IGk8u(&h4$z+mkh1J zMx8Ce@6*#9P%WEt>M9CgkG{qM`2N&az*_*YeY)LY>dMB=)7XISaG1X5sm5z`NOw9^ z@BGor6^96r+tY)ls&rV7VVZOi>`YCfS$jxfWv#-oNa6d$E@4NJPq zF(x$*D*~+O>m4|%*Rx_F@nMIa>2P(#()wT_W0=vi97pLJJP|p4gM-x#g5{Kx_3=Wl zHp3o$lVfb=r{~Sl+@XDXwnLZe$`igv-|RqjVwE-9r{_4-E(hbya#_yDdi@*@=v!h6 z-{se}+U={(a7f>}o3g?=R`v6+pyyc{pTYIo!=qu&4HYX%{=K7ASWK~0uA41yA=^o# z76Mj+|A!Pw&8?P{(|0%$_B9s646aIsJ>xqa>dF}}anXXl)t1zw?-DegH#pO6)p1J8 z>C<-$LR(*)?{E}Xi=5`|(SJfWF63 zta-s>4Cy~RhH0GHF7Q>`wiWbW9BVUQmIr9Jx`?2V5q)n6dPR)szdC$^r2^_^?3$_r zbc-kS-+aah1T1N6l+cWlzRxkB09^4MMtzd3uKE5D!_e^MxXQ5i{y+#K+2LpK9Q-5(A~qhqB6fP_8zkr3Rp zjohan4MF)`W!Zq99}?uZnPo%zv5;`EsnxkC%L;ly2-;6J%SQC$A!zh-sP&j$=s+`p z+V8bp8(FpTzjpE##rjYU7tS^>idd5xUu3mWdYCGM!sRC;iat`pz*gw?K>zaMU8JKW z7JOY=kA5m*VZ`+L%n9q$Pw%D)aeMSLjt5 zROczqgnr3!OzSZj#>G<4;6X{h>q?dr)>yV|QIn46Ge$^WoV(Mm90 zgK&~R;z?#ZG{+9`5uaSn7VBe3oo;4$-Jx|m5Za}W`n;+xr$bBR>N)ISx&l4= zn9r@J)A9hPDYmd`N}vA9r>Hj&3oI(j<_Lz|s=^MYzu6qu%#ZtIs87tNh{c-~d|D`U z6&BH_*`ZRu^k=zvW z!I=Ke=dR{3#2;e8jCPrPFrmNq$-MGouTodGxq2Rg!7J%gKFdrTpH?v$d_AdA@}gPQtW3du zPRmzca6atPDWA*ho|;*S{=q%?GM}v)v|i#Cg?pPRzE79?ByLny+W9=(qx<=IJ;$WO ztXXflJ!OECc2lVMa)jZeXNez`~svSf63_pwh{Jd>6$9?(! zK5Nu8r)S0Tbf8Ss)fmwgC$VwKhF;Qi(U=}!xvQ;il0hc)Ad4(8U2t%oA3))cn;C`= z%EEJaRitk|Iku07_}mE|Zj7*es|sQJc&HB>y%@LBynm>2Y$6ZySr{!WvG_vt@hrzK z@(7=SJ%US7FWY#D9QEjtK0~i}o4Kct&9R+4%JNp*!}Z!dFRAiLMpp$OuMI}Gm``$g zbO7`I&lA5?1{6r>(qjS&4y1?v$1&;A)d2~g?WmsMRHM3W(x=A;1bE5UAmw!34${oL zP^UjrD2rb*QO_l71*dvS*>|ZUUixwV=a(^iE?MbVSYe}dNNm|0hM=Ob zA_eLyHg4V!5ir#Z+NCE%sL@jAogO{$GPat+;5@~fpoSmzz~GqCjVk%5J~t{)a)qvo5wH0CCRC#x8e4S2)?L>7O{NFb?d+rIGY(Vj zv`9`z5>e`OR$eKCBxmi?Sx3;eV{;#5v`1gzP(2{Ze#ls#&I`<3q!`$vuXKRYW7;1!Q$s2(w}kr(-J?Z3l8XFMpQI~_D{CNQ#(mn)qur>8q?y~M%k9#0Qy}*m1o!A$lBfdv^sPxy z3*MvWrBL;*xA~z+{mvAw`vjWQ?+Vcw6c^ks z=up4gVk6uLFwgm=owmI2K=tT*9PaHM!@e5HJ^EftShf#6_zpi+@IHN?g=@S^$0NUq zE&`?J_&~qkNA){DhI;e^78-+8F{@Z%1_VY*ymE#t@kFebmyA*+J-TeHLM(N8!8=Mx+ZM|iw-nxO3N z(2GLs=#VvwLaK!og^fMud zH4Z0+g3&$t-yu3ahII$fKK-8%I#^hYQ_KS=CIwdYw&$;tkT- zl+J1Zys_@)d4HdNHGwOY2Ezk-eF9#X$}nR{Z?KHf78kHmnIpS-chI9>w+M7BwrFFt zwY+5|sJgyx@X}g5Dl7>UqE!(K|wpX1IdJ^v;lC z#W>Q0em5kUl9W%4?%R^y6_TtZ?Wdq=6}>y8p?B?L>k3cG={+F<=826s&LkU@11Oo0DCW>{5qiR;Q=#ISyjq4W3XFJppz?x87t`fyA! z&mz%=J^F})^{TX3umcsa0ev)qZN&?r5)ZIH<~ZEZ+ctYae-%T1?h$?5QA`gy0b}~> zBnhNh{>2DoLfAZ=yv}K0?;2C`)jk8Yx@SHyBaGWzo>IJdF@Gk6A z0md6Z`!KjF@jmPyEMox;yxQHy1zwkFhnT8_Y8r2ct@cnb_=SNg1v|{Ch{0D|e&wne zeYz}Surk=G?MkSjFLxX$xU^Ecg5rZUTrd+TTUrTY*r!V#t~pCM*Xaccrm)ZOKo}q^ z{nSEL1eUP-OMFtFsrdoK==fZ@RF|DeSW(&H{=lckgjKiZF+L zw&YBpfEbr`)2gUSSi~MI8A1wPc&*lY4}oFqb0iCO(dvCP>_9&-D2p+DuH;D57(X6( zhy+^!vPVjKXuz>Or$@1(he;fBjct|8(Y1so^x=}ATN|h!ODIJDjb!1wfT4w_gR^Ls z(1(7WBynS)x>LQYDg$-s=Su=xRaM`q7r3r}p%i^Y$b%p^%+Q8DQWA{e6!Q4hk)DCN z#65acf{06fQ_am2juMu(FG!HMX38v~tgPi|Kwp?(nMLAQ`%v>LGaAwtoj~Mg@W-v4 z5T`A=QnF!+K~vkuwgnpq?9-QWG@`3cAnPWN>CuuiFUyIoWLWlu9wVu`Y&Ev%NWEf> zO1fHd@W$YT`c?GU6UeH5uvb1#a%|na0Ul@c#gb$Ocs#8aBRCRF#JG%ex+Xz2tFJDy zOV>(@(W<%$H}28Dl>}bZ`N17e0hrjJWYco`^zS5X1xKy%As=4+%J0$RB@I4M?CQkI zYrJ2_Jw~}U!>qVZ*Imwj?C@y8-ycNi0QFymzx`MNZ&c~hx1S4z?Pt1y8515cD#yL| z%2Zgg5~AX5g=KvSQiwVac5w-ArW@!yZRiqwZ!hBS^Hk6sbPN7{0Zyx-3hnci;(cObS3iKMz@1= z3ID!^o&{h0J-GRwho|;!$je-obSpgr_!*>Kg4COk<4Rf~?Jm^kHsDtx-+AC;{CyMB zZ-?w#k^elRIsWCxkMuk7Ry`jRw-k8H_kW0}|^A{Mcajf>D%zSe9!zRN%D3KOi~- zyKVIKPsiAK5T1d7c|-g9U)t$opnp&b>mmPJpQU_ri%1sc7Nok!7GdBCbdHsz&y?C0 zl9&5zZgMMzZii|(*}J_ggX6V1X=x|n(%gN>Xrxk#VD(%UreI5rBGrd zai?F5;84F95hDF!lHv4=A*|;s>lXzQ>lX#cIn+0$^otUZ`bCj0^@}1|=odw5!ej|F zWhm9jfuXcbl!nqa(KnPLS&wwW6e=*aRyb3rhonrQf{-wU3N$i>O3X8b3Ls$$6=-M* z6%Zet%t){WRjlR{{pwenLPd@prcl91m_h{_n?hSKWeOD_K4W1D6+mnX6<}xz6;Nmj z6;Naf6kGfyiZGV=hDN1`~+ zS$if*gz{;{t`O=c3gshEKF20P`3S}dp?m}@70O4zSUA(6e89m@#w)Q6t-$tLk!o~a zu!yLmf+e>e*n9{UbmM~tx;f=**~)pXV097@bL7{EvfM$d;6nKbY5GtsP;)6TS=nz_ zi!@gRksgHdiG&(gX`NkdJ+^7By9TOSgl&V7(F^4xL2V^K8fyAMF z1c=LF8_Gu{;|6Dv?cl|sd^Fvpi?|}}sODioC?5}tLixm~+8?yD)%12A#+lz?V zWA_MNMn$siTdjPxo*-q0P(E5rI+TyY)cn>@Cs8qeE)rm9jqP%yLBYE10{z6He1iN& zmn=g0I06I*p?rYpV{iMytKIlGlurx?p?neq^do_=&fTd|p@L}3R@xMB#w1jdcz;EEw6gDYw* z6^ck8aVR1IdZCC!dLk5&KwWGfRFXpx2`malBr)xtge-PDR&@_T5qTM8C?Wy)p@=k~ z?S|MnO-w+J9poW)|KZp{9$@qmDt3?u*vZJTg8=B+76uCP02wIA2k^ks#R3vDpT*6B zKtWzkuAPhoBql!R_d(fr11W1_}~TGEk7f`6SH;ZOm;I zC`drokfb3sKDG@}pdgVg3=||FD^Ugt5-@ig$MCZKqXGp9JQXNNz%o!!n|xBBpq3Q) z_V`ZZ>}(*It-9UwH1FUojUep`6eK9P3MT>u34(R1O$G`QJhlG%fr11Y1PT&J5GY6> zN+Mr@^eUU z`+=xCc~~?Z{*VH-%Yh6= z0#B9{g@cONrxzS3C?UmC@RX?y6x7mo2MQ7t6X75cC@4u%lc$aGBNj`<5sd={B}K%6 zf+UTVMR=s(2MUseHoit8P*9SW2oxlESmBa^f&^tppdi68otO#~Bv^5vpa^6^ZL}hF z|I|w<{7KV+f`kNS;E7fkC`d4(KtU0Pw^D7Opa?`)$tXbH;A_#GT~fr+4lfo}m?Hf+ z$_o?}6_g4T6p>`0pa_(Kf+EmLW~T!MNp31okibp*;y^)ylL!qfr4U66evhg>}MGU3KA4kP!uRgQj{G;1PTf<89)ZFqeB?e z#KoV;@H{#s@MLUP1iXz7ao$#=KtUlX87L?u*$%NcP7V|la?*iDKhs`0(@0D#-nr!3^vl1Nz3JL{8 zfr3H;I@RiaRiK~*?ga`;;C`T>mT(_|f&?!SC`h3EOclR8$m)0zM@aP33f?bqpdgVu z3KZ00y8{IU6s_^%H3)lg6euVl?+g?a@J=$=prC-23=|Y_(7z`J z3JU1E0tE%MlLG}=4XgeD?jul8AQ@-Yg8fweKtTbC8|4KG3h;EGpnzob8p%LG0rj5~ zC@9FXBT!Jlx{p9XC$fV;K`l256x1UBj6gvFHw+XMz(y~|hXw0V#DRhW7Dfw8tQROK zU|^330|f;PJQqb^w7^q`0|m9bRG^>`3<3p(Fz^3CprDYF3=|ZSu!{SEf4?Aic;%vUC*pW<~5pE^@_QMcRveCrR~@`a<-3 z9y@(~QTDMRe@RkJ#Nj!WbFj0#uot-~jq!vRd4eIm$P=*dMV=s7TYzeeehg$AV=E!O z$b|$wPg*x{Z&+K*_u=*y1AeLLoWQ+Rz(Rg*Z@5hlIsrmm*Y+=?z6@^xFftNeqRbb^{j+VU8;xSMIK__n-t|m-ZFN2k*67+7r8r7nr8BqO?r{XGWe#T^(3mU z@FEwS6TQeiUg$;cgRvL6ho`;BJ<2XG@)RlbBKJ5ryRd?Uokv11a*wA-(!Cg7T3Ph$1g?Pryzua*wski`*k|V{oqH$*W>Fmm^QJ#?je!dXamAmxF4N4fxXC6EVD@XUgRecLr-q8zVZM;ae}7q_9FL02V^zkh$ZWBPWB@A zs9Id)MecF#%ZvOZvZ^1v$UTnjKyQHIMedQz0PpZ3Pf^X + + @@ -271,6 +275,10 @@ RelativePath=".\PhysicalInstance.h" > + + +#include "resource.h" #include "Instance.h" #include "PhysicalInstance.h" @@ -204,6 +205,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); exit(err); } @@ -254,6 +256,7 @@ void Demo::onUserInput(UserInput* ui) { spacing--; messageTime = System::time(); message = "Spacing set to " + Convert(spacing); + OnError(3423); } else if(ui->keyReleased(SDL_RIGHT_MOUSE_KEY)) diff --git a/resource.h b/resource.h new file mode 100644 index 0000000..2e64e3c --- /dev/null +++ b/resource.h @@ -0,0 +1,15 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Dialogs.rc +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif From 49013a7da8ada807c29dcbf76d132ab25dfb503a Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 11 Apr 2018 11:50:13 -0700 Subject: [PATCH 3/5] Removed test dialog --- DialogTest.resx | 110 ------------------------------------------------ 1 file changed, 110 deletions(-) delete mode 100644 DialogTest.resx diff --git a/DialogTest.resx b/DialogTest.resx deleted file mode 100644 index de824e1..0000000 --- a/DialogTest.resx +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file From 2776546ab71389c0753905531ac71fdeb9cd3f3a Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 11 Apr 2018 14:03:33 -0700 Subject: [PATCH 4/5] Added about screen template --- Dialogs.aps | Bin 33008 -> 33540 bytes Dialogs.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ G3DTest.suo | Bin 14336 -> 14336 bytes resource.h | 5 +++-- 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/Dialogs.aps b/Dialogs.aps index ec56471a0f15b9a1310292360b26e2b8e56dd6d4..d3ba647e1e2bb1be62d66d75476047a95b8be503 100644 GIT binary patch delta 687 zcmbVKze^lJ7=63k`2#UnN$?kfoe0^JSXu4v%$0^~ zea*lAb*J^dc`>t7s2^}R%zAjpvzCYer>C>W04^4%kN7u!CAMj9v2S)4i};Q;tg`Ds zgI+U;s2AZ2KI1FjVF<3vj}m4lt#XJ>Uj9v8r=dlH5Yx{{w63gVBxqC3@v(q!_-Ldx zd5R@WNm?qD5O57pq#D@O*a=9K%~W%;=P4jPvkPSDb?&$1I4sF(&-j!Au39*sdz!Zs zH(K+{^h3SLf1x`WX}g~Ua(;T^4duId?4;+(V7i|4S}O(}5uFmf`=merP5t%HuM?gn KI_3W+1pWaEntts7 delta 151 zcmZo^WBSm@G{J=_qJE>BloO-wZ y+}o(kw$qw{;fB-XXN^isC+a5m)yqtls~2Jw16su~xv)ugavYGy4CI9XdHMi|vModa diff --git a/Dialogs.rc b/Dialogs.rc index 64f8f90..b346945 100644 --- a/Dialogs.rc +++ b/Dialogs.rc @@ -50,6 +50,52 @@ END ///////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////// +// English (Canada) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENC) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CAN +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUT_DIALOG DIALOGEX 0, 0, 226, 151 +STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,169,130,50,14 + PUSHBUTTON "Cancel",IDCANCEL,112,130,50,14 +END + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO +BEGIN + IDD_ABOUT_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 219 + TOPMARGIN, 7 + BOTTOMMARGIN, 144 + END +END +#endif // APSTUDIO_INVOKED + +#endif // English (Canada) resources +///////////////////////////////////////////////////////////////////////////// + + #ifndef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// diff --git a/G3DTest.suo b/G3DTest.suo index d43a575171b11017441b928e54fffe15cac197d6..c4a6f698a145dc770d8eb2a758ff6c324bd57f22 100644 GIT binary patch delta 551 zcmZoDXeii_!@?TCdGX}+&4nyMjBE_D3=9kcllhIcCpQSNO#Z=|!SV0^|NkI7IfKoD zF?{kuwtU8j$%5?OsvyBgpzhC-JvorWV6y`U3lpm#P!k8({t~Y9ObjfOxsCNFmv9G6KEh%!`3rXd zD?3mDC&YnLESoEM!dcXBGe)iKIU{wZ{tRT!vD2xKyk3Xs(V)j9c$j)5Y`FyBOk zVQdVH42+Br6+A$SadV)^CuTNAkS|3cu9pa4Wd_PHfq7pf{3jpgv7Ou?=?tPbNgd*! ztimEV`LgB*HbyC+G6je-EubGPDpUXr6|k5FkmiO;i9^LSfwTlv3>51in;16h>xpu( Q$^*IlAQx>eG3#Lj04PzDR{#J2 delta 526 zcmYk&&r2IY6bJB`b#}9wg=A9&4VYNsAx4`-EUgzM&`ZIRA40M5XVgYhjWz1p1{Gbr z6?%|7dhDTk_0Y11UUCp}EVRd*+CQNb5viBxcan<(ALhNc@6FDxU9wAGi$eYP=TZH_ z*%Fhyo%b@vZn5Yj6eim%=)YRfr%>DiDrlp8mcD44e2z@l#L+7hvoH-aum}xI&tqSJ z9Bji9EW>Na!wRfI0p7qGtV0nt;4N%I3FLXw&b{~@;`fXxtU?^2u4FAJH+$MRqJp5V zrEz)XpiKEL?G7fXCWehNTI64os}kR*3xAmE<^WaWkLk?lrJNo*9pX+RDs(k~o(FQ? Iv7UV7ccBWB@Bjb+ diff --git a/resource.h b/resource.h index 2e64e3c..3d988c8 100644 --- a/resource.h +++ b/resource.h @@ -2,13 +2,14 @@ // Microsoft Visual C++ generated include file. // Used by Dialogs.rc // +#define IDD_ABOUT_DIALOG 102 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_RESOURCE_VALUE 105 +#define _APS_NEXT_COMMAND_VALUE 40004 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 #endif From ce7b221a11e4b2c706ec84874ed7c5697c4a014a Mon Sep 17 00:00:00 2001 From: andreja6 Date: Wed, 11 Apr 2018 14:43:15 -0700 Subject: [PATCH 5/5] im not sure what changed but ok --- G3DTest.suo | Bin 14336 -> 14336 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/G3DTest.suo b/G3DTest.suo index c4a6f698a145dc770d8eb2a758ff6c324bd57f22..0f65f6c21cfb9f7bd049ca549f9dcc3e8067ff86 100644 GIT binary patch delta 619 zcmaJ;&r2Io5T3XD-ugD1Xc9NNR%4W2LWL%xSPx!3lm@bj6iN|))Jl7)DSZbir7ZN~ zMX=64&_6+VR}Y0m=%G+cd+MPl|AavG(mJzI^wfcGnQy+?nRzowD`_1yq)_->PRQ+p z{BL|Mf9L`L{3FAIyVXNq;;w4wfm<<5@)FP03%Nl-yX8%Y(k6M&2wQ~bgl)p#k4q2i zX`gYlL+rXBnoQFZlN5#PwA^XS?8iSb{ zcC)eaD5;;5tjRrftAYDOWVppE2gLrbh*SXKCiAP0b?T=dN85JI7l*}Nr|sa|;(IY` zFN#`VA*@WpApEzA2UJ?z6a!oe2UW`1v+u$$u5yW&(%DTEt1_|SbjWTLyQ+_9wkM8# z!?v78Q$AI^marEc|0%|LUZu&pYSJH{>_w%lAMUugM+|OHz?>JsF@7>PV9OFXHbTe| z*h&O$1$M1^CVVk^#ree6-23VVoYgaJ|Kxpv$Mu^1P&@HNo`;%TA#wJq{W9J74J^{N gUxI=AumdeHSkO~`1Wvl8q4Xi$T!`y>0XuWYm!y-B%m4rY delta 514 zcmYLFK`#SQ5Z>8+Z|$~SrCN$siI9e9E0u8I))OmT2?r5TiGvfB?4c2n{RwmqeuEpH zBZ-6qi3A~WkU04PA`Vp)?1uNit*x?PtHG_T~G$AsD=hj5sDsefuQ6_|IEoj*%Z5~2W&YG&gQGb-m z6a_SIZ1K(Xv45$in97+@kJZ$5z|Gh;q{L^;06Z<^dn9{$`Jb&Tpa2BL5!nrA;w{`F z)GU$MieGBJj6|?Y(%~83~B@VXwLGeDWL4sx@U zba|O5$Ko@SHnd8vh`W6W^g7s()RZLqlPV?2SUXwcFP48SW0qLTzJUB>;SOAD_*xiM pQ-Dsw#{JwDtm51B>JXJ9^;xPJp-qiRERCLE#VFA`{sWX&gOdON