From 64a8089e544dd88bcd2a8a866bbf44bf899ad622 Mon Sep 17 00:00:00 2001 From: dean11 Date: Wed, 4 Dec 2013 11:37:26 +0100 Subject: [PATCH] GameLogic - Worked on server --- Bin/Content/Shaders/DebugCameraVertex.cso | Bin 2628 -> 20700 bytes Bin/Content/Shaders/DebugPixel.cso | Bin 488 -> 12252 bytes Bin/Content/Shaders/DebugVertex.cso | Bin 540 -> 12292 bytes Bin/Content/Shaders/LightPass.cso | Bin 336 -> 12124 bytes Bin/Content/Shaders/PixelGatherData.cso | Bin 820 -> 16684 bytes Bin/Content/Shaders/TextureDebug.cso | Bin 760 -> 15120 bytes Bin/Content/Shaders/VertexGatherData.cso | Bin 2852 -> 23008 bytes Code/DanBias.sln | 145 +++++++++--------- Code/Game/DanBiasGame/DanBiasGame.vcxproj | 2 +- Code/Game/DanBiasGame/DanBiasGame_Impl.cpp | 62 ++++++++ Code/Game/DanBiasLauncher/Launcher.cpp | 2 +- Code/Game/DanBiasServer/DBServer.cpp | 56 +++++++ Code/Game/DanBiasServer/DBServer.h | 27 ++++ Code/Game/DanBiasServer/DanBiasServer.vcxproj | 21 ++- .../Game/DanBiasServer/DanBiasServer_Impl.cpp | 39 ----- Code/Game/DanBiasServer/IDanBiasServer.cpp | 28 ++++ .../{DanBiasServer.h => IDanBiasServer.h} | 5 +- .../DanBiasServer/Include/ServerWrapper.h | 23 +++ Code/Game/DanBiasServer/MainLobby.h | 17 ++ Code/OysterPhysics3D/OysterPhysics3D.vcxproj | 8 +- 20 files changed, 317 insertions(+), 118 deletions(-) create mode 100644 Code/Game/DanBiasGame/DanBiasGame_Impl.cpp create mode 100644 Code/Game/DanBiasServer/DBServer.cpp create mode 100644 Code/Game/DanBiasServer/DBServer.h delete mode 100644 Code/Game/DanBiasServer/DanBiasServer_Impl.cpp create mode 100644 Code/Game/DanBiasServer/IDanBiasServer.cpp rename Code/Game/DanBiasServer/Include/{DanBiasServer.h => IDanBiasServer.h} (75%) create mode 100644 Code/Game/DanBiasServer/Include/ServerWrapper.h create mode 100644 Code/Game/DanBiasServer/MainLobby.h diff --git a/Bin/Content/Shaders/DebugCameraVertex.cso b/Bin/Content/Shaders/DebugCameraVertex.cso index d9e567be113914c6b913012b85586ef11a19629f..20c23e0c8ef50958c4ec22f68ec9407913ccbc16 100644 GIT binary patch literal 20700 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 Y9XS;_59BEr_Hx&9u-oC23=Y0Z|*Z5>0tia5ckQ z=*ESU#r%LW425akxSFj$!OeinF0$xa#AW06-FMIPDjACxPVc$reCM3++;d-3-Mq1| zf8qC?e~SOsOaDcG{drt}?TJWrT%>?~7BcWfx}nH1WVR^s3Nqh&GWR#^6!A}nTi7d9 zWfFg{S(y~i=ptj#xcD~^B(Tdv>?MTdMG}#TeyV$km+5}uLq{AcOe6&v>;apDANWC% zlZ`$4fJyT31xQbyZ+rsZ0J+4^!4^9HobexI{s8_l#~&E~(D+#|4?pX9sK**Svj%d5 z&md77^Llddg^js985$dN6>Kiw=Hi*T(BK~WGr4GEE+4sE8*}-{MH_R4Cf7!P+;Zo+ z2wg<_=-1?;?ToP<7#r%CIQmPlD<|d*Wh3i_eT5>tb7SMZ@;*a3K<%_XXTp04Y%e^s z7u*Lpq;a&dmjJ!EHue&r7uQBTl%c6(=X#`lfc6`K4;T|ezeou-GY7VH1b*hNcoH6g zM}IgJX)RToBvcVkA_UzM32HAR;TnVJ87=`#ZX;2A?i{pKFGHtK?IsoS(%AO%2o}?bD5pHmWsx(AQ9EM`Nrb-^e>TlA3d?VI z|3yTo;ZgerHU#G59}%HnV3j9(Ql7*pAD1UFYIk`WJZjUgJYB5I^E9l>)5R)J-na5} zYq&g#8O77!!IOUF>0(`;r(s>5E*3n;I8(lb_7Cao$b}dR>W-^l?J!HhzD3TEv7>P0 zx_`muv^bcudK#;FnFoAA)-!$D-rM=ChIymPpL@Y_XD)kB**n(vwLhN5^UN5X4RxIj zYwHZ$*_c}PyL8`>!P|T~8yD-&<}|E3o3F4%{hpQk$BECqfU?Yp!7hVitOqqNtW z{Xaol44b*v^XYyaBW|tFukRw}B82^Mkq<=|`}&@xc}|OIRu^kaNKQ^W5boq5!O4(= zIuH4U=MjsXD4lQk=wIu^wfN5C4wZUutJ9UkL*`_yJxBu4#axW}0I5K9y|qdOJLBHj z^D*{{71!S0?mR`A!yKj&WVZ?~aqm&*-tKnqi5!+#XhiJIUfkW1`u4rJ_iOL|ZuDdG zr)X)VwGy=+-r4HJ(L(R>&UP2d+|-rnsk!p>^wi~J!-c#&l&hOCrCi5j*XsCK5gS%1$5iwA#1-mrmvYuTNy%LzMsk diff --git a/Bin/Content/Shaders/DebugPixel.cso b/Bin/Content/Shaders/DebugPixel.cso index 32d35ff28af4f7a0157daf18cddca2dbc2812b90..da6e45137b8666eb0640b6ff81a31ef11eaed1f8 100644 GIT binary patch literal 12252 zcmeHNOKcQJ5Up85VlQ5>Ng#YA)Ut_U0_+D27>Drl*qF$G<#7NdgUGTwwuc?htY&8U zh(y{51);zt5+@`iB)Iv)4Jnr(Wa zdCeAW)?iULII%IgHl5tKCY?@Z)~{`8rlFn6j@{M%>jb)o^Q)M0lU`mh4WTMX%wwwT zJ=nXgXGeQ44Gk%s?faouHzQ<+Pm`n(RoxeLoFiJ#RfXx;R&dH&@bsa)WivOY^ls}t z$BbCWW(plDVRXJyHdeZ_uCe432v1f#bvGleafc>6kJ5zK50g#ORW?q$@w zCt2WJG9!KU>xCZpp%0ZmT>XQa@0~jN&8I(|UksPo1IR}EsoTC-Gny5Yj>vSffV@^# zI^~{`^?xkg1<^-i@gv^!x4=<{=yQ|k`W)_yf3%(cor-!eVGE>Ejk=jLN_kB*$l9S& ze{#TZ480){PsIBSE9*9k!K`jJtq`qZBtDXepGd@OY|Sm%rtnKOWs>Q>RU%#S1ZTxN ziTEcIRwgPq=@xi+=iwb}J%&^tIB&b%^Nm|)k1MC z+Z9exGfM6eEmtsfv)?J&)?uyS3SIQurD9R-Mn30?eU@EdxsY|6vzC2aZL{*4y63p# zYW5C0TO81Hj_SwsRK)jGMIS60nl~9)1D=xI`Z3M$<|R?CRV{fc=6x0OkExhH5~%1* zL`6?!R`F<{Vtz!$98|PC75hUK9WU&t;`2})PsKcxQ@v;Lk&2V@MZFqKluJxI0!QpJ zr$e7?Rv>>WS^9HYDs!oMjc0DHxqCwjD|qUQK>?IUd=NBz7m6T`i@Lu*aNxsyAcL}y zMKEF#dw}!ut@`u#7sOX^T(G0p&K{dJO+$Io<_? z)X$Coobzo)LY?sasu-I&8RsYv>ZmI7g8_X4qR+200v6KJ1zVY-Tpjs706n;WFHVaV zpf2=jE>+iIjBs}l#TnQLQxGc0KlK0Sj2izbsCJ~%bFu*9y-R9R_wa33^G05|k3VY@ z;#n(*-j6I0S>T0QU_QO+`CMnY73q;H=Cv8F4KGxIsPg~S0_>hW5u)*bqG@J~0AqZ# zCgYv^6GUg`($%l=f2S@+!MKX?3S$ThIk7m*1T;9VdFK`}>aHM0HMBn{@G+N1a_iZF z;7#&Z9Mdv2=B)lQd2jr>V&n%tq>+1SoR#3W0MM6^;{4&aHZ8(h6vpAa{)a{gJA;l5 z57&Af^wW?$7Z~sU?e9`^PP5OVl$jmW97;KME;XRxFL;LxD_8Itef&>6CpGnh zb2zTzFN?77GDZOQKTN9zM!3OoMw9{I=ncSi=LF+_XreOGg{G$N=@;w2U|h*+8ceS; z_2L1X{*lvVrg_F&oDR?aO`I3}&0%c-550Shv6gW@Bd;U;)%%8oL2GXBhw#17QZH|NnJ>lnRIqCP6F&W(3LyGBB_*Fz_#6U}&%hse*t8MSGxGObi_S z4GauV7X1Iuz!2==5(Ki;0f_m4crpj031i7*TgGz5AQx9Ruzf&b7?1%mSb!RV=EzK} GtOfuvR3@ST diff --git a/Bin/Content/Shaders/DebugVertex.cso b/Bin/Content/Shaders/DebugVertex.cso index f9767fdb3fda4b15b9bf290ff3d22665645976ad..e35466e14dca7c76b79bb799b061e06a02989cce 100644 GIT binary patch literal 12292 zcmeHNOKenC7(TZTY=;)6$h!$SQAo;b9+XF^l}za{v`L{&ry>ax%P@009cDUry!ZA& z)YyeFL`jT>gv7*z1+KawE+lbNqB|ExcP?BILktTeP>gY5sNZ)Vb!=clwGC6a|Kz*> zIsbWm=Rfyx?tdqG`e@gdBkRpKuXJwudZM$r<;wd$MF>$75@Ho}8*m-C4QxiiS>P{V zAbKoTgsoIMn5lg@SBr9{2cqFH^=3cl50ic}7rgY8FhE3Truv2#T#(QOaB$-xq z*`Tn#d>f?Wr-tU6#k-H4j=DmyS=fFtZA@JvqodVr!?K0@)XtChEi}2+ zJ-vcF5N(adyQ2dlQiij{t6!O7uV@8(V8Re$5-+PC6oi=R!$j=Y*A+Y?kNRRfFr3$t z=6*Sv%obXtlPPM3Y?p30MD9eUBs|jSd#lk`udC*mUXZBzN~7^{3#!XE(rBPJ#W9GP;%H^|# zj8W9J^J>nNS((wtip4}f^C?rluIV|H%V<_dR?{yey0o;K=(}K;s(xHg7DuuvBVot> z5{v^T;@Qz+UX7~f#xh`l<0(}))ycp}-pC7)YEO(=9Md+(^uIW!#~qHwlW?>+gX4t5 zF+I;QMUI-qG2?PHtoUStG!llzF>P_Qj^ia9m*|>$!8uQ^L3cZwEvnBQdyS+2mumhw zq)efQKgB0M?YsA#;*9geeX>5|gRW*n5@fuWeV^U<<*FFcEayaA@<@780UqEB=7H7UhLtvw!ueYRM3D3$3dnVu)VGSgl^L{uM#gBe5(VV7z~8eegc7?K*7atZl#&jU<<-AFmtF1D*$##{=uc4r|YS z3EeCIY{jj?+{w=IdF|9>cdvtr%{Lx*N7Y6;4gHd7m&an z;5y(6|NFJY%{bcH?;{-ns`~LeqMhNz1 z3%Q=cuqJ|q|Z(J;1q9{e|PM1FX#lv?ou;0~?;su->Q@ H;(@;bOzc$2 delta 225 zcmZokn8Q-<65-^$zth#vscpaX)EEEC)89R=Vq{=okYQqAU<1+?Ks*PC9{_O-P+|)Z zzW`##{5;DTkQfj%F#Y>)0;DuRYz7q+%n0T)Ffanu$OBcfGB7kSFz`=cVPF6vX59k} z4F4xEFg#fR#1nw#0K4Fdy%0|O%iKaifR!)U=+GC7s8TrtSS Y)hz%hgbZXr9F~9ofvOo~CRWY|0AKGcO#lD@ diff --git a/Bin/Content/Shaders/LightPass.cso b/Bin/Content/Shaders/LightPass.cso index 495854bb97ae47cc78b480c3f72577900f817481..c5573288eab9b104aa624f9dbc8f37fb5fc29ebf 100644 GIT binary patch literal 12124 zcmeHNU2GIp6h2cHZ5I~XN&$hG8-Gao+uhPqpg|ONTEG-qIu%G90^8Zy?y%dL&CD#& z5RxVuV_^`vt=OY=iA~9LIuT#4Y8bdi{?Sq{z8yHSB#@Dq{Rmte zjc6_-u$e~Y^7QBY+~@NvOfYW^US$9TMeM7vMf7ANFz?BpUNpP^K;XkW)iyt3;YHH*Hm z#GqR#m-SxM4PP8^+#=igK61J0xWjtJ$(ef3u;-iZPB&XFSca!pb8b5FZ#-%~Z@OkK zNW^)1pJ{VKPM5c5Z`SjYg_2hyGCK5%^fp)ZHupDgbH@U2y$A7Dde7b-54_Edd27I1 zM|wLLdh5vyp$<3nTFI9O+Y%n8@|d@HRA%CHw&F%w8R4b>=$Df}Z@BfXGS#3C z?Kwp#<3mW$MdoH^^u2ibTUS2jGTL2WhApC*gFuX3*-Kj+>ajpd9X(ICUc5Fhln;>| z=Wg2Rl?DY5M^`C3=u!H_MnbJW>kgVe8Q$Tx!)dAMw0(D&urEkJ)=+%|3hRQK5WayR z=W$$ue7!>FWcxL=tpTx09bqd$tAD2@)Y~9rHX|1F5u;0-=Lq#N9--QIj6NHuuN|kq z%=#M6iu}&QEMta?^-Au?%5Skl`|fx}-9M7+Oh9AL5;t})_brB&DAuxRiG}6m5<~q$oD1U`wa=`H2Fnyy(JwI*) zCJV=+^?%%}GyUUZjgQy0$a8;!=)Fbs`SoXb*luRQypH(_b4d8@&vRiVkYT(axXyfp z#TeD_2`wEoz%dQQ-qU->?D8;YJGRN1^Hk9 z+cT^Wb3e%K3btWySj>$37;+(VBQx(K{MILWmKjI_InH@WWP$1;X6!LQd$Rb0%@IvA O0!`E0f7JcVM&M5z2JN2! delta 68 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 Fi~x2#IamMy diff --git a/Bin/Content/Shaders/TextureDebug.cso b/Bin/Content/Shaders/TextureDebug.cso index 2cce30d6c069594e6fe47b5461000b04b794f041..51c99d225b5fc4792ca5fd1119ff5c227f339b01 100644 GIT binary patch literal 15120 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 S+PMhiB9MzfE&_8j0{;aA?_8Py literal 2852 zcmb7GKWGzi6n>XWlP0OA2reR+p+j9tZAC0dN!lcBAWce=#tMRzCTgT@N-PLY2jb$O z9UTNSNQV}|Npuj3;2hl1yWiz{38enu<=%bo`@Q$R-=Axf%QLet zYt!=O;cMgjqj$egWnXM*A~F&Y3E+7Z*7Aw01x0?rN+FSKSR_&3n0f`ACceMz3Z8Mg zGJ@Z0wvC8p`XYnyIQZ)qB(aBvxfd{PK*SJlL@!EYI1 zS!yx{4(7C)exzp%Jj4XC7I5+Dz;ss}KH|Gh+>f~56^D;_+l;Gv%q6n4&G!NDSwDpO ztjTxQgfjHkLM{tqoe=7{G3E{-x5C&jeG!4q7W_{Bh$la`#hJ&N%pd8IKhiV*u9Kf@ z$^M7z{Px=7U7Ez%KQZPXLVh>K{)dpC7&b*$xm54g-Ygjb*Lp%9_=3H#a+4D@vE5_X zpoz6j%--{ZPHlZ(leU5PCi7VFAz+rTiGBdzJS#p49$-JV+ij8Je6m16anU4(NjIP^ z{WK;VgD~}u5Jk%^Xle`(!?XMe_>3tWn&l3thcS!8SQT^luKWr3#1U zVx|W6+DijqM}wO~Txp0m{wSN7yun)Dy?*3RuX(8vN zTKaL_T0Gn?Ej#Dzb7b#NKP}ANPYXFG)zXja*5c-(MAz9;HKAdU=ZKkg5VuRkMpjG45&M<&JHnk*VFcQf|$DV z=`+@MU|K{gmJ+2c*V3_KC5_KlVGx z#At3j0^G21JRE+xR(*i-dpfH7&96G6=&@11S6$tz)i$kUJqlJsH`D`&8E8bnHR2#9``ub*V4bIfq_~}Yrzpj@V(`lzr@*!4(Fo>XJ6!h_TZeu8s9uP&jj%w9-Mb43j687c_)Z3 z=8Kt9CZCg1YI!!FFC- - + diff --git a/Code/Game/DanBiasGame/DanBiasGame_Impl.cpp b/Code/Game/DanBiasGame/DanBiasGame_Impl.cpp new file mode 100644 index 00000000..8176521b --- /dev/null +++ b/Code/Game/DanBiasGame/DanBiasGame_Impl.cpp @@ -0,0 +1,62 @@ +#include +#include "Include\DanBiasGame.h" + +namespace DanBias +{ +#pragma region Game Data + /** + * Private server data container + */ + class DanBiasGamePrivateData + { + public: + bool initiated; + bool running; + bool released; + + public: + DanBiasGamePrivateData() + :running(0) + , initiated(0) + {} + void Release() + { + + } + } data; +#pragma endregion + + + DanBiasClientReturn DanBiasGame::Initiate(DanBiasGameDesc& desc) + { + + data.initiated = true; + return DanBiasClientReturn_Sucess; + } + DanBiasClientReturn DanBiasGame::Run() + { + if(data.running) + { + return DanBiasClientReturn_Error; + } + if(!data.released) + { + return DanBiasClientReturn_Error; + } + if(!data.initiated) + { + return DanBiasClientReturn_Error; + } + data.running = true; + while (data.running) + { + + } + return DanBiasClientReturn_Sucess; + } + void DanBiasGame::Release() + { + data.released = true; + } + +} //End namspace DanBias \ No newline at end of file diff --git a/Code/Game/DanBiasLauncher/Launcher.cpp b/Code/Game/DanBiasLauncher/Launcher.cpp index b1cab1ee..050e6b8b 100644 --- a/Code/Game/DanBiasLauncher/Launcher.cpp +++ b/Code/Game/DanBiasLauncher/Launcher.cpp @@ -8,7 +8,7 @@ #if defined(DANBIAS_SERVER) -#include "DanBiasServer.h" +#include "IDanBiasServer.h" #elif defined(DANBIAS_CLIENT) #include "DanBiasGame.h" #endif diff --git a/Code/Game/DanBiasServer/DBServer.cpp b/Code/Game/DanBiasServer/DBServer.cpp new file mode 100644 index 00000000..db81f4da --- /dev/null +++ b/Code/Game/DanBiasServer/DBServer.cpp @@ -0,0 +1,56 @@ +///////////////////////////////////////////////////////////////////// +// Created by [Dennis Andersen] [2013] +///////////////////////////////////////////////////////////////////// +#include +#include "DBServer.h" +//#include "GameLogic\?" +#include "Utilities.h" + +using namespace DanBias; + +DBServer::DBServer() + : initiated(0) + , running(0) + , released(0) +{ +} +DBServer::~DBServer() +{ + +} +DanBiasServerReturn DBServer::Create(const DanBias::DanBiasServerDesc& desc) +{ + this->initiated = true; + return DanBiasServerReturn_Sucess; +} +DanBiasServerReturn DBServer::Run() +{ + + if(this->running) + { + return DanBiasServerReturn_Error; + } + if(this->released) + { + return DanBiasServerReturn_Error; + } + if(!this->initiated) + { + return DanBiasServerReturn_Error; + } + this->running = true; + while (this->running) + { + MessageBox(0, L"What to do here...", L"TYPELESS", 0); + + this->running = false; + } + return DanBiasServerReturn_Sucess; +} +DanBiasServerReturn DBServer::Release() +{ + this->released = true; + return DanBiasServerReturn_Sucess; +} + + diff --git a/Code/Game/DanBiasServer/DBServer.h b/Code/Game/DanBiasServer/DBServer.h new file mode 100644 index 00000000..261e62d5 --- /dev/null +++ b/Code/Game/DanBiasServer/DBServer.h @@ -0,0 +1,27 @@ +///////////////////////////////////////////////////////////////////// +// Created by [Dennis Andersen] [2013] +///////////////////////////////////////////////////////////////////// +#ifndef DANBIASSERVER_DBSERVER_H +#define DANBIASSERVER_DBSERVER_H + +#include "Include\IDanBiasServer.h" + +namespace DanBias +{ + class DBServer + { + public: + DBServer(); + ~DBServer(); + + DanBiasServerReturn Create(const DanBias::DanBiasServerDesc& desc); + DanBiasServerReturn Run(); + DanBiasServerReturn Release(); + + private: + bool initiated; + bool running; + bool released; + }; +}// End namspace DanBias +#endif // !DANBIASSERVER_DBSERVER_H diff --git a/Code/Game/DanBiasServer/DanBiasServer.vcxproj b/Code/Game/DanBiasServer/DanBiasServer.vcxproj index 139a25d1..ba85aaa5 100644 --- a/Code/Game/DanBiasServer/DanBiasServer.vcxproj +++ b/Code/Game/DanBiasServer/DanBiasServer.vcxproj @@ -103,10 +103,12 @@ Level3 Disabled DANBIAS_SERVER;DANBIAS_SERVER_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(SolutionDir)Misc\;$(SolutionDir)Game\ Windows true + GameLogic_$(PlatformShortName)D.dll;%(DelayLoadDLLs) @@ -116,10 +118,12 @@ Level3 Disabled DANBIAS_SERVER;DANBIAS_SERVER_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(SolutionDir)Misc\;$(SolutionDir)Game\ Windows true + GameLogic_$(PlatformShortName)D.dll;%(DelayLoadDLLs) @@ -131,12 +135,14 @@ true true DANBIAS_SERVER;DANBIAS_SERVER_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(SolutionDir)Misc\;$(SolutionDir)Game\ Windows true true true + GameLogic_$(PlatformShortName).dll;%(DelayLoadDLLs) @@ -148,20 +154,31 @@ true true DANBIAS_SERVER;DANBIAS_SERVER_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(SolutionDir)Misc\;$(SolutionDir)Game\ Windows true true true + GameLogic_$(PlatformShortName).dll;%(DelayLoadDLLs) - + + - + + + + + + + + {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} + diff --git a/Code/Game/DanBiasServer/DanBiasServer_Impl.cpp b/Code/Game/DanBiasServer/DanBiasServer_Impl.cpp deleted file mode 100644 index 4d4c753b..00000000 --- a/Code/Game/DanBiasServer/DanBiasServer_Impl.cpp +++ /dev/null @@ -1,39 +0,0 @@ -#include -#include "Include\DanBiasServer.h" - -namespace DanBias -{ -#pragma region Server Data - class DanBiasServerPrivateData - { - public: - DanBiasServerPrivateData() - { - - } - ~DanBiasServerPrivateData() - { - - } - - private: - - - } data; -#pragma endregion - - - DanBiasServerReturn DanBiasServer::Initiate(DanBiasServerDesc& desc) - { - return DanBiasServerReturn_Sucess; - } - DanBiasServerReturn DanBiasServer::Run() - { - return DanBiasServerReturn_Sucess; - } - void DanBiasServer::Release() - { - - } - -} //End namspace DanBias \ No newline at end of file diff --git a/Code/Game/DanBiasServer/IDanBiasServer.cpp b/Code/Game/DanBiasServer/IDanBiasServer.cpp new file mode 100644 index 00000000..bf0b52de --- /dev/null +++ b/Code/Game/DanBiasServer/IDanBiasServer.cpp @@ -0,0 +1,28 @@ +///////////////////////////////////////////////////////////////////// +// Created by [Dennis Andersen] [2013] +///////////////////////////////////////////////////////////////////// +#include "Include\IDanBiasServer.h" +#include "DBServer.h" + +namespace DanBias +{ + +#pragma region Server Data + static DBServer server; +#pragma endregion + + + DanBiasServerReturn DanBiasServer::Initiate(DanBiasServerDesc& desc) + { + return server.Create(desc); + } + DanBiasServerReturn DanBiasServer::Run() + { + return server.Run(); + } + DanBiasServerReturn DanBiasServer::Release() + { + return server.Release(); + } + +} //End namspace DanBias \ No newline at end of file diff --git a/Code/Game/DanBiasServer/Include/DanBiasServer.h b/Code/Game/DanBiasServer/Include/IDanBiasServer.h similarity index 75% rename from Code/Game/DanBiasServer/Include/DanBiasServer.h rename to Code/Game/DanBiasServer/Include/IDanBiasServer.h index e9446e76..681ea348 100644 --- a/Code/Game/DanBiasServer/Include/DanBiasServer.h +++ b/Code/Game/DanBiasServer/Include/IDanBiasServer.h @@ -1,3 +1,6 @@ +///////////////////////////////////////////////////////////////////// +// Created by [Dennis Andersen] [2013] +///////////////////////////////////////////////////////////////////// #ifndef DANBIAS_SERVER_DANBIAS_SERVER_H #define DANBIAS_SERVER_DANBIAS_SERVER_H @@ -29,7 +32,7 @@ namespace DanBias public: static DanBiasServerReturn Initiate(DanBiasServerDesc& desc); static DanBiasServerReturn Run(); - static void Release(); + static DanBiasServerReturn Release(); }; }//End Extern "C" diff --git a/Code/Game/DanBiasServer/Include/ServerWrapper.h b/Code/Game/DanBiasServer/Include/ServerWrapper.h new file mode 100644 index 00000000..29829c17 --- /dev/null +++ b/Code/Game/DanBiasServer/Include/ServerWrapper.h @@ -0,0 +1,23 @@ +#ifndef NETWORK_SERVER_WRAPPER_H +#define NETWORK_SERVER_WRAPPER_H + + +class SingletonServer +{ +public: + + struct INIT_DESC + { + bool l; + }; + void CreateServer(/*DATA*/); + void StartServer(/*DATA*/); + void StopServer(/*DATA*/); + void TerminateServer(/*DATA*/); + + void AttachLobby(/*LOBBY*/); + void DetachLobby(/*LOBBY*/); + void KickClient(/*CLIENT*/); +}; + +#endif // !NETWORK_SERVER_WRAPPER_H diff --git a/Code/Game/DanBiasServer/MainLobby.h b/Code/Game/DanBiasServer/MainLobby.h new file mode 100644 index 00000000..5807ab9c --- /dev/null +++ b/Code/Game/DanBiasServer/MainLobby.h @@ -0,0 +1,17 @@ +#ifndef DANBIASGAME_GAMELOBBY_H +#define DANBIASGAME_GAMELOBBY_H + +#include "Include\ServerWrapper.h" + +class MainLobby :public SingletonServer +{ +public: + MainLobby(); + ~MainLobby(); + +private: + + +}; + +#endif // !DANBIASGAME_GAMELOBBY_H diff --git a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj b/Code/OysterPhysics3D/OysterPhysics3D.vcxproj index 2113cccb..c36fded5 100644 --- a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj +++ b/Code/OysterPhysics3D/OysterPhysics3D.vcxproj @@ -24,26 +24,26 @@ - DynamicLibrary + StaticLibrary true v110 MultiByte - DynamicLibrary + StaticLibrary true v110 MultiByte - DynamicLibrary + StaticLibrary false v110 true MultiByte - DynamicLibrary + StaticLibrary false v110 true