Assignment2

RoboCat/Chapter3.vcxproj

@@ -92,6 +92,10 @@
     <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>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
     <LinkIncremental>true</LinkIncremental>
@@ -128,7 +132,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <AdditionalIncludeDirectories>..\SDL\include;Inc;..\</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>RoboCatPCH.h</PrecompiledHeaderFile>
     </ClCompile>
     <Link>
@@ -371,6 +375,9 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="Inc\ByteSwap.h" />
+    <ClInclude Include="Inc\Colour.h" />
+    <ClInclude Include="Inc\GraphicsLibrary.h" />
+    <ClInclude Include="Inc\InputSystem.h" />
     <ClInclude Include="Inc\LinkingContext.h" />
     <ClInclude Include="Inc\MemoryBitStream.h" />
     <ClInclude Include="Inc\OutputWindow.h" />
@@ -383,14 +390,23 @@
     <ClInclude Include="Inc\RoboCatPCH.h" />
     <ClInclude Include="Inc\RoboCatShared.h" />
     <ClInclude Include="Inc\UDPSocket.h" />
+    <ClCompile Include="Src\Colour.cpp" />
+    <ClCompile Include="Src\GameObject.cpp" />
+    <ClCompile Include="Src\GraphicsLibrary.cpp" />
+    <ClCompile Include="Src\InputSystem.cpp" />
     <ClCompile Include="Src\Main.cpp" />
     <ClCompile Include="Src\MemoryBitStream.cpp" />
+    <ClCompile Include="Src\NetworkManager.cpp" />
+    <ClCompile Include="Src\NetworkManagerServer.cpp" />
     <ClCompile Include="Src\OutputWindow.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="Src\GameObject.h" />
+    <ClInclude Include="Src\NetworkManager.h" />
+    <ClInclude Include="Src\NetworkManagerServer.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Src\RoboCatPCH.cpp">

RoboCat/Inc/Colour.h

@@ -0,0 +1,45 @@
+#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(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/GraphicsLibrary.h

@@ -0,0 +1,68 @@
+#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>
+
+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;
+
+	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(std::string backgroundFilePath);
+	void render();
+	void loadImage(std::string imageFilePath, std::string imageIdentifier);
+
+	//Drawing functions
+	void drawImage(std::string imageIdentifier, float posX, float posY);
+	void drawTintedImage(std::string imageIdentifier, float posX, float posY, Colour col);
+};

RoboCat/Inc/InputSystem.h

@@ -0,0 +1,72 @@
+#pragma once
+
+/*
+Allegro Wrapper Functions
+Written by Adel Talhouk in FA21
+InputSystem.h
+
+	File information:
+	This file contains the keycodes for input, which can be used in any way desired by other classes
+	and files.
+*/
+
+#include "GraphicsLibrary.h"
+
+
+//Include allegro libraries for input
+#include <allegro5/allegro.h>
+#include <allegro5/events.h>
+
+enum KeyCode
+{
+	Esc = ALLEGRO_KEY_ESCAPE,
+	R = ALLEGRO_KEY_R,
+	S = ALLEGRO_KEY_S,
+	D = ALLEGRO_KEY_D
+};
+
+enum MouseButton
+{
+	LeftMouse = 0,
+	RightMouse = 1,
+	MiddleMouse = 2
+};
+
+enum InputMode
+{
+	NONE = -1,
+	KeyPressed = ALLEGRO_EVENT_KEY_DOWN,
+	KeyReleased = ALLEGRO_EVENT_KEY_UP,
+	MouseDown = ALLEGRO_EVENT_MOUSE_BUTTON_DOWN,
+	MouseUp = ALLEGRO_EVENT_MOUSE_BUTTON_UP
+};
+
+class InputSystem
+{
+	//-------------------------Private data-------------------------
+
+	//Event queue
+	ALLEGRO_EVENT_QUEUE* mpEventQueue;
+
+	//Event
+	ALLEGRO_EVENT mEvent;
+
+	//-------------------------Public data-------------------------
+public:
+
+	//Constructor(s)
+	InputSystem();
+
+	//Destructor
+	~InputSystem();
+
+	//Accessor(s)
+	float getMouseX();
+	float getMouseY();
+	std::pair<float, float> getMousePosition();
+
+	//Functions
+	bool init(GraphicsLibrary* pGraphicsLib);
+	MouseButton getMouseInput();
+	KeyCode getKeyboardInput();
+};

