Commit Graph

8630 Commits (232761be02c8256e578bfc6ed0e1478ee230ab9d)

Author SHA1 Message Date
Kim Kulling 232761be02
Fix another typo 2020-04-21 16:09:11 +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
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
Kim Kulling 1567652e60
Merge branch 'master' into libsuffix-import-prefix 2020-04-17 19:22:50 +02:00
Kim Kulling 6daecdcc5a
Merge pull request #3158 from Hehongyuanlove/master
3MF fix
2020-04-17 19:19:21 +02:00
Kim Kulling c67f97e956
Merge branch 'master' into master 2020-04-17 16:37:09 +02:00
Kim Kulling e299f71cfe
Adapt the formatting 2020-04-17 16:16:28 +02:00
Kim Kulling f4b7a98131
Merge pull request #3131 from malortie/sample-simpletextureddirectx11-nullptr
Replaced NULL with nullptr for pointers in sample SimpleTexturedDirectx11.
2020-04-17 14:54:08 +02:00
Kim Kulling 966b5f4330
Merge branch 'master' into sample-simpletextureddirectx11-nullptr 2020-04-17 14:43:20 +02:00
Hehongyuanlove 9c52fd7633
Update D3MFExporter.cpp 2020-04-17 12:58:41 +08:00
Hehongyuanlove f80bdc5b71
Update StringUtils.h 2020-04-17 12:57:33 +08:00
Hehongyuanlove 59e32a5ad9
Update StringUtils.h 2020-04-17 12:51:18 +08:00
Hehongyuanlove cc3760aff1
Update StringUtils.h 2020-04-17 12:50:49 +08:00
Hehongyuanlove e9a72a5053
repair formate 3MF 2020-04-17 12:38:07 +08:00
Hehongyuanlove 3bbc8e76bd
Rgba2Hex to repair rgba(1,1,1,1) 2020-04-17 12:34:05 +08:00
Hehongyuanlove 3154cec79c
Rgba2Hex add 2020-04-17 12:31:07 +08:00
Robikz 379d59bcbd Erase the remaining _INSTALL_PREFIX and LIBSUFFIX in CMake files
These seem to have survived from the migration to GNUInstallDirs in
9fb81c3be6

_INSTALL_PREFIX was not set anywhere and resolved to empty value, which
in turn caused some paths in the installed lib config CMake files to
start from '/', effectively causing the failure of the "do the installed
files exist" checks.

After complete replacement of all uses of the _INSTALL_PREFIX with
GNUInstallDirs equivalents, the LIBSUFFIX variable has become unused
and can be removed too.
2020-04-16 16:02:34 +02:00
Kim Kulling 4314fc0521
Merge pull request #3070 from ms-maxvollmer/GLTF2_recursive_references_fix
GLTF2: Detect and abort recursive references
2020-04-16 11:47:39 +02:00
Kim Kulling c0dc26de8e
Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-16 11:29:37 +02:00
Kim Kulling 1e74fe85bf
Merge pull request #3068 from ms-maxvollmer/GLTF2_invalid_buffer_fix
GLTF2: ExtractData now throws exception instead of returning false if data is invalid
2020-04-16 11:28:38 +02:00
Kim Kulling 996abd3fbe
Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-16 11:08:29 +02:00
Kim Kulling e5786bbd8d
Merge pull request #3049 from Nimer-88/ifdef_export_defines
ifdef the exporters as specifying stricter linker flags than what's in default CMake causes linking issues
2020-04-16 11:07:49 +02:00
Kim Kulling d12e938a70
Merge branch 'master' into ifdef_export_defines 2020-04-16 10:24:23 +02:00
Kim Kulling e341eadfd9
Fix typo 2020-04-16 10:23:50 +02:00
Kim Kulling 5feb3628e3
Merge pull request #3036 from malortie/sample-simpleopengl-minor-improvements
Minor fixes and improvements in sample SimpleOpenGL.
2020-04-16 08:42:31 +02:00
Kim Kulling 20c125218d
Merge branch 'master' into sample-simpleopengl-minor-improvements 2020-04-16 08:30:30 +02:00
Kim Kulling 4b544f8984
Merge pull request #3035 from maquefel/cmake_targets_determine_lib_path
[RFC] cmake: targets: check lib or lib64 path
2020-04-16 08:25:06 +02:00
Kim Kulling 2d4eab6db0
Merge branch 'master' into cmake_targets_determine_lib_path 2020-04-16 08:08:37 +02:00
Kim Kulling c530635c03
Merge pull request #3147 from malortie/add-tests-to-c-api-2
Added tests to C API missing functionalities in #3091
2020-04-15 22:34:54 +02:00
Kim Kulling 5377d740e8
fix the build 2020-04-15 21:52:21 +02:00
Kim Kulling 7fb37403de
Merge branch 'master' into sample-simpletextureddirectx11-nullptr 2020-04-15 20:55:53 +02:00
Kim Kulling d46ec3f9b9
fix init ordering of members 2020-04-15 20:41:38 +02:00
Kim Kulling a0218c690b
Remove unused variable m 2020-04-15 20:06:22 +02:00
Kim Kulling 54dbb90929
Merge branch 'master' into add-tests-to-c-api-2 2020-04-15 17:17:39 +02:00
Kim Kulling f7cab11a80
Merge pull request #3150 from assimp/kimkulling-fix-workflow
Use checkoutv2
2020-04-15 17:17:25 +02:00
Kim Kulling c079bb21a4
Use checkoutv2 2020-04-15 16:29:55 +02:00
Timur Umayev 69f8d47941 glTF2 support targetNames 2020-04-15 09:39:46 +01:00
Kim Kulling b2a547b817
Add doc 2020-04-14 19:07:41 +02:00
Marc-Antoine Lortie e399a12f71 Small changes to C API unit tests.
- (1) Changed randomized math structure values to predefined values to prevent cases that could potentially lead to division by zero.
- (2) Removed unused variable(s) due to (1).
- (3) Renamed variable(s) for better clarity.
2020-04-13 14:13:54 -04:00
Marc-Antoine Lortie ac16a857ff Merge remote-tracking branch 'upstream/master' into add-tests-to-c-api-2 2020-04-13 09:08:45 -04:00
Kim Kulling 91ff457c87
Merge branch 'master' into sample-simpletextureddirectx11-nullptr 2020-04-10 19:44:04 +02:00
Kim Kulling 9b694a8645
Merge pull request #2885 from assimp/kimkulling_dev
Testcoverage improvements.
2020-04-10 18:58:29 +02:00
Kim Kulling 13429485d9
Update CMakeLists.txt
remove not needed lib
2020-04-10 17:00:38 +02:00