From 426a45a47c7597793e83dd2e1c30654bdd44727e Mon Sep 17 00:00:00 2001 From: dean11 Date: Thu, 7 Nov 2013 14:20:05 +0100 Subject: [PATCH] Added Gamelogic project --- DanBias.sln | 13 ++ Dokumentation/Danbias Structure.uxf | 290 ++++++++++++++-------------- GameLogic/GameLogic.vcxproj | 145 ++++++++++++++ GameLogic/GameLogic.vcxproj.filters | 17 ++ Input/InputDeviceControll.cpp | 2 +- Input/RawInput.h | 12 +- 6 files changed, 332 insertions(+), 147 deletions(-) create mode 100644 GameLogic/GameLogic.vcxproj create mode 100644 GameLogic/GameLogic.vcxproj.filters diff --git a/DanBias.sln b/DanBias.sln index bf7eb41b..302ed386 100644 --- a/DanBias.sln +++ b/DanBias.sln @@ -23,6 +23,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OysterNetworkServer", "Netw EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetworkDependencies", "Network\NetworkDependencies\NetworkDependencies.vcxproj", "{C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GameLogic", "GameLogic\GameLogic.vcxproj", "{B1195BB9-B3A5-47F0-906C-8DEA384D1520}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Mixed Platforms = Debug|Mixed Platforms @@ -153,6 +155,17 @@ Global {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|Win32.Build.0 = Release|Win32 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|x64.ActiveCfg = Release|x64 {C5AA09D0-6594-4CD3-BD92-1D380C7B3B50}.Release|x64.Build.0 = Release|x64 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|Win32.ActiveCfg = Debug|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|Win32.Build.0 = Debug|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|x64.ActiveCfg = Debug|x64 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Debug|x64.Build.0 = Debug|x64 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|Mixed Platforms.Build.0 = Release|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|Win32.ActiveCfg = Release|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|Win32.Build.0 = Release|Win32 + {B1195BB9-B3A5-47F0-906C-8DEA384D1520}.Release|x64.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Dokumentation/Danbias Structure.uxf b/Dokumentation/Danbias Structure.uxf index 15a0c1b0..3380c3ff 100644 --- a/Dokumentation/Danbias Structure.uxf +++ b/Dokumentation/Danbias Structure.uxf @@ -4,8 +4,8 @@ com.umlet.element.Class - 759 - 352 + 726 + 363 132 33 @@ -15,8 +15,8 @@ com.umlet.element.Class - 473 - 352 + 440 + 363 132 33 @@ -26,8 +26,8 @@ com.umlet.element.Class - 583 - 275 + 550 + 286 132 33 @@ -37,8 +37,8 @@ com.umlet.element.Class - 770 - 121 + 737 + 176 121 33 @@ -49,7 +49,7 @@ com.umlet.element.Class 363 - 275 + 286 154 33 @@ -60,7 +60,7 @@ com.umlet.element.Class 385 - 121 + 176 121 33 @@ -70,8 +70,8 @@ com.umlet.element.Class - 583 - 187 + 550 + 154 132 33 @@ -81,8 +81,8 @@ com.umlet.element.Class - 616 - 352 + 583 + 363 132 33 @@ -92,8 +92,8 @@ com.umlet.element.Class - 583 - 231 + 550 + 198 132 33 @@ -103,8 +103,8 @@ com.umlet.element.Class - 583 - 44 + 550 + 55 132 44 @@ -115,151 +115,151 @@ bg=green com.umlet.element.Relation - 792 - 121 + 759 + 176 54 - 252 + 208 lt=<- - 33;231;33;209;33;33 + 33;187;33;165;33;33 com.umlet.element.Relation - 495 - 121 + 462 + 176 351 - 252 + 208 lt=<- - 33;231;33;209;330;209;330;33 + 33;187;33;165;330;165;330;33 com.umlet.element.Relation 407 - 121 + 176 54 - 175 + 131 lt=<- - 33;154;33;33 - - - com.umlet.element.Relation - - 682 - 121 - 164 - 186 - - lt=<- - 33;165;143;165;143;33 - - - com.umlet.element.Relation - - 407 - 121 - 197 - 98 - - lt=<- - 176;77;33;77;33;33 - - - com.umlet.element.Relation - - 484 - 253 - 120 - 54 - - lt=<- - 99;33;33;33 + 33;110;33;33 com.umlet.element.Relation 649 - 121 - 197 - 252 + 176 + 153 + 142 lt=<- - 33;231;33;209;176;209;176;33 + 33;121;132;121;132;33 + + + com.umlet.element.Relation + + 473 + 143 + 98 + 65 + + lt=<- + 77;33;44;33;44;44;33;44 + + + com.umlet.element.Relation + + 484 + 264 + 87 + 54 + + lt=<- + 66;33;33;33 + + + com.umlet.element.Relation + + 616 + 176 + 197 + 208 + + lt=<- + 33;187;33;165;176;165;176;33 + + + com.umlet.element.Relation + + 473 + 165 + 98 + 65 + + lt=<- + 77;44;44;44;44;33;33;33 + + + com.umlet.element.Relation + + 649 + 165 + 109 + 65 + + lt=<- + 33;44;66;44;66;33;88;33 + + + com.umlet.element.Relation + + 649 + 143 + 109 + 65 + + lt=<- + 33;33;66;33;66;44;88;44 + + + com.umlet.element.Relation + + 649 + 33 + 164 + 164 + + lt=>- + 33;33;143;33;143;143 com.umlet.element.Relation 407 - 121 - 197 - 142 - - lt=<- - 176;121;33;121;33;33 - - - com.umlet.element.Relation - - 682 - 121 + 33 164 - 142 - - lt=<- - 33;121;143;121;143;33 - - - com.umlet.element.Relation - - 682 - 121 - 164 - 98 - - lt=<- - 33;77;143;77;143;33 - - - com.umlet.element.Relation - - 682 - 22 - 164 - 120 + 164 lt=>- - 33;33;143;33;143;99 - - - com.umlet.element.Relation - - 407 - 22 - 197 - 120 - - lt=>- - 176;33;33;33;33;99 + 143;33;33;33;33;143 com.umlet.element.Package - 352 - 0 + 319 + 22 550 - 407 + 385 - Game + GameEngine com.umlet.element.Relation - 792 - 352 + 759 + 363 54 164 @@ -269,8 +269,8 @@ bg=green com.umlet.element.Package - 803 - 495 + 770 + 506 319 220 @@ -280,8 +280,8 @@ bg=green com.umlet.element.Class - 814 - 528 + 781 + 539 297 176 @@ -300,8 +300,8 @@ Release(resource :Model*) :void com.umlet.element.Package - 473 - 495 + 440 + 506 308 242 @@ -311,8 +311,8 @@ Release(resource :Model*) :void com.umlet.element.Relation - 561 - 352 + 528 + 363 142 175 @@ -322,8 +322,8 @@ Release(resource :Model*) :void com.umlet.element.Class - 484 - 528 + 451 + 539 286 198 @@ -343,8 +343,8 @@ Enable(Enable :bool) :void com.umlet.element.Class - 363 - 352 + 330 + 363 99 33 @@ -354,19 +354,19 @@ Enable(Enable :bool) :void com.umlet.element.Relation - 374 - 121 + 341 + 176 472 - 252 + 208 lt=<- - 33;231;33;209;451;209;451;33 + 33;187;33;165;451;165;451;33 com.umlet.element.Package - 88 - 495 + 55 + 506 374 242 @@ -376,8 +376,8 @@ Enable(Enable :bool) :void com.umlet.element.Class - 99 - 528 + 66 + 539 352 121 @@ -393,8 +393,8 @@ Release(Resource :ResourceHandle*) :void com.umlet.element.Class - 99 - 682 + 66 + 693 352 44 @@ -406,8 +406,8 @@ FMOD com.umlet.element.Relation - 242 - 616 + 209 + 627 54 87 @@ -417,8 +417,8 @@ FMOD com.umlet.element.Relation - 198 - 352 + 165 + 363 362 175 diff --git a/GameLogic/GameLogic.vcxproj b/GameLogic/GameLogic.vcxproj new file mode 100644 index 00000000..beb08cbb --- /dev/null +++ b/GameLogic/GameLogic.vcxproj @@ -0,0 +1,145 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {B1195BB9-B3A5-47F0-906C-8DEA384D1520} + GameLogic + + + + StaticLibrary + true + v110 + MultiByte + + + StaticLibrary + true + v110 + MultiByte + + + StaticLibrary + false + v110 + true + MultiByte + + + StaticLibrary + false + v110 + true + MultiByte + + + + + + + + + + + + + + + + + + + $(SolutionDir)..\External\Lib\$(ProjectName)\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName)D + + + $(SolutionDir)..\External\Lib\$(ProjectName)\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName) + + + $(SolutionDir)..\External\Lib\$(ProjectName)\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName)D + + + $(SolutionDir)..\External\Lib\$(ProjectName)\ + $(SolutionDir)..\Obj\$(ProjectName)\$(PlatformShortName)\$(Configuration)\ + $(ProjectName)_$(PlatformShortName) + + + + Level3 + Disabled + true + %(AdditionalIncludeDirectories) + + + true + + + + + Level3 + Disabled + true + %(AdditionalIncludeDirectories) + + + true + + + + + Level3 + MaxSpeed + true + true + true + %(AdditionalIncludeDirectories) + + + true + true + true + + + + + Level3 + MaxSpeed + true + true + true + %(AdditionalIncludeDirectories) + + + true + true + true + + + + + + + + \ No newline at end of file diff --git a/GameLogic/GameLogic.vcxproj.filters b/GameLogic/GameLogic.vcxproj.filters new file mode 100644 index 00000000..d7ef6a1a --- /dev/null +++ b/GameLogic/GameLogic.vcxproj.filters @@ -0,0 +1,17 @@ + + + + + {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 + + + \ No newline at end of file diff --git a/Input/InputDeviceControll.cpp b/Input/InputDeviceControll.cpp index e22e68dd..b7010558 100644 --- a/Input/InputDeviceControll.cpp +++ b/Input/InputDeviceControll.cpp @@ -41,7 +41,7 @@ void RawInput::Mouse_Disable() } bool RawInput::Keyboard_KeyUp(IN RIK key) { - return false; + return false } bool RawInput::Keyboard_KeyDown(IN RIK key) { diff --git a/Input/RawInput.h b/Input/RawInput.h index a009da5f..c68970b0 100644 --- a/Input/RawInput.h +++ b/Input/RawInput.h @@ -136,6 +136,13 @@ enum InputType InputType_Mouse, InputType_HID, }; +enum MousePosition +{ + MousePosition_GetClientMousePosition, + MousePosition_GetRelativeMousePosition, + MousePosition_GetRelativeMouseVelocity, + MousePosition_GetDesktopMousePosition, +}; /*********************************************************************/ @@ -222,7 +229,7 @@ class RawInput * @see INPUT_DESC is set to false this function call will be pointless. */ virtual void Frame () = 0; - + virtual void Mouse_Show () = 0; virtual void Mouse_Hide () = 0; virtual void Mouse_Lock () = 0; @@ -238,6 +245,9 @@ class RawInput virtual void Keyboard_Enable () = 0; virtual void Keyboard_Disable () = 0; + + virtual bool Query (RIM) = 0; + virtual bool Query (RIK) = 0; };