Merge branch 'master' of https://github.com/assimp/assimp (99b51eb4) · Commits · Jonas Karlsson / Qtquick3d Assimp · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

Qtquick3d Assimp
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

99b51eb4

Commit 99b51eb4 authored 9 years ago by Kim Kulling

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/assimp/assimp

parents 6641188a a9723971

No related branches found

No related tags found

No related merge requests found

Changes 13

Expand all Hide whitespace changes

Inline Side-by-side

Showing

code/BaseImporter.h 21 additions, 0 deletions

code/BaseImporter.h
code/CMakeLists.txt 6 additions, 5 deletions

code/CMakeLists.txt
code/Exporter.cpp 2 additions, 2 deletions

code/Exporter.cpp
code/glTFAsset.h 945 additions, 0 deletions

code/glTFAsset.h
code/glTFAsset.inl 1215 additions, 0 deletions

code/glTFAsset.inl
code/glTFAssetWriter.h 39 additions, 35 deletions

code/glTFAssetWriter.h
code/glTFAssetWriter.inl 497 additions, 0 deletions

code/glTFAssetWriter.inl
code/glTFExporter.cpp 206 additions, 240 deletions

code/glTFExporter.cpp
code/glTFExporter.h 23 additions, 2 deletions

code/glTFExporter.h
code/glTFFileData.h 0 additions, 122 deletions

code/glTFFileData.h
code/glTFImporter.cpp 384 additions, 972 deletions

code/glTFImporter.cpp
code/glTFImporter.h 22 additions, 5 deletions

code/glTFImporter.h
code/glTFUtil.cpp 0 additions, 164 deletions

code/glTFUtil.cpp

with 3360 additions and 1547 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment