BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed to correct branch

Browse Source
This commit is contained in:
viktorljung
2015-12-18 11:29:11 +01:00
parent 6cf7c12d34
commit 3636ad45af
4 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets
+1 -1
Submodule assets updated: b37468222e...c8e631f449
include/Engine/Rendering/Renderer.h
+1 -1
View File
@@ -15,7 +15,7 @@
#define TILE_SIZE 16
#define NUM_LIGHTS 5000
#define NUM_LIGHTS 1000
#include "../Core/EventBroker.h"
resources/Schema/Entities/Test.xml
-21
View File
@@ -17,27 +17,6 @@
</c:Model>
</Components>
</Entity>
<Entity>
<Components>
<c:Transform>
<Position X="-1.5"/>
<Scale X="1" Y="1" Z="1"/>
</c:Transform>
<c:Model>
<Resource>Models/ScaleWidget.obj</Resource>
</c:Model>
</Components>
</Entity>
<Entity>
<Components>
<c:Transform>
<Position X="1.5"/>
</c:Transform>
<c:Model>
<Resource>Models/RotationWidget.obj</Resource>
</c:Model>
</Components>
</Entity>
<Entity>
<Components>
<c:Player>
src/Engine/Rendering/Renderer.cpp
+1 -1
View File
@@ -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;
}
}