You can now choose if you want to become a client or a server from the menu.

Fixed on window resize memory leak

include/Engine/Input/FirstPersonInputController.h

@@ -19,7 +19,6 @@ public:
     virtual const glm::vec3 Rotation() const { return m_Rotation; }
     virtual bool Jumping() const { return m_Jumping; }
     virtual bool Crouching() const { return m_Crouching; }
-    virtual bool CrouchingLastFrame() const { return m_CrouchingLastFrame; }
     virtual bool DoubleJumping() const { return m_DoubleJumping; }
     virtual void SetDoubleJumping(bool isDoubleJumping) {
         m_DoubleJumping = isDoubleJumping;
@@ -45,7 +44,6 @@ protected:
     bool m_Jumping = false;
     bool m_DoubleJumping = false;
     bool m_Crouching = false;
-    bool m_CrouchingLastFrame = false;
     //assault dash membervariables - needed to calculate the doubletap- and dashlogic
     double m_AssaultDashDoubleTapDeltaTime = 0.0;
     //i will let m_AssaultDashDoubleTapSensitivityTimer stay hardcoded, its not really a gamevariable (more an inputvariable), 
@@ -84,7 +82,6 @@ void FirstPersonInputController<EventContext>::Reset()
 {
     m_Rotation = glm::vec3(0.f, 0.f, 0.f);
     m_Jumping = false;
-    m_CrouchingLastFrame = m_Crouching;
 }
 
 template <typename EventContext>

include/Engine/Network/EBecomeServerOrClient.h

@@ -0,0 +1,15 @@
+#ifndef Events_BecomeServerOrClient_h__
+#define Events_BecomeServerOrClient_h__
+
+#include "Core/EventBroker.h"
+
+namespace Events 
+{
+
+struct BecomeServer : public Event { };
+
+struct BecomeClient : public Event { };
+
+}
+
+#endif

include/Engine/Rendering/EResolutionChanged.h

@@ -0,0 +1,19 @@
+#ifndef EResolutionChanged_h__
+#define EResolutionChanged_h__
+
+#include "../Core/Event.h"
+#include "../Core/Util/Rectangle.h"
+
+namespace Events
+{
+
+// Fired when the framebuffer size changes
+struct ResolutionChanged : Event
+{
+    Rectangle OldResolution;
+    Rectangle NewResolution;
+};
+
+}
+
+#endif

include/Engine/Rendering/LightCullingPass.h

@@ -54,7 +54,7 @@ private:
     struct Frustum {
         Plane Planes[4];
     };
-    Frustum* m_Frustums;
+    Frustum* m_Frustums = nullptr;
 
     //This should be a component
     struct LightSource {
@@ -74,11 +74,11 @@ private:
         glm::vec2 Padding = glm::vec2(1.f, 2.f);
     };
 
-    LightGrid* m_LightGrid;
+    LightGrid* m_LightGrid = nullptr;
 
     int m_LightOffset = 0;
 
-    float* m_LightIndex;
+    float* m_LightIndex = nullptr;
 };
 
 

include/Engine/Rendering/RenderSystem.h

@@ -19,6 +19,7 @@
 #include "../Core/Octree.h"
 #include "../Collision/EntityAABB.h"
 #include "../Core/ConfigFile.h"