RoboCat/Src/Colour.cpp

@@ -0,0 +1,32 @@
+/*
+Allegro Wrapper Functions
+Written by Adel Talhouk in FA21
+Colour.cpp
+*/
+
+#include "Colour.h"
+#include "RoboCatPCH.h"
+
+//Constructor - without alpha
+Colour::Colour(unsigned __int8 r, unsigned __int8 g, unsigned __int8 b)
+{
+	mR = r;
+	mG = g;
+	mB = b;
+	mA = 255;
+}
+
+//Constructor - with alpha
+Colour::Colour(unsigned __int8 r, unsigned __int8 g, unsigned __int8 b, unsigned __int8 a)
+{
+	mR = r;
+	mG = g;
+	mB = b;
+	mA = a;
+}
+
+//Destructor
+Colour::~Colour()
+{
+
+}

RoboCat/Src/GameObject.cpp

@@ -0,0 +1,119 @@
+#include "GameObject.h"
+
+GameObject::GameObject()
+{
+	mColor = Colour(0, 255, 0);
+}
+
+GameObject::~GameObject()
+{
+
+}
+
+void GameObject::CreateObject()
+{
+	int val;
+	val = rand() % 3;
+
+	if (val == 0)
+	{
+		al_draw_filled_circle(400, 400, 10, al_map_rgb(0, 255, 0));
+		objectType = 'g';
+		positionX = 400;
+		positionY = 400;
+	}
+	else if (val == 1)
+	{
+		al_draw_filled_circle(400, 400, 10, al_map_rgb(255, 0, 0));
+		objectType = 'r'; 
+		positionX = 400;
+		positionY = 400;
+
+		//al_draw_triangle();
+	}
+	else if (val == 2)
+	{
+		al_draw_filled_circle(400, 400, 10, al_map_rgb(0, 0, 255));
+		objectType = 'b';
+		positionX = 400;
+		positionY = 400;
+
+		//al_draw_rectangle();
+	}
+
+	//probably no need for a final else statement
+}
+
+void GameObject::DeleteObject()
+{
+	//idk if there is any deletion i need to do necessarily
+		//possibly just undrawing things
+
+}
+
+void GameObject::UpdatePosition()
+{
+	int val;
+	val = rand() % 4;
+
+	if (val == 0)
+	{
+		//have it move up and to the right
+		positionX += 20;
+		positionY += 20;
+	}
+
+	if (val == 1)
+	{
+		//move down and to the right
+		positionX += 20;
+		positionY -= 20;
+	}
+
+	if (val == 2)
+	{
+		//down and to the left
+		positionX -= 20;
+		positionY -= 20;
+	}
+
+	if (val == 3)
+	{
+		//up and to the left
+		positionX -= 20;
+		positionY += 20;
+	}
+}
+
+void GameObject::DrawObjects()
+{
+	if (objectType == 'r')
+	{
+		al_draw_filled_circle(positionX, positionY, 10, al_map_rgb(255, 0, 0));
+	}
+
+	if (objectType == 'g')
+	{
+		al_draw_filled_circle(positionX, positionY, 10, al_map_rgb(0, 255, 0));
+	}
+
+	if (objectType == 'b')
+	{
+		al_draw_filled_circle(positionX, positionY, 10, al_map_rgb(0, 0, 255));
+	}
+}
+
+char GameObject::GetObjectType()
+{
+	return objectType;
+}
+
+float GameObject::GetPositionX()
+{
+	return positionX;
+}
+
+float GameObject::GetPositionY()
+{
+	return positionY;
+}