Commit Graph

9909 Commits (21b56b00580623b256de669a5c2d561ca34f8b26)

Author SHA1 Message Date
ardenpm d203457f56
Merge pull request #14 from assimp/master
Update master from upstream
2020-04-28 09:43:29 +10:00
Kim Kulling 625cc9d096
Remove useless comparison 2020-04-27 21:30:06 +02:00
Kim Kulling c1c8080143
Use correct name 2020-04-27 19:55:58 +02:00
Kim Kulling 603a1200a2
add gcc build target 2020-04-27 19:51:59 +02:00
luca 7db73182b0 enable gcc build on Linux 2020-04-27 09:51:02 -07:00
Kim Kulling b0c9711894
Small format finding 2020-04-27 15:16:57 +02:00
kimkulling 4c3aee1968 add opencollective to funding 2020-04-27 12:54:17 +02:00
kimkulling aa1e0872c3 Merge branch 'opencollective' of https://github.com/opencollective/assimp into opencollective-opencollective 2020-04-27 12:51:06 +02:00
Inho Lee 629320a3a0 Add timescale for collada 2020-04-27 11:52:04 +02:00
Kim Kulling 0a66a2c670
Merge pull request #3168 from lukka/master
Use clang on Unix, msvc on Windows, Use Ninja everywhere
2020-04-27 10:22:02 +02:00
luca d98787f35b CI: use clang on Unix, msvc on Windows;Remove explicit flags in CMakeLists.txt; 2020-04-26 12:50:42 -07:00
Kim Kulling 2273160f2c
Merge pull request #3167 from assimp/iisue_3165
Iisue 3165
2020-04-26 19:38:31 +02:00
Kim Kulling 6c1e21d754 fix formatting. 2020-04-26 19:14:30 +02:00
Kim Kulling bafb8e3189 closes https://github.com/assimp/assimp/issues/3165: remove deprecated code whch causes compiler warning. 2020-04-26 08:59:52 +02:00
Kim Kulling 638df2ceac
Merge branch 'master' into master 2020-04-25 12:07:06 +02:00
Trevor David Black 3dc550a9b2 Got a working geometry prototype, sponza renders correctly when camera and light is added 2020-04-25 00:10:31 -07:00
David Golembiowski e438310d8c should have added these earlier 2020-04-25 00:12:58 -04:00
David M. Golembiowski 52f0f0fd2c
Merge pull request #2 from dmgolembiowski/rust-port
Rust port
2020-04-24 22:17:35 -04:00
David Golembiowski 060c45fcf3 initial layout for anim.rs 2020-04-24 22:15:32 -04:00
David Golembiowski 2108e08c90 adding structs 2020-04-24 18:15:51 -04:00
David M. Golembiowski 1ccf86ea7d
Merge pull request #1 from dmgolembiowski/rust-port
Rust port
2020-04-24 17:05:06 -04:00
David Golembiowski 6363bf34c0 see git commit message rust-port 5d05c536 2020-04-24 17:03:41 -04:00
David Golembiowski 5d05c536e7 updated gitignore and made port library name compliant with cargo 2020-04-24 17:02:36 -04:00
David Golembiowski df57ee6cb6 laying out the submodules 2020-04-24 16:49:38 -04:00
David Golembiowski 45e33ce1bf first commit 2020-04-24 16:36:44 -04:00
Kim Kulling 02ef435d55
Merge pull request #3116 from assimp/issue_3103
closes https://github.com/assimp/assimp/issues/3103: always enable wa…
2020-04-24 09:06:46 +02:00
Kim Kulling 9fc2b2f168
Merge branch 'master' into issue_3103 2020-04-23 21:22:12 +02:00
Kim Kulling 7f9a1887f3
Merge pull request #3164 from assimp/migenius-migenius-rsws53-mig-2
Migenius migenius rsws53 mig 2
2020-04-23 21:20:45 +02:00
Trevor David Black 07065e2235 Working first proof of concept. Renders ambient term in pbrt 2020-04-22 13:38:06 -07:00
Kim Kulling 9b1759dcc2
Merge branch 'master' into migenius-migenius-rsws53-mig-2 2020-04-22 19:59:53 +02:00
Kim Kulling ca70b44e44 Merge branch 'migenius-rsws53-mig-2' of https://github.com/migenius/assimp into migenius-migenius-rsws53-mig-2 2020-04-22 19:58:41 +02:00
Kim Kulling 76f2e783c3
Merge branch 'master' into ps-devel-fix-contrib-zlib-static-compile-001 2020-04-21 20:59:46 +02:00
Kim Kulling e3256303f5
Merge pull request #3085 from napina/optimized_bonelimits
Optimized LimitBoneWeightsProcess.
2020-04-21 19:52:36 +02:00
Kim Kulling 2471ae9fcc
Merge branch 'master' into optimized_bonelimits 2020-04-21 19:31:54 +02:00
Kim Kulling 92cb3402ab
Merge pull request #3161 from assimp/kimkulling-installerupdate
Update to 5.0.1
2020-04-21 19:31:05 +02:00
Kim Kulling c36b028412
fix type error for template deduction. 2020-04-21 16:39:18 +02:00
Kim Kulling 232761be02
Fix another typo 2020-04-21 16:09:11 +02:00
Kim Kulling 32de8737b7
Update to 5.0.1 2020-04-21 16:07:58 +02:00
Kim Kulling 435f898ffa
Update to 5.0.1 2020-04-21 16:06:52 +02:00
Kim Kulling 843ca6e386
Fix typo 2020-04-21 15:50:17 +02:00
Kim Kulling 428b91154a
Adapt smallvector
- Add doc ( public header )
- Fix type error
2020-04-21 08:59:40 +02:00
Kim Kulling 788f2f244e
Adapt code
- Reformatting based on clang-format rules
- Add usage of size_t instead of unsigned int for sizes
- Fix typo in naming
2020-04-21 08:50:51 +02:00
Kim Kulling c91d3764ca
Merge branch 'master' into optimized_bonelimits 2020-04-21 08:45:50 +02:00
Trevor David Black cb88210c62 Completed scene wide rendering output 2020-04-20 12:23:22 -07:00
Trevor David Black 1045fb7798 Got 90 percent solution for exporting camera data 2020-04-20 11:55:46 -07:00
Kim Kulling 69bdebf3ac
Merge pull request #3149 from timuber/master
Add support for glTF2 targetNames
2020-04-20 14:52:53 +02:00
Kim Kulling f71b332ed1
Update glTF2Asset.inl
fix VS-compiler warning.
2020-04-19 21:14:47 +02:00
Kim Kulling e3563212d7
Merge branch 'master' into master 2020-04-19 21:13:12 +02:00
Kim Kulling e0f6eb09e6
Merge branch 'master' into optimized_bonelimits 2020-04-17 20:37:28 +02:00
Kim Kulling 8219b7c362
Merge pull request #3155 from Zalewa/libsuffix-import-prefix
Erase the remaining _INSTALL_PREFIX and LIBSUFFIX in CMake files
2020-04-17 20:36:59 +02:00