+#include "EResolutionChanged.h"
 
 class RenderSystem : public ImpureSystem
 {
@@ -36,6 +37,8 @@ private:
     EntityWrapper m_LocalPlayer = EntityWrapper::Invalid;
     Octree<EntityAABB>* m_Octree;
 
+    EventRelay<RenderSystem, Events::ResolutionChanged> m_EResolutionChanged;
+    bool OnResolutionChanged(Events::ResolutionChanged &event);
     EventRelay<RenderSystem, Events::SetCamera> m_ESetCamera;
     bool OnSetCamera(Events::SetCamera &event);
     EventRelay<RenderSystem, Events::InputCommand> m_EInputCommand;

include/Engine/Rendering/Renderer.h

@@ -28,10 +28,12 @@
 #include "Util/CommonFunctions.h"
 #include "Core/PerformanceTimer.h"
 #include "ShadowPass.h"
+#include "EResolutionChanged.h"
 
 class Renderer : public IRenderer
 {
     static void glfwFrameBufferCallback(GLFWwindow* window, int width, int height);
+    static void glfwWindowSizeCallback(GLFWwindow* window, int width, int height);
 
 public:
 	Renderer(EventBroker* eventBroker, ConfigFile* config)
@@ -40,13 +42,14 @@ public:
     { }
 	~Renderer();
 
+    virtual void SetResolution(const Rectangle& resolution) override;
+
     virtual void Initialize() override;
     virtual void Update(double dt) override;
     virtual void Draw(RenderFrame& frame) override;
 
     virtual PickData Pick(glm::vec2 screenCoord) override;
 
-
 private:
     //----------------------Variables----------------------//
 
@@ -90,11 +93,14 @@ private:
     void InputUpdate(double dt);
     //void PickingPass(RenderQueueCollection& rq);
     //void DrawScreenQuad(GLuint textureToDraw);
+    void setWindowSize(Rectangle size);
+    void updateFramebufferSize();
 
     static bool DepthSort(const std::shared_ptr<RenderJob> &i, const std::shared_ptr<RenderJob> &j) { return (i->Depth < j->Depth); }
     void SortRenderJobsByDepth(RenderScene &scene);
     void GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filtering, glm::vec2 dimensions, GLint internalFormat, GLint format, GLenum type);
-	//--------------------ShaderPrograms-------------------//
+
+    //--------------------ShaderPrograms-------------------//
     ShaderProgram* m_BasicForwardProgram;
     ShaderProgram* m_ExplosionEffectProgram;
 

include/Engine/Rendering/ShadowPass.h

@@ -63,7 +63,8 @@ private:
 
 	GLuint m_DepthMap;
 	FrameBuffer m_DepthBuffer;
-	ShaderProgram* m_ShadowProgram;
+    ShaderProgram* m_ShadowProgram;
+    ShaderProgram* m_ShadowProgramSkinned;
 
 	std::array<glm::mat4, MAX_SPLITS> m_LightProjection;
 	std::array<glm::mat4, MAX_SPLITS> m_LightView;

include/Engine/Rendering/Util/GLError.h

@@ -16,7 +16,11 @@ inline bool _GLERROR(const char* info, const char* file, const char* func, unsig
 	return false;
 }
 
+#ifndef DEBUG
 #define GLERROR(function) \
 	_GLERROR(function, __BASE_FILE__, __func__, __LINE__)
+#else
+#define GLERROR(function) false
+#endif
 
 #endif

include/Game/Game.h

@@ -29,6 +29,7 @@
 #include "Network/Network.h"
 #include "Network/Server.h"
 #include "Network/Client.h"
+#include "Network/EBecomeServerOrClient.h"
 
 // Sound
 #include "Sound/SoundManager.h"
@@ -70,6 +71,11 @@ private:
     bool m_IsServer = false;
 
     int parseArgs(int argc, char* argv[]);
+
+    EventRelay<Game, Events::BecomeServer> m_EBecomeServer;
+    bool OnBecomeServer(const Events::BecomeServer& e);
+    EventRelay<Game, Events::BecomeClient> m_EBecomeClient;
+    bool OnBecomeClient(const Events::BecomeClient& e);
 };
 
 #endif

include/Game/Systems/MainMenuSystem.h

@@ -14,6 +14,7 @@
 #include "Input/EInputCommand.h"
 #include "Network/ESearchForServers.h"
 #include "Network/EConnectRequest.h"
+#include "Network/EBecomeServerOrClient.h"
 
 
 class MainMenuSystem : public ImpureSystem

resources/Schema/Entities/MainMenu.xml

@@ -319,23 +319,80 @@
             </Entity>
           </Children>
         </Entity>
-      </Children>
-    </Entity>
-    <Entity name="Popup_Origin">
-      <Components>
-        <c:Transform>
-          <Position X="-0.103822395" Y="0" Z="0"/>
-        </c:Transform>
-      </Components>
-      <Children>
-        <Entity name="PlaySpawner">
+        <Entity name="ButtonPos_5">
           <Components>
-            <c:Spawner>
-              <EntityFile>Schema/Entities/ServerList.xml</EntityFile>
-            </c:Spawner>
-            <c:Transform/>
+            <c:Transform>
+              <Position X="0" Y="-0.280000001" Z="0"/>
+            </c:Transform>
           </Components>
