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

6850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
262bbc0d5e fix compiler warnings. 2019-02-25 23:19:21 +01:00
Kim Kulling
16080ba60c Merge branch 'master' into simple_skin_test 2019-02-25 22:06:56 +01:00
Kim Kulling
206004c7d6 introduce simple skin-test +some findings. 2019-02-25 22:06:24 +01:00
Kim Kulling
bc0064d3b0 Merge pull request #2345 from assimp/issue_1593 
closes https://github.com/assimp/assimp/issues/1593: fix computation …
 2019-02-20 00:33:02 +01:00
Kim Kulling
f59f3976c0 closes https://github.com/assimp/assimp/issues/1593: fix computation of percentf for 3DS. 2019-02-20 00:02:19 +01:00
Kim Kulling
873f77a48d Merge pull request #2344 from assimp/issue_2115 
closes https://github.com/assimp/assimp/issues/2115: rollback setup o…
 2019-02-19 21:02:21 +01:00
Kim Kulling
adbc7e8f70 closes https://github.com/assimp/assimp/issues/2115: rollback setup of FBX-camera. 2019-02-19 20:23:20 +01:00
Kim Kulling
cc8f91c24d Merge pull request #2341 from BoneCrasher/issue_2340 
[Issue_2340] Added ASSIMP_ANDROID_JNIIOSYSTEM precheck to only remain…
 2019-02-19 14:31:29 +01:00
Kim Kulling
050430cae0 Merge branch 'master' into issue_2340 2019-02-19 13:14:59 +01:00
Kim Kulling
ef35acc7db Merge pull request #2342 from assimp/isue_305 
Isue 305
 2019-02-19 13:14:28 +01:00
Kim Kulling
ebf9deb6e0 Update appveyor.yml 
Disable vs2017
 2019-02-19 11:28:15 +01:00
Kim Kulling
b0f94c4620 Update appveyor.yml 
Disable vs2015-test
 2019-02-19 11:19:53 +01:00
Kim Kulling
ea2e6936e5 Add test file. 2019-02-18 21:44:07 +01:00
Kim Kulling
ae41ae3211 closes https://github.com/assimp/assimp/issues/305': fix viewer 2019-02-18 21:43:45 +01:00
Marc-Anton Boehm-von Thenen
4d0740a120 [Issue_2340] Proper closing endif()... 2019-02-18 14:15:39 +01:00
Marc-Anton Boehm-von Thenen
a94c8bf3f6 [Issue_2340] Wrong precondition layout... missed ANDROID=ON and ASSIMP_ANDROID_JNIIOSYSTEM=OFFvalid constellation 2019-02-18 14:14:27 +01:00
Marc-Anton Boehm-von Thenen
c3129e55d2 [Issue_2340] Added ASSIMP_ANDROID_JNIIOSYSTEM precheck to only remain set to ON in proper ANDROID enabled toolchain environment 2019-02-18 14:10:32 +01:00
Kim Kulling
fadfaf88db Merge pull request #2326 from MalcolmTyrrell/topic/Bug2034_typeCodeC 
Fix for FBX binary tokenization of arrays of type 'c'
 2019-02-08 20:38:07 +01:00
Kim Kulling
4621bde985 Merge branch 'master' into topic/Bug2034_typeCodeC 2019-02-08 14:38:25 +01:00
Kim Kulling
2f69e4945c Merge pull request #2330 from assimp/kimkulling-dev-1 
Update README
 2019-02-08 14:38:11 +01:00
Kim Kulling
54c5f3f2d0 Update README 
- Update the readme for the exampes.
 2019-02-07 19:22:47 +01:00
Kim Kulling
cd7a9fdcb3 Merge pull request #2329 from assimp/remove_the_devil 
Devil: replace this by header-only lib.
 2019-02-07 19:18:36 +01:00
kimkulling
3f9a25df5a Devil: replace this by header-only lib. 2019-02-07 17:09:05 +01:00
Kim Kulling
06392394ab Merge pull request #2328 from lerppana/bugfix/ambiguous_calls 
Bugfix issue: #2327 Build broken on clang-7.0.1
 2019-02-07 10:10:59 +01:00
Lassi Lääti
cc276c3180 cast size_t to unsigned int 2019-02-06 21:14:22 +02:00
Kim Kulling
cfeb0060a2 Merge pull request #2325 from assimp/sec_issues 
Fix potential security issues.
 2019-02-06 13:24:38 +01:00
