v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds importing blender material.

pull/891/head^2
ciechowoj 2016-05-16 21:17:58 +02:00
parent 560e1eebc1
commit 913f26475d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/BlenderScene.h
View File

@ -246,6 +246,7 @@ struct MDeformVert : ElemBase {
struct Material : ElemBase { struct Material : ElemBase {
ID id FAIL; ID id FAIL;
short flag;
float r,g,b WARN; float r,g,b WARN;
float specr,specg,specb WARN; float specr,specg,specb WARN;
short har; short har;

9
test/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Open Asset Import Library (assimp) # Open Asset Import Library (assimp)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# #
# Copyright (c) 2006-2016, assimp team # Copyright (c) 2006-2016, assimp team
# All rights reserved. # All rights reserved.
# #
@ -54,6 +54,9 @@ SOURCE_GROUP( unit FILES
SET( TEST_SRCS SET( TEST_SRCS
unit/AssimpAPITest.cpp unit/AssimpAPITest.cpp
unit/utBlendImportMaterials.cpp
unit/utColladaExportCamera.cpp
unit/utColladaExportLight.cpp
unit/utFastAtof.cpp unit/utFastAtof.cpp
unit/utFindDegenerates.cpp unit/utFindDegenerates.cpp
unit/utFindInvalidData.cpp unit/utFindInvalidData.cpp
@ -62,6 +65,7 @@ SET( TEST_SRCS
unit/utImporter.cpp unit/utImporter.cpp
unit/utImproveCacheLocality.cpp unit/utImproveCacheLocality.cpp
unit/utIOSystem.cpp unit/utIOSystem.cpp
unit/utIssues.cpp
unit/utJoinVertices.cpp unit/utJoinVertices.cpp
unit/utLimitBoneWeights.cpp unit/utLimitBoneWeights.cpp
unit/utMaterialSystem.cpp unit/utMaterialSystem.cpp
@ -79,9 +83,6 @@ SET( TEST_SRCS
unit/utTextureTransform.cpp unit/utTextureTransform.cpp
unit/utTriangulate.cpp unit/utTriangulate.cpp
unit/utVertexTriangleAdjacency.cpp unit/utVertexTriangleAdjacency.cpp
unit/utColladaExportCamera.cpp
unit/utColladaExportLight.cpp
unit/utIssues.cpp
) )
SOURCE_GROUP( tests FILES ${TEST_SRCS} ) SOURCE_GROUP( tests FILES ${TEST_SRCS} )