-          <Children/>
+          <Children>
+            <Entity name="Button_5">
+              <Components>
+                <c:Button/>
+                <c:Sprite>
+                  <DiffuseTexture>Textures/Core/White.png</DiffuseTexture>
+                  <BlurBackground>true</BlurBackground>
+                  <GlowMap></GlowMap>
+                  <DepthSort>false</DepthSort>
+                  <Color A="0.392156869" B="0" G="0" R="0"/>
+                </c:Sprite>
+                <c:Transform>
+                  <Scale X="0.200000003" Y="0.0500000007" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="Text">
+              <Components>
+                <c:Text>
+                  <Content>Host</Content>
+                  <Resource>Fonts/DroidSans.ttf,64</Resource>
+                  <Alignment>
+                    <Right/>
+                  </Alignment>
+                </c:Text>
+                <c:Transform>
+                  <Position X="0.0920000002" Y="-0.0150000006" Z="0.00499999989"/>
+                  <Scale X="0.0199999996" Y="0.0199999996" Z="1"/>
+                </c:Transform>
+              </Components>
+              <Children/>
+            </Entity>
+            <Entity name="ButtonCorner_Origin">
+              <Components>
+                <c:Transform/>
+              </Components>
+              <Children>
+                <Entity name="TopRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="0.0220000017" Z="0.00499999989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+                <Entity name="BottomRight">
+                  <Components>
+                    <c:Sprite>
+                      <DiffuseTexture>Textures/HUD/ButtonCorner_16.png</DiffuseTexture>
+                      <GlowMap></GlowMap>
+                    </c:Sprite>
+                    <c:Transform>
+                      <Position X="0.0970000029" Y="-0.0219999999" Z="0.00499999989"/>
+                      <Orientation X="0" Y="0" Z="4.71199989"/>
+                      <Scale X="0.00499999989" Y="0.00499999989" Z="1"/>
+                    </c:Transform>
+                  </Components>
+                  <Children/>
+                </Entity>
+              </Children>
+            </Entity>
+          </Children>
         </Entity>
       </Children>
     </Entity>

resources/Shaders/ShadowSkinned.vert.glsl

@@ -0,0 +1,29 @@
+#version 430
+
+uniform mat4 M;
+uniform mat4 V;
+uniform mat4 P;
+uniform mat4 Bones[100];
+
+layout (location = 0) in vec3 Position;
+layout (location = 4) in vec2 TextureCoords;
+layout(location = 5) in vec4 BoneIndices;
+layout(location = 6) in vec4 BoneWeights;
+
+out VertexData{
+	vec2 TextureCoordinate;
+}Output;
+
+void main()
+{	
+	mat4 boneTransform = mat4(1);
+	if(BoneWeights[0] > 0.0f){
+	boneTransform = BoneWeights[0] * Bones[int(BoneIndices[0])]
+				  + BoneWeights[1] * Bones[int(BoneIndices[1])]
+				  + BoneWeights[2] * Bones[int(BoneIndices[2])]
+				  + BoneWeights[3] * Bones[int(BoneIndices[3])];
+	}
+
+	gl_Position = P * V * M * boneTransform * vec4(Position, 1.0);
+	Output.TextureCoordinate = TextureCoords;
+}

src/Engine/Collision/Collision.cpp

@@ -470,7 +470,6 @@ bool AABBvsTriangle(const AABB& box,
     }
 
     glm::vec3 cornerResolution = (1+t) * diagonal;
