Remove unused variable.
PiperOrigin-RevId: 889771550 Change-Id: I8b89e6ccf0a896461b9ddadc23f57e003ea7f8da
This commit is contained in:
committed by
Copybara-Service
parent
f28e727a57
commit
a25b9376f0
@@ -123,12 +123,7 @@ FilamentContext::~FilamentContext() {
|
|||||||
filament::Engine::destroy(engine_);
|
filament::Engine::destroy(engine_);
|
||||||
}
|
}
|
||||||
|
|
||||||
void FilamentContext::Render(const mjrRect& viewport, const mjvScene* scene,
|
void FilamentContext::Render(const mjrRect& viewport, const mjvScene* scene) {
|
||||||
const mjrContext* con) {
|
|
||||||
if (con != context_) {
|
|
||||||
mju_error("Unexpected context.");
|
|
||||||
}
|
|
||||||
|
|
||||||
// If we're rendering to the window, and the window size has changed, we need
|
// If we're rendering to the window, and the window size has changed, we need
|
||||||
// to reacquire the swap chain.
|
// to reacquire the swap chain.
|
||||||
if (scene_swap_chain_target_ == kWindowSwapChain &&
|
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_->SetViewport(viewport);
|
||||||
scene_view_->UpdateScene(con, scene);
|
scene_view_->UpdateScene(scene);
|
||||||
// Update the UX renderable entity after processing the scene in case there
|
// 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).
|
// 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_) {
|
if (gui_view_ && gui_swap_chain_target_ == scene_swap_chain_target_) {
|
||||||
|
|||||||
@@ -39,8 +39,7 @@ class FilamentContext {
|
|||||||
mjrContext* con);
|
mjrContext* con);
|
||||||
~FilamentContext();
|
~FilamentContext();
|
||||||
|
|
||||||
void Render(const mjrRect& viewport, const mjvScene* scene,
|
void Render(const mjrRect& viewport, const mjvScene* scene);
|
||||||
const mjrContext* con);
|
|
||||||
|
|
||||||
void SetFrameBuffer(int framebuffer);
|
void SetFrameBuffer(int framebuffer);
|
||||||
|
|
||||||
|
|||||||
@@ -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]);
|
views_[kNormalIndex]->setShadowingEnabled(scene->flags[mjRND_SHADOW]);
|
||||||
|
|
||||||
mjtNum hpos[3], hfwd[3];
|
mjtNum hpos[3], hfwd[3];
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ class SceneView {
|
|||||||
|
|
||||||
// Updates the Entities in the filament Scene to match the current mjvScene
|
// Updates the Entities in the filament Scene to match the current mjvScene
|
||||||
// state.
|
// state.
|
||||||
void UpdateScene(const mjrContext* context, const mjvScene* scene);
|
void UpdateScene(const mjvScene* scene);
|
||||||
|
|
||||||
using DrawMode = Material::DrawMode;
|
using DrawMode = Material::DrawMode;
|
||||||
|
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ void mjrf_freeContext(mjrContext* con) {
|
|||||||
|
|
||||||
void mjrf_render(mjrRect viewport, mjvScene* scn, const mjrContext* con) {
|
void mjrf_render(mjrRect viewport, mjvScene* scn, const mjrContext* con) {
|
||||||
CheckFilamentContext();
|
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) {
|
void mjrf_uploadMesh(const mjModel* m, const mjrContext* con, int meshid) {
|
||||||
|
|||||||
Reference in New Issue
Block a user