Assignment3 Submission - Jaeger and Talhouk

RoboCat/Chapter3.vcxproj

@@ -92,6 +92,11 @@
     <LinkIncremental>true</LinkIncremental>
     <GenerateManifest>true</GenerateManifest>
     <OutDir>Bin\$(Configuration)\</OutDir>
+    <Allegro_AddonImage>true</Allegro_AddonImage>
+    <Allegro_AddonTTF>true</Allegro_AddonTTF>
+    <Allegro_AddonPrimitives>true</Allegro_AddonPrimitives>
+    <Allegro_AddonFont>true</Allegro_AddonFont>
+    <Allegro_AddonColor>true</Allegro_AddonColor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <LinkIncremental>true</LinkIncremental>
@@ -128,7 +133,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <AdditionalIncludeDirectories>..\SDL\include;Inc;..\</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>RoboCatPCH.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
@@ -370,14 +375,24 @@
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="Src\Colour.cpp" />
+    <ClCompile Include="Src\Networker.cpp" />
+    <ClCompile Include="Src\Wall.cpp" />
     <ClInclude Include="Inc\AckRange.h" />
     <ClInclude Include="Inc\ByteSwap.h" />
+    <ClInclude Include="Inc\Colour.h" />
     <ClInclude Include="Inc\DeliveryNotificationManager.h" />
+    <ClInclude Include="Inc\GameObject.h" />
+    <ClInclude Include="Inc\GraphicsLibrary.h" />
     <ClInclude Include="Inc\InFlightPacket.h" />
+    <ClInclude Include="Inc\InputSystem.h" />
     <ClInclude Include="Inc\LinkingContext.h" />
     <ClInclude Include="Inc\MemoryBitStream.h" />
+    <ClInclude Include="Inc\Networker.h" />
     <ClInclude Include="Inc\OutputWindow.h" />
+    <ClInclude Include="Inc\PlayerController.h" />
     <ClInclude Include="Inc\RoboMath.h" />
+    <ClInclude Include="Inc\Rock.h" />
     <ClInclude Include="Inc\SocketAddress.h" />
     <ClInclude Include="Inc\SocketAddressFactory.h" />
     <ClInclude Include="Inc\SocketUtil.h" />
@@ -390,15 +405,21 @@
     <ClInclude Include="Inc\UDPSocket.h" />
     <ClCompile Include="Src\AckRange.cpp" />
     <ClCompile Include="Src\DeliveryNotificationManager.cpp" />
+    <ClCompile Include="Src\GameObject.cpp" />
+    <ClCompile Include="Src\GraphicsLibrary.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" />
+    <ClCompile Include="Src\PlayerController.cpp" />
+    <ClCompile Include="Src\Rock.cpp" />
     <ClCompile Include="Src\SocketAddress.cpp" />
     <ClCompile Include="Src\SocketAddressFactory.cpp" />
     <ClCompile Include="Src\SocketUtil.cpp" />
     <ClCompile Include="Src\StringUtils.cpp" />
     <ClCompile Include="Src\TCPSocket.cpp" />
+    <ClInclude Include="Inc\Wall.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\RoboCatPCH.cpp">

RoboCat/Inc/AckRange.h

@@ -1,3 +1,5 @@
+#pragma once
+
 //typedef PacketSequenceNumber uint16_t;
 
 class AckRange

RoboCat/Inc/Colour.h

@@ -0,0 +1,43 @@
+#pragma once
+
+/*
+Allegro Wrapper Functions
+Written by Adel Talhouk in FA21
+Colour.h
+	File information:
+	This file contains data used for colours.
+*/
+
+class Colour
+{
+	//-------------------------Private data-------------------------
+
+	//Red channel
+	unsigned __int8 mR;
+
+	//Green channel
+	unsigned __int8 mG;
+
+	//Blue channel
+	unsigned __int8 mB;
+
+	//Alpha channel
+	unsigned __int8 mA;
+
+	//-------------------------Public data-------------------------
+public:
+
+	//Constructor(s)
+	Colour();
+	Colour(unsigned __int8 r, unsigned __int8 g, unsigned __int8 b);
+	Colour(unsigned __int8 r, unsigned __int8 g, unsigned __int8 b, unsigned __int8 a);
+
+	//Destructor
+	~Colour();
+
+	//Accessor(s)
+	unsigned __int8 getR() { return mR; };
+	unsigned __int8 getG() { return mG; };
+	unsigned __int8 getB() { return mB; };
+	unsigned __int8 getA() { return mA; };
+};

RoboCat/Inc/DeliveryNotificationManager.h

