Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
d10d20f62f34e58b82da0dc2c01d7567832b0af8
assimp/code
History
Nathan Morse d10d20f62f Update ObjExporter.cpp 
In the OBJ spec ( http://www.martinreddy.net/gfx/3d/OBJ.spec ), in the section labeled "Referencing groups of vertices", there is no support for allowing a trailing slash with no valid vertex normal reference at the end. This commit modifies the vertex reference output code to prevent this behavior, as it has been causing compatibility issues with other software that parse OBJ files.
2014-06-20 15:08:29 -07:00
..
BoostWorkaround/boost
BoostWorkaround/shared_array and shared_ptr: fix checks for whether the boost originals are included already. Fixes #277
2014-05-16 14:57:33 +02:00
res
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
3DSConverter.cpp
Fix 3DS instances loading, fixes #151
2014-01-30 02:39:04 +01:00
3DSHelper.h
Fix 3DS instances loading, fixes #151
2014-01-30 02:39:04 +01:00
3DSLoader.cpp
Fix 3DS instances loading, fixes #151
2014-01-30 02:39:04 +01:00
3DSLoader.h
bugfix : fix unresolved symbols if 3DS-import is configured not to be oart of the lib.
2013-04-08 20:16:56 +02:00
ACLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
ACLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
ASELoader.cpp
+ add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it.
2012-06-21 17:24:50 +02:00
ASELoader.h
+ add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it.
2012-06-21 17:24:50 +02:00
ASEParser.cpp
Fix a logging message and a comment
2013-06-12 09:01:05 -04:00
ASEParser.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
assbin_chunks.h
[3393728] [PATCH 1/2] ommit->omit and splitted->split
2011-08-20 22:00:33 +00:00
Assimp.cpp
Added matrix properties
2014-02-28 15:21:10 +01:00
AssimpCExport.cpp
Scene: keep an internal flag whether the scene was copied using aiCopyScene() (and potentially modified by the user afterwards)
2013-10-05 16:26:16 +02:00
AssimpPCH.cpp
Fixed bug during compilation with mingw & improved git revision support for automatic up to date revision number.
2014-05-19 14:36:24 +02:00
AssimpPCH.h
Move pstdint.h for <= VC9 under include. Apps that include the Assimp headers need to have this available, as its pulled in by metadata.h. Fixes #290.
2014-05-30 01:57:21 +03:00
B3DImporter.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
B3DImporter.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
BaseImporter.cpp
Added matrix properties
2014-02-28 15:21:10 +01:00
BaseImporter.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
BaseProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
BaseProcess.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
Bitmap.cpp
In Collada: added support for exporting uncompressed embeded textures as bitmap
2014-01-17 11:53:41 +01:00
Bitmap.h
In Collada: added support for exporting uncompressed embeded textures as bitmap
2014-01-17 11:53:41 +01:00
BlenderBMesh.cpp
bugfix: fix compiler warnings for gcc-4.8.1.
2014-04-21 16:18:14 +02:00
BlenderBMesh.h
Adding tessellation support for new Blender 2.6 polygons
2013-11-22 13:17:21 +01:00
BlenderDNA.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
BlenderDNA.h
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
BlenderDNA.inl
Blender: iterative loading code for the linked list of scene objects, fixes #28 but is preliminary as it touches code that is normally machine-generated.
2013-10-02 01:39:59 +02:00
BlenderIntermediate.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
BlenderLoader.cpp
Adding tessellation support for new Blender 2.6 polygons
2013-11-22 13:17:21 +01:00
BlenderLoader.h
- blend: compute parent inverses on your own instead of trusting the blend input. Thanks to Kalmár Dániel for the patch.
2012-07-17 22:18:10 +00:00
BlenderModifier.cpp
Properly orient mirrored blend mesh faces
2014-05-24 08:49:33 -07:00
BlenderModifier.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
BlenderScene.cpp
bugfix: fix compiler warnings for gcc-4.8.1.
2014-04-21 16:18:14 +02:00
BlenderScene.h
Blender: map texture influence to aiTextureType
2013-10-08 19:01:02 -07:00
BlenderSceneGen.h
Blender: new DNA loading code generated by genblenddna.py script, now machine-generates the previously hand-written fix.
2013-10-02 14:16:09 +02:00
BlenderTessellator.cpp
bugfix: fix compiler warnings for gcc-4.8.1.
2014-04-21 16:18:14 +02:00
BlenderTessellator.h
BlenderTesselator: disable GLU tesselation code by default.
2013-11-22 13:58:40 +01:00
BlobIOSystem.h
bugfix : fix pedantic vs2012 warnings.
2013-08-15 20:57:54 +02:00
BVHLoader.cpp
+ add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it.
2012-06-21 17:24:50 +02:00
BVHLoader.h
+ add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it.
2012-06-21 17:24:50 +02:00
ByteSwap.h
- rename assert.h to ai_assert.h. See also https://sourceforge.net/tracker/?func=detail&atid=1067632&aid=3520178&group_id=226462
2012-04-22 23:14:39 +00:00
CalcTangentsProcess.cpp
bugfix:
2014-03-05 23:25:49 +01:00
CalcTangentsProcess.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
CInterfaceIOWrapper.h
Bugfix : Removed const_cast from CIOSystemWrapper::Exists. ( merged from GitHub, thanks to Riku Palomäki ).
2012-03-20 20:54:31 +00:00
CMakeLists.txt
Move pstdint.h for <= VC9 under include. Apps that include the Assimp headers need to have this available, as its pulled in by metadata.h. Fixes #290.
2014-05-30 01:57:21 +03:00
COBLoader.cpp
- drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits.
2013-03-21 19:54:55 +01:00
COBLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
COBScene.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
ColladaExporter.cpp
In Collada: improved embeded textures naming scheme in exporter
2014-01-17 11:54:20 +01:00
ColladaExporter.h
In Collada: improved embeded textures naming scheme in exporter
2014-01-17 11:54:20 +01:00
ColladaHelper.h
Added name member to Collada::Mesh.
2013-08-15 00:11:23 -04:00
ColladaLoader.cpp
obj loader: added multiline support
2014-06-13 10:56:10 +02:00
ColladaLoader.h
add AI_CONFIG_IMPORT_COLLADA_IGNORE_UP_DIRECTION for not transforming position of vertices
2013-07-27 10:34:48 +09:00
ColladaParser.cpp
fix for collada parser when importing empty arrays.
2013-12-20 11:36:35 +02:00
ColladaParser.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
ComputeUVMappingProcess.cpp
bugfix:
2014-03-05 23:25:49 +01:00
ComputeUVMappingProcess.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
ConvertToLHProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
ConvertToLHProcess.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
CSMLoader.cpp
+ add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it.
2012-06-21 17:24:50 +02:00
CSMLoader.h
+ add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it.
2012-06-21 17:24:50 +02:00
DeboneProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
DeboneProcess.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
DefaultIOStream.cpp
Updated some code comments in DefaultIOStream.cpp
2013-11-26 14:52:53 +01:00
DefaultIOStream.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
DefaultIOSystem.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
DefaultIOSystem.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
DefaultLogger.cpp
Fixed bugs in Q3BSPZipArchive & DefaultLogger
2014-01-17 11:36:47 +01:00
DefaultProgressHandler.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
DXFHelper.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
DXFLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
DXFLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
Exceptional.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
Exporter.cpp
Change default extension for binary STL exports from stlb to stl
2014-05-12 12:50:21 +02:00
fast_atof.h
Improved fast_atof (bis)
2014-01-17 11:47:37 +01:00
FBXAnimation.cpp
- fbx: pre-filter animated property we don't support as early as possible.
2012-08-26 18:40:04 +02:00
FBXBinaryTokenizer.cpp
Fixes for uninitialized variable warnings.
2013-08-09 19:52:15 -04:00
FBXCompileConfig.h
- FBX importer: basic interface and importer skeleton. Start tokenizer and parser.
2012-06-23 03:36:55 +02:00
FBXConverter.cpp
Correction on FBX material texture UV index
2014-05-27 09:11:27 +02:00
FBXConverter.h
- fbx: skeleton for DOM -> aiScene converter.
2012-06-28 20:02:09 +02:00
FBXDeformer.cpp
- fbx: more warn policy tuning.
2012-08-26 18:58:08 +02:00
FBXDocument.cpp
Initial version for FBX layered textures.
2014-03-24 11:46:36 +01:00
FBXDocument.h
Initial version for FBX layered textures.
2014-03-24 11:46:36 +01:00
FBXDocumentUtil.cpp
- fbx: better error reporting reading property tables.
2012-08-25 19:53:46 +02:00
FBXDocumentUtil.h
Added AI_WONT_RETURN and AI_WONT_RETURN_SUFFIX to DOMError.
2013-08-04 10:11:02 -04:00
FBXImporter.cpp
- fbx: add import settings to public assimp config interface.
2012-08-11 16:41:44 +02:00
FBXImporter.h
- fbx: add ImportSettings to keep track of fbx-specific import settings. The settings are generated by the importer instance and injected into parser and DOM.
2012-06-28 19:16:14 +02:00
FBXImportSettings.h
Correction on FBX material texture UV index
2014-05-27 09:11:27 +02:00
FBXMaterial.cpp
Initial version for FBX layered textures.
2014-03-24 11:46:36 +01:00
FBXMeshGeometry.cpp
- some fixes for vc12
2013-01-19 17:00:14 +01:00
FBXModel.cpp
- fbx: add special output node name tag to mark fbx null nodes.
2012-08-25 22:24:08 +02:00
FBXNodeAttribute.cpp
- fbx: support reading LimbNode attachments, less Property70 warnings.
2012-08-26 18:53:15 +02:00
FBXParser.cpp
FBXParser: fix compiler warning on double -> float.
2014-06-01 17:34:11 +02:00
FBXParser.h
- fbx: refactor parsing code, move all parsing stuff to FBXParser.cpp. Parsing errors now carry the prefix "FBX-Parser".
2012-08-10 23:24:58 +02:00
FBXProperties.cpp
Added unparsed FBX properties to the aiNode's metadata. This allows the
2014-03-09 16:18:05 +01:00
FBXProperties.h
Fixed a compile error due to a >> expression in a nested template statement.
2014-03-09 17:04:27 +01:00
FBXTokenizer.cpp
- fbx: add DOM layer to represent the parsed FBX file in-memory, capturing the essential semantics we need for importing.
2012-06-26 18:31:19 +02:00
FBXTokenizer.h
- fbx: add binary reading draft. Started from scratch after my first attempt had design flaws. The binary reader now sits on the lexer stage (really) and generates a (fake) token sequence similar to the text lexer's output - this means most parsing code can go unaffected.
2012-08-09 02:08:12 +02:00
FBXUtil.cpp
- FBX: silence some warnings produced by clang about missing switch cases. Add TokenType_BINARY_DATA to TokenTypeString() function.
2013-04-08 19:45:09 +02:00
FBXUtil.h
- fbx: add binary reading draft. Started from scratch after my first attempt had design flaws. The binary reader now sits on the lexer stage (really) and generates a (fake) token sequence similar to the text lexer's output - this means most parsing code can go unaffected.
2012-08-09 02:08:12 +02:00
FileLogStream.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
FileSystemFilter.h
- fix off-by-one error in FileSystemFilter.
2012-03-11 20:04:35 +00:00
FindDegenerates.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
FindDegenerates.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
FindInstancesProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
FindInstancesProcess.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
FindInvalidDataProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
FindInvalidDataProcess.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
FixNormalsStep.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
FixNormalsStep.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
GenericProperty.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
GenFaceNormalsProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
GenFaceNormalsProcess.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
GenVertexNormalsProcess.cpp
fix: smoothed normal qnan handling & more stable smoothed normals for imprecise geometry w/ long thin faces
2014-04-21 23:12:51 +02:00
GenVertexNormalsProcess.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
HalfLifeFileData.h
- move include/ to include/assimp/ to have consistent header locations between installed and trunk version.
2012-02-03 16:25:12 +00:00
Hash.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
HMPFileData.h
- move include/ to include/assimp/ to have consistent header locations between installed and trunk version.
2012-02-03 16:25:12 +00:00
HMPLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
HMPLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
IFCBoolean.cpp
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
IFCCurve.cpp
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
IFCGeometry.cpp
bugfix: fix compiler warnings for gcc-4.8.1.
2014-04-21 16:18:14 +02:00
IFCLoader.cpp
Merge remote-tracking branch 'official/master' into contrib
2014-03-24 10:44:57 +01:00
IFCLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
IFCMaterial.cpp
- fix some -Wall warnings
2012-07-08 03:28:14 +02:00
IFCOpenings.cpp
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
IFCProfile.cpp
- Ifc: implement IfcIShapeProfileDef entity.
2013-01-24 15:16:03 +01:00
IFCReaderGen.cpp
- Ifc: support reading IfcComplexProperty
2013-03-29 14:07:28 +01:00
IFCReaderGen.h
- Ifc: support reading IfcComplexProperty
2013-03-29 14:07:28 +01:00
IFCUtil.cpp
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
IFCUtil.h
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
IFF.h
- move include/ to include/assimp/ to have consistent header locations between installed and trunk version.
2012-02-03 16:25:12 +00:00
Importer.cpp
Fixed error in GetProperty when accessed from external libraries using a different language (using swig for example)
2014-03-20 15:32:12 +01:00
Importer.h
Added matrix properties
2014-02-28 15:21:10 +01:00
ImporterRegistry.cpp
OgreImporter: Forgot to rebuild after filename changes so broke the build. Fix includes, add include guards and ASSIMP_BUILD_NO_OGRE_IMPORTER to missing places.
2014-05-02 00:28:12 +03:00
ImproveCacheLocality.cpp
Bugfix : Refactored ImproveCacheLocalityProcess::ProcessMesh. ( merged from GitHub, thanks to Riku Palomäki ).
2012-03-20 20:48:26 +00:00
ImproveCacheLocality.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
IRRLoader.cpp
- fixed preprocessor checks for some importers
2012-12-20 11:43:09 +00:00
IRRLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
IRRMeshLoader.cpp
Irrlicht mesh loader is now predicated on the proper preprocessor define (ASSIMP_BUILD_NO_IRRMESH_IMPORTER) as opposed to a similarly named but wrong define (ASSIMP_BUILD_NO_IRR_IMPORTER).
2013-10-07 19:32:46 -04:00
IRRMeshLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
IRRShared.cpp
Irrlicht shared code is now excluded only if both the Irrlicht and Irrlicht Mesh importers are excluded from the build.
2013-10-07 19:40:21 -04:00
IRRShared.h
FIX: Adding empty final line to some units where it was missing.
2009-10-11 13:57:55 +00:00
irrXMLWrapper.h
Removing null characters from xml parser input to avoid parsing failures
2014-01-17 11:48:42 +01:00
JoinVerticesProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
JoinVerticesProcess.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
LimitBoneWeightsProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
LimitBoneWeightsProcess.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
LineSplitter.h
Modif dans le parsing IFC suppressions des espaces avant traitement de la chaine
2014-01-17 12:02:58 +01:00
LogAux.h
- fix [3595689] by requiring gcc 4.6 for the full magic in LogAux.h
2013-03-28 14:30:45 +01:00
LWOAnimation.cpp
- drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits.
2013-03-21 19:54:55 +01:00
LWOAnimation.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
LWOBLoader.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
LWOFileData.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
LWOLoader.cpp
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
LWOLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
LWOMaterial.cpp
LWO: take last CLIP with the requested index (CLIPs ordered by ordinal string)
2013-09-18 14:27:56 +02:00
LWSLoader.cpp
- LWS: fix bugs pointed out by clang leading to path strings being incorrectly build.
2013-04-08 19:36:24 +02:00
LWSLoader.h
+ add AI_CONFIG_IMPORT_NO_SKELETON_MESHES flag to control skeleton mesh visualization. No need for this in Blender, and difficult to just ignore the geometry created by it.
2012-06-21 17:24:50 +02:00
makefile.mingw
Fix makefile.mingw, see http://sourceforge.net/projects/assimp/forums/forum/817654/topic/3828839.
2010-08-30 13:13:18 +00:00
MakeVerboseFormat.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
MakeVerboseFormat.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
MaterialSystem.cpp
Missing material functions for aiUVTransform added
2014-01-17 11:51:43 +01:00
MaterialSystem.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
MD2FileData.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
MD2Loader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
MD2Loader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
MD2NormalTable.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
MD3FileData.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
MD3Loader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
MD3Loader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
MD4FileData.h
Get rid of ./extra folder in ./code. Move contents to main code folder.
2010-04-11 01:41:24 +00:00
MD5Loader.cpp
- remove self-assignment in MD5Loader.cpp
2013-04-08 19:37:08 +02:00
MD5Loader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
MD5Parser.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
MD5Parser.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
MDCFileData.h
Bugfix : Replaced ugly (const_)casting by a better ctor and placement new. ( merged from GitHub, thanks to Riku Palomäki ).
2012-03-20 20:45:33 +00:00
MDCLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
MDCLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
MDCNormalTable.h
Fixes for build with mingw (no warnings in 32 Bit build, even with -wall).
2008-09-12 20:25:11 +00:00
MDLDefaultColorMap.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
MDLFileData.h
Bugfix : pcGroupTris isn't really const, removed const and const_cast ( merged from GitHub, thanks to Riku Palomäki ).
2012-03-20 20:42:16 +00:00
MDLLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
MDLLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
MDLMaterialLoader.cpp
- drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits.
2013-03-21 19:54:55 +01:00
MemoryIOWrapper.h
- add IFCZIP support to IFC loader.
2012-07-11 19:18:51 +00:00
MS3DLoader.cpp
typo fix: loose -> lose
2013-11-14 10:09:10 -08:00
MS3DLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
NDOLoader.cpp
- NDOLoader: fix ASSIMP_BUILD_NO_NDO_IMPORTER guard.
2013-03-28 13:41:58 +01:00
NDOLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
NFFLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
NFFLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
ObjExporter.cpp
Update ObjExporter.cpp
2014-06-20 15:08:29 -07:00
ObjExporter.h
using a custom compare function instead of a global aiVector3t less than operator
2013-10-01 11:21:36 -04:00
ObjFileData.h
bugfix: Obj-importer is now able to deal with 3d-texture coordinates.
2014-04-29 00:04:54 +02:00
ObjFileImporter.cpp
obj loader: added multiline support
2014-06-13 10:56:10 +02:00
ObjFileImporter.h
refactor the code, also parse texture option explictly
2013-12-02 22:58:15 +08:00
ObjFileMtlImporter.cpp
saves value in the 'Ke'-Attribute in ObjMtl Files in COLOR_EMISSIVE
2014-03-16 21:30:10 +01:00
ObjFileMtlImporter.h
refactor the code, also parse texture option explictly
2013-12-02 22:58:15 +08:00
ObjFileParser.cpp
bugfix: Obj-importer is now able to deal with 3d-texture coordinates.
2014-04-29 00:04:54 +02:00
ObjFileParser.h
bugfix: Obj-importer is now able to deal with 3d-texture coordinates.
2014-04-29 00:04:54 +02:00
ObjTools.h
bugfix: Obj-importer is now able to deal with 3d-texture coordinates.
2014-04-29 00:04:54 +02:00
OFFLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
OFFLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
OgreBinarySerializer.cpp
OgreImporter: Implement binary skeleton serialization. Fix bone/animation matrix stuff to be simpler (aka read as Quats to internal structures). Cleanup code for pull request.
2014-05-21 04:00:11 +03:00
OgreBinarySerializer.h
OgreImporter: Mirror bool return for XmlSerializer as it is in BinarySerializer. Document its meaning.
2014-05-21 04:06:22 +03:00
OgreImporter.cpp
fixed OgreImporter compilation error with boost scoped_ptr
2014-06-10 19:58:02 +03:00
OgreImporter.h
OgreImporter: Proper rewrite of the XML parser to OgreXmlSerializer. Now more robust for XML sources, previously had hardcoded expectations on the child node ordering. Implement common Skeleton class for both binary and xml serialization. Implement shared IVertexData with proper bone assignment to Assimp bone weights functionality.
2014-05-20 04:52:53 +03:00
OgreMaterial.cpp
OgreImporter: Fix UV flip for binary meshes. Fix exception XML parsing when positions are declared in a previous vertex buffer than the currentl parsed one (that has eg. UVs). Remove debug prints from material parser.
2014-05-21 04:37:45 +03:00
OgreParsingUtils.h
OgreImporter: Proper rewrite of the XML parser to OgreXmlSerializer. Now more robust for XML sources, previously had hardcoded expectations on the child node ordering. Implement common Skeleton class for both binary and xml serialization. Implement shared IVertexData with proper bone assignment to Assimp bone weights functionality.
2014-05-20 04:52:53 +03:00
OgreStructs.cpp
fixed OgreImporter compilation error with boost scoped_ptr
2014-06-10 19:58:02 +03:00
OgreStructs.h
OgreImporter: Fix UV flip for binary meshes. Fix exception XML parsing when positions are declared in a previous vertex buffer than the currentl parsed one (that has eg. UVs). Remove debug prints from material parser.
2014-05-21 04:37:45 +03:00
OgreXmlSerializer.cpp
OgreImporter: Fix UV flip for binary meshes. Fix exception XML parsing when positions are declared in a previous vertex buffer than the currentl parsed one (that has eg. UVs). Remove debug prints from material parser.
2014-05-21 04:37:45 +03:00
OgreXmlSerializer.h
OgreImporter: Mirror bool return for XmlSerializer as it is in BinarySerializer. Document its meaning.
2014-05-21 04:06:22 +03:00
OptimizeGraph.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
OptimizeGraph.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
OptimizeMeshes.cpp
fix: OptimizeMeshes w/o SplitLargeMeshes was disabled due to obscure max_verts = 0 assignment
2014-04-21 22:40:48 +02:00
OptimizeMeshes.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
ParsingUtils.h
Minor improvement of ParsingUtils
2014-01-17 11:42:51 +01:00
PlyExporter.cpp
PlyExporter: fix export format for compatibility with Blender and MeshLab (and the PLY spec). Fixes #122
2013-10-01 17:56:00 +02:00
PlyExporter.h
+ add Ply exporter.
2012-02-16 02:11:29 +00:00
PlyLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
PlyLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
PlyParser.cpp
fix miss commit at 8e35ea59d5
2014-03-01 20:34:57 +09:00
PlyParser.h
check binary or not in ParseHeader in PlyParser
2014-02-07 10:38:49 +09:00
PolyTools.h
Bugfix : Fixed some compiler warnings and some C99 and C++11 specific syntax. ( merged from GitHub, thanks to Riku Palomäki ).
2012-03-20 21:31:56 +00:00
PostStepRegistry.cpp
Merge remote-tracking branch 'official/master' into contrib
2014-04-22 14:32:59 +02:00
PretransformVertices.cpp
Added custom root transformation for pre-transform vertices post-process step
2014-02-28 15:32:43 +01:00
PretransformVertices.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
ProcessHelper.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
ProcessHelper.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
Profiler.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
Q3BSPFileData.h
bugfix:
2014-03-27 20:33:08 +01:00
Q3BSPFileImporter.cpp
Merge remote-tracking branch 'official/master' into contrib
2014-04-22 14:32:59 +02:00
Q3BSPFileImporter.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
Q3BSPFileParser.cpp
- fixed preprocessor checks for some importers
2012-12-20 11:43:09 +00:00
Q3BSPFileParser.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
Q3BSPZipArchive.cpp
Fixed error when compiling with mingw
2014-03-19 15:45:12 +01:00
Q3BSPZipArchive.h
Fixed unzip support to use IOSystem/IOStream abstraction
2014-03-10 17:21:17 +01:00
Q3DLoader.cpp
- drop a few swear words from documentation. Some of these are years old and I think the authors (me included) don't want them associated with their commits.
2013-03-21 19:54:55 +01:00
Q3DLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
qnan.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
RawLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
RawLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
RemoveComments.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
RemoveComments.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
RemoveRedundantMaterials.cpp
RemoveRedundantMaterials: Fix crash bug when unreferenced materials were destroyed. The logic only rebuilt the material list if there were redundant materials being removed. This is a clear bug as it left freed aiMaterial ptrs into the list and did not fix the scene->numMaterials to be correct, even when deleting materials. This crashed later on in the ComputeUVMappingsProcess that accessed the freed ptr.
2014-05-09 01:33:30 +03:00
RemoveRedundantMaterials.h
Release candidate 2 : 3.1
2014-05-04 19:17:51 +02:00
RemoveVCProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
RemoveVCProcess.h
Release candidate 2 : 3.1
2014-05-04 19:17:51 +02:00
SceneCombiner.cpp
Fixed bug in merging of materials
2014-02-10 15:11:13 +01:00
SceneCombiner.h
Improved Q3BSPZipArchive + added material merging
2014-01-17 11:38:01 +01:00
ScenePreprocessor.cpp
In Assimp: fixed typo in comments
2014-01-17 11:58:20 +01:00
ScenePreprocessor.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
ScenePrivate.h
Scene: keep an internal flag whether the scene was copied using aiCopyScene() (and potentially modified by the user afterwards)
2013-10-05 16:26:16 +02:00
SGSpatialSort.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
SGSpatialSort.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
SkeletonMeshBuilder.cpp
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
SkeletonMeshBuilder.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
SMDLoader.cpp
bugfix : fix level 4 compiler warnings for Visual studio 2012.
2012-10-27 19:41:56 +00:00
SMDLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
SmoothingGroups.h
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
SmoothingGroups.inl
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
SortByPTypeProcess.cpp
SortByPType Posprocessing crashed for crappy models with degenerated geometry
2013-11-25 10:50:15 +01:00
SortByPTypeProcess.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
SpatialSort.cpp
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
SpatialSort.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
SplitByBoneCountProcess.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
SplitByBoneCountProcess.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
SplitLargeMeshes.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
SplitLargeMeshes.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
StandardShapes.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
StandardShapes.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
StdOStreamLogStream.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
STEPFile.h
Modif dans le parsing IFC suppressions des espaces avant traitement de la chaine
2014-01-17 12:02:58 +01:00
STEPFileEncoding.cpp
- STEP: fix possible compilation error due to unwanted line continuation in a comment line.
2013-01-27 03:23:41 +01:00
STEPFileEncoding.h
- STEP: support UTF16, UTF32 and Mac/Roman escape sequences.
2013-01-24 19:51:46 +01:00
STEPFileReader.cpp
Modif dans le parsing IFC suppressions des espaces avant traitement de la chaine
2014-01-17 12:02:58 +01:00
STEPFileReader.h
Modif dans le parsing IFC suppressions des espaces avant traitement de la chaine
2014-01-17 12:02:58 +01:00
STLExporter.cpp
add AI_SWAP4 for big endian architecture
2013-08-09 17:54:28 +09:00
STLExporter.h
add binary exporter to STLExporter
2013-07-31 20:15:59 +09:00
STLLoader.cpp
Default to light gray diffuse for STL
2013-11-26 14:11:24 -08:00
STLLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
StreamReader.h
Fixed parameter type mismatch in StreamReader.
2013-08-09 19:10:56 -04:00
StringComparison.h
bugfix : fix level 4 compiler warnings for Visual studio 2012.
2012-10-27 19:41:56 +00:00
Subdivision.cpp
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
Subdivision.h
Bugfix : Fixed the Subdivision input mesh to be non-const. ( merged from GitHub, thanks to Riku Palomäki ).
2012-03-20 21:00:16 +00:00
TargetAnimation.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
TargetAnimation.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
TerragenLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
TerragenLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
TextureTransform.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
TextureTransform.h
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
TinyFormatter.h
- workaround for older gcc versions (<4.6) sometimes copying temporaries even though they shouldn't.
2013-04-13 16:08:13 +02:00
TriangulateProcess.cpp
- triangulation: re-introduce special handling for quads, now with proper support for concave quads. This should *really* fix [3429812], but it leaves me to suspect bugs in the general-purpose triangulation code for ngons.
2012-11-29 15:25:09 +00:00
TriangulateProcess.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
UnrealLoader.cpp
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
UnrealLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00
ValidateDataStructure.cpp
Improving homogeneity of DEBUG macro for improved portability with compilers other than Visual Studio
2014-01-17 11:43:48 +01:00
ValidateDataStructure.h
Added AI_WONT_RETURN_SUFFIX to ReportError().
2013-08-04 10:10:41 -04:00
Vertex.h
- some fixes for vc12
2013-01-19 17:00:14 +01:00
VertexTriangleAdjacency.cpp
- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.
2012-02-03 03:38:30 +00:00
VertexTriangleAdjacency.h
bugfix: export processes for unittests.
2014-05-04 16:02:52 +02:00
Win32DebugLogStream.h
- unify naming of all header files. Obviously, this is a breaking change that affects all users.
2012-02-03 17:04:06 +00:00
XFileHelper.h
- rewrote the XFileLoader material management to handle meshes with dummy material names correctly.
2013-02-12 13:13:12 +01:00
XFileImporter.cpp
- rewrote the XFileLoader material management to handle meshes with dummy material names correctly.
2013-02-12 13:13:12 +01:00
XFileImporter.h
- rewrote the XFileLoader material management to handle meshes with dummy material names correctly.
2013-02-12 13:13:12 +01:00
XFileParser.cpp
Fixes #158 via anonymous user
2014-05-12 12:04:19 -05:00
XFileParser.h
Fixes #158 via anonymous user
2014-05-12 12:04:19 -05:00
XGLLoader.cpp
- XGL: fix non isocpp-compliant definition of LogFunctions::log_prefix outside the namespace where the class resides.
2013-04-08 19:41:18 +02:00
XGLLoader.h
- add mFileExtensions field to aiImporterDesc, BaseImporter::GetExtensionList is now longer virtual since this would be redundant.
2012-04-22 22:26:26 +00:00