Skip to content

Commit

Permalink
pipelines extensions json -> lua
Browse files Browse the repository at this point in the history
render all remaining instances after each custom pipeline command
  • Loading branch information
nem0 committed Jul 29, 2015
1 parent 37a8d35 commit 7cbe8c3
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/graphics/pipeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ struct PipelineInstanceImpl : public PipelineInstance
{
handler.invoke();
}
finishInstances();
}


Expand Down
2 changes: 1 addition & 1 deletion src/studio/gameview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void GameView::setWorldEditor(Lumix::WorldEditor& editor)
{
ASSERT(m_editor == nullptr);
m_editor = &editor;
m_render_device = new WGLRenderDevice(m_editor->getEngine(), "pipelines/game_view.json");
m_render_device = new WGLRenderDevice(m_editor->getEngine(), "pipelines/game_view.lua");
m_render_device->setWidget(*getContentWidget());
}

Expand Down
2 changes: 1 addition & 1 deletion src/studio/sceneview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void SceneView::setWorldEditor(Lumix::WorldEditor& world_editor)
static_cast<ViewWidget*>(m_view)->m_world_editor = &world_editor;
m_world_editor = &world_editor;
m_render_device =
new WGLRenderDevice(m_world_editor->getEngine(), "pipelines/main.json");
new WGLRenderDevice(m_world_editor->getEngine(), "pipelines/main.lua");
world_editor.getMeasureTool()
->distanceMeasured()
.bind<SceneView, &SceneView::onDistanceMeasured>(this);
Expand Down

0 comments on commit 7cbe8c3

Please sign in to comment.