-    cornerResolution = glm::dot(cornerResolution, triNormal) * triNormal;
     //Overwrite the smallest resolution if cornerResolution is smaller.
     float lenSq = glm::length2(cornerResolution);
     if (lenSq < resolveShortest.DistanceSq) {

src/Engine/Collision/CollisionSystem.cpp

@@ -88,11 +88,12 @@ void CollisionSystem::UpdateComponent(EntityWrapper& entity, ComponentWrapper& c
                 glm::mat4 modelMatrix = Transform::ModelMatrix(boxB.Entity);
 
                 glm::vec3 inOutVelocity = (glm::vec3)cPhysics["Velocity"];
+                bool notMovingxz = glm::all(glm::lessThan(glm::abs(glm::vec2(inOutVelocity.x, inOutVelocity.z)), glm::vec2(0.01f))) && prevPosIt != m_PrevPositions.end();
                 bool isOnGround = (bool)cPhysics["IsOnGround"];
                 float verticalStepHeight = (float)(double)cPhysics["VerticalStepHeight"];
                 if (Collision::AABBvsTriangles(boxA, model->Vertices(), model->m_Indices, modelMatrix, inOutVelocity, verticalStepHeight, isOnGround, resolutionVector)) {
                     //Move the position to previous position if it is not moving in the xz-plane, else resolve with the resolution vector.
-                    (glm::vec3&)cTransform["Position"] += resolutionVector;
+                    (glm::vec3&)cTransform["Position"] += notMovingxz ? prevPosIt->second - boxA.Origin() : resolutionVector;
                     boxA = *Collision::EntityAbsoluteAABB(entity);
                     cPhysics["Velocity"] = inOutVelocity;
                     if (isOnGround) {

src/Engine/Network/Server.cpp

@@ -22,7 +22,8 @@ Server::Server(World* world, EventBroker* eventBroker, int port)
         port = config->Get<float>("Networking.Port", 27666);
     }
     m_Port = port;
-    LOG_INFO("Server initialized and bound to port %i", port);
+    printf("Server initialized and bound to port %i\n", port);
+    
 }
 
 Server::~Server()

src/Engine/Rendering/AnimationSystem.cpp

@@ -127,12 +127,12 @@ void AnimationSystem::UpdateAnimations(double dt)
 void AnimationSystem::UpdateWeights(double dt)
 {
     for (auto it = m_AutoBlendQueues.begin(); it != m_AutoBlendQueues.end(); ) {
-        LOG_INFO("%s", it->first.Name().c_str());
-        it->second.PrintQueue();
+       /* LOG_INFO("%s", it->first.Name().c_str());
+        it->second.PrintQueue();*/
         
         if(it->second.HasActiveBlendJob()) {
             AutoBlendQueue::AutoBlendJob& blendJob = it->second.GetActiveBlendJob();
-            LOG_INFO("%s", blendJob.RootNode.Name().c_str());
+            //LOG_INFO("%s", blendJob.RootNode.Name().c_str());
             std::shared_ptr<BlendTree> blendTree = it->second.GetBlendTree();
             if (blendTree != nullptr) {
                 if (blendJob.Duration != 0.0) {

src/Engine/Rendering/LightCullingPass.cpp

@@ -42,6 +42,15 @@ void LightCullingPass::SetSSBOSizes()
 {
     m_NumberOfTiles = (int)(m_Renderer->GetViewportSize().Width/TILE_SIZE) * (int)(m_Renderer->GetViewportSize().Height/TILE_SIZE);
 
+	if (m_Frustums != nullptr) {
+		delete[] m_Frustums;
+	}
+	if (m_LightGrid != nullptr) {
+		delete[] m_LightGrid;
+	}
+	if (m_LightIndex != nullptr) {
+		delete[] m_LightIndex;
+	}
     m_Frustums = new Frustum[m_NumberOfTiles];
     m_LightGrid = new LightGrid[m_NumberOfTiles];
     m_LightIndex = new float[m_NumberOfTiles*MAX_LIGHTS_PER_TILE];

src/Engine/Rendering/PickingPass.cpp

@@ -219,7 +219,7 @@ void PickingPass::Draw(RenderScene& scene)
 					m_PickingSkinnedProgram->Bind();
 					lastShader = m_PickingSkinnedProgram->GetHandle();
 				}
-				glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
+				glUniformMatrix4fv(glGetUniformLocation(shaderSkinnedHandle, "PVM"), 1, GL_FALSE, glm::value_ptr(scene.Camera->ProjectionMatrix() * scene.Camera->ViewMatrix() * modelJob->Matrix));
                 glUniform2fv(glGetUniformLocation(shaderSkinnedHandle, "PickingColor"), 1, glm::value_ptr(glm::vec2(pickColor[0], pickColor[1])));
 
                 std::vector<glm::mat4> frameBones;

src/Engine/Rendering/RenderSystem.cpp

@@ -9,10 +9,11 @@ RenderSystem::RenderSystem(SystemParams params, const IRenderer* renderer, Rende
     , m_Octree(frustumCullOctree)
 {
     EVENT_SUBSCRIBE_MEMBER(m_ESetCamera, &RenderSystem::OnSetCamera);
+    EVENT_SUBSCRIBE_MEMBER(m_EResolutionChanged, &RenderSystem::OnResolutionChanged);
     EVENT_SUBSCRIBE_MEMBER(m_EInputCommand, &RenderSystem::OnInputCommand);
     EVENT_SUBSCRIBE_MEMBER(m_EPlayerSpawned, &RenderSystem::OnPlayerSpawned);
 
-    m_Camera = new Camera((float)m_Renderer->Resolution().Width / m_Renderer->Resolution().Height, glm::radians(45.f), 0.01f, 5000.f);
+    m_Camera = new Camera((float)m_Renderer->GetViewportSize().Width / m_Renderer->GetViewportSize().Height, glm::radians(45.f), 0.01f, 5000.f);
 }
 
 RenderSystem::~RenderSystem()
@@ -20,6 +21,13 @@ RenderSystem::~RenderSystem()
     delete m_Camera;
 }
 
+bool RenderSystem::OnResolutionChanged(Events::ResolutionChanged& e)
+{
+    // Update camera aspect ration on resolution change
+    m_Camera->SetAspectRatio((float)e.NewResolution.Width / e.NewResolution.Height);
+    return true;
+}
+
 bool RenderSystem::OnSetCamera(Events::SetCamera& e)
 {
     ComponentWrapper cTransform = e.CameraEntity["Transform"];

src/Engine/Rendering/Renderer.cpp

@@ -36,16 +36,24 @@ void Renderer::Initialize()
     m_ImGuiRenderPass = new ImGuiRenderPass(this, m_EventBroker);
 }
 
+void Renderer::glfwWindowSizeCallback(GLFWwindow* window, int width, int height)
+{
+    m_WindowToRenderer[window]->setWindowSize(Rectangle(width, height));
+}
+
 void Renderer::glfwFrameBufferCallback(GLFWwindow* window, int width, int height)
 {
-    glViewport(0, 0, width, height);
-    Renderer* currentRenderer = m_WindowToRenderer[window];
-    currentRenderer->m_ViewportSize = Rectangle(width, height);
-	currentRenderer->m_PickingPass->OnWindowResize();
-    currentRenderer->m_DrawFinalPass->OnWindowResize();
-    currentRenderer->m_LightCullingPass->OnWindowResize();
-    currentRenderer->m_DrawBloomPass->OnWindowResize();
-	currentRenderer->m_SSAOPass->OnWindowResize();
+    m_WindowToRenderer[window]->updateFramebufferSize();
+}
+
+void Renderer::SetResolution(const Rectangle& resolution)
+{
+    m_Resolution = resolution;
+
+    if (m_Window != nullptr) {
+        setWindowSize(resolution);
+        updateFramebufferSize();
+    }
 }
 
 void Renderer::InitializeWindow()
@@ -67,6 +75,7 @@ void Renderer::InitializeWindow()
 		LOG_ERROR("GLFW: Failed to create window");
 		exit(EXIT_FAILURE);
 	}
+    glfwSetWindowSizeCallback(m_Window, &glfwWindowSizeCallback);
     glfwSetFramebufferSizeCallback(m_Window, &glfwFrameBufferCallback);
 	glfwMakeContextCurrent(m_Window);
 
@@ -111,6 +120,30 @@ void Renderer::InputUpdate(double dt)
    
 }
 
+void Renderer::setWindowSize(Rectangle size)
+{
+    glfwSetWindowSize(m_Window, size.Width, size.Height);
+}
+
+void Renderer::updateFramebufferSize()
+{
+    Events::ResolutionChanged e;
+    e.OldResolution = m_ViewportSize;
+
+    int width, height;
+    glfwGetFramebufferSize(m_Window, &width, &height);
+    glViewport(0, 0, width, height);
+    m_ViewportSize = Rectangle(width, height);
+    m_PickingPass->OnWindowResize();
+    m_DrawFinalPass->OnWindowResize();
+    m_LightCullingPass->OnWindowResize();
+    m_DrawBloomPass->OnWindowResize();
+    m_SSAOPass->OnWindowResize();
+    
+    e.NewResolution = m_ViewportSize;
+    m_EventBroker->Publish(e);
+}
+
 void Renderer::Update(double dt)
 {
     m_EventBroker->Process<Renderer>();
@@ -263,6 +296,7 @@ void Renderer::GenerateTexture(GLuint* texture, GLenum wrapping, GLenum filterin
     GLERROR("Texture initialization failed");
 }
 
+
 void Renderer::InitializeRenderPasses()
 {
     m_PickingPass = new PickingPass(this, m_EventBroker);

src/Engine/Rendering/ShadowPass.cpp

@@ -156,7 +156,12 @@ void ShadowPass::InitializeShaderPrograms()
 	m_ShadowProgram->BindFragDataLocation(0, "ShadowMap");
 	m_ShadowProgram->Link();
 
-
+    m_ShadowProgramSkinned = ResourceManager::Load<ShaderProgram>("#ShadowProgramSkinned");
+    m_ShadowProgramSkinned->AddShader(std::shared_ptr<Shader>(new VertexShader("Shaders/ShadowSkinned.vert.glsl")));
+    m_ShadowProgramSkinned->AddShader(std::shared_ptr<Shader>(new FragmentShader("Shaders/Shadow.frag.glsl")));
+    m_ShadowProgramSkinned->Compile();
+    m_ShadowProgramSkinned->BindFragDataLocation(0, "ShadowMap");
+    m_ShadowProgramSkinned->Link();
 }
 
 void ShadowPass::ClearBuffer()
@@ -212,8 +217,7 @@ void ShadowPass::Draw(RenderScene & scene)
 
 		ShadowPassState* state = new ShadowPassState(m_DepthBuffer.GetHandle());
 
-		m_ShadowProgram->Bind();
-		GLuint shaderHandle = m_ShadowProgram->GetHandle();
+		
 		glViewport(0, 0, m_ResolutionSizeWidth, m_ResolutionSizeHeight);
 
 		for (int i = 0; i < m_CurrentNrOfSplits; i++) {
@@ -221,7 +225,11 @@ void ShadowPass::Draw(RenderScene & scene)
 
 			glFramebufferTextureLayer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, m_DepthMap, 0, i);
 
+
+            GLuint shaderHandle;
+
 			for (auto &job : scene.Jobs.DirectionalLight) {
+
 				auto directionalLightJob = std::dynamic_pointer_cast<DirectionalLightJob>(job);
 
 				if (directionalLightJob) {
@@ -232,9 +240,19 @@ void ShadowPass::Draw(RenderScene & scene)
 					//RadiusToLightspace(m_shadowFrusta[i]);
 					m_LightProjection[i] = glm::ortho(m_shadowFrusta[i].LRBT[LEFT], m_shadowFrusta[i].LRBT[RIGHT], m_shadowFrusta[i].LRBT[BOTTOM], m_shadowFrusta[i].LRBT[TOP], m_NearFarPlane[NEAR], m_NearFarPlane[FAR]);
 
+
+                    m_ShadowProgram->Bind();
+                    shaderHandle = m_ShadowProgram->GetHandle();
 					glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(m_LightProjection[i]));
 					glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(m_LightView[i]));
 
+                    m_ShadowProgramSkinned->Bind();
+                    shaderHandle = m_ShadowProgramSkinned->GetHandle();
+                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "P"), 1, GL_FALSE, glm::value_ptr(m_LightProjection[i]));
+                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "V"), 1, GL_FALSE, glm::value_ptr(m_LightView[i]));
+
+
+
 					GLERROR("ShadowLight ERROR");
 
 					for (auto &objectJob : scene.Jobs.OpaqueObjects) {
@@ -245,6 +263,23 @@ void ShadowPass::Draw(RenderScene & scene)
 								continue;
 							}
 
+                            if(modelJob->Model->IsSkinned()) {
+                                m_ShadowProgramSkinned->Bind();
+                                shaderHandle = m_ShadowProgramSkinned->GetHandle();
+
+                                std::vector<glm::mat4> frameBones;
+                                if (modelJob->BlendTree != nullptr) {
+                                    frameBones = modelJob->BlendTree->GetFinalPose();
+                                } else {
+                                    frameBones = modelJob->Skeleton->GetTPose();
+                                }
+                                glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+                            } else {
+                                m_ShadowProgram->Bind();
+                                shaderHandle = m_ShadowProgram->GetHandle();
+                            }
+
 							glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
 							glUniform1f(glGetUniformLocation(shaderHandle, "Alpha"), 1.f);
 
@@ -265,6 +300,23 @@ void ShadowPass::Draw(RenderScene & scene)
 									continue;
 								}
 
+                                if (modelJob->Model->IsSkinned()) {
+                                    m_ShadowProgramSkinned->Bind();
+                                    shaderHandle = m_ShadowProgramSkinned->GetHandle();
+
+                                    std::vector<glm::mat4> frameBones;
+                                    if (modelJob->BlendTree != nullptr) {
+                                        frameBones = modelJob->BlendTree->GetFinalPose();
+                                    } else {
+                                        frameBones = modelJob->Skeleton->GetTPose();
+                                    }
+                                    glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "Bones"), frameBones.size(), GL_FALSE, glm::value_ptr(frameBones[0]));
+
+                                } else {
+                                    m_ShadowProgram->Bind();
+                                    shaderHandle = m_ShadowProgram->GetHandle();
+                                }
+
 								glUniformMatrix4fv(glGetUniformLocation(shaderHandle, "M"), 1, GL_FALSE, glm::value_ptr(modelJob->Matrix));
 								glUniform1f(glGetUniformLocation(shaderHandle, "Alpha"), modelJob->Color.a);
 

