Skip to content

Commit

Permalink
Merge pull request #68 from dmsurti/issue-57-test
Browse files Browse the repository at this point in the history
Merged 👍
  • Loading branch information
dmsurti committed Sep 2, 2017
2 parents 9379cc5 + 1b36562 commit 143a643
Show file tree
Hide file tree
Showing 5 changed files with 419 additions and 3 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions docs/user/glance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ supported by `Assimp`_ to `Scene Kit`_ scenes.
Why AssimpKit
-------------

AssimpKit currently supports 30 file formats that allows you to use these files directly in SceneKit without having to convert these to any of the files that SceneKit or Model IO supports thereby saving an extra step in your asset pipeline.
AssimpKit currently supports 29 file formats that allows you to use these files directly in SceneKit without having to convert these to any of the files that SceneKit or Model IO supports thereby saving an extra step in your asset pipeline.

.. image:: ../img/kit.*

Expand All @@ -24,8 +24,8 @@ File formats supported

Currently AssimpKit supports the following file formats:

***3d, 3ds, ac, b3d, bvh, cob, dae, dxf, hmp, ifc, irr, md2, md5mesh, md5anim,
m3sd, nff, obj, off, mesh.xml, ply, q3o, q3s, raw, smd, stl, wrl, xgl, zgl, fbx,
***3d, 3ds, ac, b3d, bvh, cob, dae, dxf, ifc, irr, md2, md5mesh, md5anim, m3sd,
nff, obj, off, mesh.xml, ply, q3o, q3s, raw, smd, stl, wrl, xgl, zgl, fbx,
md3***

.. _Assimp: https://github.com/assimp/assimp
Expand Down

0 comments on commit 143a643

Please sign in to comment.