6ee5e248ee
Fix typo
2020-10-22 22:26:29 +02:00
d48ac9d0a4
fix xcode compile bug
2020-10-18 10:54:04 +08:00
857f62cde0
closes pParam.mReference = source;
2020-10-14 20:34:46 +02:00
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
0e9621012c
Adapt code style - finally :-).
2020-09-14 08:43:31 +02:00
1ff9e2b522
Adapt code style.
2020-09-14 08:40:21 +02:00
23defc275a
Merge branch 'master' into makeInternalErrorsAccessible
2020-09-14 08:36:13 +02:00
f3b25b999b
Fix an unreferenced formal parameter warning on MSVC when no exporter is built
2020-09-05 23:20:31 +02:00
0730eebe6f
fix collada handling of xml nodes.
2020-08-28 16:17:56 +02:00
8f893e3653
Actually, just keep the old behaviour for now.
2020-08-20 14:32:15 +01:00
9b5e758bdd
Even simpler DeadlyErrorBase
2020-08-19 17:59:13 +01:00
6f9c61e157
Use case which matches surrounding code.
2020-08-19 17:57:25 +01:00
e1a0163e7e
Make all exceptions available.
2020-08-18 18:14:51 +01:00
0ffcdf160e
Build formatting into DeadlyImportError
2020-08-18 16:32:34 +01:00
829ff1adf0
Maybe this will help.
2020-08-18 10:33:47 +01:00
b1ed751b83
Provide an API for accessing internal errors.
2020-08-18 10:33:42 +01:00
729882debb
Fix incorrect index
...
closes https://github.com/assimp/assimp/issues/3364
2020-08-11 19:57:36 +02:00
13d7fad7f7
closes https://github.com/assimp/assimp/issues/2992 : add single or double precision + missing compilers.
2020-08-07 14:23:07 +02:00
e7ae576614
undo change
2020-08-03 15:54:19 +02:00
435bba30dd
Move functions into the correct preprocessor branch
2020-08-03 09:30:02 +02:00
9cad10a995
Disable MSVC warnings on all MSVC
...
Fixes the build on MSVC 2017 (and probably MSVC 2015)
2020-07-17 14:58:51 +01:00
fa486240d5
Merge branch 'master' into rbsheth_update_hunter
2020-07-17 11:39:55 +02:00
516bdc2a4b
Merge branch 'master' into master
2020-07-16 22:48:02 +02:00
df8792d24b
Merge branch 'master' into gltf1_gltf2_split
2020-07-16 10:45:55 +02:00
84e68eaf24
fix invalid pointer for bone animation
2020-07-16 15:26:02 +09:00
209a61d0e7
Update hunter and utf8cpp inclusion
2020-07-14 19:00:23 -04:00
84e342acd7
DefaultIOStream: Remove assert on empty count
...
fwrite() is valid to call with a 0 count, and will simply return 0.
See:
https://en.cppreference.com/w/cpp/io/c/fwrite
http://www.cplusplus.com/reference/cstdio/fwrite/
There are code paths where StreamWriter will call Tell(), which calls
Flush(), which calls Write(buffer.data(), 1, buffer.size()). This can
happen when nothing has yet been written to the buffer, so size is 0.
2020-07-14 10:39:18 -04:00
306e03d497
Merge branch 'master' into extras_property_callback
2020-07-11 22:46:19 +02:00
9aa468262f
closes https://github.com/assimp/assimp/issues/3252 : fix build.
2020-07-07 17:35:03 +02:00
abf43eaf74
* Added ASSIMP_BUILD_NO_GLTF1_IMPORTER, ASSIMP_BUILD_NO_GLTF2_IMPORTER, ASSIMP_BUILD_NO_GLTF1_EXPORTER, and ASSIMP_BUILD_NO_GLTF2_EXPORTER to allow disabling GLTF1 and GLTF2 independently.
...
* ASSIMP_BUILD_NO_GLTF_IMPORTER and ASSIMP_BUILD_NO_GLTF_EXPORTER remain with same behavior as before
2020-07-05 19:22:31 +01:00
3fb7747429
Improve ToBinary() for double precision.
...
The constant 0x80000000 is specific to 32 bit types. Make the bit mask
according to the size of types.
2020-07-03 18:14:45 -07:00
97085c1c05
update sync
2020-06-30 11:48:37 -07:00
36f899bf09
sync update
2020-06-30 11:45:11 -07:00
30f09e9fc0
Fix build when ASSIMP_DOUBLE_PRECISION is on.
...
Tested:
$ cmake -DASSIMP_DOUBLE_PRECISION=1 -DASSIMP_BUILD_MDL_IMPORTER=0 ..; make
The MDL importer is disabled due to the fact that there is some float-only code
in MDL. This also means bin/assimp and bin/unit would not link successfully with
the above build flags.
2020-06-28 17:36:21 -07:00
95e822a6ec
Merge branch 'master' into aiAssertHandler
2020-06-24 20:47:10 +02:00
6205af4efb
replace NULL and avoid ai_assert with more than 2 tests.
2020-06-23 21:05:42 +02:00
9188f56839
Allow assert handling to be replaced.
2020-06-23 11:55:51 +01:00
524e2e4728
fix warning, hopefully ...
2020-06-15 21:34:49 +02:00
e65434bf82
extra callback
2020-06-11 17:37:06 -07:00
f57e7221c0
temp
2020-06-10 13:23:29 -07:00
578a7ac502
add Callback API in ExporterProperties
2020-06-09 11:20:48 -07:00
88c1509d69
Remove dead code
2020-06-09 10:15:35 +02:00
6d04e16c7e
Merge branch 'master' into issue_3165
2020-05-28 21:51:58 +02:00
d40a3026db
closes https://github.com/assimp/assimp/issues/3165 : fix gcc build.
2020-05-28 21:02:13 +02:00
e11d78596f
Use verbose debug logging in certain places
2020-05-15 17:26:17 +01:00
5e0136d737
Add concept of verboseDebug
2020-05-15 17:23:07 +01:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
c6131ce38a
scenecombiner: fix leak.
2020-04-29 20:43:23 +02:00
4488e3e745
build on Linux with gcc and clang; warning as error only for 'assimp' target
2020-04-27 23:38:33 -07:00
6c1e21d754
fix formatting.
2020-04-26 19:14:30 +02:00
bafb8e3189
closes https://github.com/assimp/assimp/issues/3165 : remove deprecated code whch causes compiler warning.
2020-04-26 08:59:52 +02:00
3dc550a9b2
Got a working geometry prototype, sponza renders correctly when camera and light is added
2020-04-25 00:10:31 -07:00
d12e938a70
Merge branch 'master' into ifdef_export_defines
2020-04-16 10:24:23 +02:00
e341eadfd9
Fix typo
2020-04-16 10:23:50 +02:00
8c3b374486
Pbrt file exporter hello world
2020-04-06 12:12:37 -07:00
131aed73b0
closes https://github.com/assimp/assimp/issues/2166 : add missing setter for metadata.
2020-04-06 11:16:16 +02:00
609632c6a5
Added missing functionalities to C API.
...
The C API functions that have been added are the following:
Vector2:
- aiVector2AreEqual
- aiVector2AreEqualEpsilon
- aiVector2Add
- aiVector2Subtract
- aiVector2Scale
- aiVector2SymMul
- aiVector2DivideByScalar
- aiVector2DivideByVector
- aiVector2Length
- aiVector2SquareLength
- aiVector2Negate
- aiVector2DotProduct
- aiVector2Normalize
Vector3:
- aiVector3AreEqual
- aiVector3AreEqualEpsilon
- aiVector3LessThan
- aiVector3Add
- aiVector3Subtract
- aiVector3Scale
- aiVector3SymMul
- aiVector3DivideByScalar
- aiVector3DivideByVector
- aiVector3Length
- aiVector3SquareLength
- aiVector3Negate
- aiVector3DotProduct
- aiVector3CrossProduct
- aiVector3Normalize
- aiVector3NormalizeSafe
- aiVector3RotateByQuaternion
Matrix3x3:
- aiMatrix3FromMatrix4
- aiMatrix3FromQuaternion
- aiMatrix3AreEqual
- aiMatrix3AreEqualEpsilon
- aiMatrix3Inverse
- aiMatrix3Determinant
- aiMatrix3RotationZ
- aiMatrix3FromRotationAroundAxis
- aiMatrix3Translation
- aiMatrix3FromTo
Matrix4x4:
- aiMatrix4FromMatrix3
- aiMatrix4FromScalingQuaternionPosition
- aiMatrix4Add
- aiMatrix4AreEqual
- aiMatrix4AreEqualEpsilon
- aiMatrix4Inverse
- aiMatrix4Determinant
- aiMatrix4IsIdentity
- aiMatrix4DecomposeIntoScalingEulerAnglesPosition
- aiMatrix4DecomposeIntoScalingAxisAnglePosition
- aiMatrix4DecomposeNoScaling
- aiMatrix4FromEulerAngles
- aiMatrix4RotationX
- aiMatrix4RotationY
- aiMatrix4RotationZ
- aiMatrix4FromRotationAroundAxis
- aiMatrix4Translation
- aiMatrix4Scaling
- aiMatrix4FromTo
Quaternion:
- aiQuaternionFromEulerAngles
- aiQuaternionFromAxisAngle
- aiQuaternionFromNormalizedQuaternion
- aiQuaternionAreEqual
- aiQuaternionAreEqualEpsilon
- aiQuaternionNormalize
- aiQuaternionConjugate
- aiQuaternionMultiply
- aiQuaternionInterpolate
In addition, a const qualifier has been added to aiQuaterniont::Rotate to allow call to this method via a const aiQuaterniont pointer.
2020-03-26 13:08:40 -04:00
68a9fa2df3
reformat unittests.
2020-03-22 12:13:09 +01:00
1529f9518f
Make file formatting comply with POSIX and Unix standards
...
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
097d2faeea
fix vs2013 specific warnings.
2020-03-18 19:31:30 +01:00
d1afd97ec2
fix 2 more warnings for vs2013.
2020-03-18 16:48:32 +01:00
a9e8f65941
fix the build - add misisng forward declaration for aiVector3t.
2020-03-16 10:50:07 +01:00
976091a6f6
ix compiler warning for pragma statements.
2020-03-15 11:47:05 +01:00
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
f8757322be
fix warnings
2020-03-11 09:43:55 +01:00
02e5698a38
fix linker issues.
2020-03-09 22:49:32 +01:00
f3b6b78d4d
small refactorings.
2020-03-09 10:55:32 +01:00
8b9abc58e7
ifdef the exporters as specifying harsher linker flags than what's in default CMake causes linking issues.
2020-03-04 17:15:09 -08:00
496fcd35c1
Trimmed trailing whitespaces
2020-02-28 19:17:53 -08:00
22311883ce
Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop
2020-02-28 18:42:22 -08:00
ad52c5c5f6
.clear in destructor is redundant
2020-02-18 18:56:09 +02:00
016c0a8665
small changes
2020-02-18 18:42:59 +02:00
c2bfbdacf4
fix more warnings.
2020-02-16 15:37:20 +01:00
8c09cd2ef3
Fixed TextureTypeToString defined multiple times.
...
- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 missing values in TextureTypeToString.
- Added 6 missing aiTextureType enum values in assimp_cmd/Info.cpp.
2020-02-06 13:19:01 -05:00
f00256d185
Merge branch 'master' into rename-writedumb-to-writedump
2020-02-05 13:58:09 +01:00
ede860173e
Fixed mValues allocated twice.
...
mValues is already allocated in aiMetadata::Alloc().
2020-01-31 16:43:20 -05:00
2c1c1d846e
Renamed WriteDumb.cpp to WriteDump.cpp
...
This includes as well changes to places referencing WriteDumb.cpp.
2020-01-30 16:40:34 -05:00
092883cf19
Merge branch 'master' into update-copyright-end-date
2020-01-22 18:03:43 +01:00
1edb52c0de
ScenePreprocessor: Assert some properties about animation channels
2020-01-22 12:22:52 +02:00
4e7e47bd43
Updated copyright dates.
...
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".
Changed copyright end year to 2020 in LICENCE.rtf.
Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
2020-01-20 08:53:12 -05:00
37210372a8
Update VertexTriangleAdjacency.cpp
...
closes https://github.com/assimp/assimp/issues/2806 : calculate corret number of vertices.
2020-01-07 21:26:37 +01:00
4a8b7800ff
Update M3D ASCII exporter ident and extension
...
Changed to match existing Assimp style.
Set extension as per:
https://gitlab.com/bztsrc/model3d/blob/master/docs/a3d_format.md
2019-12-09 11:23:57 +00:00
9f3c26dbd8
Update Importer.cpp
...
fix typo
2019-12-07 09:18:45 +01:00
7648c438ca
Update Importer.cpp
...
fix more typos.
2019-12-07 09:08:15 +01:00
26f6e5ad30
Update Importer.cpp
...
fix typo
2019-12-07 08:58:47 +01:00
ef13fb2ddd
Update Importer.cpp
...
Fix minor review findings.
2019-12-06 21:38:07 +01:00
fabfcf3cb0
More checking
2019-12-05 12:33:00 +00:00
894b8e3519
Initial version
2019-12-05 12:32:22 +00:00
e5edd8a28a
Merge branch 'master' into preserve_error_string
2019-12-03 11:29:35 +01:00
631da3a3d1
Merge branch 'master' into preserve_error_string
2019-12-02 10:35:29 +00:00
4071fcd398
Update Exporter.cpp
...
Fix format.
2019-12-01 22:46:48 +01:00
54720e36cb
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-12-01 22:46:18 +01:00
929d83398d
Remove duplicate call to exporter. Fixes issue #2718 .
2019-11-25 13:51:33 +11:00
5cfb0fd633
Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags
2019-11-22 18:27:34 +01:00
868aea8d94
Merge branch 'master' into fix_vertex_weighted_repeatedly
2019-11-22 08:19:50 +01:00
80f5283b2f
Error string of Importer should contain a message in case of an exception
2019-11-18 16:57:01 +00:00
17257cd2ae
just a try, i dunno have a clue ...
2019-11-16 15:51:26 +01:00
aa25c815bd
closes https://github.com/assimp/assimp/issues/1320 : make sure build works with all exporter disabled.
2019-11-10 09:47:50 +01:00
ddf7c0ad8f
avoid weighting vertex repeatedly when joining identical vertices
2019-11-05 17:34:32 -08:00
adec426b7c
Fix for exporting fbx bigger than 2GB
2019-11-05 17:11:56 +00:00
dda46f5f4d
Merge branch 'master' into master
2019-11-02 01:14:04 +01:00
be09110aa8
Merge branch 'master' into feature/easy-armature-lookup
2019-10-29 21:09:50 +01:00
0baec5f0bd
Added M3D format support
2019-10-29 14:14:00 +01:00
9c8d835704
Explicitly use nullptr
2019-10-27 14:16:39 +00:00
a30936954e
Best to check the number of children before checking the actual array
2019-10-27 14:16:39 +00:00
514257f587
Added unit tests for ArmaturePopulate when used (added huestos model to tests)
...
Added clear documentation for this too to explain, you need to enable it to make it available
Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
120e97e55b
Merge branch 'master' into assimp_version_2693
2019-10-27 13:47:59 +01:00
e6a051d953
Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678 .
2019-10-16 19:06:57 +11:00
059ee0e091
Update assimp legal and version
...
Will now report the major and minor versions specified in cmakelists
2019-10-11 16:28:14 +01:00
78cfec41ec
Merge branch 'master' into issue_2693
2019-10-06 11:11:22 +02:00
afec2e2c49
Fix #2693 aiGetVersionMajor return wrong version
...
The 2 constants MinorVersion and MajorVersion are updated for 5.0
2019-10-05 19:23:02 +02:00
e0fee3d87b
gltf2.0 importer - Support for mesh morph animations added.
...
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
2019-09-25 09:58:23 +01:00
7ff7a5d64e
glTF: Try to remove duplicate code.
2019-09-11 17:00:39 +02:00
f8bcd7cb40
Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
2019-09-07 10:02:20 +02:00
336ae0e55a
Merge branch 'fix_issue_joinIdenticalVertices_notNeeded' of https://github.com/thomasbiang/assimp into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded
2019-09-07 09:58:07 +02:00
3546403284
Merge branch 'master' into crash_in_ai_mesh_desctuctor
2019-09-06 20:45:16 +02:00
873a358ce4
A crash in the aiMesh descructor
2019-09-05 11:44:02 +01:00
eb762e654e
Removed WindowsStore checks
2019-09-03 23:13:44 -04:00
a16906686f
Fixed type conversion warnings
2019-09-03 21:06:48 -04:00
a8822a2b29
Cleaned up formatting in DefaultIOSystem.cpp
2019-09-03 11:18:01 -04:00
0685e415ad
removed extra null character in Utf8ToWide and WideToUtf8
2019-09-03 11:18:01 -04:00
6c65b5b549
Cleaned up unicode code and removed fixed-size buffers
2019-09-03 11:18:01 -04:00
727cf0c49f
Fixed unicode on windows
2019-09-03 11:18:01 -04:00
0f18ec9e2c
Merge branch 'master' into accessibleIsVerbose
2019-09-02 20:47:04 +02:00
01d0f06d3a
Make IsVerbose accessible outside the exporter
2019-08-30 11:42:23 +01:00
abdd853ca5
FIX missing update call for scale to post process
2019-08-27 15:50:50 +01:00
3d0775eebc
respect export flag if aiJoinIdenticalVertices is not needed
2019-08-12 18:10:43 -07:00
090e896ebf
Merge branch 'master' into collada_zae
2019-08-06 21:22:02 +02:00
d83af91095
Update Exporter.cpp
...
Add exporter detail.
2019-07-29 09:03:29 +02:00
7e8a3ec4cb
Add unit test of valid and unique Exporter IDs, rename assjson id
...
"json" is a very vague exporter ID, change to "assjson"
Add a unit test to ensure all exporter have unique IDs
and that they all have an ID, description and extension
2019-07-25 13:38:49 +01:00
e993cdc309
Merge branch 'master' into collada_zae
2019-07-25 12:42:08 +01:00
9b78060a4a
Add copyright headers to ZipArchiveIOSystem
2019-07-25 10:14:42 +01:00
9e04df810e
ZipArchiveIOSystem should be sorted, fix ZipFile::Read()
...
Q3BSP relies on the sort order
Read() should return number of elements read, not count of bytes
Read() should clip to the file size and return elements actually read,
instead of aborting if try to read too much
2019-07-25 09:53:18 +01:00
c6620478ec
Fix GCC warnings reported by Travis
2019-07-24 16:12:06 +01:00
17adc98eec
Fix issue #2557
2019-07-23 15:58:30 +02:00
41ea607739
Merge branch 'master' into collada_zae
2019-07-20 14:12:18 +02:00
07d3a7d5b0
Fix some warnings
...
Hopefully the sorts out the MSVC2013 compiler
2019-07-12 16:02:51 +01:00
678dd32da3
Add missing header
2019-07-12 15:37:10 +01:00
53c0f91305
Add unittest for json.
2019-07-12 16:08:51 +02:00
2c7f607e7c
Create ZipArchiveIOSystem
...
Moved IOSystem Unzip functionality out of D3MF Importer into include/assimp
Cleaned up and more efficient:
Don't map the archive until the caller opens a file or requests the contents list
Don't extract any files until they are opened
Store the location of the data within the ZIP and extract it later if the file is opened.
2019-07-12 11:22:17 +01:00
eb5e829436
Assjson: add json export to list of exporters.
2019-07-11 17:43:03 +02:00
b463ddd399
closes https://github.com/assimp/assimp/issues/340 : start integrating assimp2json.
2019-07-11 17:37:31 +02:00
05f5b54f75
Merge branch 'master' into issue_2518_active_importer_ident
2019-06-27 14:02:01 +02:00
0f66a917e5
Add unittest.
2019-06-24 21:37:53 +02:00
8f43fb144a
Add "importerIndex" Importer property
...
This indicates the index of the Importer that was selected, or -1 if did not find one at all.
2019-06-24 14:55:48 +01:00
dab8041bcd
rewrite include paths for Hunter packages
2019-06-13 21:32:36 -07:00
4dcb3c9235
Update ImporterRegistry.cpp
...
fix case-sensiive folder bug.
2019-06-11 21:55:21 +02:00
2da3a38d60
Fix the compile pass, still unresolved symbols.
2019-06-10 23:26:00 +02:00
2d985b92c9
Fix references in cmake file.
2019-06-09 18:43:56 +02:00
Kim Kulling
john
Kim Kulling
Denis Blank
Malcolm Tyrrell
RichardTea
Kota Iguchi
Rahul Sheth
Ryan Styrczula
Max Vollmer
Hill Ma
Yingying Wang
kkulling
luca
Trevor David Black
Marc-Antoine Lortie
Aaron Franke
Sebastian Matusik
iamAdrianIusca
Turo Lamminen
Mike Samsonov
Paul Arden
Loïc
Mike Samsonov
Zoltan Baldaszti
bzt
RevoluPowered
Engin Manap
Victor Cebollada
Ryan McCampbell
Pierre Anquez