v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,542 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

54 Commits (0f32f59dc3d1fa11f6b3afb53c2900d9150c474e)

Author SHA1 Message Date
Kim Kulling e543a58dfb
Update m3d.h 
fix more alignment errors.
 2020-03-27 18:23:22 +01:00
Kim Kulling 2cfdbe2d50
Update m3d.h 
Fix alignment bug.
 2020-03-27 16:27:07 +01:00
Kim Kulling 7a01061c3e
Update m3d.h 
Try to fix build error.
 2020-03-27 15:39:49 +01:00
Kim Kulling 60750161d5
Update m3d.h 
replace assignment by memcpy.
 2020-03-27 15:28:32 +01:00
Kim Kulling 32c59643f2
Update m3d.h 
fix alignment issue.
 2020-03-27 11:38:38 +01:00
kimkulling ccd13436da fix memory leak during export 2020-03-25 16:37:43 +01:00
Kim Kulling 9aa5e3e04f fix new vs2013 warnings. 2020-03-18 21:32:17 +01:00
Kim Kulling 097d2faeea fix vs2013 specific warnings. 2020-03-18 19:31:30 +01:00
Kim Kulling 976091a6f6 ix compiler warning for pragma statements. 2020-03-15 11:47:05 +01:00
Kim Kulling e8d2b84017 clean all warnings for vs-2019 2020-03-08 21:24:01 +01:00
Kim Kulling 920535165d next fixed warnings 2020-03-01 13:15:45 +01:00
Kim Kulling 47fc3f2627
Update M3DImporter.cpp 
Fix a memoryleak.
 2020-02-12 14:54:00 +01:00
bzt e434c63c31 Fixed what kimkulling broke 2020-01-31 14:20:23 +01:00
Kim Kulling a2ef0b5bd5
Update M3DImporter.cpp 
Fix some review finding:
- Add missing brackets to make code more readable
- fix scope of variables
 2020-01-30 10:00:43 +01:00
Kim Kulling 605336832f
Update M3DImporter.cpp 
Add missing brackets
 2020-01-30 09:47:39 +01:00
Zoltan Baldaszti cb623f8b74
Merge branch 'master' into master 2020-01-29 22:24:48 +01:00
bzt 398a8f757e Additional checks on invalid input 2020-01-29 22:08:34 +01:00
Marc-Antoine Lortie 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
Kim Kulling 79aeb65ab4
Merge branch 'master' into master 2019-12-22 09:18:02 +01:00
bzt 8a800e7aa5 Removed functionality and minor material-mapping fix 2019-12-15 12:25:34 +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
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
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
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 fadf4a3ee2 Update M3DWrapper.h 
Add missing include.
Odd that MSVC2013-2017, GCC and Clang were ok with this.
 2019-12-04 14:05:46 +00:00
RichardTea 45a96af9ac Fix typo in M3DWrapper.cpp 
Don't use std::mutex if not supported.
Allow override to force it to be used if does in fact exist
Thank you CI
 2019-12-03 14:15:50 +00:00
RichardTea ee537b70ad Correct M3DWrapper ifdef guards 
M3DWrapper should also compile if M3D Importer is enabled
 2019-12-03 13:18:59 +00:00
RichardTea e668eead19 Some cleanup of M3D support 
Wrap the m3d.h header
Note: C++11 support required to use in a threaded environment
Fix export memory leak (although exporter apopears to be unused)
Apply clangformat.
 2019-12-03 12:56:21 +00:00
bzt 9ddeb4edad MinGW support, profiling and signed error code 2019-11-25 05:03:10 +01:00
bzt 83e9c551f5 stbi functions prefixed for those who do not know how to use inlcude 2019-11-18 18:31:53 +01:00
bzt 301748be6a Make Clang happy 2019-11-18 15:22:15 +01:00
bzt 2b252bb9a5 My mistake, fixed 2019-11-18 06:23:41 +01:00
bzt 41ae01a6b2 Upgraded to newest SDK and improved texture import 2019-11-18 03:04:52 +01:00
bzt 7201ebdccc Make Clang happy 2019-11-01 21:52:11 +01:00
bzt 7d9e9aadbb Asked modifications and unit test 2019-11-01 17:21:24 +01:00
bzt 8ebd48442e Made the M3D SDK C++ wrapper optional 2019-11-01 03:39:36 +01:00
bzt 3bf81375da Fixed clang's problem with register keyword 2019-10-30 03:06:24 +01:00
bzt 37cc29c020 Fixed clang's problem with register keyword 2019-10-30 03:04:33 +01:00
bzt 0ff3e40157 Fixed clang's casting issue and MSVC's buffer allocation problem 2019-10-30 02:35:51 +01:00
bzt 60e9157699 Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this 2019-10-30 01:37:28 +01:00
bzt 5a79287041 More reduced scope fix, what's wrong with reusing i as a loop variable? 2019-10-30 01:21:15 +01:00
bzt 7ed621b53f More reduced scope fix by wasting more memory... 2019-10-30 01:14:20 +01:00