LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:nem0/LumixEngine

Browse source
This commit is contained in:
Mikulas Florek 2015-11-17 21:41:33 +01:00
commit 1afd78bd95
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/editor/editor_icon.cpp
View file

@ -140,8 +140,9 @@ void EditorIcon::render(PipelineInstance& pipeline)
static const float MAX_SCALE_FACTOR = 60;
if (m_is_visible)
{
const Universe& universe = m_scene->getUniverse();
ComponentIndex camera = m_scene->getCameraInSlot("editor");
if (camera < 0) return;
const Universe& universe = m_scene->getUniverse();
Lumix::Matrix mtx = universe.getMatrix(m_scene->getCameraEntity(camera));
float fov = m_scene->getCameraFOV(camera);

2
src/renderer/pipeline.cpp
View file

@ -849,6 +849,8 @@ struct PipelineInstanceImpl : public PipelineInstance
int framebuffers_count,
int64 layer_mask)
{
if (camera < 0) return;
Universe& universe = m_scene->getUniverse();
Entity camera_entity = m_scene->getCameraEntity(camera);
Vec3 camera_pos = universe.getPosition(camera_entity);