Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,023 Commits 19 Branches 43 Tags
6bdda42cd003a7594b8954c2a295377e71eb36b2
Commit Graph

4428 Commits

Author SHA1 Message Date
Kim Kulling
6bdda42cd0 Merge branch 'master' into fix/collada-combining-animations 2020-01-02 00:40:03 +01:00
Marc-Antoine Lortie
1d8e854ba3 Merge branch 'master' into uv-coordinates-swapped-twice 2019-12-30 08:37:43 -05:00
Marc-Antoine Lortie
6de5ff8f7d Fixed UV coordinate swapped twice in big endian. 2019-12-30 08:30:34 -05:00
Felipeek
5ce373c312 Don't combine Collada animations when channels are shared 2019-12-29 16:05:33 -03:00
Kim Kulling
c9d9f2077d Merge branch 'master' into gltf-import-bug-fix 2019-12-27 16:35:09 +01:00
bill.shan
d2ed36756c fix bug:Using custom IO logic in Android platform, importing from 'assets' dir,there comes to be one more '/', which makes the '.bin' file loads failed. 2019-12-27 11:21:05 +08:00
Marc-Antoine Lortie
2026d52df4 Improved comments in HL1MDLFile.h 2019-12-25 12:57:48 -05:00
Kim Kulling
1e29329a84 Merge branch 'master' into hl1-mdl-loader 2019-12-25 10:13:42 +01:00
Kim Kulling
97bc855e80 Merge branch 'master' into patch-1 2019-12-23 23:27:21 +01:00
Mateusz Paluch
ae92a34d91 Update SMDLoader.cpp 
GCC compilation on windows was failing. Better to check for Visual c++ than Win32.
 2019-12-22 09:57:02 +01:00
Kim Kulling
79aeb65ab4 Merge branch 'master' into master 2019-12-22 09:18:02 +01:00
Marc-Antoine Lortie
4050f7601f Merge branch 'master' into hl1-mdl-loader 2019-12-19 09:47:19 -05:00
Malcolm Tyrrell
3b7e2bc3fa Fix typos 2019-12-18 16:13:23 +00:00
Marc-Antoine Lortie
87de50e1f3 Added missing parentheses around assignment in while condition. 2019-12-18 07:51:45 -05:00
Marc-Antoine Lortie
02c2bfa2b8 Added missing member initializations. 2019-12-18 07:35:30 -05:00
Marc-Antoine Lortie
7c2cec2182 Fixed member initialization order. 
anim_headers_ is declared before animbuffers_ in HL1MDLLoader.h.
 2019-12-18 07:28:52 -05:00
Marc-Antoine Lortie
69902c99c8 Restored PACK_STRUCT on AnimValue_HL1 union and removed PACK_STRUCT on inner struct. 
My apologies, as this was a mistake. I misread the problem and removed the wrong PACK_STRUCT.
 2019-12-17 18:22:22 -05:00
Marc-Antoine Lortie
188ee6562e Moved/Added several includes to file HL1MDLLoader.h. 
GCC says there are several class types such as DefaultIOSystem, std::unique_ptr that are undeclared. I moved several includes to this header and also added <string> and <assimp/types> because there are strings and Assimp types defined further down.
 2019-12-17 17:47:26 -05:00
Marc-Antoine Lortie
fe2fdcf77c Removed unwanted PACK_STRUCT on union. 2019-12-17 17:27:21 -05:00
Marc-Antoine Lortie
330d9ca916 Replaced strncpy by individual character assigments. 2019-12-17 16:37:32 -05:00
Marc-Antoine Lortie
e85776aaab Added missing null terminator. 2019-12-17 16:16:18 -05:00
Marc-Antoine Lortie
a45e13b183 Fixed compilation issue. 
"insert_or_assign" was not defined in the Visual Studio 2013 toolset.
 2019-12-17 15:12:19 -05:00
Marc-Antoine Lortie
eed0bd3ef6 Added support to load Half-Life 1 MDL files. 
Added code to use Half-Life 1 MDL loader in MDLLoader.cpp.
Added Half-Life 1 MDL loader files to CMakeLists.
Added new options in config.h to use with Half-Life 1 MDL loader.
 2019-12-16 10:26:46 -05:00
bzt
8a800e7aa5 Removed functionality and minor material-mapping fix 2019-12-15 12:25:34 +01:00
Kim Kulling
7244f53f5f Merge branch 'master' into partial-cleanup-m3d 2019-12-14 19:22:19 +01:00
bzt
a10b0d4de3 Requested modifications 2019-12-14 08:52:48 +01:00
bzt
512e6dff4f Fixed ANSI C compiler issue 2019-12-13 09:16:41 +01:00
Zoltan Baldaszti
2fc72c8f72 Merge branch 'master' into master 2019-12-13 09:17:06 +01:00
bzt
453eeb65cd Merge branch 'master' of https://github.com/bztsrc/assimp 2019-12-13 09:05:06 +01:00
bzt
f151a5d11d MSVC2013 alternative to thread_local 2019-12-13 09:04:40 +01:00
Kim Kulling
8be1060ec4 Update m3d.h 
Fix vs-defines for unused define as well.
 2019-12-13 08:21:45 +01:00
Kim Kulling
32835873f0 Update m3d.h 
Fix review warning.
 2019-12-13 08:19:39 +01:00
bzt
6b2fe41a3b Replaced mutex with thread-local variable 2019-12-13 07:30:59 +01:00
bzt
30634ff56e Be more tolerant to invalid input 2019-12-13 06:38:49 +01:00
Zoltan Baldaszti
7a83e89b02 Merge branch 'master' into master 2019-12-13 04:49:57 +01:00
Malcolm Tyrrell
b6553b8a78 Merge branch 'master' into fixTexcoord 2019-12-12 12:19:02 +00:00
Malcolm Tyrrell
b70c05b4e0 Fix texcoords. 2019-12-12 09:38:50 +00:00
bzt
e17431b993 Added extra check for file size 2019-12-11 06:21:35 +01:00
bzt
fb95e49824 More MSVC workarounds 2019-12-11 05:47:59 +01:00
Mike Samsonov
08c5fa37bf Add a support for 3DSMax Physically Based Materials for FBX format 2019-12-10 12:04:35 +00:00
bzt
17aabc34cc MSVC workarounds 2019-12-10 06:30:41 +01:00
RichardTea
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
RichardTea
9cabeddf4f Odd Negative Scale: PretransformVertices 
PretransformVertices postprocessing now reverses face order when transform is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.

(Odd count of negative scale components, negative determinant)
 2019-12-09 11:07:13 +00:00
RichardTea
193b02cdac Odd negative scale: OptimizeGraph 
OptimizeGraph postprocessing now reverses face order when
node scale is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.

(Odd count of negative scale components, negative determinant)
 2019-12-09 10:42:50 +00:00
RichardTea
463573c771 Apply clangformat 2019-12-09 09:56:01 +00:00
Kim Kulling
e3da92f7d3 closes https://github.com/assimp/assimp/issues/2809: fix crash for special ifc file. 2019-12-08 10:12:14 +01:00
Kim Kulling
747e12465b Merge branch 'master' into partial-cleanup-m3d 2019-12-07 19:43:05 +01:00
Kim Kulling
9f3c26dbd8 Update Importer.cpp 
fix typo
 2019-12-07 09:18:45 +01:00
Kim Kulling
7648c438ca Update Importer.cpp 
fix more typos.
 2019-12-07 09:08:15 +01:00
Kim Kulling
26f6e5ad30 Update Importer.cpp 
fix typo
 2019-12-07 08:58:47 +01:00