Merge remote-tracking branch 'origin/master' into RendererBugFixes

Conflicts:
	assets

include/Engine/Network/Client.h

@@ -17,6 +17,7 @@
 #include "Network/TCPClient.h"
 #include "Network/SnapshotDefinitions.h"
 #include "Core/World.h"
+#include "Core/EntityFile.h"
 #include "Core/EventBroker.h"
 #include "Core/ConfigFile.h"
 #include "Core/EPlayerDeath.h"
@@ -30,7 +31,7 @@
 #include "Network/ESearchForServers.h"
 #include "../Game/Events/EDashAbility.h"
 #include "Network/EDisplayServerlist.h"
-
+#include "Network/EConnectRequest.h"
 class Client : public Network
 {
 public:
@@ -108,6 +109,8 @@ private:
     void sendLocalPlayerTransform();
     void becomePlayer();
     void displayServerlist();
+    void removeWorld();
+    void createMainMenu();
     // Mapping Logic
     // Returns if local EntityID exist in map
     bool clientServerMapsHasEntity(EntityID clientEntityID);
@@ -128,6 +131,8 @@ private:
     bool OnDoubleJump(Events::DoubleJump & e);
     EventRelay<Client, Events::DashAbility> m_EDashAbility;
     bool OnDashAbility(const Events::DashAbility& e);
+    EventRelay<Client, Events::ConnectRequest> m_EConnectRequest;
+    bool OnConnectRequest(const Events::ConnectRequest& e);
 
     bool OnSearchForServers(const Events::SearchForServers& e);
     UDPClient m_ServerlistRequest;

include/Engine/Network/NetworkClient.h

@@ -11,7 +11,7 @@ class NetworkClient
 public:
     NetworkClient();
     virtual ~NetworkClient();
-    virtual void Connect(std::string playerName, std::string address, int port) = 0;
+    virtual bool Connect(std::string playerName, std::string address, int port) = 0;
     virtual void Disconnect() = 0;
     virtual void Receive(Packet& packet) = 0;
     virtual void Send(Packet & packet) = 0;

include/Engine/Network/Server.h

@@ -60,6 +60,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
+    std::string m_ServerName = "";
 
     // Packet loss logic
     PacketID m_PacketID = 0;

include/Engine/Network/TCPClient.h

@@ -10,7 +10,7 @@ public:
     TCPClient();
     ~TCPClient();
 
-    void Connect(std::string playerName, std::string address, int port);
+    bool Connect(std::string playerName, std::string address, int port);
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);

include/Engine/Network/UDPClient.h

@@ -10,7 +10,7 @@ public:
     UDPClient();
     ~UDPClient();
 
-    void Connect(std::string playerName, std::string address, int port);
+    bool Connect(std::string playerName, std::string address, int port);
     void Disconnect();
     void Receive(Packet& packet);
     void Send(Packet & packet);

include/Engine/Rendering/BlurHUD.h

@@ -48,7 +48,7 @@ private:
     //const LightCullingPass* m_LightCullingPass 
     int m_Iterations = 3;
 	int m_Quality = 0;
-    float m_BlurQuality = 2.f;
+    float m_BlurQuality = 4.f;
 
     GLuint m_GaussianTexture_horiz = 0;
     GLuint m_GaussianTexture_vert = 0;

include/Engine/Rendering/SpriteJob.h

@@ -7,6 +7,7 @@
 #include "../GLM.h"
 #include "../Core/ComponentWrapper.h"
 #include "Texture.h"
+#include "TextureSprite.h"
 #include "Model.h"
 #include "RenderJob.h"
 #include "../Core/ResourceManager.h"
@@ -24,9 +25,9 @@ struct SpriteJob : RenderJob
         ::RawModel::MaterialProperties matProp = Model->MaterialGroups().front();
         TextureID = 0;
 
-        DiffuseTexture = CommonFunctions::LoadTexture(cSprite["DiffuseTexture"], true);
+        DiffuseTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["DiffuseTexture"]);
 
-        IncandescenceTexture = CommonFunctions::LoadTexture(cSprite["GlowMap"], true);
+        IncandescenceTexture = CommonFunctions::TryLoadResource<TextureSprite, true>(cSprite["GlowMap"]);
 
         StartIndex = matProp.material->StartIndex;
         EndIndex = matProp.material->EndIndex;

include/Engine/Rendering/Texture.h

@@ -9,7 +9,7 @@ class Texture : public BaseTexture
 {
 	friend class ResourceManager;
 
-private:
+protected:
 	Texture(std::string path);
 
 public:

include/Engine/Rendering/TextureSprite.h

@@ -0,0 +1,26 @@
+#ifndef TextureSprite_h__
+#define TextureSprite_h__
+
+#include "../OpenGL.h"
+#include "BaseTexture.h"
+#include "Texture.h"
+#include "PNG.h"
+
+class TextureSprite : public Texture
+{
+	friend class ResourceManager;
+
+protected:
+	TextureSprite(std::string path);
+
+public:
+	~TextureSprite();
+
+	void Bind(GLenum textureUnit = GL_TEXTURE0);
+
+	GLuint m_Texture = 0;
+    unsigned char* Data = nullptr;
+    
+};
+
+#endif

include/Engine/Rendering/Util/CommonFunctions.h

@@ -8,7 +8,23 @@
 
 namespace CommonFunctions
 { 
-Texture* LoadTexture(std::string path, bool threaded);
+
+//Loads Texture/SpriteTexture and return null if it fails
+template <typename T, bool threaded>
+Texture* TryLoadResource(std::string path)
+{
+    Texture* img;
+    try {
+        img = ResourceManager::Load<T, threaded>(path);
+    } catch (const Resource::StillLoadingException&) {
+        img = ResourceManager::Load<T>("Textures/Core/ErrorTexture.png");
+    } catch (const std::exception&) {
+        img = nullptr;
+    }
+
+    return img;
+}
+
 void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
 void GenerateMultiSampleTexture(GLuint* texture, int numSamples, glm::vec2 dimensions, GLint internalFormat);
 void GenerateMipMapTexture(GLuint* texture, GLenum wrapping, glm::vec2 dimensions, GLint format, GLenum type, GLint numMipMaps);