Skip to content

Commit 3d0867f

Browse files
committed
Remove ign-rendering SetTime hack (#1514)
Signed-off-by: Louise Poubel <[email protected]>
1 parent d1c19d2 commit 3d0867f

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

include/gz/sim/components/Model.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ namespace serializers
4646
sdf::ElementPtr modelElem = _model.Element();
4747
if (!modelElem)
4848
{
49-
gzerr << "Unable to serialize sdf::Model" << std::endl;
49+
gzwarn << "Unable to serialize sdf::Model" << std::endl;
5050
return _out;
5151
}
5252

src/rendering/RenderUtil.cc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2620,13 +2620,6 @@ void RenderUtil::SetSceneName(const std::string &_name)
26202620
void RenderUtil::SetScene(const rendering::ScenePtr &_scene)
26212621
{
26222622
this->dataPtr->scene = _scene;
2623-
{
2624-
// HACK: Tell ign-rendering6 to listen to SetTime calls
2625-
// TODO(anyone) Remove this when linked against ign-rendering7
2626-
this->dataPtr->scene->SetTime(std::chrono::nanoseconds(-1));
2627-
IGN_ASSERT(this->dataPtr->scene->Time() != std::chrono::nanoseconds(-1),
2628-
"Please remove this snippet after merging with ign-rendering7");
2629-
}
26302623
this->dataPtr->sceneManager.SetScene(_scene);
26312624
this->dataPtr->engine = _scene == nullptr ? nullptr : _scene->Engine();
26322625
}

src/systems/thruster/Thruster.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ namespace systems
126126

127127
/// Documentation inherited
128128
public: void PostUpdate(const UpdateInfo &_info,
129-
const EntityComponentManager &_ecm);
129+
const EntityComponentManager &_ecm) override;
130130

131131
/// \brief Private data pointer
132132
private: std::unique_ptr<ThrusterPrivateData> dataPtr;

0 commit comments

Comments
 (0)