src/Game/Game.cpp

@@ -58,7 +58,6 @@ Game::Game(int argc, char* argv[])
     ResourceManager::RegisterType<EntityFile>("EntityFile");
     ResourceManager::RegisterType<EntityXMLFile>("EntityXMLFile");
     ResourceManager::RegisterType<Font>("FontFile");
-
     m_Config = ResourceManager::Load<ConfigFile>("Config.ini");
     ResourceManager::UseThreading = m_Config->Get<bool>("Multithreading.ResourceLoading", true);
     DisableMemoryPool::Value = m_Config->Get<bool>("Debug.DisableMemoryPool", false);
@@ -66,6 +65,8 @@ Game::Game(int argc, char* argv[])
 
     // Create the core event broker
     m_EventBroker = new EventBroker();
+    EVENT_SUBSCRIBE_MEMBER(m_EBecomeServer, &Game::OnBecomeServer);
+    EVENT_SUBSCRIBE_MEMBER(m_EBecomeClient, &Game::OnBecomeClient);
 
     // Create the renderer
     m_Renderer = new Renderer(m_EventBroker, m_Config);
@@ -76,7 +77,7 @@ Game::Game(int argc, char* argv[])
         0,
         m_Config->Get<int>("Video.Width", 1280),
         m_Config->Get<int>("Video.Height", 720)
