Assignment 2 done (really we fixed deleting now)

RoboCat/Chapter3.vcxproj

@@ -36,36 +36,36 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|X64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
@@ -92,10 +92,15 @@
     <LinkIncremental>true</LinkIncremental>
     <GenerateManifest>true</GenerateManifest>
     <OutDir>Bin\$(Configuration)\</OutDir>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
+    <Allegro_AddonImage>true</Allegro_AddonImage>
+    <Allegro_AddonColor>true</Allegro_AddonColor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <LinkIncremental>true</LinkIncremental>
     <GenerateManifest>true</GenerateManifest>
+    <IncludePath>C:\Users\Charlie\Desktop\College\NetworkingProj1\SDL"C:\Users\Charlie\Desktop\College\NetworkingProj1\SDL\include;$(IncludePath)</IncludePath>
+    <LibraryPath>"C:\Users\Charlie\Desktop\College\NetworkingProj1\SDL\lib\win\x64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -127,9 +132,10 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;DEBUG;PROFILE;_WINDOWS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <AdditionalIncludeDirectories>..\SDL\include;Inc;..\</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <AdditionalIncludeDirectories>inc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>RoboCatPCH.h</PrecompiledHeaderFile>
+      <SDLCheck>false</SDLCheck>
     </ClCompile>
     <Link>
       <AdditionalDependencies>d3d11.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies);Ws2_32.lib</AdditionalDependencies>
@@ -175,7 +181,7 @@
     </ClCompile>
     <Link>
       <AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>d3d11.lib;dxguid.lib;winmm.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>d3d11.lib;dxguid.lib;winmm.lib;comctl32.lib;SDL.lib;SDLmain.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <LargeAddressAware>true</LargeAddressAware>
@@ -370,9 +376,19 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="LagSimulator.cpp" />
+    <ClCompile Include="Src\Network.cpp" />
+    <ClCompile Include="TransmissionData.cpp" />
+    <ClInclude Include="Inc\AckRange.h" />
     <ClInclude Include="Inc\ByteSwap.h" />
+    <ClInclude Include="Inc\DeliveryNotificationManager.h" />
+    <ClInclude Include="Inc\GameObjects.h" />
+    <ClInclude Include="Inc\GraphicsSystems.h" />
+    <ClInclude Include="Inc\InFlightPacket.h" />
+    <ClInclude Include="Inc\InputSystem.h" />
     <ClInclude Include="Inc\LinkingContext.h" />
     <ClInclude Include="Inc\MemoryBitStream.h" />
+    <ClInclude Include="Inc\Network.h" />
     <ClInclude Include="Inc\OutputWindow.h" />
     <ClInclude Include="Inc\RoboMath.h" />
     <ClInclude Include="Inc\SocketAddress.h" />
@@ -382,7 +398,15 @@
     <ClInclude Include="Inc\TCPSocket.h" />
     <ClInclude Include="Inc\RoboCatPCH.h" />
     <ClInclude Include="Inc\RoboCatShared.h" />
+    <ClInclude Include="Inc\Timing.h" />
+    <ClInclude Include="Inc\TransmissionData.h" />
     <ClInclude Include="Inc\UDPSocket.h" />
+    <ClCompile Include="Src\AckRange.cpp" />
+    <ClCompile Include="Src\DeliveryNotificationManager.cpp" />
+    <ClCompile Include="Src\GameObjects.cpp" />
+    <ClCompile Include="Src\GraphicsSystems.cpp" />
+    <ClCompile Include="Src\InFlightPacket.cpp" />
+    <ClCompile Include="Src\InputSystem.cpp" />
     <ClCompile Include="Src\Main.cpp" />
     <ClCompile Include="Src\MemoryBitStream.cpp" />
     <ClCompile Include="Src\OutputWindow.cpp" />
@@ -391,12 +415,14 @@
     <ClCompile Include="Src\SocketUtil.cpp" />
     <ClCompile Include="Src\StringUtils.cpp" />
     <ClCompile Include="Src\TCPSocket.cpp" />
+    <ClInclude Include="LagSimulator.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\RoboCatPCH.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">RoboCatPCH.h</PrecompiledHeaderFile>
     </ClCompile>
