Some refactoring related to material handling (#242)

examples/objects/sprite.cpp

@@ -110,7 +110,7 @@ int main() {
     Sprite* lastPicked = nullptr;
     canvas.animate([&]() {
         if (lastPicked) {
-            lastPicked->material = material;
+            lastPicked->setMaterial(material);
             lastPicked->scale.set(1, 1, 1);
         }
 
@@ -120,12 +120,12 @@ int main() {
         raycaster.setFromCamera(mouse, *camera);
         auto intersects = raycaster.intersectObjects(sprites->children, true);
         if (!intersects.empty()) {
-            auto& intersection = intersects.front();
+            const auto& intersection = intersects.front();
             helper->position.copy(intersection.point);
             helper->visible = true;
 
             lastPicked = intersection.object->as<Sprite>();
-            lastPicked->material = pickMaterial;
+            lastPicked->setMaterial(pickMaterial);
             lastPicked->scale.set(1.2, 1.2, 1.2);
         }
 

include/threepp/core/Object3D.hpp

@@ -228,16 +228,6 @@ namespace threepp {
             return nullptr;
         }
 
-        virtual std::vector<Material*> materials() {
-
-            return {};
-        }
-
-        [[nodiscard]] virtual const Material* material() const {
-
-            return nullptr;
-        }
-
         template<class T>
         T* as() {
 

include/threepp/helpers/AxesHelper.hpp

@@ -11,8 +11,6 @@ namespace threepp {
     class AxesHelper: public LineSegments {
 
     public:
-        ~AxesHelper() override;
-
         static std::shared_ptr<AxesHelper> create(float size);
 
     protected:

include/threepp/helpers/GridHelper.hpp

@@ -12,8 +12,6 @@ namespace threepp {
     class GridHelper: public LineSegments {
 
     public:
-        ~GridHelper() override;
-
         static std::shared_ptr<GridHelper> create(
                 unsigned int size = 10,
                 unsigned int divisions = 10,

include/threepp/helpers/PointLightHelper.hpp

@@ -3,7 +3,6 @@
 #ifndef THREEPP_POINTLIGHTHELPER_HPP
 #define THREEPP_POINTLIGHTHELPER_HPP
 
-#include "threepp/geometries/SphereGeometry.hpp"
 #include "threepp/objects/Mesh.hpp"
 
 #include <memory>
@@ -22,7 +21,7 @@ namespace threepp {
 
     private:
         std::optional<Color> color;
-        PointLight& light;
+        PointLight* light;
 
         PointLightHelper(PointLight& light, float sphereSize, std::optional<Color> color);
     };

include/threepp/objects/Line.hpp

@@ -6,14 +6,15 @@
 #include "threepp/core/BufferGeometry.hpp"
 #include "threepp/core/Object3D.hpp"
 #include "threepp/materials/Material.hpp"
+#include "threepp/objects/ObjectWithMaterials.hpp"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
 namespace threepp {
 
-    class Line: public Object3D {
+    class Line: public virtual Object3D, public ObjectWithMaterials {
 
     public:
         Line(std::shared_ptr<BufferGeometry> geometry, std::shared_ptr<Material> material);
@@ -24,10 +25,6 @@ namespace threepp {
 
         void setGeometry(const std::shared_ptr<BufferGeometry>& geometry);
 
-        Material* material() override;
-
-        std::vector<Material*> materials() override;
-
         virtual void computeLineDistances();
 
         void raycast(const Raycaster& raycaster, std::vector<Intersection>& intersects) override;
@@ -38,7 +35,6 @@ namespace threepp {
 
     protected:
         std::shared_ptr<BufferGeometry> geometry_;
-        std::shared_ptr<Material> material_;
     };
 
 }// namespace threepp

include/threepp/objects/Mesh.hpp

@@ -6,16 +6,16 @@
 #include "threepp/core/BufferGeometry.hpp"
 #include "threepp/core/Object3D.hpp"
 #include "threepp/materials/Material.hpp"
+#include "threepp/objects/ObjectWithMaterials.hpp"
 #include "threepp/objects/ObjectWithMorphTargetInfluences.hpp"
 
 
 namespace threepp {
 
     // Class representing triangular polygon mesh based objects.
-    class Mesh: public Object3D, public ObjectWithMorphTargetInfluences {
+    class Mesh: public virtual Object3D, public ObjectWithMorphTargetInfluences, public ObjectWithMaterials {
 
     public:
-
         explicit Mesh(std::shared_ptr<BufferGeometry> geometry = nullptr, std::shared_ptr<Material> material = nullptr);
         Mesh(std::shared_ptr<BufferGeometry> geometry, std::vector<std::shared_ptr<Material>> materials);
 
@@ -34,16 +34,6 @@ namespace threepp {
 
         void setGeometry(const std::shared_ptr<BufferGeometry>& geometry);
 
-        Material* material() override;
-
-        [[nodiscard]] std::vector<Material*> materials() override;
-
-        void setMaterial(const std::shared_ptr<Material>& material);
-
-        void setMaterials(const std::vector<std::shared_ptr<Material>>& materials);
-
-        [[nodiscard]] size_t numMaterials() const;
-
         void raycast(const Raycaster& raycaster, std::vector<Intersection>& intersects) override;
 
         std::shared_ptr<Object3D> clone(bool recursive = true) override;
@@ -60,7 +50,6 @@ namespace threepp {
 
     protected:
         std::shared_ptr<BufferGeometry> geometry_;
-        std::vector<std::shared_ptr<Material>> materials_;
     };
 
 }// namespace threepp

include/threepp/objects/ObjectWithMaterials.hpp

@@ -0,0 +1,34 @@
+
+#ifndef THREEPP_OBJECTWITHMATERIALS_HPP
+#define THREEPP_OBJECTWITHMATERIALS_HPP
+
+#include "threepp/core/Object3D.hpp"
+#include "threepp/materials/Material.hpp"
+
+
+#include <vector>
+
+namespace threepp {
+
+    class ObjectWithMaterials: public virtual Object3D {
+
+    public:
+        Material* material() override;
+
+        void setMaterial(const std::shared_ptr<Material>& material);
+
+        std::vector<Material*> materials();
+
+        void setMaterials(const std::vector<std::shared_ptr<Material>>& materials);
+
+        [[nodiscard]] size_t numMaterials() const;
+
+    protected:
+        std::vector<std::shared_ptr<Material>> materials_;
+
+        explicit ObjectWithMaterials(std::vector<std::shared_ptr<Material>> materials);
+    };
+
+}// namespace threepp
+
+#endif//THREEPP_OBJECTWITHMATERIALS_HPP

include/threepp/objects/ObjectWithMorphTargetInfluences.hpp

@@ -2,12 +2,15 @@
 #ifndef THREEPP_OBJECTWITHMORPHTARGETINFLUENCES_HPP
 #define THREEPP_OBJECTWITHMORPHTARGETINFLUENCES_HPP
 
+#include "threepp/core/Object3D.hpp"
+
 #include <vector>
 
 namespace threepp {
 
-    struct ObjectWithMorphTargetInfluences {
+    class ObjectWithMorphTargetInfluences: public virtual Object3D {
 
+    public:
         std::vector<float>& morphTargetInfluences() {
 
             if (copyMorphTargetInfluences_) {

include/threepp/objects/Points.hpp

@@ -6,11 +6,12 @@
 #include "threepp/core/BufferGeometry.hpp"
 #include "threepp/core/Object3D.hpp"
 #include "threepp/materials/PointsMaterial.hpp"
+#include "threepp/objects/ObjectWithMaterials.hpp"
 #include "threepp/objects/ObjectWithMorphTargetInfluences.hpp"
 
 namespace threepp {
 
-    class Points: public Object3D, public ObjectWithMorphTargetInfluences {
+    class Points: public virtual Object3D, public ObjectWithMorphTargetInfluences, public ObjectWithMaterials {
 
     public:
         Points(std::shared_ptr<BufferGeometry> geometry, std::shared_ptr<Material> material);
@@ -21,10 +22,6 @@ namespace threepp {
 
         void setGeometry(const std::shared_ptr<BufferGeometry>& geometry);
 
-        Material* material() override;
-
-        std::vector<Material*> materials() override;
-
         std::shared_ptr<Object3D> clone(bool recursive = true) override;
 
         void raycast(const Raycaster& raycaster, std::vector<Intersection>& intersects) override;
@@ -35,7 +32,6 @@ namespace threepp {
 
     protected:
         std::shared_ptr<BufferGeometry> geometry_;
-        std::shared_ptr<Material> material_;
     };
 
 }// namespace threepp

include/threepp/objects/Sprite.hpp

@@ -13,7 +13,6 @@ namespace threepp {
 
     public:
         Vector2 center{0.5f, 0.5f};
-        std::shared_ptr<SpriteMaterial> material;
 
         explicit Sprite(const std::shared_ptr<SpriteMaterial>& material);
 
@@ -23,10 +22,15 @@ namespace threepp {
 
         BufferGeometry* geometry() override;
 
-        static std::shared_ptr<Sprite> create(const std::shared_ptr<SpriteMaterial>& material = SpriteMaterial::create());
+        Material* material() override;
+
+        void setMaterial(const std::shared_ptr<SpriteMaterial>& material);
+
+        static std::shared_ptr<Sprite> create(const std::shared_ptr<SpriteMaterial>& material = nullptr);
 
     private:
         std::shared_ptr<BufferGeometry> _geometry;
+        std::shared_ptr<SpriteMaterial> _material;
     };
 
 }// namespace threepp

src/CMakeLists.txt

@@ -150,6 +150,7 @@ set(publicHeaders
         "threepp/objects/LineSegments.hpp"
         "threepp/objects/LOD.hpp"
         "threepp/objects/Mesh.hpp"
+        "threepp/objects/ObjectWithMaterials.hpp"
         "threepp/objects/ObjectWithMorphTargetInfluences.hpp"
         "threepp/objects/ParticleSystem.hpp"
         "threepp/objects/Sky.hpp"
@@ -371,6 +372,7 @@ set(sources
         "threepp/objects/LOD.cpp"
         "threepp/objects/InstancedMesh.cpp"
         "threepp/objects/Mesh.cpp"
+        "threepp/objects/ObjectWithMaterials.cpp"
         "threepp/objects/ParticleSystem.cpp"
         "threepp/objects/Points.cpp"
         "threepp/objects/Skeleton.cpp"

src/threepp/helpers/AxesHelper.cpp

@@ -20,16 +20,10 @@ AxesHelper::AxesHelper(float size): LineSegments(BufferGeometry::create(), LineB
     geometry_->setAttribute("position", FloatBufferAttribute::create(vertices, 3));
     geometry_->setAttribute("color", FloatBufferAttribute::create(colors, 3));
 
-    material_->vertexColors = true;
+    materials_.front()->vertexColors = true;
 }
 
 std::shared_ptr<AxesHelper> AxesHelper::create(float size) {
 
     return std::shared_ptr<AxesHelper>(new AxesHelper(size));
 }
-
-AxesHelper::~AxesHelper() {
-
-    this->geometry_->dispose();
-    this->material_->dispose();
-}

src/threepp/helpers/Box3Helper.cpp

@@ -13,7 +13,7 @@ Box3Helper::Box3Helper(const Box3& box, const Color& color)
 
     std::vector<float> positions{1, 1, 1, -1, 1, 1, -1, -1, 1, 1, -1, 1, 1, 1, -1, -1, 1, -1, -1, -1, -1, 1, -1, -1};
 
-    auto lineMaterial = material_->as<LineBasicMaterial>();
+    auto lineMaterial = material()->as<LineBasicMaterial>();
     lineMaterial->color.copy(color);
     lineMaterial->toneMapped = false;
 

src/threepp/helpers/BoxHelper.cpp

@@ -16,7 +16,7 @@ BoxHelper::BoxHelper(Object3D& object, const Color& color)
     geometry_->setIndex(indices);
     geometry_->setAttribute("position", FloatBufferAttribute::create(positions, 3));
 
-    material_->setValues({{"color", color}, {"toneMapped", false}});
+    material()->setValues({{"color", color}, {"toneMapped", false}});
 
     this->matrixAutoUpdate = false;
 

src/threepp/helpers/CameraHelper.cpp

@@ -18,7 +18,7 @@ struct CameraHelper::Impl {
     explicit Impl(CameraHelper& scope, Camera& camera)
         : scope(scope), camera(camera) {
 
-        auto m = scope.material_->as<LineBasicMaterial>();
+        auto m = scope.material()->as<LineBasicMaterial>();
         m->toneMapped = false;
         m->vertexColors = true;
         m->color = 0xffffff;

src/threepp/helpers/GridHelper.cpp

@@ -37,25 +37,15 @@ GridHelper::GridHelper(unsigned int size, unsigned int divisions, const Color& c
         k += step;
     }
 
-    auto geometry = BufferGeometry::create();
-    geometry->setAttribute("position", FloatBufferAttribute::create(vertices, 3));
-    geometry->setAttribute("color", FloatBufferAttribute::create(colors, 3));
+    geometry_->setAttribute("position", FloatBufferAttribute::create(vertices, 3));
+    geometry_->setAttribute("color", FloatBufferAttribute::create(colors, 3));
 
-    auto material = LineBasicMaterial::create();
-    material->vertexColors = true;
-    material->toneMapped = false;
-
-    material_ = material;
-    geometry_ = geometry;
+    auto m = material()->as<LineBasicMaterial>();
+    m->vertexColors = true;
+    m->toneMapped = false;
 }
 
 std::shared_ptr<GridHelper> GridHelper::create(unsigned int size, unsigned int divisions, const Color& color1, const Color& color2) {
 
     return std::shared_ptr<GridHelper>(new GridHelper(size, divisions, color1, color2));
 }
-
-GridHelper::~GridHelper() {
-
-    this->geometry_->dispose();
-    this->material_->dispose();
-}

src/threepp/helpers/HemisphereLightHelper.cpp

@@ -110,4 +110,4 @@ std::shared_ptr<HemisphereLightHelper> threepp::HemisphereLightHelper::create(He
     return std::shared_ptr<HemisphereLightHelper>(new HemisphereLightHelper(light, size, color));
 }
 
-threepp::HemisphereLightHelper::~HemisphereLightHelper() = default;
+HemisphereLightHelper::~HemisphereLightHelper() = default;

src/threepp/helpers/PlaneHelper.cpp

@@ -15,9 +15,9 @@ PlaneHelper::PlaneHelper(const Plane& plane, float size, const Color& color)
     geometry_->setAttribute("position", FloatBufferAttribute::create(positions, 3));
     geometry_->computeBoundingSphere();
 
-    auto material = dynamic_cast<LineBasicMaterial*>(material_.get());
-    material->color.copy(color);
-    material->toneMapped = false;
+    auto _material = material()->as<MaterialWithColor>();
+    _material->color.copy(color);
+    _material->toneMapped = false;
 
     std::vector<float> positions2{1, 1, 1, -1, 1, 1, -1, -1, 1, 1, 1, 1, -1, -1, 1, 1, -1, 1};