@@ -1,52 +1,77 @@
+#pragma once
+
+#include "MemoryBitStream.h"
+#include "InFlightPacket.h"
+#include "AckRange.h"
+#include <utility>
+#include <deque>
+
+using std::deque;
+
+typedef uint16_t PacketSequenceNumber;
+
+////https://www.geeksforgeeks.org/priority-queue-of-pairs-in-c-with-ordering-by-first-and-second-element/
+//struct myComp {
+//	constexpr bool operator()(
+//		std::pair<InFlightPacket, OutputMemoryBitStream&> const& a,
+//		std::pair<InFlightPacket, OutputMemoryBitStream&> const& b)
+//		const noexcept
+//	{
+//		return a.first.GetSequenceNumber() > b.first.GetSequenceNumber();
+//	}
+//};
+
+class Networker;
 
 class DeliveryNotificationManager
 {
 public:
 
-
-	DeliveryNotificationManager( bool inShouldSendAcks, bool inShouldProcessAcks );
+	DeliveryNotificationManager(bool inShouldSendAcks, bool inShouldProcessAcks, Networker* pNetworker);
 	~DeliveryNotificationManager();
 
-	inline	InFlightPacket*		WriteState( OutputMemoryBitStream& inOutputStream );
-	inline	bool				ReadAndProcessState( InputMemoryBitStream& inInputStream );
+	inline	InFlightPacket* WriteState(OutputMemoryBitStream& inOutputStream);
+	inline	bool ReadAndProcessState(InputMemoryBitStream& inInputStream);
 
-	void				ProcessTimedOutPackets();
+	void ResendPacket(const int ID, const PacketSequenceNumber packetSequenceNum);
+	void ProcessTimedOutPackets();
 
-	uint32_t			GetDroppedPacketCount()		const	{ return mDroppedPacketCount; }
-	uint32_t			GetDeliveredPacketCount()	const	{ return mDeliveredPacketCount; }
-	uint32_t			GetDispatchedPacketCount()	const	{ return mDispatchedPacketCount; }
+	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; }
+	//const deque<InFlightPacket>& GetInFlightPackets() const { return mInFlightPackets; }
+	const deque<std::pair<InFlightPacket, OutputMemoryBitStream*>> GetInFlightPackets() const { return mInFlightPacketsPair; }
 
 private:
-
-
-
-	InFlightPacket*		WriteSequenceNumber( OutputMemoryBitStream& inOutputStream );
-	void				WriteAckData( OutputMemoryBitStream& inOutputStream );
+
+	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 );
-
+	bool ProcessSequenceNumber(InputMemoryBitStream& inInputStream);
+	void ProcessAcks(InputMemoryBitStream& inInputStream);
 
-	void				AddPendingAck( PacketSequenceNumber inSequenceNumber );
-	void				HandlePacketDeliveryFailure( const InFlightPacket& inFlightPacket );
-	void				HandlePacketDeliverySuccess( const InFlightPacket& inFlightPacket );
+	void AddPendingAck(PacketSequenceNumber inSequenceNumber);
+	void HandlePacketDeliveryFailure(const InFlightPacket& inFlightPacket, const PacketSequenceNumber packetSequenceNum);
+	void HandlePacketDeliverySuccess(const InFlightPacket& inFlightPacket, const PacketSequenceNumber packetSequenceNum);
 
-	PacketSequenceNumber	mNextOutgoingSequenceNumber;
-	PacketSequenceNumber	mNextExpectedSequenceNumber;
+	PacketSequenceNumber mNextOutgoingSequenceNumber;
+	PacketSequenceNumber mNextExpectedSequenceNumber;
 
-	deque< InFlightPacket >	mInFlightPackets;
-	deque< AckRange >		mPendingAcks;
+	//deque<InFlightPacket> mInFlightPackets;
+	deque<std::pair<InFlightPacket, OutputMemoryBitStream*>> mInFlightPacketsPair;
+	deque<AckRange> mPendingAcks;
 
-	bool					mShouldSendAcks;
-	bool					mShouldProcessAcks;
+	bool mShouldSendAcks;
+	bool mShouldProcessAcks;
 
-	uint32_t		mDeliveredPacketCount;
-	uint32_t		mDroppedPacketCount;
-	uint32_t		mDispatchedPacketCount;
+	uint32_t mDeliveredPacketCount;
+	uint32_t mDroppedPacketCount;
+	uint32_t mDispatchedPacketCount;
 
+	//Networker
+	Networker* mpNetworker;
 };
 
 

RoboCat/Inc/GameObject.h

