diff --git a/assets b/assets index b3746822..c8e631f4 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit b37468222e45ec0b2116f1543c578cb9784d43f2 +Subproject commit c8e631f449515cdbe3647b96ce472839748e28f9 diff --git a/include/Engine/Rendering/Renderer.h b/include/Engine/Rendering/Renderer.h index 2f0dae08..d8928b18 100644 --- a/include/Engine/Rendering/Renderer.h +++ b/include/Engine/Rendering/Renderer.h @@ -15,7 +15,7 @@ #define TILE_SIZE 16 -#define NUM_LIGHTS 5000 +#define NUM_LIGHTS 1000 #include "../Core/EventBroker.h" diff --git a/resources/Schema/Entities/Test.xml b/resources/Schema/Entities/Test.xml index cf428a77..aed1510c 100644 --- a/resources/Schema/Entities/Test.xml +++ b/resources/Schema/Entities/Test.xml @@ -17,27 +17,6 @@ - - - - - - - - Models/ScaleWidget.obj - - - - - - - - - - Models/RotationWidget.obj - - - diff --git a/src/Engine/Rendering/Renderer.cpp b/src/Engine/Rendering/Renderer.cpp index c32fc4f8..8721127a 100644 --- a/src/Engine/Rendering/Renderer.cpp +++ b/src/Engine/Rendering/Renderer.cpp @@ -271,7 +271,7 @@ void Renderer::TEMPCreateLights() glm::vec3 pos = glm::vec3(cos(i) * i/10.f , 0.5f, sin(i) * i/10.f); m_PointLights[i].Position = glm::vec4(pos, 1.f); m_PointLights[i].Color = glm::vec4(rand()%255 / 255.f, rand()%255 / 255.f, rand()%255 / 255.f, 1.f); - m_PointLights[i].Radius = 5.0f; + m_PointLights[i].Radius = glm::length(pos) / 5.f; } }