Remove unused member variable.
PiperOrigin-RevId: 889775964 Change-Id: I8464d381158875c22437633dfbb548c10dc89462
This commit is contained in:
committed by
Copybara-Service
parent
a25b9376f0
commit
0021564035
@@ -77,7 +77,7 @@ FilamentContext::FilamentContext(const mjrFilamentConfig* config,
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
offscreen_swap_chain_ = engine_->createSwapChain(width, height);
|
offscreen_swap_chain_ = engine_->createSwapChain(width, height);
|
||||||
object_manager_ = std::make_unique<ObjectManager>(model, engine_, config);
|
object_manager_ = std::make_unique<ObjectManager>(model, engine_);
|
||||||
|
|
||||||
// Set clear options.
|
// Set clear options.
|
||||||
filament::Renderer::ClearOptions opts;
|
filament::Renderer::ClearOptions opts;
|
||||||
|
|||||||
@@ -64,9 +64,8 @@ struct Asset {
|
|||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
ObjectManager::ObjectManager(const mjModel* model, filament::Engine* engine,
|
ObjectManager::ObjectManager(const mjModel* model, filament::Engine* engine)
|
||||||
const mjrFilamentConfig* config)
|
: model_(model), engine_(engine) {
|
||||||
: model_(model), engine_(engine), config_(config) {
|
|
||||||
shapes_[kLine] = CreateLine(engine_, model_);
|
shapes_[kLine] = CreateLine(engine_, model_);
|
||||||
shapes_[kBox] = CreateBox(engine_, model_);
|
shapes_[kBox] = CreateBox(engine_, model_);
|
||||||
shapes_[kLineBox] = CreateLineBox(engine_, model_);
|
shapes_[kLineBox] = CreateLineBox(engine_, model_);
|
||||||
|
|||||||
@@ -34,8 +34,7 @@ namespace mujoco {
|
|||||||
// Creates and owns various filament objects based on the data in a mjrContext.
|
// Creates and owns various filament objects based on the data in a mjrContext.
|
||||||
class ObjectManager {
|
class ObjectManager {
|
||||||
public:
|
public:
|
||||||
ObjectManager(const mjModel* model, filament::Engine* engine,
|
ObjectManager(const mjModel* model, filament::Engine* engine);
|
||||||
const mjrFilamentConfig* config);
|
|
||||||
~ObjectManager();
|
~ObjectManager();
|
||||||
|
|
||||||
enum MaterialType {
|
enum MaterialType {
|
||||||
@@ -120,7 +119,6 @@ class ObjectManager {
|
|||||||
private:
|
private:
|
||||||
const mjModel* model_ = nullptr;
|
const mjModel* model_ = nullptr;
|
||||||
filament::Engine* engine_ = nullptr;
|
filament::Engine* engine_ = nullptr;
|
||||||
const mjrFilamentConfig* config_;
|
|
||||||
|
|
||||||
std::array<FilamentBuffers, kNumShapes> shapes_;
|
std::array<FilamentBuffers, kNumShapes> shapes_;
|
||||||
std::array<filament::Material*, kNumMaterials> materials_;
|
std::array<filament::Material*, kNumMaterials> materials_;
|
||||||
|
|||||||
Reference in New Issue
Block a user