Malcolm Tyrrell
56374666a7 Add two test files which require 'c' handling to be tokenized correctly. 2019-02-06 11:15:31 +00:00
Malcolm Tyrrell
02a5f6b62f Remove unneeded newline. 2019-02-06 11:15:27 +00:00
Malcolm Tyrrell
f9014d7410 Add tokenization of 'c' type arrays, both compressed and uncompressed. 2019-02-06 11:15:21 +00:00
Kim Kulling
1e35ea3bc8 Merge branch 'master' into sec_issues 2019-02-06 11:27:53 +01:00
Kim Kulling
502f59ccbc Merge pull request #2323 from assimp/fix_ofd 
remove dead code
 2019-02-06 11:27:07 +01:00
Kim Kulling
6e39c22554 Fix potential security issues. 2019-02-05 22:05:52 +01:00
Kim Kulling
28622d25bf Merge branch 'master' into fix_ofd 2019-02-05 21:10:07 +01:00
Kim Kulling
103fb5d3eb Merge pull request #2324 from assimp/kimkulling-patch-4 
Update Readme.md
 2019-02-05 21:09:55 +01:00
Kim Kulling
216008d230 Update Readme.md 
closes https://github.com/assimp/assimp/issues/2248: Add lgtm badge.
 2019-02-05 20:16:53 +01:00
Kim Kulling
963c892862 Merge branch 'master' into fix_ofd 2019-02-05 00:36:59 +01:00
Kim Kulling
afb779e59d remove dead code 2019-02-05 00:36:07 +01:00
Kim Kulling
0f8f1449a1 Merge pull request #2322 from assimp/fix_ofd 
fix openfiledialog in modelviewer.
 2019-02-05 00:06:10 +01:00
Kim Kulling
daad5b4ee9 Merge branch 'master' into fix_ofd 2019-02-04 22:17:38 +01:00
Kim Kulling
ae15228703 Merge pull request #2319 from muxanick/topic/large_gltf_files_support 
glTF/glTF2 Buffer grow changes and large files support
 2019-02-04 22:17:09 +01:00
Kim Kulling
f5ef078834 fix openfiledialog in modelviewer. 2019-02-04 22:15:15 +01:00
Mike Samsonov
5ce1cfedfe warning fix for gcc 2019-02-04 16:15:52 +00:00
Mike Samsonov
971ba308b3 Merged PR 2811682: buffer grow changes and large files support 
Buffer grow changes:
The exporting of relatevely large data could take a few days, because reallocation of a buffer every time for a few new bytes is overkill. I've introduced standard capacity member for the buffer and growth it by 1.5 times every time. That helps a lot, descrease exporting to a minute (from a few days).

Large file support:
glTF is a json file, all lengths and offsets don't have a type, just numbers, but code was always reading it as uint32, this doesn't work for files bigger than int32 (almost all files we have as an example). So, I've changed it to be reading as size_t. Specification doesn't specify the type for it, so it's not against spec.
 2019-02-04 15:16:28 +00:00
Kim Kulling
6c4fde73e6 Merge pull request #2318 from assimp/issue_2297 
closes https://github.com/assimp/assimp/issues/2297: introduce obj-un…
 2019-02-03 21:21:35 +01:00
Kim Kulling
acc8826b02 Merge branch 'master' into issue_2297 2019-02-03 11:34:07 +01:00
Kim Kulling
996fb4aae7 closes https://github.com/assimp/assimp/issues/2297: introduce obj-unittest to validate working importer. 2019-02-03 11:32:56 +01:00
Kim Kulling
475e51d157 Merge pull request #2316 from assimp/kimkulling-dev 
Kimkulling dev
 2019-02-02 08:25:06 +01:00
Kim Kulling
d25654c8c4 Merge branch 'master' into kimkulling-dev 2019-02-01 16:08:01 +01:00
Kim Kulling
2fd10a37ee Merge pull request #2317 from severin-lemaignan/master 
[pyassimp] Bumped to 4.1.4
 2019-02-01 16:07:47 +01:00
kimkulling
0a0ac06285 Merge branch 'kimkulling-dev' of https://github.com/assimp/assimp into kimkulling-dev 2019-01-31 17:24:29 +01:00