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

8986 Commits (bdcad5cd0a2ff6f2dd495290992abc5b6e926626)

Author SHA1 Message Date
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
jess 0f32f59dc3
Add Open Collective 
Hi, I'm making updates for Open Collective. Either you or another core contributor signed this repository up for Open Collective. This pull request adds financial contributors from your Open Collective https://opencollective.com/assimp ❤️

  What it does:
  - adds a badge to show the latest number of financial contributors
  - adds a banner displaying contributors to the project on GitHub
  - adds a banner displaying all individuals contributing financially on Open Collective
  - adds a section displaying all organizations contributing financially on Open Collective, with their logo and a link to their website

P.S: As with any pull request, feel free to comment or suggest changes.

  Thank you for your great contribution to the Open Source community. You are awesome! 🙌
  And welcome to the Open Collective community! 😊

  Come chat with us in the #opensource channel on https://slack.opencollective.com - great place to ask questions and share best practices with other Open Source sustainers!
 2020-04-15 13:24:22 -07: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
Peter Seiderer 74c8d09bd8 contrib/zlib: disable dynamic library building 
Fixes compile failure for static only toolchains (and assimp
links against the static one).
 2020-04-13 14:55:57 +02:00
György Straub e4ceccb42d
Merge branch 'master' into master 2020-04-12 15:58:25 +01: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
Kim Kulling d2499ac197
Update CMakeLists.txt 
Linke irrXml static for apple
 2020-04-10 12:52:54 +02:00
Kim Kulling 872001c1c9
Merge branch 'master' into sample-simpletextureddirectx11-nullptr 2020-04-10 12:29:51 +02:00
Kim Kulling 9b671c6eb4
Update CMakeLists.txt 
Add explicit linking of irrxml.
 2020-04-10 12:27:40 +02:00
Max Vollmer (Microsoft Havok) a14b5fb06f
Merge branch 'master' into GLTF2_invalid_buffer_fix 2020-04-10 08:44:19 +01:00
Max Vollmer (Microsoft Havok) 485d7ab52e
Merge branch 'master' into GLTF2_recursive_references_fix 2020-04-10 08:44:18 +01:00
Kim Kulling 79af2b1a5c
Merge branch 'master' into kimkulling_dev 2020-04-09 19:55:45 +02:00
Kim Kulling 3d95e75774
Merge pull request #3141 from malortie/sample-simpletexturedogl-nullptr 
Replaced NULL with nullptr for pointers in sample SimpleTexturedOpenGL.
 2020-04-08 22:13:50 +02:00
Kim Kulling 909a838ea8
Merge branch 'master' into sample-simpletexturedogl-nullptr 2020-04-08 20:53:25 +02:00
Kim Kulling bb7212c46a
Merge pull request #3139 from malortie/assimp-viewer-nullptr 
Replaced NULL with nullptr for pointers in Assimp viewer.
 2020-04-08 20:52:43 +02:00
Kim Kulling c6045438dc
Merge branch 'master' into assimp-viewer-nullptr 2020-04-08 20:17:37 +02:00
György Straub faf6ee2607
Merge branch 'master' into master 2020-04-08 12:11:02 +01:00