+    <ClCompile Include="Src\Timing.cpp" />
     <ClCompile Include="Src\UDPSocket.cpp" />
   </ItemGroup>
   <ItemGroup>

RoboCat/Chapter3.vcxproj.user

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>

RoboCat/Debug/Chapter3.log

@@ -0,0 +1 @@
+  Chapter3.vcxproj -> E:\GitProjects\College\SocketDemo\RoboCat\Bin\Debug\SocketDemo.exe

RoboCat/Debug/SocketDemo.exe.recipe

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <ProjectOutputs>
+    <ProjectOutput>
+      <FullPath>E:\GitProjects\College\SocketDemo\RoboCat\Bin\Debug\SocketDemo.exe</FullPath>
+    </ProjectOutput>
+  </ProjectOutputs>
+  <ContentFiles />
+  <SatelliteDlls />
+  <NonRecipeFileRefs />
+</Project>

RoboCat/Debug/SocketDemo.tlog/SocketDemo.lastbuildstate

@@ -0,0 +1,2 @@
+PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.31.31103:TargetPlatformVersion=10.0.19041.0:
+Debug|Win32|E:\GitProjects\College\SocketDemo\|

RoboCat/Inc/AckRange.h

@@ -0,0 +1,36 @@
+#pragma once
+//typedef PacketSequenceNumber uint16_t;
+
+class AckRange
+{
+public:
+	AckRange() : mStart( 0 ), mCount( 0 ) {}
+
+	AckRange( PacketSequenceNumber inStart ) : mStart( inStart ), mCount( 1 ) {}
+
+	//if this is the next in sequence, just extend the range
+	inline bool ExtendIfShould( PacketSequenceNumber inSequenceNumber );
+
+	PacketSequenceNumber	GetStart() const { return mStart; }
+	uint32_t		GetCount() const { return mCount; }
+
+	void Write( OutputMemoryBitStream& inOutputStream ) const;
+	void Read( InputMemoryBitStream& inInputStream );
+
+private:
+	PacketSequenceNumber	mStart;
+	uint32_t		mCount;
+};
+
+inline bool AckRange::ExtendIfShould( PacketSequenceNumber inSequenceNumber )
+{
+	if( inSequenceNumber == mStart + mCount )
+	{
+		++mCount;
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}

RoboCat/Inc/DeliveryNotificationManager.h

@@ -0,0 +1,72 @@
+#pragma once
+class DeliveryNotificationManager
+{
+public:
+
+
+	DeliveryNotificationManager( bool inShouldSendAcks, bool inShouldProcessAcks );
+	~DeliveryNotificationManager();
+
+	inline	InFlightPacket*		WriteState( OutputMemoryBitStream& inOutputStream );
+	inline	bool				ReadAndProcessState( InputMemoryBitStream& inInputStream );
+
+	void				ProcessTimedOutPackets();
+
+	uint32_t			GetDroppedPacketCount()		const	{ return mDroppedPacketCount; }
+	uint32_t			GetDeliveredPacketCount()	const	{ return mDeliveredPacketCount; }
+	uint32_t			GetDispatchedPacketCount()	const	{ return mDispatchedPacketCount; }
+
+	const deque< InFlightPacket >&	GetInFlightPackets()	const	{ return mInFlightPackets; }
+
+private:
+
+
+
+	InFlightPacket*		WriteSequenceNumber( OutputMemoryBitStream& inOutputStream );
+	void				WriteAckData( OutputMemoryBitStream& inOutputStream );
+
+	//returns wether to drop the packet- if sequence number is too low!
+	bool				ProcessSequenceNumber( InputMemoryBitStream& inInputStream );
+	void				ProcessAcks( InputMemoryBitStream& inInputStream );
+
+
+	void				AddPendingAck( PacketSequenceNumber inSequenceNumber );
+	void				HandlePacketDeliveryFailure( const InFlightPacket& inFlightPacket );
+	void				HandlePacketDeliverySuccess( const InFlightPacket& inFlightPacket );
+
+	PacketSequenceNumber	mNextOutgoingSequenceNumber;
+	PacketSequenceNumber	mNextExpectedSequenceNumber;
+
+	deque< InFlightPacket >	mInFlightPackets;
+	deque< AckRange >		mPendingAcks;
+
+	bool					mShouldSendAcks;
+	bool					mShouldProcessAcks;
+
+	uint32_t		mDeliveredPacketCount;
+	uint32_t		mDroppedPacketCount;
+	uint32_t		mDispatchedPacketCount;
+
+};
+
+
+
+inline InFlightPacket* DeliveryNotificationManager::WriteState( OutputMemoryBitStream& inOutputStream )
+{
+	InFlightPacket* toRet = WriteSequenceNumber( inOutputStream );
+	if( mShouldSendAcks )
+	{
+		WriteAckData( inOutputStream );
+	}
+	return toRet;
+}
+
+inline bool	DeliveryNotificationManager::ReadAndProcessState( InputMemoryBitStream& inInputStream )
+{
+	bool toRet = ProcessSequenceNumber( inInputStream );
+	if( mShouldProcessAcks )
+	{
+		ProcessAcks( inInputStream );
+	}
+	return toRet;
+}

RoboCat/Inc/GameObjects.h

@@ -0,0 +1,67 @@
+#pragma once
+#include <GraphicsSystems.h>
+
+#include <vector>
+#include <string>
+#include <map>
+#include <utility>
+
+using std::vector;
+using std::pair;
+using std::string;
+using std::map;
+
+enum ClassId
+{
+	DEFAULT = 'AAAA',
+	DEANSPRITE = 'RJGH',
+	AMONGUS = 'JJGD',
+	SCOTTSPRITE = 'LJDE',
+};
+
+class GameObject
+{
+public:
+
+	GameObject() {};
+	virtual ~GameObject();
+	virtual void Draw();
+
+	int getNetworkId() { return mNetworkId; };
+	void setNetworkId(int newNetworkId) { mNetworkId = newNetworkId; };
+
+	std::pair<float, float> getPosition() { return mPosition; };
+	void setPosition(float positionX, float positionY) { mPosition.first = positionX; mPosition.second = positionY; };
+
+	ClassId getClassId() { return mId; };
+	GraphicsSystems* getGraphics() { return mGraphics; };
+
+	ALLEGRO_BITMAP* getmpBitmap() { return mpBitmap; };
+protected:
+	GameObject(int networkId, std::pair<float, float> position, GraphicsSystems* graphics, std::string imageFilePath, ClassId id = DEFAULT);
+private:
+	int mNetworkId;
+	std::pair<float, float> mPosition;
+	ClassId mId;
+	GraphicsSystems* mGraphics;
+	ALLEGRO_BITMAP* mpBitmap;
+
+};
+
+class DeanSprite : public GameObject
+{
+public:
+	DeanSprite(int networkId, std::pair<float, float> position, std::string imageFilePath, GraphicsSystems* graphics);
+};
+
+class AmongUs : public GameObject
+{
+public:
+	AmongUs(int networkId, std::pair<float, float> position, std::string imageFilePath, GraphicsSystems* graphics);
+};
+
+class ScottSprite : public GameObject
+{
+public:
+	ScottSprite(int networkId, std::pair<float, float> position, std::string imageFilePath, GraphicsSystems* graphics);
+};

RoboCat/Inc/GraphicsSystems.h

@@ -0,0 +1,39 @@
+#pragma once
+#include <allegro5/allegro.h>
+#include <allegro5/allegro_image.h>
+#include <vector>
+#include <string>
+#include <map>
+#include <utility>
+
+using std::vector;
+using std::pair;
+using std::string;
+using std::map;
+
+class GraphicsSystems
+{
+public:
+
+	GraphicsSystems(); //constructor
+	~GraphicsSystems(); //destructor
+
+
+	bool Init(int mWidth, int mHeight);
+	void Draw(int locX, int locY, ALLEGRO_BITMAP* bitmap); //Draw to current backbuffer
+
+
+    void Flip() { al_flip_display(); };//flips display
+
+	int getmScreenHeight() { return mScreenHeight; };
+	int getmScreenWidth() { return mScreenWidth; };
+	ALLEGRO_DISPLAY* getmpDisplay() { return mpDisplay; };
+
+private:
+
+	int mScreenWidth;
+
+	int mScreenHeight;
+
+	ALLEGRO_DISPLAY* mpDisplay;
+};