Read the clear color from the model if available
PiperOrigin-RevId: 875079722 Change-Id: Id5a9c359d19f46d1c0bb5fbf5043db0ee4b1b9b6
This commit is contained in:
committed by
Copybara-Service
parent
84205f7dd0
commit
253494739a
@@ -40,6 +40,7 @@
|
|||||||
#include "experimental/filament/filament/gui_view.h"
|
#include "experimental/filament/filament/gui_view.h"
|
||||||
#include "experimental/filament/filament/imgui_editor.h"
|
#include "experimental/filament/filament/imgui_editor.h"
|
||||||
#include "experimental/filament/filament/object_manager.h"
|
#include "experimental/filament/filament/object_manager.h"
|
||||||
|
#include "experimental/filament/filament/model_util.h"
|
||||||
#include "experimental/filament/filament/scene_view.h"
|
#include "experimental/filament/filament/scene_view.h"
|
||||||
#include "experimental/filament/filament/texture_util.h"
|
#include "experimental/filament/filament/texture_util.h"
|
||||||
#include "experimental/filament/render_context_filament.h"
|
#include "experimental/filament/render_context_filament.h"
|
||||||
@@ -91,11 +92,11 @@ FilamentContext::FilamentContext(const mjrFilamentConfig* config,
|
|||||||
filament::Renderer::ClearOptions opts;
|
filament::Renderer::ClearOptions opts;
|
||||||
opts.clear = true;
|
opts.clear = true;
|
||||||
opts.discard = true;
|
opts.discard = true;
|
||||||
opts.clearColor = {0, 0, 0, 1};
|
opts.clearColor = ReadElement(model_, "filament.clearColor",
|
||||||
|
filament::math::float4(0, 0, 0, 1));
|
||||||
renderer_->setClearOptions(opts);
|
renderer_->setClearOptions(opts);
|
||||||
|
|
||||||
// Copy parameters from model to context.
|
// Copy parameters from model to context.
|
||||||
if (model_) {
|
|
||||||
context_->shadowClip = model_->stat.extent * model_->vis.map.shadowclip;
|
context_->shadowClip = model_->stat.extent * model_->vis.map.shadowclip;
|
||||||
context_->shadowScale = model_->vis.map.shadowscale;
|
context_->shadowScale = model_->vis.map.shadowscale;
|
||||||
context_->offWidth = model_->vis.global.offwidth;
|
context_->offWidth = model_->vis.global.offwidth;
|
||||||
@@ -115,7 +116,6 @@ FilamentContext::FilamentContext(const mjrFilamentConfig* config,
|
|||||||
for (int i = 0; i < model_->ntex; ++i) {
|
for (int i = 0; i < model_->ntex; ++i) {
|
||||||
context_->textureType[i] = model_->tex_type[i];
|
context_->textureType[i] = model_->tex_type[i];
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
scene_view_ = std::make_unique<SceneView>(engine_, object_manager_.get());
|
scene_view_ = std::make_unique<SceneView>(engine_, object_manager_.get());
|
||||||
if (config_.enable_gui) {
|
if (config_.enable_gui) {
|
||||||
|
|||||||
Reference in New Issue
Block a user