Remove unused render_flags parameters.
PiperOrigin-RevId: 936528056 Change-Id: Iae8545ec1d71bc7d5a20c46394104fb1db369d5d
This commit is contained in:
committed by
Copybara-Service
parent
7a00c1f3e0
commit
2800a682e4
@@ -213,7 +213,7 @@ void SceneBridge::Update(const mjrRect& viewport, const mjvScene* scene) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
UniquePtr<mjrfRenderable> renderable = CreateGeomRenderable(
|
UniquePtr<mjrfRenderable> renderable = CreateGeomRenderable(
|
||||||
*geom, ctx_, model_objects_.get(), scene_objects_.get(), scene->flags);
|
*geom, ctx_, model_objects_.get(), scene_objects_.get());
|
||||||
|
|
||||||
mjrf_addRenderableToScene(scene_.get(), renderable.get());
|
mjrf_addRenderableToScene(scene_.get(), renderable.get());
|
||||||
renderables_.push_back(std::move(renderable));
|
renderables_.push_back(std::move(renderable));
|
||||||
|
|||||||
@@ -145,8 +145,7 @@ static void PrepareGeomMeshes(mjrfRenderable* renderable, const mjvGeom& geom,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void UpdateGeomMaterial(mjrfRenderable* renderable, const mjvGeom& geom,
|
static void UpdateGeomMaterial(mjrfRenderable* renderable, const mjvGeom& geom,
|
||||||
ModelObjects* model_objs,
|
ModelObjects* model_objs) {
|
||||||
const mjtByte render_flags[mjNRNDFLAG]) {
|
|
||||||
const mjModel* model = model_objs->GetModel();
|
const mjModel* model = model_objs->GetModel();
|
||||||
|
|
||||||
mjrfMaterial material;
|
mjrfMaterial material;
|
||||||
@@ -271,14 +270,15 @@ static void UpdateGeomMaterial(mjrfRenderable* renderable, const mjvGeom& geom,
|
|||||||
mjrf_setRenderableMaterial(renderable, &material);
|
mjrf_setRenderableMaterial(renderable, &material);
|
||||||
}
|
}
|
||||||
|
|
||||||
UniquePtr<mjrfRenderable> CreateGeomRenderable(
|
UniquePtr<mjrfRenderable> CreateGeomRenderable(const mjvGeom& geom,
|
||||||
const mjvGeom& geom, mjrfContext* ctx, ModelObjects* model_objs,
|
mjrfContext* ctx,
|
||||||
SceneObjects* scene_objs, const mjtByte render_flags[mjNRNDFLAG]) {
|
ModelObjects* model_objs,
|
||||||
|
SceneObjects* scene_objs) {
|
||||||
mjrfRenderableParams params;
|
mjrfRenderableParams params;
|
||||||
mjrf_defaultRenderableParams(¶ms);
|
mjrf_defaultRenderableParams(¶ms);
|
||||||
auto renderable = CreateRenderable(ctx, params);
|
auto renderable = CreateRenderable(ctx, params);
|
||||||
PrepareGeomMeshes(renderable.get(), geom, model_objs, scene_objs);
|
PrepareGeomMeshes(renderable.get(), geom, model_objs, scene_objs);
|
||||||
UpdateGeomMaterial(renderable.get(), geom, model_objs, render_flags);
|
UpdateGeomMaterial(renderable.get(), geom, model_objs);
|
||||||
return renderable;
|
return renderable;
|
||||||
}
|
}
|
||||||
} // namespace mujoco
|
} // namespace mujoco
|
||||||
|
|||||||
@@ -25,9 +25,10 @@
|
|||||||
namespace mujoco {
|
namespace mujoco {
|
||||||
|
|
||||||
// Creates a Renderable from the given mjvGeom.
|
// Creates a Renderable from the given mjvGeom.
|
||||||
UniquePtr<mjrfRenderable> CreateGeomRenderable(
|
UniquePtr<mjrfRenderable> CreateGeomRenderable(const mjvGeom& geom,
|
||||||
const mjvGeom& geom, mjrfContext* ctx, ModelObjects* model_objs,
|
mjrfContext* ctx,
|
||||||
SceneObjects* scene_objs, const mjtByte render_flags[mjNRNDFLAG]);
|
ModelObjects* model_objs,
|
||||||
|
SceneObjects* scene_objs);
|
||||||
|
|
||||||
} // namespace mujoco
|
} // namespace mujoco
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user