@@ -0,0 +1,71 @@
+#pragma once
+
+#include <utility>
+#include "GraphicsLibrary.h"
+#include "TransmissionData.h"
+
+using std::pair;
+
+/*
+	File information:
+	This file contains the definition for the GameObject class.
+*/
+
+enum GameObjectType
+{
+	INVALID = -1,
+	ROCK,
+	WALL,
+	PLAYER,
+	ENUM_SIZE
+};
+
+class GameObject : public TransmissionData
+{
+	//-------------------------Private data-------------------------
+
+
+	//-------------------------Protected data-------------------------
+
+protected:
+
+	//Identifiers
+	const GameObjectType mGameObjectType = GameObjectType::INVALID;
+	const int mNetworkID;
+
+	//Position
+	pair<float, float> mPosition;
+
+	//Graphics library
+	GraphicsLibrary* pGraphicsLibrary;
+
+	//Sprite identifier
+	const std::string mSPRITE_IDENTIFIER;
+
+	//Constructor(s)
+	GameObject(GameObjectType gameObjectType, const int networkID, GraphicsLibrary* graphicsLibrary);
+	GameObject(GameObjectType gameObjectType, const int networkID, GraphicsLibrary* graphicsLibrary, pair<float, float> position, const std::string spriteIdentifier = "");
+
+	//-------------------------Public data-------------------------
+public:
+
+	//Copy constructor
+	GameObject(const GameObject& copy);
+
+	//Destructor
+	virtual ~GameObject();
+
+	//Accessor(s)
+	const GameObjectType getGameObjectType() { return mGameObjectType; };
+	const int getNetworkID() { return mNetworkID; };
+	const pair<float, float> getPosition() { return mPosition; };
+
+	//Mutator(s)
+	float setPosX(float posX) { mPosition.first = posX; };
+	float setPosY(float posY) { mPosition.second = posY; };
+	void setPos(pair<float, float> newPos) { mPosition = newPos; };
+
+	//Functions
+	virtual void update() = 0;
+	virtual void draw() = 0;
+};

RoboCat/Inc/GraphicsLibrary.h

@@ -0,0 +1,80 @@
+#pragma once
+
+/*
+Allegro Wrapper Functions
+Written by Adel Talhouk in FA21
+GraphicsLibrary.h
+	File information:
+	This file contains function abstractions from Allegro 5, wrapped up in my Graphics Library. This will
+	be used to render images and text to the screen.
+	Source I am consulting: Allegro 5.0.10 Manual - http://cdn.allegro.cc/file/library/allegro/5.0.10/allegro-5.0.10-manual.pdf
+*/
+
+#include <string>
+#include <vector>
+
+#include "Colour.h"
+
+//https://github.com/liballeg/allegro_wiki/wiki/Allegro-in-Visual-Studio#using-nuget-within-visual-studio
+#include <allegro5/allegro.h>
+#include <allegro5/allegro_font.h>
+#include <allegro5/allegro_ttf.h>
+#include <allegro5/allegro_acodec.h>
+#include <allegro5/allegro_image.h>
+#include <allegro5/allegro_primitives.h>
+
+enum TextAlignment
+{
+	ALIGN_LEFT = ALLEGRO_ALIGN_LEFT,
+	ALIGN_CENTER = ALLEGRO_ALIGN_CENTRE,
+	ALIGN_RIGHT = ALLEGRO_ALIGN_RIGHT
+};
+
+class GraphicsLibrary
+{
+	//-------------------------Private data-------------------------
+
+	//Screen data
+	float mScreenSizeX;
+	float mScreenSizeY;
+
+	//Allegro display
+	ALLEGRO_DISPLAY* mpDisplay;
+
+	//Other images to draw
+	std::vector<std::pair<std::string, ALLEGRO_BITMAP*>> mBitmapPointersVector;
+
+	//UI text
+	ALLEGRO_FONT* mpFont;
+	ALLEGRO_COLOR mTextColour;
+
+	friend class InputSystem;
+
+	//-------------------------Public data-------------------------
+public:
+
+	//Constructor(s)
+	GraphicsLibrary(float screenSizeX, float screenSizeY);
+
+	//Destructor
+	~GraphicsLibrary();
+
+	//Accessor(s)
+	float getScreenSizeX() { return mScreenSizeX; };
+	float getScreenSizeY() { return mScreenSizeY; };
+
+	//Mutator(s)
+
+	//Functions
+	bool init();
+	bool initText(std::string fontFilePath, int fontSize, Colour textColour);
+	void render();
+	void loadImage(std::string imageFilePath, std::string imageIdentifier);
+
+	//Drawing functions
+	void drawText(float posX, float posY, std::string text, TextAlignment alignment);
+	void drawRectangle(float topLeftX, float topLeftY, float bottomRightX, float bottomRightY, Colour colour, float thickness);
+	void drawImage(std::string imageIdentifier, float posX, float posY);
+	void drawScaledImage(std::string imageIdentifier, float posX, float posY, float scaleX, float scaleY);
+	void drawTintedImage(std::string imageIdentifier, float posX, float posY, Colour col);
+};