Added note about model bones

And cleaned up notes about collada.

Fixes #576

Author: britzl

docs/en/manuals/glossary.md

@@ -125,7 +125,7 @@ Here, `"#weapon"` is the address of the current object's sprite component. `"dis
 
 ## Model
 
-![Model](images/icons/model.png){.left} The 3D model component can import glTF and Collada mesh, skeleton and animation assets into your game. See the [Model manual](/manuals/model/) for more information.
+![Model](images/icons/model.png){.left} The 3D model component can import glTF mesh, skeleton and animation assets into your game. See the [Model manual](/manuals/model/) for more information.
 
 ## ParticleFX
 

docs/en/manuals/importing-assets.md

@@ -26,7 +26,7 @@ When the assets are imported into Defold they can be used by the various compone
 * Images can be used to create many kinds of visual components frequently used in 2D games. Read more about [how to import and use 2D graphics here](/manuals/importing-graphics).
 * Sounds can be used by the [Sound component](/manuals/sound) to play sounds.
 * Fonts are used by the [Label component](/manuals/label) and by [text nodes](/manuals/gui-text) in a GUI.
-* glTF and Collada models can be used by the [Model component](/manuals/model) to show 3D models with animations. Read more about [how to import and use 3D models here](/manuals/importing-models).
+* glTF models can be used by the [Model component](/manuals/model) to show 3D models with animations. Read more about [how to import and use 3D models here](/manuals/importing-models).
 
 
 ## Editing external assets

docs/en/manuals/importing-models.md

@@ -4,7 +4,7 @@ brief: This manual covers how to import 3D models used by the model component.
 ---
 
 # Importing 3D models
-Defold currently support models, skeletons and animations in GL Transmission Format *.glTF* and Collada *.dae* format. You can use tools such as Maya, 3D Max, Sketchup and Blender to create and/or convert 3D models into glTF and Collada format. Blender is a powerful and popular 3D modeling, animation and rendering program. It runs on Windows, macOS and Linux and is freely available for download at http://www.blender.org
+Defold currently support models, skeletons and animations in GL Transmission Format *.glTF* format. You can use tools such as Maya, 3D Max, Sketchup and Blender to create and/or convert 3D models into glTF format. Blender is a powerful and popular 3D modeling, animation and rendering program. It runs on Windows, macOS and Linux and is freely available for download at http://www.blender.org
 
 ![Model in Blender](images/model/blender.png)
 
@@ -17,8 +17,8 @@ To import the model, simply drag and drop the *.gltf* file or *.dae* file and th
 Once you have the model imported into Defold you can use it in a [Model component](/manuals/model).
 
 
-## Exporting to glTF and Collada
-The exported *.gltf* or *.dae* file contain all the vertices, edges and faces that make up the model, as well as _UV coordinates_ (what part of the texture image maps to a certain part of the mesh) if you have defined them, the bones in the skeleton and animation data.
+## Exporting to glTF
+The exported *.gltf* file contain all the vertices, edges and faces that make up the model, as well as _UV coordinates_ (what part of the texture image maps to a certain part of the mesh) if you have defined them, the bones in the skeleton and animation data.
 
 * A detailed description on polygon meshes can be found on http://en.wikipedia.org/wiki/Polygon_mesh.
 
@@ -30,8 +30,6 @@ Defold imposes some limitations on exported animation data:
 
 * Animations are also linearly interpolated. If you do more advanced curve interpolation the animations needs to be prebaked from the exporter.
 
-* Animation clips in Collada are not supported. To use multiple animations per model, export them into separate *.dae* files and gather the files into an *.animationset* file in Defold.
-
 ### Requirements
 When you export a model it's good to know that we don't yet support all features.
 Currently known issues/not supported features from the glTF format:

docs/en/manuals/model-animation.md

@@ -28,8 +28,6 @@ end
 Defold currently supports only baked animations. Animations need to have matrices for each animated bone each keyframe, and not position, rotation and scale as separate keys.
 
 Animations are also linearly interpolated. If you do more advanced curve interpolation the animations needs to be prebaked from the exporter.
-
-Animation clips in Collada are not supported. To use multiple animations per model, export them into separate *.dae* files and gather the files into an *.animationset* file in Defold.
 :::
 
 ### The bone hierarchy

docs/en/manuals/model.md

@@ -23,7 +23,21 @@ With the model created you need to specify a number of properties:
 Apart from the properties *Id*, *Position* and *Rotation* the following component specific properties exist:
 
 *Mesh*
