Merge pull request #4272 from errissa/pbr-obj (c2375a4f) · 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

c2375a4f

Unverified Commit c2375a4f authored 3 years ago by Kim Kulling Committed by GitHub 3 years ago

Downloads
- Plain Diff

Merge pull request #4272 from errissa/pbr-obj

Support PBR properties/maps in Obj importer

parents 049a2418 ab19cff3

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

code/AssetLib/Obj/ObjFileData.h 28 additions, 1 deletion

code/AssetLib/Obj/ObjFileData.h
code/AssetLib/Obj/ObjFileImporter.cpp 39 additions, 0 deletions

code/AssetLib/Obj/ObjFileImporter.cpp
code/AssetLib/Obj/ObjFileMtlImporter.cpp 61 additions, 0 deletions

code/AssetLib/Obj/ObjFileMtlImporter.cpp
include/assimp/material.h 3 additions, 0 deletions

include/assimp/material.h

with 131 additions and 1 deletion

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