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

8568 Commits (e5786bbd8dc0d01ddeba2cf35b825e7f85d493fe)

Author SHA1 Message Date
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 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
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 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 9b671c6eb4
Update CMakeLists.txt 
Add explicit linking of irrxml.
 2020-04-10 12:27:40 +02: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
Marc-Antoine Lortie 592e71dd7e Replaced NULL with nullptr for pointers in sample SimpleTexturedOpenGL. 2020-04-07 16:43:36 -04:00
Kim Kulling abb628bc58
Merge pull request #3125 from malortie/fix-sample-simpletexturedogl-w4-compile-warnings 
Fixed /W4 compile warnings in sample SimpleTexturedOpenGL.
 2020-04-07 20:43:04 +02:00
Kim Kulling d0e14e4140
Merge branch 'master' into fix-sample-simpletexturedogl-w4-compile-warnings 2020-04-07 18:47:32 +02:00
Marc-Antoine Lortie 3510d85967 Replaced NULL with nullptr for pointers in Assimp viewer. 2020-04-07 10:56:22 -04:00
Kim Kulling b59e6a2df4
Merge pull request #3129 from malortie/fix-assimp-viewer-w4-compile-warnings 
Fixed /W4 compile warnings in Assimp viewer.
 2020-04-07 11:25:28 +02:00
Kim Kulling c79c6f5ae7
Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings 2020-04-07 11:09:25 +02:00
Kim Kulling 0f3b196afc
Merge pull request #3126 from vmatare/master 
use GNUInstallDirs where possible (master branch)
 2020-04-07 11:08:55 +02:00
Kim Kulling 06f148defc
Merge branch 'master' into fix-assimp-viewer-w4-compile-warnings 2020-04-06 20:59:36 +02:00
Kim Kulling 09eba0f039
Merge branch 'master' into master 2020-04-06 20:42:41 +02:00
Kim Kulling 4eb129fa6d
Merge pull request #3137 from assimp/issue_2166 
closes https://github.com/assimp/assimp/issues/2166:
 2020-04-06 20:42:08 +02:00
Kim Kulling 9a11d91cb8 code reformattings. 2020-04-06 13:33:03 +02:00
Kim Kulling 131aed73b0 closes https://github.com/assimp/assimp/issues/2166: add missing setter for metadata. 2020-04-06 11:16:16 +02:00
Kim Kulling 132ecae6f4
Merge branch 'master' into kimkulling_dev 2020-04-04 18:28:50 +02:00
Kim Kulling a73fd6c84c
Update MessageProc.cpp 
I guess Turol meant this change.
 2020-04-04 18:24:19 +02:00
Marc-Antoine Lortie 1b0a0675dc Applied review requested changes - renamed _data to data. 2020-04-04 10:32:29 -04:00
Marc-Antoine Lortie 1cb564aa4b Fixed /W4 compile warnings in Assimp viewer. 2020-04-03 14:36:44 -04:00
Marc-Antoine Lortie 732dc6a5d6
Merge branch 'master' into fix-sample-simpletexturedogl-w4-compile-warnings 2020-04-03 14:15:31 -04:00
Kim Kulling 085212e58a
Merge pull request #3127 from malortie/fix-sample-simpletextureddirectx11-w4-compile-warnings 
Fixed /W4 compile warnings in sample SimpleTexturedDirectx11.
 2020-04-03 18:56:34 +02:00
Marc-Antoine Lortie 4bae1d2596 Fixed warning C4018: '<': signed/unsigned mismatch 2020-04-03 10:07:44 -04:00
Marc-Antoine Lortie e67ddd0ca1 Fixed /W4 compile warnings in sample SimpleTexturedDirectx11. 2020-04-03 09:43:01 -04:00
Marc-Antoine Lortie fa9ccfba61 Applied review requested changes for #3125 
- Reverted stb_image.h changes to prevent future merge conflicts.
- Added #pragma warning before and after stb_image header to disable and enable 'unreferenced formal parameter' warning.
 2020-04-03 07:50:07 -04:00
Victor Mataré 9fb81c3be6 use GNUInstallDirs where possible 
Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and
disable redefining FHS-mandated install locations via user-editable
ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary,
Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables.
 2020-04-03 00:44:44 +02:00
Marc-Antoine Lortie 895675535a Fixed /W4 compile warnings in sample SimpleTexturedOpenGL. 2020-04-02 15:28:06 -04:00
Kim Kulling 6b68c0ee45
Merge pull request #3124 from malortie/fix-sample-simpleogl-w4-compile-warnings 
Fixed /W4 compile warnings in sample SimpleOpenGL.
 2020-04-02 21:02:14 +02:00