-: This property should refer to the glTF *.gltf* or Collada *.dae* file that contains the mesh to use. If the file contains multiple meshes, only the first one is read.
+: This property should refer to the glTF *.gltf* file that contains the mesh to use. If the file contains multiple meshes, only the first one is read.
+
+*Create GO Bones*
+: Check this to create a game object for every bone of the model. You can use the game objects to attach other game objects such as weapons to hand bones and so on. 
+
+*Skeleton*
+: This property should refer to the glTF *.gltf* file that contains the skeleton to use for animation. Note that Defold requires a single root bone in your hierarchy.
+
+*Animations*
+: Set this to the *Animation Set File* that contains the animations you want to use on the model.
+
+*Default Animation*
+: This is the animation (from the animation set) that will be automatically played on the model.
+
+In addition to the properties above there will also be a field to assign a material for every mesh of the model:
 
 *Material*
 : Set this property to a material you have created that is suitable for a textured 3D object. There are a number of built-in materials that you can use as a starting point:
@@ -33,17 +47,11 @@ Apart from the properties *Id*, *Position* and *Rotation* the following componen
   * Use *model_skinned.material* for skinned (animated) non-instanced models
   * Use *model_skinned_instances.material* for skinned (animated) instanced models
 
+Depending on the material there will be one or more texture properties:
+
 *Texture*
 : This property should point to the texture image file that you want applied to the object.
 
-*Skeleton*
-: This property should refer to the glTF *.gltf* or Collada *.dae* file that contains the skeleton to use for animation. Note that Defold requires a single root bone in your hierarchy.
-
-*Animations*
-: Set this to the *Animation Set File* that contains the animations you want to use on the model.
-
-*Default Animation*
-: This is the animation (from the animation set) that will be automatically played on the model.
 
 ## Editor manipulation
 
@@ -95,7 +103,7 @@ A model also has a number of different properties that can be manipulated using
 
 ## Material
 
-3D software commonly allows you to set properties on your object vertices, like coloring and texturing. This information goes into the glTF *.gltf* or Collada *.dae* file that you export from your 3D software. Depending on the requirements of your game you will have to select and/or create appropriate and _performant_ materials for your objects. A material combines _shader programs_ with a set of parameters for rendering of the object.
+3D software commonly allows you to set properties on your object vertices, like coloring and texturing. This information goes into the glTF *.gltf* file that you export from your 3D software. Depending on the requirements of your game you will have to select and/or create appropriate and _performant_ materials for your objects. A material combines _shader programs_ with a set of parameters for rendering of the object.
 
 There are a number of built-in materials that you can use as a starting point:
 

docs/en/tutorials/grading.md

@@ -114,14 +114,9 @@ That's all we need to do. If you run the game now it will draw everything to the
 
 To draw the pixels in the render target's color buffer onto the screen, we need to set something up that we can texture with the pixel data. For that purpose we are going to use a flat, quadratic 3D model.
 
-Create a quadratic plane mesh in Blender (or any other 3D modelling program). Set the vertex coordinates to -1 and 1 on the X-axis and -1 and 1 on the Y axis. Blender has the Z-axis up by default so you need to rotate the mesh 90° around the X-axis. You should also make sure that you generate correct UV-coordinates for the mesh. In Blender, enter Edit Mode with the mesh selected, then select <kbd>Mesh ▸ UV unwrap... ▸ Unwrap</kbd>.
-
-![game.project](images/grading/quad_blender.png)
-
-1. Export the model as a Collada file called *`quad.dae`* and drag it into your Defold project.
-2. Open *`main.collection`* and create a new game object called "`grade`".
-3. Add a Model component to the "`grade`" game object.
-3. Set the *Mesh* property of the model component to the *`quad.dae`* file.
+1. Open *`main.collection`* and create a new game object called "`grade`".
+2. Add a Model component to the "`grade`" game object.
+3. Set the *Mesh* property of the model component to the *`quad.gltf`* file found in `builtins/assets/meshes`.
 
 Leave the game object unscaled at origin. Later, when we render the quad we will project it so it fills the whole screen. But first we need a material and shader programs for the quad:
 

docs/en/tutorials/shadertoy.md

@@ -29,11 +29,10 @@ Blender is a free, open-source 3D software which can be downloaded from [blender
 
 ![quad in Blender](images/shadertoy/quad_blender.png)
 
-1. Export the model as a *Collada* file called *`quad.dae`* and drag it into a new Defold project.
-2. Open your "main.collection" file in Defold and create a new game object "star-nest".
-3. Add a *Model* component to "star-nest".
-4. Set the *Mesh* property to the *`quad.dae`* file.
-5. The model is small (2⨉2 units) so we need to scale the "star-nest" game object to a reasonable size. 600⨉600 is a nice large size so set the X and Y scale to 300.
+1. Open your "main.collection" file in Defold and create a new game object "star-nest".
+2. Add a *Model* component to "star-nest".
+3. Set the *Mesh* property to the *`quad.gltf`* file found in `builtins/assets/meshes`.
+4. The model is small (2⨉2 units) so we need to scale the "star-nest" game object to a reasonable size. 600⨉600 is a nice large size so set the X and Y scale to 300.
 
 The model should appear in the scene editor, but it is rendered all black. That is because it has no material set yet: