From cd10a1d3a94ecadd98329e6978a94e111b8a8acd Mon Sep 17 00:00:00 2001 From: Squareys Date: Sat, 13 Feb 2016 22:47:11 +0100 Subject: [PATCH 1/2] doc++: Use AnimableGroup3D instead of DrawableGroup3D for Animable3D. Signed-off-by: Squareys --- src/Magnum/SceneGraph/Animable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Magnum/SceneGraph/Animable.h b/src/Magnum/SceneGraph/Animable.h index 4e1df2a3c..cc4d32ac7 100644 --- a/src/Magnum/SceneGraph/Animable.h +++ b/src/Magnum/SceneGraph/Animable.h @@ -78,7 +78,7 @@ typedef SceneGraph::Scene Scene3D; class AnimableObject: public Object3D, SceneGraph::Animable3D { public: - AnimableObject(Object3D* parent = nullptr, SceneGraph::DrawableGroup3D* group = nullptr): Object3D{parent}, SceneGraph::Animable3D{*this, group} { + AnimableObject(Object3D* parent = nullptr, SceneGraph::AnimableGroup3D* group = nullptr): Object3D{parent}, SceneGraph::Animable3D{*this, group} { setDuration(10.0f); // ... } From 3f44faf55eb55f25a6447421856fcd996b185360 Mon Sep 17 00:00:00 2001 From: Squareys Date: Sat, 13 Feb 2016 22:52:28 +0100 Subject: [PATCH 2/2] doc++: ResourceManager::instance() now returns a reference. Signed-off-by: Squareys --- doc/debug-tools.dox | 2 +- src/Magnum/DebugTools/ForceRenderer.h | 2 +- src/Magnum/DebugTools/ObjectRenderer.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/debug-tools.dox b/doc/debug-tools.dox index f079f2b93..0da51fc61 100644 --- a/doc/debug-tools.dox +++ b/doc/debug-tools.dox @@ -65,7 +65,7 @@ DebugTools::ResourceManager manager; SceneGraph::DrawableGroup3D debugDrawables; // Create renderer options which will be referenced later by "my" resource key -DebugTools::ResourceManager::instance()->set("my", +DebugTools::ResourceManager::instance().set("my", DebugTools::ObjectRendererOptions().setSize(0.3f)); // Create debug renderer for given object, use "my" options for it. The diff --git a/src/Magnum/DebugTools/ForceRenderer.h b/src/Magnum/DebugTools/ForceRenderer.h index e0a8ea369..bf81fc060 100644 --- a/src/Magnum/DebugTools/ForceRenderer.h +++ b/src/Magnum/DebugTools/ForceRenderer.h @@ -90,7 +90,7 @@ See @ref debug-tools-renderers for more information. Example code: @code -DebugTools::ResourceManager::instance()->set("my", DebugTools::ForceRendererOptions() +DebugTools::ResourceManager::instance().set("my", DebugTools::ForceRendererOptions() .setScale(5.0f) .setColor(Color3::fromHSV(120.0_degf, 1.0f, 0.7f)); diff --git a/src/Magnum/DebugTools/ObjectRenderer.h b/src/Magnum/DebugTools/ObjectRenderer.h index 45d97a53b..0bcebc6b5 100644 --- a/src/Magnum/DebugTools/ObjectRenderer.h +++ b/src/Magnum/DebugTools/ObjectRenderer.h @@ -75,7 +75,7 @@ Visualizes object position, rotation and scale using colored axes. See Example code: @code // Create some options -DebugTools::ResourceManager::instance()->set("my", DebugTools::ObjectRendererOptions().setSize(0.3f)); +DebugTools::ResourceManager::instance().set("my", DebugTools::ObjectRendererOptions().setSize(0.3f)); // Create debug renderer for given object, use "my" options for it Object3D* object;