diff --git a/src/experimental/filament/filament/filament_context.cc b/src/experimental/filament/filament/filament_context.cc index a394560f..b5d91034 100644 --- a/src/experimental/filament/filament/filament_context.cc +++ b/src/experimental/filament/filament/filament_context.cc @@ -123,12 +123,7 @@ FilamentContext::~FilamentContext() { filament::Engine::destroy(engine_); } -void FilamentContext::Render(const mjrRect& viewport, const mjvScene* scene, - const mjrContext* con) { - if (con != context_) { - mju_error("Unexpected context."); - } - +void FilamentContext::Render(const mjrRect& viewport, const mjvScene* scene) { // If we're rendering to the window, and the window size has changed, we need // to reacquire the swap chain. if (scene_swap_chain_target_ == kWindowSwapChain && @@ -145,7 +140,7 @@ void FilamentContext::Render(const mjrRect& viewport, const mjvScene* scene, } scene_view_->SetViewport(viewport); - scene_view_->UpdateScene(con, scene); + scene_view_->UpdateScene(scene); // Update the UX renderable entity after processing the scene in case there // are any elements in the scene which generate UX draw calls (e.g. labels). if (gui_view_ && gui_swap_chain_target_ == scene_swap_chain_target_) { diff --git a/src/experimental/filament/filament/filament_context.h b/src/experimental/filament/filament/filament_context.h index 483988ba..507ccbe5 100644 --- a/src/experimental/filament/filament/filament_context.h +++ b/src/experimental/filament/filament/filament_context.h @@ -39,8 +39,7 @@ class FilamentContext { mjrContext* con); ~FilamentContext(); - void Render(const mjrRect& viewport, const mjvScene* scene, - const mjrContext* con); + void Render(const mjrRect& viewport, const mjvScene* scene); void SetFrameBuffer(int framebuffer); diff --git a/src/experimental/filament/filament/scene_view.cc b/src/experimental/filament/filament/scene_view.cc index 5fad8088..68246dfd 100644 --- a/src/experimental/filament/filament/scene_view.cc +++ b/src/experimental/filament/filament/scene_view.cc @@ -431,7 +431,7 @@ void SceneView::PrepareLights() { } } -void SceneView::UpdateScene(const mjrContext* context, const mjvScene* scene) { +void SceneView::UpdateScene(const mjvScene* scene) { views_[kNormalIndex]->setShadowingEnabled(scene->flags[mjRND_SHADOW]); mjtNum hpos[3], hfwd[3]; diff --git a/src/experimental/filament/filament/scene_view.h b/src/experimental/filament/filament/scene_view.h index 554c2a90..a46a54d2 100644 --- a/src/experimental/filament/filament/scene_view.h +++ b/src/experimental/filament/filament/scene_view.h @@ -64,7 +64,7 @@ class SceneView { // Updates the Entities in the filament Scene to match the current mjvScene // state. - void UpdateScene(const mjrContext* context, const mjvScene* scene); + void UpdateScene(const mjvScene* scene); using DrawMode = Material::DrawMode; diff --git a/src/experimental/filament/render_context_filament.cc b/src/experimental/filament/render_context_filament.cc index 3955a816..d22d5f1a 100644 --- a/src/experimental/filament/render_context_filament.cc +++ b/src/experimental/filament/render_context_filament.cc @@ -74,7 +74,7 @@ void mjrf_freeContext(mjrContext* con) { void mjrf_render(mjrRect viewport, mjvScene* scn, const mjrContext* con) { CheckFilamentContext(); - g_filament_context->Render(viewport, scn, con); + g_filament_context->Render(viewport, scn); } void mjrf_uploadMesh(const mjModel* m, const mjrContext* con, int meshid) {