From a852e8eab4b4c320905843270377c96f5b090d05 Mon Sep 17 00:00:00 2001 From: dean11 Date: Tue, 3 Dec 2013 12:07:37 +0100 Subject: [PATCH] Created the game modules --- Bin/Content/Models/PLACEHOLDER | 0 Bin/Content/Shaders/DebugCameraVertex.cso | Bin 0 -> 2628 bytes Bin/Content/Shaders/DebugPixel.cso | Bin 0 -> 488 bytes Bin/Content/Shaders/DebugVertex.cso | Bin 0 -> 540 bytes Bin/Content/Shaders/LightPass.cso | Bin 0 -> 336 bytes Bin/Content/Shaders/PixelGatherData.cso | Bin 0 -> 820 bytes Bin/Content/Shaders/TextureDebug.cso | Bin 0 -> 760 bytes Bin/Content/Shaders/VertexGatherData.cso | Bin 0 -> 2852 bytes Bin/Content/Textures/PLACEHOLDER | 0 Bin/DLL/LightPass.cso | Bin 12124 -> 0 bytes Code/DanBias.sln | 287 ++++++++++-------- Code/Game/DanBiasGame/DLLMain.cpp | 8 + .../DanBiasGame/DanBiasGame.vcxproj | 41 +-- .../{ => Game}/DanBiasGame/DanBiasMaincpp.cpp | 0 Code/Game/DanBiasGame/Include/DanBiasGame.h | 37 +++ .../DanBiasLauncher/DanBiasLauncher.vcxproj | 179 +++++++++++ Code/Game/DanBiasLauncher/Launcher.cpp | 38 +++ Code/Game/DanBiasServer/DLLMain.cpp | 8 + Code/Game/DanBiasServer/DanBiasServer.vcxproj | 169 +++++++++++ .../Game/DanBiasServer/DanBiasServer_Impl.cpp | 39 +++ .../DanBiasServer/Include/DanBiasServer.h | 38 +++ Code/{ => Game}/GameLogic/Camera.cpp | 0 Code/{ => Game}/GameLogic/Camera.h | 0 .../{ => Game}/GameLogic/CollisionManager.cpp | 0 Code/{ => Game}/GameLogic/CollisionManager.h | 0 Code/{ => Game}/GameLogic/DynamicObject.cpp | 0 Code/{ => Game}/GameLogic/DynamicObject.h | 0 Code/{ => Game}/GameLogic/Game.cpp | 0 Code/{ => Game}/GameLogic/Game.h | 0 Code/{ => Game}/GameLogic/GameLogic.vcxproj | 19 +- Code/{ => Game}/GameLogic/GameMode.cpp | 0 Code/{ => Game}/GameLogic/GameMode.h | 0 Code/{ => Game}/GameLogic/IGame.cpp | 0 Code/{ => Game}/GameLogic/IGame.h | 0 Code/{ => Game}/GameLogic/Level.cpp | 0 Code/{ => Game}/GameLogic/Level.h | 0 Code/{ => Game}/GameLogic/Object.cpp | 0 Code/{ => Game}/GameLogic/Object.h | 0 Code/{ => Game}/GameLogic/Player.cpp | 0 Code/{ => Game}/GameLogic/Player.h | 0 Code/{ => Game}/GameLogic/RefManager.cpp | 0 Code/{ => Game}/GameLogic/RefManager.h | 0 Code/{ => Game}/GameLogic/StaticObject.cpp | 0 Code/{ => Game}/GameLogic/StaticObject.h | 0 Code/{ => Game}/GameLogic/TestGLMain.cpp | 0 Code/{ => Game}/GameLogic/Weapon.cpp | 0 Code/{ => Game}/GameLogic/Weapon.h | 0 Code/GameLogic/GameLogic.vcxproj.filters | 96 ------ Code/OysterGraphics/DllInterfaces/GFXAPI.h | 1 - Code/OysterPhysics3D/OysterPhysics3D.vcxproj | 8 +- 50 files changed, 705 insertions(+), 263 deletions(-) create mode 100644 Bin/Content/Models/PLACEHOLDER create mode 100644 Bin/Content/Shaders/DebugCameraVertex.cso create mode 100644 Bin/Content/Shaders/DebugPixel.cso create mode 100644 Bin/Content/Shaders/DebugVertex.cso create mode 100644 Bin/Content/Shaders/LightPass.cso create mode 100644 Bin/Content/Shaders/PixelGatherData.cso create mode 100644 Bin/Content/Shaders/TextureDebug.cso create mode 100644 Bin/Content/Shaders/VertexGatherData.cso create mode 100644 Bin/Content/Textures/PLACEHOLDER delete mode 100644 Bin/DLL/LightPass.cso create mode 100644 Code/Game/DanBiasGame/DLLMain.cpp rename Code/{ => Game}/DanBiasGame/DanBiasGame.vcxproj (88%) rename Code/{ => Game}/DanBiasGame/DanBiasMaincpp.cpp (100%) create mode 100644 Code/Game/DanBiasGame/Include/DanBiasGame.h create mode 100644 Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj create mode 100644 Code/Game/DanBiasLauncher/Launcher.cpp create mode 100644 Code/Game/DanBiasServer/DLLMain.cpp create mode 100644 Code/Game/DanBiasServer/DanBiasServer.vcxproj create mode 100644 Code/Game/DanBiasServer/DanBiasServer_Impl.cpp create mode 100644 Code/Game/DanBiasServer/Include/DanBiasServer.h rename Code/{ => Game}/GameLogic/Camera.cpp (100%) rename Code/{ => Game}/GameLogic/Camera.h (100%) rename Code/{ => Game}/GameLogic/CollisionManager.cpp (100%) rename Code/{ => Game}/GameLogic/CollisionManager.h (100%) rename Code/{ => Game}/GameLogic/DynamicObject.cpp (100%) rename Code/{ => Game}/GameLogic/DynamicObject.h (100%) rename Code/{ => Game}/GameLogic/Game.cpp (100%) rename Code/{ => Game}/GameLogic/Game.h (100%) rename Code/{ => Game}/GameLogic/GameLogic.vcxproj (92%) rename Code/{ => Game}/GameLogic/GameMode.cpp (100%) rename Code/{ => Game}/GameLogic/GameMode.h (100%) rename Code/{ => Game}/GameLogic/IGame.cpp (100%) rename Code/{ => Game}/GameLogic/IGame.h (100%) rename Code/{ => Game}/GameLogic/Level.cpp (100%) rename Code/{ => Game}/GameLogic/Level.h (100%) rename Code/{ => Game}/GameLogic/Object.cpp (100%) rename Code/{ => Game}/GameLogic/Object.h (100%) rename Code/{ => Game}/GameLogic/Player.cpp (100%) rename Code/{ => Game}/GameLogic/Player.h (100%) rename Code/{ => Game}/GameLogic/RefManager.cpp (100%) rename Code/{ => Game}/GameLogic/RefManager.h (100%) rename Code/{ => Game}/GameLogic/StaticObject.cpp (100%) rename Code/{ => Game}/GameLogic/StaticObject.h (100%) rename Code/{ => Game}/GameLogic/TestGLMain.cpp (100%) rename Code/{ => Game}/GameLogic/Weapon.cpp (100%) rename Code/{ => Game}/GameLogic/Weapon.h (100%) delete mode 100644 Code/GameLogic/GameLogic.vcxproj.filters diff --git a/Bin/Content/Models/PLACEHOLDER b/Bin/Content/Models/PLACEHOLDER new file mode 100644 index 00000000..e69de29b diff --git a/Bin/Content/Shaders/DebugCameraVertex.cso b/Bin/Content/Shaders/DebugCameraVertex.cso new file mode 100644 index 0000000000000000000000000000000000000000..d9e567be113914c6b913012b85586ef11a19629f GIT binary patch literal 2628 zcmb7FL2FZ46h80eC9kQ$iZB}ye2Xq-Hl;=>Er_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 literal 0 HcmV?d00001 diff --git a/Bin/Content/Shaders/DebugPixel.cso b/Bin/Content/Shaders/DebugPixel.cso new file mode 100644 index 0000000000000000000000000000000000000000..32d35ff28af4f7a0157daf18cddca2dbc2812b90 GIT binary patch literal 488 zcmZ>XaB_Az!)NXFHnyQ`yKQRZJLf5k3=9k}fCL+mwgBP@Kzsp+eSl(1fOrcKJLczE z1^~rCn1Sj4e;pvD0%C(n5DS4Bf%1V246FXcQ9z2Y&+t!;=O7 z|1&TId$~sKPJ|IqIU|{~FAOK`BFqkngaKPA14j>U!v+Nic7=uF`LrQ=$Odx3} z0NQ~9(D^8mSUAXLVUdOl1-ZDofx`nX!oVN{VzU5!2DB8!_RUN#$}i4OD^bu0(p2#9 z3HDJ4&PYs2EmCmK&n?Kz0WvK0j1BZGjSLL*49$!!Oc+*s2D|%lK+Ocv{y;t`yg~i| b@fCm=2AH7?ejptj79ZjmXaB|+?>FVdywqJVci+|fx&@+k%1pb#{)Hd5)c5g7#Pxl`adZ^*g$;@ zW(*9hFut1{MBEN&ZE%QVNC{9LXfPZgvq6F&{iFbN{kZf7xwyIoph?Pr_$>eagDeHH zeKV7b@{9A+N)$ALG!;C2f_)T%GZIr$ixiyma|<$afDB7LV*@=)BLf3HLo;Iw6Nc5E z!R~%KK)oP$a{#dd5W@g7l)(=SumJyH&k#?4KZez-SNr4812O}y2gnW%i-&6i0F?$t A*Z=?k literal 0 HcmV?d00001 diff --git a/Bin/Content/Shaders/LightPass.cso b/Bin/Content/Shaders/LightPass.cso new file mode 100644 index 0000000000000000000000000000000000000000..495854bb97ae47cc78b480c3f72577900f817481 GIT binary patch literal 336 zcmZ>XaB^;_&Oe|zyZ6iL*LATTce$1_GB7X%00~wgZ34tSKs*PC*8uSqAP#bIbqfH} z$Up|fVF`9-0O|v=eKV7b@{9A+N)$ALG!;C2f_)T%GZIr$ixiyma|<$afDB7LV*@=) zBLf3HLo;Iw6Nc5E!R~$>P(wkqKN>&S!!<$yDDD7s8Av{hgMo22&{mLpVb~7H3=VM& RDS?UsDXajbo)kc=dH{`GCE)-7 literal 0 HcmV?d00001 diff --git a/Bin/Content/Shaders/PixelGatherData.cso b/Bin/Content/Shaders/PixelGatherData.cso new file mode 100644 index 0000000000000000000000000000000000000000..400255d7ceb4ec6d32cb65042e1ada232e9fec4d GIT binary patch literal 820 zcmb7CO-mb56g@N1CcA{Lr4Axe5kgu;3`lj%#2AP(c4m-lM64eeutriBUAP$h6)v-I z7YcS$x~T5D@5Z$o1y?To1MwU)qmqTtL(aT2=e~R2y?Nu*7fP4c{@TU<&#RGf)0h~$ z8#4e*rGPhFXUIR~EY06!&IE2rySZOHqA$YicI#Y5r5~SC&omhS3=9IRB@%(?BNi&3PJq{V+b*VxIOczU|eLcN}|0obw4Vg3t~RxsQ!LL1({&>iiF0 z)_N_^cgl+^eH(`KKEQv5he|IuHe1ba&7DK*y+3X()q~3srx2#h0>p^3WqL`m7 zh1|pUf3K5xaP$y=lkO+EdD3nIIh@i(JXw#xi(6U9l z*+jpgMg5Na1+Lmn=c*GzcHqoC-?{g@_s*9rttHxDAO7vfyHEdH{o;CJG3^5I?FL2| zqvQ*z(7Y#u^xw&NqaG{M7s74Z%M1b0ov)|>T$t&d0T*kgSxMst7<%pL2Y7wYYcv2K z{njhIt!IvL)0gv&Z39L&smq*Ia*EuN`dx(zC{4nHldj&_0QMCO%_|CL0~OY_)ov~Y zj5#{p%crlpIj7eO*EGzy+2mbW)Iq-%PkR4{LAgQRp!<3jjkCsKQw`{|YBq1=RinCBuAHig#_>t* zh$0q>ghR3Ua5yx#6p1dtvT{bI_`n|0*GpDOfy{Mw@=?qCIS{{-r?_-XM)76OQSz2_ zAihxg7@IrmnvpYeS`lWdl+ZLiiK3<#;(7cgEX&fkSCI8GNA^-l2hvN>>u1LGOv>cH F`~ZQ)TEqYV literal 0 HcmV?d00001 diff --git a/Bin/Content/Shaders/VertexGatherData.cso b/Bin/Content/Shaders/VertexGatherData.cso new file mode 100644 index 0000000000000000000000000000000000000000..14e821480af9c735e3f8af039ba1818bb728df90 GIT binary patch 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-5IVxSKS`d~p2(TDn05T#JDB7#9dR78C6L0>G?H-D(D;$zqI-Q9^xu&XJF`J0oR zJ?EZt=iGbG{XaAEiNVOVw+`Is{b6U%uU(73pZTh)QDTg#A;umc+DrHf;bp?Bgx?Xy zDML&i8jccQ49!URlt=~X!5=dcw&hr?cV}-GdwWb7IbK;X3OcbYt&9$x;3R*NRWRt!yvU?Cs8rP1#iPV3@qu`@AS3dR zfcz_g|C(Qk%7ZLe-2O-?($>b0DZ{)c7!C*gO|pW5%fvt1P3!{F1PyuO{cZsdEap7e z&K~Gx-U!&v{a-8SnR9Nd9bxTP`4=s|aM?(ucpFz{ z^~92FU}nnD&4doYGq#b{`AEh(7w`xCC(XH;Y}(efq|?&T&hg)RD&T+CGLn2oGt3q~ zXPDVeF2_mG$CaliWy6`(vWawDJT)fs)`0&)!2jHeTjD)%KOVSy>+UUVwGu#n3K1^FHSsLk+(HQ3yP7V3^g8j# z2R}gP!N&0b#^7<*UssC`lB(Fl?6>`k3^fn8L#uZQ5bs^M@Hyam}9A zvn=6Ec1?zbWXR0g^9=ifaL7ScTL-4SFbLiG0a{Myl4hb3yDah_WJl|8R;gmxO7PUZ zp^-)FxQJ%>3O0P~D#bZmxsPUI-nNguS0t}2l7B$*GKz})LB;GLL=|hLM9_0IzKN6Bkyvsn_0rhNO!yHk>4{Dg$)af~?UUVI0_Om?=(4lQRSY>S) z$#x?JLmq4x4;1&md-kth*8dx(vR*}2-2=3&<(jHOxAC5`k~VV8UonSQp(MTvHarua z2Rsj~od@dKW8%#9G8G~HeH0S~x@*JQmF`(yZx56@j(PpR-o3N-<)e?!RdtAae}J)< zcChQ8?xbSJ2{~aqVVcl|Mq>85i2`-c3!Kt~r->{<8Qsvrg$%f+f&FIh)RJCY=1j}f zN%HuI!P}*6l`+IrUKZm>WM6^>!=oRt6Qx + +BOOL WINAPI DllMain( _In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved ) +{ + MessageBox(0, L"DanBiasGame Loaded", 0, 0); + return TRUE; +} \ No newline at end of file diff --git a/Code/DanBiasGame/DanBiasGame.vcxproj b/Code/Game/DanBiasGame/DanBiasGame.vcxproj similarity index 88% rename from Code/DanBiasGame/DanBiasGame.vcxproj rename to Code/Game/DanBiasGame/DanBiasGame.vcxproj index 88181e55..d2d48214 100644 --- a/Code/DanBiasGame/DanBiasGame.vcxproj +++ b/Code/Game/DanBiasGame/DanBiasGame.vcxproj @@ -25,26 +25,26 @@ - Application + DynamicLibrary true v110 Unicode - Application + DynamicLibrary true v110 Unicode - Application + DynamicLibrary false v110 true Unicode - Application + DynamicLibrary false v110 true @@ -68,28 +68,28 @@ true - $(SolutionDir)..\Bin\Executable\ + $(SolutionDir)..\Bin\DLL\ $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ $(ProjectName)_$(PlatformShortName)D C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(LibraryPath)$(SolutionDir)..\External\Lib\Input;$(SolutionDir)..\Bin\DLL; true - $(SolutionDir)..\Bin\Executable\ + $(SolutionDir)..\Bin\DLL\ $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ $(ProjectName)_$(PlatformShortName)D C:\Program Files %28x86%29\Visual Leak Detector\lib\Win64;$(LibraryPath)$(SolutionDir)..\External\Lib\Input;$(SolutionDir)..\Bin\DLL; false - $(SolutionDir)..\Bin\Executable\ + $(SolutionDir)..\Bin\DLL\ $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ $(ProjectName)_$(PlatformShortName) C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(LibraryPath)$(SolutionDir)..\External\Lib\Input;$(SolutionDir)..\Bin\DLL; false - $(SolutionDir)..\Bin\Executable\ + $(SolutionDir)..\Bin\DLL\ $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ $(ProjectName)_$(PlatformShortName) C:\Program Files %28x86%29\Visual Leak Detector\lib\Win64;$(LibraryPath)$(SolutionDir)..\External\Lib\Input;$(SolutionDir)..\Bin\DLL; @@ -100,7 +100,7 @@ Level3 Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + DANBIAS_GAME_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true $(SolutionDir)GameLogic;$(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories) @@ -117,7 +117,7 @@ Level3 Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + DANBIAS_GAME_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true $(SolutionDir)GameLogic;$(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories) @@ -136,7 +136,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + DANBIAS_GAME_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true $(SolutionDir)GameLogic;$(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories) @@ -157,7 +157,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + DANBIAS_GAME_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true $(SolutionDir)GameLogic;$(SolutionDir)Input;$(SolutionDir)OysterGraphics;$(SolutionDir)Misc;$(SolutionDir)OysterMath;%(AdditionalIncludeDirectories) @@ -171,21 +171,22 @@ - - {b1195bb9-b3a5-47f0-906c-8dea384d1520} - - + {7e3990d2-3d94-465c-b58d-64a74b3ecf9b} - - {f10cbc03-9809-4cba-95d8-327c287b18ee} + + {0ec83e64-230e-48ef-b08c-6ac9651b4f82} - - {4285bd3f-3c6c-4670-b7af-a29afef5f6a8} + + {b1195bb9-b3a5-47f0-906c-8dea384d1520} + + + + diff --git a/Code/DanBiasGame/DanBiasMaincpp.cpp b/Code/Game/DanBiasGame/DanBiasMaincpp.cpp similarity index 100% rename from Code/DanBiasGame/DanBiasMaincpp.cpp rename to Code/Game/DanBiasGame/DanBiasMaincpp.cpp diff --git a/Code/Game/DanBiasGame/Include/DanBiasGame.h b/Code/Game/DanBiasGame/Include/DanBiasGame.h new file mode 100644 index 00000000..c24fe460 --- /dev/null +++ b/Code/Game/DanBiasGame/Include/DanBiasGame.h @@ -0,0 +1,37 @@ +#ifndef DANBIASGAME_DANBIASGAME_H +#define DANBIASGAME_DANBIASGAME_H + +#if defined (DANBIAS_GAME_DLL_EXPORT) + #define DANBIAS_GAME_DLL __declspec(dllexport) +#else + #define DANBIAS_GAME_DLL __declspec(dllimport) +#endif + +namespace DanBias +{ + extern "C" + { + enum DanBiasClientReturn + { + DanBiasClientReturn_Error, + DanBiasClientReturn_Sucess, + }; + + struct DanBiasGameDesc + { + //Stuff goes here... + int port; + }; + + class DANBIAS_GAME_DLL DanBiasGame + { + public: + static DanBiasClientReturn Initiate(DanBiasGameDesc& desc); + static DanBiasClientReturn Run(); + static void Release(); + }; + + }//End Extern "C" +} //End namspace DanBias + +#endif // !DANBIASGAME_DANBIASGAME_H diff --git a/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj b/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj new file mode 100644 index 00000000..2605ece8 --- /dev/null +++ b/Code/Game/DanBiasLauncher/DanBiasLauncher.vcxproj @@ -0,0 +1,179 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8690FDDF-C5B7-4C42-A337-BD5243F29B85} + Win32Proj + DanBiasLauncher + + + + Application + true + v110 + Unicode + + + Application + true + v110 + Unicode + + + Application + false + v110 + true + Unicode + + + Application + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\Bin\Executable\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName)D + $(IncludePath) + $(OutDir)..\DLL\;$(LibraryPath); + + + true + $(SolutionDir)..\Bin\Executable\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName)D + $(IncludePath) + $(OutDir)..\DLL\;$(LibraryPath); + + + false + $(SolutionDir)..\Bin\Executable\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName) + $(IncludePath) + $(OutDir)..\DLL\;$(LibraryPath); + + + false + $(SolutionDir)..\Bin\Executable\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName) + $(IncludePath) + $(OutDir)..\DLL\;$(LibraryPath); + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(SolutionDir)Game\DanBiasServer\Include + + + Windows + true + DanBiasServer_$(PlatformShortName)D.dll;DanBiasGame_$(PlatformShortName)D.dll;%(DelayLoadDLLs) + DanBiasServer_$(PlatformShortName)D.lib;DanBiasGame_$(PlatformShortName)D.lib;%(AdditionalDependencies) + + + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(SolutionDir)Game\DanBiasServer\Include + + + Windows + true + DanBiasServer_$(PlatformShortName)D.dll;DanBiasGame_$(PlatformShortName)D.dll;%(DelayLoadDLLs) + DanBiasServer_$(PlatformShortName)D.lib;DanBiasGame_$(PlatformShortName)D.lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(SolutionDir)Game\DanBiasServer\Include + + + Windows + true + true + true + DanBiasServer_$(PlatformShortName).dll;DanBiasGame_$(PlatformShortName).dll;%(DelayLoadDLLs) + DanBiasServer_$(PlatformShortName).lib;DanBiasGame_$(PlatformShortName).lib;%(AdditionalDependencies) + + + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + $(SolutionDir)Game\DanBiasServer\Include + + + Windows + true + true + true + DanBiasServer_$(PlatformShortName).dll;DanBiasGame_$(PlatformShortName).dll;%(DelayLoadDLLs) + DanBiasServer_$(PlatformShortName).lib;DanBiasGame_$(PlatformShortName).lib;%(AdditionalDependencies) + + + + + + + + + \ No newline at end of file diff --git a/Code/Game/DanBiasLauncher/Launcher.cpp b/Code/Game/DanBiasLauncher/Launcher.cpp new file mode 100644 index 00000000..b1cab1ee --- /dev/null +++ b/Code/Game/DanBiasLauncher/Launcher.cpp @@ -0,0 +1,38 @@ +///////////////////////////////////////////////// +// Launcher to launch Danbias server or client // +///////////////////////////////////////////////// +#include + +#define DANBIAS_SERVER +//#define DANBIAS_CLIENT + + +#if defined(DANBIAS_SERVER) +#include "DanBiasServer.h" +#elif defined(DANBIAS_CLIENT) +#include "DanBiasGame.h" +#endif + +int WINAPI WinMain( HINSTANCE hinst, HINSTANCE prevInst, PSTR cmdLine, int cmdShow) +{ +#if defined(DANBIAS_SERVER) + if(SetDllDirectory(L"..\\DLL") == FALSE) + { + return cmdShow; + } + // Server starter code goes here + DanBias::DanBiasServerDesc desc; + desc.port = 0; + + if( DanBias::DanBiasServer::Initiate(desc) == DanBias::DanBiasServerReturn_Sucess) + { + DanBias::DanBiasServer::Run(); + DanBias::DanBiasServer::Release(); + } +#elif defined(DANBIAS_CLIENT) + // Game client starter code goes here + return cmdShow; +#endif + + return cmdShow; +} \ No newline at end of file diff --git a/Code/Game/DanBiasServer/DLLMain.cpp b/Code/Game/DanBiasServer/DLLMain.cpp new file mode 100644 index 00000000..93409304 --- /dev/null +++ b/Code/Game/DanBiasServer/DLLMain.cpp @@ -0,0 +1,8 @@ + +#include + +BOOL WINAPI DllMain( _In_ HINSTANCE hinstDLL, _In_ DWORD fdwReason, _In_ LPVOID lpvReserved ) +{ + MessageBox(0, L"DanBiasServer Loaded", 0, 0); + return TRUE; +} \ No newline at end of file diff --git a/Code/Game/DanBiasServer/DanBiasServer.vcxproj b/Code/Game/DanBiasServer/DanBiasServer.vcxproj new file mode 100644 index 00000000..139a25d1 --- /dev/null +++ b/Code/Game/DanBiasServer/DanBiasServer.vcxproj @@ -0,0 +1,169 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {52380DAA-0F4A-4D97-8E57-98DF39319CAF} + Win32Proj + DanBiasServer + + + + DynamicLibrary + true + v110 + Unicode + false + + + DynamicLibrary + true + v110 + Unicode + true + + + DynamicLibrary + false + v110 + true + Unicode + + + DynamicLibrary + false + v110 + true + Unicode + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\Bin\DLL\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName)D + $(SolutionDir)..\External\Include\;$(IncludePath) + + + true + $(SolutionDir)..\Bin\DLL\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName)D + $(SolutionDir)..\External\Include\;$(IncludePath) + + + false + $(SolutionDir)..\Bin\DLL\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName) + $(SolutionDir)..\External\Include\;$(IncludePath) + + + false + $(SolutionDir)..\Bin\DLL\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName) + $(SolutionDir)..\External\Include\;$(IncludePath) + + + + + + Level3 + Disabled + DANBIAS_SERVER;DANBIAS_SERVER_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + + + + + + + Level3 + Disabled + DANBIAS_SERVER;DANBIAS_SERVER_DLL_EXPORT;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + + + + + Level3 + + + MaxSpeed + true + true + DANBIAS_SERVER;DANBIAS_SERVER_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + Level3 + + + MaxSpeed + true + true + DANBIAS_SERVER;DANBIAS_SERVER_DLL_EXPORT;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + + + Windows + true + true + true + + + + + + + + + + + + + \ No newline at end of file diff --git a/Code/Game/DanBiasServer/DanBiasServer_Impl.cpp b/Code/Game/DanBiasServer/DanBiasServer_Impl.cpp new file mode 100644 index 00000000..4d4c753b --- /dev/null +++ b/Code/Game/DanBiasServer/DanBiasServer_Impl.cpp @@ -0,0 +1,39 @@ +#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/Include/DanBiasServer.h b/Code/Game/DanBiasServer/Include/DanBiasServer.h new file mode 100644 index 00000000..e9446e76 --- /dev/null +++ b/Code/Game/DanBiasServer/Include/DanBiasServer.h @@ -0,0 +1,38 @@ +#ifndef DANBIAS_SERVER_DANBIAS_SERVER_H +#define DANBIAS_SERVER_DANBIAS_SERVER_H + + +#if defined (DANBIAS_SERVER_DLL_EXPORT) + #define DANBIAS_SERVER_DLL __declspec(dllexport) +#else + #define DANBIAS_SERVER_DLL __declspec(dllimport) +#endif + +namespace DanBias +{ + extern "C" + { + enum DanBiasServerReturn + { + DanBiasServerReturn_Error, + DanBiasServerReturn_Sucess, + }; + + struct DanBiasServerDesc + { + //Stuff goes here... + int port; + }; + + class DANBIAS_SERVER_DLL DanBiasServer + { + public: + static DanBiasServerReturn Initiate(DanBiasServerDesc& desc); + static DanBiasServerReturn Run(); + static void Release(); + }; + + }//End Extern "C" +} //End namspace DanBias + +#endif // !DANBIAS_SERVER_DANBIAS_SERVER_H diff --git a/Code/GameLogic/Camera.cpp b/Code/Game/GameLogic/Camera.cpp similarity index 100% rename from Code/GameLogic/Camera.cpp rename to Code/Game/GameLogic/Camera.cpp diff --git a/Code/GameLogic/Camera.h b/Code/Game/GameLogic/Camera.h similarity index 100% rename from Code/GameLogic/Camera.h rename to Code/Game/GameLogic/Camera.h diff --git a/Code/GameLogic/CollisionManager.cpp b/Code/Game/GameLogic/CollisionManager.cpp similarity index 100% rename from Code/GameLogic/CollisionManager.cpp rename to Code/Game/GameLogic/CollisionManager.cpp diff --git a/Code/GameLogic/CollisionManager.h b/Code/Game/GameLogic/CollisionManager.h similarity index 100% rename from Code/GameLogic/CollisionManager.h rename to Code/Game/GameLogic/CollisionManager.h diff --git a/Code/GameLogic/DynamicObject.cpp b/Code/Game/GameLogic/DynamicObject.cpp similarity index 100% rename from Code/GameLogic/DynamicObject.cpp rename to Code/Game/GameLogic/DynamicObject.cpp diff --git a/Code/GameLogic/DynamicObject.h b/Code/Game/GameLogic/DynamicObject.h similarity index 100% rename from Code/GameLogic/DynamicObject.h rename to Code/Game/GameLogic/DynamicObject.h diff --git a/Code/GameLogic/Game.cpp b/Code/Game/GameLogic/Game.cpp similarity index 100% rename from Code/GameLogic/Game.cpp rename to Code/Game/GameLogic/Game.cpp diff --git a/Code/GameLogic/Game.h b/Code/Game/GameLogic/Game.h similarity index 100% rename from Code/GameLogic/Game.h rename to Code/Game/GameLogic/Game.h diff --git a/Code/GameLogic/GameLogic.vcxproj b/Code/Game/GameLogic/GameLogic.vcxproj similarity index 92% rename from Code/GameLogic/GameLogic.vcxproj rename to Code/Game/GameLogic/GameLogic.vcxproj index 236258d2..c22b4ef8 100644 --- a/Code/GameLogic/GameLogic.vcxproj +++ b/Code/Game/GameLogic/GameLogic.vcxproj @@ -151,27 +151,16 @@ - + {104fa3e9-94d9-4e1d-a941-28a03bc8a095} - false - true - false - false - false - - {7e3990d2-3d94-465c-b58d-64a74b3ecf9b} - - + {2ec4dded-8f75-4c86-a10b-e1e8eb29f3ee} - - {0ec83e64-230e-48ef-b08c-6ac9651b4f82} - - + {f10cbc03-9809-4cba-95d8-327c287b18ee} - + {4285bd3f-3c6c-4670-b7af-a29afef5f6a8} diff --git a/Code/GameLogic/GameMode.cpp b/Code/Game/GameLogic/GameMode.cpp similarity index 100% rename from Code/GameLogic/GameMode.cpp rename to Code/Game/GameLogic/GameMode.cpp diff --git a/Code/GameLogic/GameMode.h b/Code/Game/GameLogic/GameMode.h similarity index 100% rename from Code/GameLogic/GameMode.h rename to Code/Game/GameLogic/GameMode.h diff --git a/Code/GameLogic/IGame.cpp b/Code/Game/GameLogic/IGame.cpp similarity index 100% rename from Code/GameLogic/IGame.cpp rename to Code/Game/GameLogic/IGame.cpp diff --git a/Code/GameLogic/IGame.h b/Code/Game/GameLogic/IGame.h similarity index 100% rename from Code/GameLogic/IGame.h rename to Code/Game/GameLogic/IGame.h diff --git a/Code/GameLogic/Level.cpp b/Code/Game/GameLogic/Level.cpp similarity index 100% rename from Code/GameLogic/Level.cpp rename to Code/Game/GameLogic/Level.cpp diff --git a/Code/GameLogic/Level.h b/Code/Game/GameLogic/Level.h similarity index 100% rename from Code/GameLogic/Level.h rename to Code/Game/GameLogic/Level.h diff --git a/Code/GameLogic/Object.cpp b/Code/Game/GameLogic/Object.cpp similarity index 100% rename from Code/GameLogic/Object.cpp rename to Code/Game/GameLogic/Object.cpp diff --git a/Code/GameLogic/Object.h b/Code/Game/GameLogic/Object.h similarity index 100% rename from Code/GameLogic/Object.h rename to Code/Game/GameLogic/Object.h diff --git a/Code/GameLogic/Player.cpp b/Code/Game/GameLogic/Player.cpp similarity index 100% rename from Code/GameLogic/Player.cpp rename to Code/Game/GameLogic/Player.cpp diff --git a/Code/GameLogic/Player.h b/Code/Game/GameLogic/Player.h similarity index 100% rename from Code/GameLogic/Player.h rename to Code/Game/GameLogic/Player.h diff --git a/Code/GameLogic/RefManager.cpp b/Code/Game/GameLogic/RefManager.cpp similarity index 100% rename from Code/GameLogic/RefManager.cpp rename to Code/Game/GameLogic/RefManager.cpp diff --git a/Code/GameLogic/RefManager.h b/Code/Game/GameLogic/RefManager.h similarity index 100% rename from Code/GameLogic/RefManager.h rename to Code/Game/GameLogic/RefManager.h diff --git a/Code/GameLogic/StaticObject.cpp b/Code/Game/GameLogic/StaticObject.cpp similarity index 100% rename from Code/GameLogic/StaticObject.cpp rename to Code/Game/GameLogic/StaticObject.cpp diff --git a/Code/GameLogic/StaticObject.h b/Code/Game/GameLogic/StaticObject.h similarity index 100% rename from Code/GameLogic/StaticObject.h rename to Code/Game/GameLogic/StaticObject.h diff --git a/Code/GameLogic/TestGLMain.cpp b/Code/Game/GameLogic/TestGLMain.cpp similarity index 100% rename from Code/GameLogic/TestGLMain.cpp rename to Code/Game/GameLogic/TestGLMain.cpp diff --git a/Code/GameLogic/Weapon.cpp b/Code/Game/GameLogic/Weapon.cpp similarity index 100% rename from Code/GameLogic/Weapon.cpp rename to Code/Game/GameLogic/Weapon.cpp diff --git a/Code/GameLogic/Weapon.h b/Code/Game/GameLogic/Weapon.h similarity index 100% rename from Code/GameLogic/Weapon.h rename to Code/Game/GameLogic/Weapon.h diff --git a/Code/GameLogic/GameLogic.vcxproj.filters b/Code/GameLogic/GameLogic.vcxproj.filters deleted file mode 100644 index f2c5e978..00000000 --- a/Code/GameLogic/GameLogic.vcxproj.filters +++ /dev/null @@ -1,96 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/Code/OysterGraphics/DllInterfaces/GFXAPI.h b/Code/OysterGraphics/DllInterfaces/GFXAPI.h index e55a435f..bd07c391 100644 --- a/Code/OysterGraphics/DllInterfaces/GFXAPI.h +++ b/Code/OysterGraphics/DllInterfaces/GFXAPI.h @@ -10,7 +10,6 @@ #define GFX_DLL_USAGE __declspec(dllimport) #endif - namespace Oyster { namespace Graphics diff --git a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj b/Code/OysterPhysics3D/OysterPhysics3D.vcxproj index c36fded5..2113cccb 100644 --- a/Code/OysterPhysics3D/OysterPhysics3D.vcxproj +++ b/Code/OysterPhysics3D/OysterPhysics3D.vcxproj @@ -24,26 +24,26 @@ - StaticLibrary + DynamicLibrary true v110 MultiByte - StaticLibrary + DynamicLibrary true v110 MultiByte - StaticLibrary + DynamicLibrary false v110 true MultiByte - StaticLibrary + DynamicLibrary false v110 true