-    ));
+        ));
     m_Renderer->Initialize();
     //m_Renderer->Camera()->SetFOV(glm::radians(m_Config->Get<float>("Video.FOV", 90.f)));
     m_RenderFrame = new RenderFrame();
@@ -99,21 +100,7 @@ Game::Game(int argc, char* argv[])
     // Create the sound manager
     m_SoundManager = new SoundManager(m_World, m_EventBroker);
 
-    // Initialize network
-    if (m_Config->Get<bool>("Networking.StartNetwork", false)) {
-        if (m_IsServer) {
-            m_NetworkServer = new Server(m_World, m_EventBroker, m_NetworkPort);
-            m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " SERVER");
-        } else if (m_IsClient) {
-            m_NetworkClient = new Client(m_World, m_EventBroker, std::make_unique<MultiplayerSnapshotFilter>(m_EventBroker));
-            m_NetworkClient->Connect(m_NetworkAddress, m_NetworkPort);
-            m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " CLIENT");
-        }
-    } else {
-        // If network is disabled, pretend we're a server
-        m_IsClient = true;
-        m_IsServer = true;
-    }
+
 
     // Create Octrees
     // TODO: Perhaps the world bounds should be set in some non-arbitrary way instead of this.
@@ -188,6 +175,8 @@ Game::~Game()
     delete m_OctreeCollision;
     delete m_OctreeTrigger;
     delete m_SoundManager;
