Adding skeletons to models.

alexlitty · Aug 18, 2017 · ce83106 · ce83106
1 parent 512242f
commit ce83106
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/modules/engine/include/randar/Render/Model.hpp b/modules/engine/include/randar/Render/Model.hpp
@@ -12,6 +12,7 @@ namespace randar
     protected:
         Geometry* geo;
         ShaderProgram* program;
+        Skeleton* skel;
 
     public:
         /**
@@ -43,6 +44,13 @@ namespace randar
         void shaderProgram(ShaderProgram& newProgram);
         ShaderProgram& shaderProgram();
         bool hasShaderProgram() const;
+
+        /**
+         * Sets and retrieves the skeleton applied to the model.
+         */
+        void skeleton(Skeleton& skeleton);
+        Skeleton& skeleton();
+        bool hasSkeleton() const;
     };
 
     /**

diff --git a/modules/engine/src/Render/Canvas.cpp b/modules/engine/src/Render/Canvas.cpp
@@ -253,14 +253,19 @@ void randar::Canvas::draw(randar::Model& model, randar::LightCollection& lights)
         return;
     }
 
-    ShaderProgram* program;
+    randar::DrawState state;
+    state.transform = &model;
+    state.lights    = &lights;
+
+    if (model.hasSkeleton()) {
+        state.skeleton = &model.skeleton();
+    }
+
     if (model.hasShaderProgram()) {
-        program = &model.shaderProgram();
-    } else {
-        program = &this->framebuffer().context().defaultShaderProgram();
+        state.program = &model.shaderProgram();
     }
 
-    this->draw(model.geometry(), model, lights, *program);
+    this->draw(model.geometry(), state);
 }
 
 // Draws a world to the canvas.

diff --git a/modules/engine/src/Render/Model.cpp b/modules/engine/src/Render/Model.cpp
@@ -70,6 +70,25 @@ bool randar::Model::hasShaderProgram() const
     return this->program != nullptr;
 }
 
+// Sets and retrieves the skeleton applied to the model.
+void randar::Model::skeleton(randar::Skeleton& skeleton)
+{
+    this->skel = &skeleton;
+}
+
+randar::Skeleton& randar::Model::skeleton()
+{
+    if (!this->hasSkeleton()) {
+        throw std::runtime_error("Model has no skeleton");
+    }
+    return *this->skel;
+}
+
+bool randar::Model::hasSkeleton() const
+{
+    return this->skel != nullptr;
+}
+
 // Node.js helper for intuitive model creation.
 randar::Model randar::model()
 {