refactor hud and text

examples/demo.cpp

@@ -118,7 +118,7 @@ int main() {
     auto planeMaterial = plane->material()->as<MeshBasicMaterial>();
     scene->add(plane);
 
-    HUD hud(canvas);
+    HUD hud(canvas.size());
     FontLoader fontLoader;
     const auto font1 = fontLoader.defaultFont();
     const auto font2 = *fontLoader.load("data/fonts/helvetiker_regular.typeface.json");
@@ -129,7 +129,7 @@ int main() {
     hud.add(hudText1, HUD::Options());
 
     TextGeometry::Options opts2(font2, 10, 1);
-    auto hudText2 = Text2D(opts1, "");
+    auto hudText2 = Text2D(opts2);
     hudText2.setColor(Color::red);
     hud.add(hudText2, HUD::Options()
                               .setNormalizedPosition({1, 1})
@@ -155,7 +155,7 @@ int main() {
 
         box->rotation.y += 0.5f * dt;
 
-        hudText2.setText("Delta=" + std::to_string(dt), opts2);
+        hudText2.setText("Delta=" + std::to_string(dt));
         hud.needsUpdate(hudText2);
 
         renderer.clear();

examples/geometries/heightmap.cpp

@@ -98,7 +98,7 @@ int main() {
 
     FontLoader fontLoader;
 
-    HUD hud(canvas);
+    HUD hud(canvas.size());
     TextGeometry::Options opts(fontLoader.defaultFont(), 40);
     Text2D hudText(opts, "Loading terrain..");
     hudText.material()->as<MaterialWithColor>()->color.setHex(Color::black);

examples/objects/instancing.cpp

@@ -88,7 +88,7 @@ int main() {
     canvas.setIOCapture(&capture);
 #endif
 
-    HUD hud(canvas);
+    HUD hud(canvas.size());
     FontLoader fontLoader;
     const auto font = *fontLoader.load("data/fonts/helvetiker_regular.typeface.json");
 

examples/objects/lod.cpp

@@ -33,7 +33,7 @@ int main() {
         renderer.setSize(size);
     });
 
-    HUD hud(canvas);
+    HUD hud(canvas.size());
     FontLoader fontLoader;
     const auto font = *fontLoader.load("data/fonts/gentilis_bold.typeface.json");
 

examples/objects/sprite.cpp

@@ -86,7 +86,7 @@ int main() {
     auto helper = Mesh::create(SphereGeometry::create(0.1));
     scene->add(helper);
 
-    HUD hud(canvas);
+    HUD hud(&canvas);
     createHudSprites(hud);
 
     canvas.onWindowResize([&](WindowSize size) {

examples/projects/Crane3R/main.cpp

@@ -116,7 +116,7 @@ int main() {
     scene->add(light1);
     scene->add(light2);
 
-    HUD hud(canvas);
+    HUD hud(canvas.size());
     FontLoader fontLoader;
     const auto font = *fontLoader.load("data/fonts/helvetiker_regular.typeface.json");
 

examples/projects/MotorControl/main.cpp

@@ -110,7 +110,7 @@ int main() {
     auto motorVisuals = VisualisationObject();
     scene.add(motorVisuals);
 
-    HUD hud(canvas);
+    HUD hud(canvas.size());
 
     FontLoader fontLoader;
     auto font = fontLoader.defaultFont();

examples/projects/Snake/main.cpp

@@ -18,7 +18,7 @@ int main() {
     auto camera = OrthographicCamera::create(0, game.gridSize(), 0, game.gridSize());
     camera->position.z = 1;
 
-    HUD hud(canvas);
+    HUD hud(canvas.size());
     FontLoader fontLoader;
     const auto font = fontLoader.defaultFont();
 

examples/projects/Youbot/youbot.cpp

@@ -32,7 +32,7 @@ int main() {
     auto light2 = AmbientLight::create(0xffffff, 1.f);
     scene->add(light2);
 
-    HUD hud(canvas);
+    HUD hud(canvas.size());
     FontLoader fontLoader;
     const auto font = *fontLoader.load("data/fonts/helvetiker_regular.typeface.json");
 

examples/projects/Youbot/youbot_kine.cpp

@@ -93,7 +93,7 @@ int main() {
     auto targetHelper = AxesHelper::create(2);
     targetHelper->visible = false;
 
-    HUD hud(canvas);
+    HUD hud(canvas.size());
     FontLoader fontLoader;
     const auto font = *fontLoader.load("data/fonts/helvetiker_regular.typeface.json");
 

include/threepp/objects/HUD.hpp

@@ -84,7 +84,8 @@ namespace threepp {
             HorizontalAlignment horizontalAlignment_;
         };
 
-        explicit HUD(PeripheralsEventSource& eventSource);
+        explicit HUD(WindowSize size);
+        explicit HUD(PeripheralsEventSource* eventSource);
 
         void apply(GLRenderer& renderer);
 

include/threepp/objects/Text.hpp

@@ -13,8 +13,8 @@ namespace threepp {
     class Text2D: public Mesh {
 
     public:
-        Text2D(const TextGeometry::Options& opts, const std::string& str, const std::shared_ptr<Material>& material = nullptr)
-            : Mesh(TextGeometry::create(str, opts), material ? material : SpriteMaterial::create()) {}
+        Text2D(const TextGeometry::Options& opts, const std::string& str = "", const std::shared_ptr<Material>& material = nullptr)
+            : Mesh(TextGeometry::create(str, opts), material ? material : SpriteMaterial::create()), options(opts) {}
 
         void setColor(const Color& color) {
 
@@ -23,22 +23,31 @@ namespace threepp {
             }
         }
 
+        void setText(const std::string& str) {
+
+            auto geometry = TextGeometry::create(str, options);
+            setGeometry(geometry);
+        }
+
         void setText(const std::string& str, const TextGeometry::Options& opts) {
 
             auto geometry = TextGeometry::create(str, opts);
             setGeometry(geometry);
         }
 
-        static std::shared_ptr<Text2D> create(const TextGeometry::Options& opts, const std::string& str, const std::shared_ptr<Material>& material = nullptr) {
+        static std::shared_ptr<Text2D> create(const TextGeometry::Options& opts, const std::string& str = "", const std::shared_ptr<Material>& material = nullptr) {
 
             return std::make_shared<Text2D>(opts, str, material);
         }
+
+    private:
+        TextGeometry::Options options;
     };
 
     class Text3D: public Mesh {
 
     public:
-        Text3D(const ExtrudeTextGeometry::Options& opts, const std::string& str, const std::shared_ptr<Material>& material = nullptr)
+        Text3D(const ExtrudeTextGeometry::Options& opts, const std::string& str = "", const std::shared_ptr<Material>& material = nullptr)
             : Mesh(ExtrudeTextGeometry::create(str, opts), material ? material : MeshBasicMaterial::create()) {}
 
         void setColor(const Color& color) {
@@ -54,7 +63,7 @@ namespace threepp {
             setGeometry(geometry);
         }
 
-        static std::shared_ptr<Text3D> create(const ExtrudeTextGeometry::Options& opts, const std::string& str, const std::shared_ptr<Material>& material = nullptr) {
+        static std::shared_ptr<Text3D> create(const ExtrudeTextGeometry::Options& opts, const std::string& str = "", const std::shared_ptr<Material>& material = nullptr) {
 
             return std::make_shared<Text3D>(opts, str, material);
         }

include/threepp/scenes/Scene.hpp

@@ -30,7 +30,7 @@ namespace threepp {
 
         [[nodiscard]] bool isTexture() const;
 
-        [[nodiscard]] Color color() const;
+        [[nodiscard]] Color& color();
 
         [[nodiscard]] std::shared_ptr<Texture> texture() const;
 

src/threepp/objects/HUD.cpp

@@ -43,12 +43,12 @@ void HUD::Options::updateElement(Object3D& o, WindowSize windowSize) {
 
 struct HUD::Impl: Scene, MouseListener {
 
-    Impl(PeripheralsEventSource* eventSource)
+    Impl(PeripheralsEventSource* eventSource, const WindowSize& size)
         : eventSource_(eventSource),
-          size_(eventSource->size()),
+          size_(size),
           camera_(0, size_.width, size_.height, 0, 0.1, 10) {
 
-        eventSource->addMouseListener(*this);
+        if (eventSource) eventSource->addMouseListener(*this);
 
         camera_.position.z = 1;
     }
@@ -133,7 +133,7 @@ struct HUD::Impl: Scene, MouseListener {
     }
 
     ~Impl() override {
-        eventSource_->removeMouseListener(*this);
+        if (eventSource_) eventSource_->removeMouseListener(*this);
     }
 
 private:
@@ -148,9 +148,12 @@ struct HUD::Impl: Scene, MouseListener {
     std::unordered_map<Object3D*, Options> map_;
 };
 
+HUD::HUD(WindowSize size)
+    : pimpl_(std::make_unique<Impl>(nullptr, size)) {}
 
-HUD::HUD(PeripheralsEventSource& eventSource)
-    : pimpl_(std::make_unique<Impl>(&eventSource)) {}
+
+HUD::HUD(PeripheralsEventSource* eventSource)
+    : pimpl_(std::make_unique<Impl>(eventSource, eventSource->size())) {}
 
 void HUD::apply(GLRenderer& renderer) {
     pimpl_->apply(renderer);

src/threepp/scenes/Scene.cpp

@@ -32,7 +32,7 @@ bool Background::isTexture() const {
     return texture_ != nullptr;
 }
 
-Color Background::color() const {
+Color& Background::color() {
 
     return *color_;
 }