+    m_EventBroker->Unsubscribe(m_EBecomeServer);
+    m_EventBroker->Unsubscribe(m_EBecomeClient);
     if (m_NetworkClient != nullptr) {
         delete m_NetworkClient;
     }
@@ -210,6 +199,7 @@ void Game::Tick()
     double dt = currentTime - m_LastTime;
     m_LastTime = currentTime;
 
+    m_EventBroker->Process<Game>();
     // Handle input in a weird looking but responsive way
     m_EventBroker->Process<InputManager>();
     m_EventBroker->Swap();
@@ -284,3 +274,40 @@ int Game::parseArgs(int argc, char* argv[])
 
     return 0;
 }
+
+bool Game::OnBecomeServer(const Events::BecomeServer& e)
+{
+
+    //    if (m_IsServer) {
+    //        m_NetworkServer = new Server(m_World, m_EventBroker, m_NetworkPort);
+    //        m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " SERVER");
+    //    } else if (m_IsClient) {
+    //        m_NetworkClient = new Client(m_World, m_EventBroker, std::make_unique<MultiplayerSnapshotFilter>(m_EventBroker));
+    //        m_NetworkClient->Connect(m_NetworkAddress, m_NetworkPort);
+    //        m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " CLIENT");
+    //    }
+
+    if (m_NetworkServer != nullptr) {
+        delete m_NetworkServer;
+    }
+    if (m_NetworkClient != nullptr) {
+        delete m_NetworkClient;
+    }
+    m_NetworkServer = new Server(m_World, m_EventBroker, m_NetworkPort);
+    m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " SERVER");
+    return true;
+}
+
+bool Game::OnBecomeClient(const Events::BecomeClient& e)
+{
+    if (m_NetworkServer != nullptr) {
+        delete m_NetworkServer;
+    }
+    if (m_NetworkClient != nullptr) {
+        delete m_NetworkClient;
+    }
+    m_NetworkClient = new Client(m_World, m_EventBroker, std::make_unique<MultiplayerSnapshotFilter>(m_EventBroker));
+    m_NetworkClient->Connect(m_NetworkAddress, m_NetworkPort);
+    m_Renderer->SetWindowTitle(m_Renderer->WindowTitle() + " CLIENT");
+    return true;
+}

