Codebase list assimp / 1a5a524
New upstream version 5.1.5~ds0 IOhannes m zmölnig (Debian/GNU) 2 years ago
16 changed file(s) with 196 addition(s) and 23 deletion(s). Raw diff Collapse all Expand all
+2
-2
CMakeLists.txt less more
245245 ENDIF()
246246
247247 # Grouped compiler settings ########################################
248 IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW)
248 IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW)
249249 IF(NOT ASSIMP_HUNTER_ENABLED)
250250 SET(CMAKE_CXX_STANDARD 11)
251251 SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
282282 ENDIF()
283283 SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long ${CMAKE_CXX_FLAGS}" )
284284 SET(CMAKE_C_FLAGS "-fno-strict-aliasing ${CMAKE_C_FLAGS}")
285 ELSEIF( CMAKE_COMPILER_IS_MINGW )
285 ELSEIF( MINGW )
286286 IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
287287 message(FATAL_ERROR "MinGW is too old to be supported. Please update MinGW and try again.")
288288 ELSEIF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.3)
+5
-2
code/AssetLib/Blender/BlenderScene.cpp less more
4848 #include "BlenderDNA.h"
4949 #include "BlenderSceneGen.h"
5050
51 using namespace Assimp;
52 using namespace Assimp::Blender;
51 namespace Assimp {
52 namespace Blender {
5353
5454 //--------------------------------------------------------------------------------
5555 template <>
884884 converters["CollectionObject"] = DNA::FactoryPair(&Structure::Allocate<CollectionObject>, &Structure::Convert<CollectionObject>);
885885 }
886886
887 } // namespace Blender
888 } //namespace Assimp
889
887890 #endif // ASSIMP_BUILD_NO_BLEND_IMPORTER
+1
-0
code/AssetLib/FBX/FBXConverter.cpp less more
20692069 TrySetTextureProperties(out_mat, layeredTextures, "ShininessExponent", aiTextureType_SHININESS, mesh);
20702070 TrySetTextureProperties(out_mat, layeredTextures, "EmissiveFactor", aiTextureType_EMISSIVE, mesh);
20712071 TrySetTextureProperties(out_mat, layeredTextures, "TransparencyFactor", aiTextureType_OPACITY, mesh);
2072 TrySetTextureProperties(out_mat, layeredTextures, "ReflectionFactor", aiTextureType_METALNESS, mesh);
20722073 }
20732074
20742075 aiColor3D FBXConverter::GetColorPropertyFactored(const PropertyTable &props, const std::string &colorName,
+5
-0
code/AssetLib/LWS/LWSLoader.cpp less more
536536
537537 // get file format version and print to log
538538 ++it;
539
540 if ((*it).tokens[0].empty()) {
541 ASSIMP_LOG_ERROR("Invalid LWS file detectedm abort import.");
542 return;
543 }
539544 unsigned int version = strtoul10((*it).tokens[0].c_str());
540545 ASSIMP_LOG_INFO("LWS file format version is ", (*it).tokens[0]);
541546 first = 0.;
+6
-2
code/AssetLib/MDL/MDLMaterialLoader.cpp less more
462462 ASSIMP_LOG_WARN("Found a reference to an embedded DDS texture, "
463463 "but texture height is not equal to 1, which is not supported by MED");
464464 }
465
466 pcNew.reset(new aiTexture());
465 if (iWidth == 0) {
466 ASSIMP_LOG_ERROR("Found a reference to an embedded DDS texture, but texture width is zero, aborting import.");
467 return;
468 }
469
470 pcNew.reset(new aiTexture);
467471 pcNew->mHeight = 0;
468472 pcNew->mWidth = iWidth;
469473
+28
-1
code/AssetLib/Obj/ObjFileData.h less more
132132 aiString textureSpecularity;
133133 aiString textureOpacity;
134134 aiString textureDisp;
135 aiString textureRoughness;
136 aiString textureMetallic;
137 aiString textureSheen;
138 aiString textureRMA;
135139
136140 enum TextureType {
137141 TextureDiffuseType = 0,
150154 TextureSpecularityType,
151155 TextureOpacityType,
152156 TextureDispType,
157 TextureRoughnessType,
158 TextureMetallicType,
159 TextureSheenType,
160 TextureRMAType,
153161 TextureTypeCount
154162 };
155163 bool clamp[TextureTypeCount];
173181 //! Transparency color
174182 aiColor3D transparent;
175183
184 //! PBR Roughness
185 ai_real roughness;
186 //! PBR Metallic
187 ai_real metallic;
188 //! PBR Metallic
189 aiColor3D sheen;
190 //! PBR Clearcoat Thickness
191 ai_real clearcoat_thickness;
192 //! PBR Clearcoat Rougness
193 ai_real clearcoat_roughness;
194 //! PBR Anisotropy
195 ai_real anisotropy;
196
176197 //! Constructor
177198 Material() :
178199 diffuse(ai_real(0.6), ai_real(0.6), ai_real(0.6)),
180201 shineness(ai_real(0.0)),
181202 illumination_model(1),
182203 ior(ai_real(1.0)),
183 transparent(ai_real(1.0), ai_real(1.0), ai_real(1.0)) {
204 transparent(ai_real(1.0), ai_real(1.0), ai_real(1.0)),
205 roughness(ai_real(1.0)),
206 metallic(ai_real(0.0)),
207 sheen(ai_real(1.0), ai_real(1.0), ai_real(1.0)),
208 clearcoat_thickness(ai_real(0.0)),
209 clearcoat_roughness(ai_real(0.0)),
210 anisotropy(ai_real(0.0)) {
184211 std::fill_n(clamp, static_cast<unsigned int>(TextureTypeCount), false);
185212 }
186213
+39
-0
code/AssetLib/Obj/ObjFileImporter.cpp less more
617617 mat->AddProperty(&pCurrentMaterial->shineness, 1, AI_MATKEY_SHININESS);
618618 mat->AddProperty(&pCurrentMaterial->alpha, 1, AI_MATKEY_OPACITY);
619619 mat->AddProperty(&pCurrentMaterial->transparent, 1, AI_MATKEY_COLOR_TRANSPARENT);
620 mat->AddProperty(&pCurrentMaterial->roughness, 1, AI_MATKEY_ROUGHNESS_FACTOR);
621 mat->AddProperty(&pCurrentMaterial->metallic, 1, AI_MATKEY_METALLIC_FACTOR);
622 mat->AddProperty(&pCurrentMaterial->sheen, 1, AI_MATKEY_SHEEN_COLOR_FACTOR);
623 mat->AddProperty(&pCurrentMaterial->clearcoat_thickness, 1, AI_MATKEY_CLEARCOAT_FACTOR);
624 mat->AddProperty(&pCurrentMaterial->clearcoat_roughness, 1, AI_MATKEY_CLEARCOAT_ROUGHNESS_FACTOR);
625 mat->AddProperty(&pCurrentMaterial->anisotropy, 1, AI_MATKEY_ANISOTROPY_FACTOR);
620626
621627 // Adding refraction index
622628 mat->AddProperty(&pCurrentMaterial->ior, 1, AI_MATKEY_REFRACTI);
708714 }
709715 }
710716
717 if (0 != pCurrentMaterial->textureRoughness.length) {
718 mat->AddProperty(&pCurrentMaterial->textureRoughness, _AI_MATKEY_TEXTURE_BASE, aiTextureType_DIFFUSE_ROUGHNESS, 0);
719 mat->AddProperty(&uvwIndex, 1, _AI_MATKEY_UVWSRC_BASE, aiTextureType_DIFFUSE_ROUGHNESS, 0 );
720 if (pCurrentMaterial->clamp[ObjFile::Material::TextureRoughnessType]) {
721 addTextureMappingModeProperty(mat, aiTextureType_DIFFUSE_ROUGHNESS);
722 }
723 }
724
725 if (0 != pCurrentMaterial->textureMetallic.length) {
726 mat->AddProperty(&pCurrentMaterial->textureMetallic, _AI_MATKEY_TEXTURE_BASE, aiTextureType_METALNESS, 0);
727 mat->AddProperty(&uvwIndex, 1, _AI_MATKEY_UVWSRC_BASE, aiTextureType_METALNESS, 0 );
728 if (pCurrentMaterial->clamp[ObjFile::Material::TextureMetallicType]) {
729 addTextureMappingModeProperty(mat, aiTextureType_METALNESS);
730 }
731 }
732
733 if (0 != pCurrentMaterial->textureSheen.length) {
734 mat->AddProperty(&pCurrentMaterial->textureSheen, _AI_MATKEY_TEXTURE_BASE, aiTextureType_SHEEN, 0);
735 mat->AddProperty(&uvwIndex, 1, _AI_MATKEY_UVWSRC_BASE, aiTextureType_SHEEN, 0 );
736 if (pCurrentMaterial->clamp[ObjFile::Material::TextureSheenType]) {
737 addTextureMappingModeProperty(mat, aiTextureType_SHEEN);
738 }
739 }
740
741 if (0 != pCurrentMaterial->textureRMA.length) {
742 // NOTE: glTF importer places Rough/Metal/AO texture in Unknown so doing the same here for consistency.
743 mat->AddProperty(&pCurrentMaterial->textureRMA, _AI_MATKEY_TEXTURE_BASE, aiTextureType_UNKNOWN, 0);
744 mat->AddProperty(&uvwIndex, 1, _AI_MATKEY_UVWSRC_BASE, aiTextureType_UNKNOWN, 0 );
745 if (pCurrentMaterial->clamp[ObjFile::Material::TextureRMAType]) {
746 addTextureMappingModeProperty(mat, aiTextureType_UNKNOWN);
747 }
748 }
749
711750 // Store material property info in material array in scene
712751 pScene->mMaterials[pScene->mNumMaterials] = mat;
713752 pScene->mNumMaterials++;
+61
-0
code/AssetLib/Obj/ObjFileMtlImporter.cpp less more
6666 static const std::string DisplacementTexture1 = "map_disp";
6767 static const std::string DisplacementTexture2 = "disp";
6868 static const std::string SpecularityTexture = "map_ns";
69 static const std::string RoughnessTexture = "map_Pr";
70 static const std::string MetallicTexture = "map_Pm";
71 static const std::string SheenTexture = "map_Ps";
72 static const std::string RMATexture = "map_Ps";
6973
7074 // texture option specific token
7175 static const std::string BlendUOption = "-blendu";
177181 case 'e': // New material
178182 createMaterial();
179183 break;
184 case 'o': // Norm texture
185 --m_DataIt;
186 getTexture();
187 break;
180188 }
181189 m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine);
182190 } break;
191
192 case 'P':
193 {
194 ++m_DataIt;
195 switch(*m_DataIt)
196 {
197 case 'r':
198 ++m_DataIt;
199 getFloatValue(m_pModel->m_pCurrentMaterial->roughness);
200 break;
201 case 'm':
202 ++m_DataIt;
203 getFloatValue(m_pModel->m_pCurrentMaterial->metallic);
204 break;
205 case 's':
206 ++m_DataIt;
207 getColorRGBA(&m_pModel->m_pCurrentMaterial->sheen);
208 break;
209 case 'c':
210 ++m_DataIt;
211 if (*m_DataIt == 'r') {
212 ++m_DataIt;
213 getFloatValue(m_pModel->m_pCurrentMaterial->clearcoat_roughness);
214 } else {
215 getFloatValue(m_pModel->m_pCurrentMaterial->clearcoat_thickness);
216 }
217 break;
218 }
219 m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine);
220 }
221 break;
183222
184223 case 'm': // Texture
185224 case 'b': // quick'n'dirty - for 'bump' sections
193232 {
194233 m_DataIt = getNextToken<DataArrayIt>(m_DataIt, m_DataItEnd);
195234 getIlluminationModel(m_pModel->m_pCurrentMaterial->illumination_model);
235 m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine);
236 } break;
237
238 case 'a': // Anisotropy
239 {
240 getFloatValue(m_pModel->m_pCurrentMaterial->anisotropy);
196241 m_DataIt = skipLine<DataArrayIt>(m_DataIt, m_DataItEnd, m_uiLine);
197242 } break;
198243
333378 // Specularity scaling (glossiness)
334379 out = &m_pModel->m_pCurrentMaterial->textureSpecularity;
335380 clampIndex = ObjFile::Material::TextureSpecularityType;
381 } else if ( !ASSIMP_strincmp( pPtr, RoughnessTexture.c_str(), static_cast<unsigned int>(RoughnessTexture.size()))) {
382 // PBR Roughness texture
383 out = & m_pModel->m_pCurrentMaterial->textureRoughness;
384 clampIndex = ObjFile::Material::TextureRoughnessType;
385 } else if ( !ASSIMP_strincmp( pPtr, MetallicTexture.c_str(), static_cast<unsigned int>(MetallicTexture.size()))) {
386 // PBR Metallic texture
387 out = & m_pModel->m_pCurrentMaterial->textureMetallic;
388 clampIndex = ObjFile::Material::TextureMetallicType;
389 } else if (!ASSIMP_strincmp( pPtr, SheenTexture.c_str(), static_cast<unsigned int>(SheenTexture.size()))) {
390 // PBR Sheen (reflectance) texture
391 out = & m_pModel->m_pCurrentMaterial->textureSheen;
392 clampIndex = ObjFile::Material::TextureSheenType;
393 } else if (!ASSIMP_strincmp( pPtr, RMATexture.c_str(), static_cast<unsigned int>(RMATexture.size()))) {
394 // PBR Rough/Metal/AO texture
395 out = & m_pModel->m_pCurrentMaterial->textureRMA;
396 clampIndex = ObjFile::Material::TextureRMAType;
336397 } else {
337398 ASSIMP_LOG_ERROR("OBJ/MTL: Encountered unknown texture type");
338399 return;
+2
-2
code/CMakeLists.txt less more
556556 if (ASSIMP_BUILD_IFC_IMPORTER)
557557 if (MSVC)
558558 set_source_files_properties(Importer/IFC/IFCReaderGen1_2x3.cpp Importer/IFC/IFCReaderGen2_2x3.cpp PROPERTIES COMPILE_FLAGS "/bigobj")
559 elseif(CMAKE_COMPILER_IS_MINGW)
559 elseif(MINGW)
560560 set_source_files_properties(Importer/IFC/IFCReaderGen1_2x3.cpp Importer/IFC/IFCReaderGen2_2x3.cpp PROPERTIES COMPILE_FLAGS "-O2 -Wa,-mbig-obj")
561561 endif()
562562 endif ()
861861 # optimizations that take up extra space. Given that the issue is a string table overflowing, -Os seemed appropriate
862862 # Also, I'm not positive if both link & compile flags are needed, but this hopefully ensures that the issue should not
863863 # recur for edge cases such as static builds.
864 if ((CMAKE_COMPILER_IS_MINGW) AND (CMAKE_BUILD_TYPE MATCHES Debug))
864 if ((MINGW) AND (CMAKE_BUILD_TYPE MATCHES Debug))
865865 message("-- Applying MinGW StepFileGen1.cpp Debug Workaround")
866866 SET_SOURCE_FILES_PROPERTIES(Importer/StepFile/StepFileGen1.cpp PROPERTIES COMPILE_FLAGS -Os )
867867 SET_SOURCE_FILES_PROPERTIES(Importer/StepFile/StepFileGen1.cpp PROPERTIES LINK_FLAGS -Os )
+5
-1
code/Common/BaseImporter.cpp less more
6464 // Constructor to be privately used by Importer
6565 BaseImporter::BaseImporter() AI_NO_EXCEPT
6666 : m_progress() {
67 // empty
6768 }
6869
6970 // ------------------------------------------------------------------------------------------------
371372
372373 // UTF 16 BE with BOM
373374 if (*((uint16_t *)&data.front()) == 0xFFFE) {
374
375 // Check to ensure no overflow can happen
376 if(data.size() % 2 != 0) {
377 return;
378 }
375379 // swap the endianness ..
376380 for (uint16_t *p = (uint16_t *)&data.front(), *end = (uint16_t *)&data.back(); p <= end; ++p) {
377381 ByteSwap::Swap2(p);
+9
-8
code/Common/DefaultProgressHandler.h less more
22 ----------------------------------------------------------------------
33
44 Copyright (c) 2006-2021, assimp team
5
65
76 All rights reserved.
87
4746
4847 #include <assimp/ProgressHandler.hpp>
4948
50 namespace Assimp {
49 namespace Assimp {
5150
5251 // ------------------------------------------------------------------------------------
53 /** @brief Internal default implementation of the #ProgressHandler interface. */
52 /**
53 * @brief Internal default implementation of the #ProgressHandler interface.
54 */
5455 class DefaultProgressHandler : public ProgressHandler {
55
56 virtual bool Update(float /*percentage*/) {
56 public:
57 /// @brief Ignores the update callback.
58 bool Update(float) override {
5759 return false;
5860 }
61 };
5962
60
61 }; // !class DefaultProgressHandler
6263 } // Namespace Assimp
6364
64 #endif
65 #endif // INCLUDED_AI_DEFAULTPROGRESSHANDLER_H
+1
-1
code/Common/Importer.cpp less more
328328
329329 // ------------------------------------------------------------------------------------------------
330330 // Supplies a custom progress handler to get regular callbacks during importing
331 void Importer::SetProgressHandler ( ProgressHandler* pHandler ) {
331 void Importer::SetProgressHandler(ProgressHandler* pHandler) {
332332 ai_assert(nullptr != pimpl);
333333
334334 ASSIMP_BEGIN_EXCEPTION_REGION();
+1
-0
contrib/android-cmake/android.toolchain.cmake less more
16151615 if( CMAKE_GENERATOR MATCHES "Ninja" AND CMAKE_HOST_WIN32 )
16161616 # it is a bad hack after all
16171617 # CMake generates Ninja makefiles with UNIX paths only if it thinks that we are going to build with MinGW
1618 set( MINGW TRUE ) # tell CMake that we are MinGW
16181619 set( CMAKE_COMPILER_IS_MINGW TRUE ) # tell CMake that we are MinGW
16191620 set( CMAKE_CROSSCOMPILING TRUE ) # stop recursion
16201621 enable_language( C )
+1
-0
include/assimp/ProgressHandler.hpp less more
7373 public:
7474 /// @brief Virtual destructor.
7575 virtual ~ProgressHandler () {
76 // empty
7677 }
7778
7879 // -------------------------------------------------------------------
+3
-0
include/assimp/material.h less more
988988 // Roughness factor. 0.0 = Perfectly Smooth, 1.0 = Completely Rough
989989 #define AI_MATKEY_ROUGHNESS_FACTOR "$mat.roughnessFactor", 0, 0
990990 #define AI_MATKEY_ROUGHNESS_TEXTURE aiTextureType_DIFFUSE_ROUGHNESS, 0
991 // Anisotropy factor. 0.0 = isotropic, 1.0 = anisotropy along tangent direction,
992 // -1.0 = anisotropy along bitangent direction
993 #define AI_MATKEY_ANISOTROPY_FACTOR "$mat.anisotropyFactor", 0, 0
991994
992995 // Specular/Glossiness Workflow
993996 // ---------------------------
+27
-4
tools/assimp_cmd/Main.cpp less more
33 ---------------------------------------------------------------------------
44
55 Copyright (c) 2006-2021, assimp team
6
7
86
97 All rights reserved.
108
4644
4745 #include "Main.h"
4846
47 #include <assimp/ProgressHandler.hpp>
48 #include <iostream>
49
50 class ConsoleProgressHandler : public ProgressHandler {
51 public:
52 ConsoleProgressHandler() :
53 ProgressHandler() {
54 // empty
55 }
56
57 ~ConsoleProgressHandler() override {
58 // empty
59 }
60
61 bool Update(float percentage) override {
62 std::cout << percentage * 100.0f << " %\n";
63 return true;
64 }
65 };
4966 const char* AICMD_MSG_ABOUT =
5067 "------------------------------------------------------ \n"
5168 "Open Asset Import Library (\"Assimp\", https://github.com/assimp/assimp) \n"
7289 "\n Use \'assimp <verb> --help\' for detailed help on a command.\n"
7390 ;
7491
75 /*extern*/ Assimp::Importer* globalImporter = NULL;
92 /*extern*/ Assimp::Importer* globalImporter = nullptr;
7693
7794 #ifndef ASSIMP_BUILD_NO_EXPORT
78 /*extern*/ Assimp::Exporter* globalExporter = NULL;
95 /*extern*/ Assimp::Exporter* globalExporter = nullptr;
7996 #endif
8097
8198 // ------------------------------------------------------------------------------
285302
286303 // do the actual import, measure time
287304 const clock_t first = clock();
305 ConsoleProgressHandler *ph = new ConsoleProgressHandler;
306 globalImporter->SetProgressHandler(ph);
307
288308 const aiScene* scene = globalImporter->ReadFile(path,imp.ppFlags);
289309
290310 if (imp.showLog) {
304324 if (imp.log) {
305325 FreeLogStreams();
306326 }
327 globalImporter->SetProgressHandler(nullptr);
328 delete ph;
329
307330 return scene;
308331 }
309332