Skip to content

Commit

Permalink
Merge branch 'master' into issue-1219
Browse files Browse the repository at this point in the history
  • Loading branch information
EdwardAndrew authored Apr 4, 2018
2 parents 0c035f1 + 2488074 commit b8025d9
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 23 deletions.
40 changes: 20 additions & 20 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,29 +35,29 @@ Please check our Wiki as well: https://github.com/assimp/assimp/wiki
__Importers__:

- 3D
- 3DS
- 3MF
- [3DS](https://en.wikipedia.org/wiki/.3ds)
- [3MF](https://en.wikipedia.org/wiki/3D_Manufacturing_Format)
- AC
- AC3D
- [AC3D](https://en.wikipedia.org/wiki/AC3D)
- ACC
- AMJ
- ASE
- ASK
- B3D
- BLEND (Blender)
- BVH
- COB
- [BLEND](https://en.wikipedia.org/wiki/.blend_(file_format))
- [BVH](https://en.wikipedia.org/wiki/Biovision_Hierarchy)
- CMS
- DAE/Collada
- DXF
- COB
- [DAE/Collada](https://en.wikipedia.org/wiki/COLLADA)
- [DXF](https://en.wikipedia.org/wiki/AutoCAD_DXF)
- ENFF
- FBX
- glTF 1.0 + GLB
- glTF 2.0
- [FBX](https://en.wikipedia.org/wiki/FBX)
- [glTF 1.0](https://en.wikipedia.org/wiki/GlTF#glTF_1.0) + GLB
- [glTF 2.0](https://en.wikipedia.org/wiki/GlTF#glTF_2.0)
- HMB
- IFC-STEP
- IRR / IRRMESH
- LWO
- [LWO](https://en.wikipedia.org/wiki/LightWave_3D)
- LWS
- LXO
- MD2
Expand All @@ -70,10 +70,10 @@ __Importers__:
- MS3D
- NDO
- NFF
- OBJ
- OFF
- OGEX
- PLY
- [OBJ](https://en.wikipedia.org/wiki/Wavefront_.obj_file)
- [OFF](https://en.wikipedia.org/wiki/OFF_(file_format))
- [OGEX](https://en.wikipedia.org/wiki/Open_Game_Engine_Exchange)
- [PLY](https://en.wikipedia.org/wiki/PLY_(file_format))
- PMX
- PRJ
- Q3O
Expand All @@ -82,19 +82,19 @@ __Importers__:
- SCN
- SIB
- SMD
- STL
- STP
- [STP](https://en.wikipedia.org/wiki/ISO_10303-21)
- [STL](https://en.wikipedia.org/wiki/STL_(file_format))
- TER
- UC
- VTA
- X
- X3D
- [X3D](https://en.wikipedia.org/wiki/X3D)
- XGL
- ZGL

Additionally, some formats are supported by dependency on non-free code or external SDKs (not built by default):

- C4D (https://github.com/assimp/assimp/wiki/Cinema4D-&-Melange)
- [C4D](https://en.wikipedia.org/wiki/Cinema_4D) (https://github.com/assimp/assimp/wiki/Cinema4D-&-Melange)

__Exporters__:

Expand Down
9 changes: 6 additions & 3 deletions code/COBLoader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef ASSIMP_BUILD_NO_COB_IMPORTER
#include "COBLoader.h"
#include "COBScene.h"

#include "ConvertToLHProcess.h"
#include <assimp/StreamReader.h>
#include <assimp/ParsingUtils.h>
#include <assimp/fast_atof.h>

#include <assimp/LineSplitter.h>
#include <assimp/TinyFormatter.h>
#include <memory>
Expand Down Expand Up @@ -105,7 +104,7 @@ COBImporter::~COBImporter()
bool COBImporter::CanRead( const std::string& pFile, IOSystem* pIOHandler, bool checkSig) const
{
const std::string& extension = GetExtension(pFile);
if (extension == "cob" || extension == "scn") {
if (extension == "cob" || extension == "scn" || extension == "COB" || extension == "SCN") {
return true;
}

Expand Down Expand Up @@ -225,6 +224,9 @@ void COBImporter::InternReadFile( const std::string& pFile,
}

pScene->mRootNode = BuildNodes(*root.get(),scene,pScene);
//flip normals after import
FlipWindingOrderProcess flip;
flip.Execute( pScene );
}

// ------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -1299,3 +1301,4 @@ void COBImporter::ReadUnit_Binary(COB::Scene& out, StreamReaderLE& reader, const


#endif

0 comments on commit b8025d9

Please sign in to comment.