src/Game/Systems/MainMenuSystem.cpp

@@ -21,7 +21,7 @@ bool MainMenuSystem::OnButtonClick(const Events::ButtonClicked& e)
     if (e.EntityName == "ServerIdentityConnect") {
         EntityWrapper entity = e.Entity;
         EntityWrapper serverIdentityEntity = entity.FirstParentWithComponent("ServerIdentity");
-        if(serverIdentityEntity.Valid()) {
+        if (serverIdentityEntity.Valid()) {
             Events::ConnectRequest event;
             event.IP = (std::string)serverIdentityEntity["ServerIdentity"]["IP"];
             event.Port = (int)serverIdentityEntity["ServerIdentity"]["Port"];
@@ -44,7 +44,13 @@ bool MainMenuSystem::OnButtonPress(const Events::ButtonPressed& e)
 
 bool MainMenuSystem::OnInputCommand(const Events::InputCommand& e)
 {
-    if(e.Command == "Play" && e.Value == 1) {
+    if (e.Command == "Host" && e.Value == 1) {
+        printf("Sending event...\n");
+        m_EventBroker->Publish(Events::BecomeServer());
+        return true;
+    }
+    if (e.Command == "Play" && e.Value == 1) {
+        m_EventBroker->Publish(Events::BecomeClient());
         auto menus = m_World->GetComponents("Menu");
         if (menus == nullptr) {
             return 0;
@@ -64,7 +70,7 @@ bool MainMenuSystem::OnInputCommand(const Events::InputCommand& e)
                 break;
             }
 
-        } else if(!m_OpenSubMenu.HasComponent("ServerList")) {
+        } else if (!m_OpenSubMenu.HasComponent("ServerList")) {
             //Menu is open, but not the right one, delete the old one and open a new one.
             m_World->DeleteEntity(m_OpenSubMenu.ID);
             m_OpenSubMenu = EntityWrapper::Invalid;
@@ -85,7 +91,7 @@ bool MainMenuSystem::OnInputCommand(const Events::InputCommand& e)
             m_World->DeleteEntity(m_OpenSubMenu.ID);
             m_OpenSubMenu = EntityWrapper::Invalid;
         }
-    } else if (e.Command == "RefreshServerList" && e.Value == 1){
+    } else if (e.Command == "RefreshServerList" && e.Value == 1) {
         Events::SearchForServers event;
         m_EventBroker->Publish(event);
     }

src/Game/Systems/PlayerMovementSystem.cpp

@@ -264,11 +264,6 @@ void PlayerMovementSystem::updateMovementControllers(double dt)
                     size = glm::vec3(1.f, 1.f, 1.f);
                 } else {
                     size = glm::vec3(1.f, 1.6f, 1.f);
-                    if (controller->CrouchingLastFrame() && isOnGround) {
-                        // The collision should resolve this anyway, but 
-                        // this is more reliable, since the box gets larger.
-                        ((glm::vec3&)cTransform["Position"]).y += 0.3f;
-                    }
                 }
             }