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

8648 Commits (f8024188f0a8833db90c5adf1a7d3f06357e9ba3)

Author SHA1 Message Date
iamAdrianIusca 691dfe7012 fixing the conflicts 2020-03-09 22:23:18 +02:00
iamAdrianIusca 18cb5745bc fixing the conflicts 2020-03-09 22:21:36 +02:00
iamAdrianIusca 8f41516637 Merge remote-tracking branch 'origin/master' 2020-03-09 22:19:22 +02:00
iamAdrianIusca 051d01e339 fixing the conflicts 2020-03-09 22:19:12 +02:00
Kim Kulling c7628d0f92
Merge pull request #3058 from assimp/fix_zip_issue 
Fix zip issue
 2020-03-09 13:47:45 +01:00
Kim Kulling 9fae5fdabb
Merge branch 'master' into fix_zip_issue 2020-03-09 10:57:04 +01:00
kimkulling f3b6b78d4d small refactorings. 2020-03-09 10:55:32 +01:00
kimkulling bb3db0ebaf closes https://github.com/assimp/assimp/issues/2954: upgrade to latest greatest. 2020-03-09 10:51:26 +01:00
Kim Kulling 7b1187a917
Merge pull request #3057 from shawwn/2020-03-09/fix 
Only try to initialize members whose name starts with 'm' followed by an uppercase character
 2020-03-09 10:15:03 +01:00
Shawn Presser f305f10551 Only try to initialize members whose name starts with 'm' followed by an uppercase character 2020-03-09 00:05:17 -07:00
Kim Kulling e8d2b84017 clean all warnings for vs-2019 2020-03-08 21:24:01 +01:00
Kim Kulling 5866f3f98f
Merge branch 'master' into fix-simpletextureddirectx11-sample2 2020-03-08 18:48:26 +01:00
Kim Kulling 339f9387a7
Merge pull request #3056 from malortie/fix-matrix3x3-comparison-operators 
Fixed wrong matrix type used in aiMatrix3x3t comparison operators.
 2020-03-08 18:47:11 +01:00
Marc-Antoine Lortie 424f5e939f Fixed wrong matrix type used in comparaison operators. 2020-03-08 12:18:09 -04:00
Marc-Antoine Lortie dda083fa7b Added missing std namespace prefix to std types. 2020-03-08 10:50:18 -04:00
Kim Kulling a3ff03f193
Merge branch 'master' into raise-cmake-minimum-version-to-3.0 2020-03-08 09:06:09 +01:00
Kim Kulling 1e2c3c9c01
Merge pull request #3053 from malortie/fix-simpledirectx11-sample 
Fixed SimpleTexturedDirectX11 sample.
 2020-03-07 17:59:24 +01:00
Kim Kulling b5d65bf94e
Update ModelLoader.cpp 
Apply asimp-code-style.
 2020-03-07 12:22:57 +01:00
Kim Kulling 31c6f0db92
Update Mesh.h 
Apply code style.
 2020-03-07 12:19:55 +01:00
Marc-Antoine Lortie c620e9a2ac Fixed memory leak caused by glutMainLoop() not returning. 
Fixed memory leak by allowing glutMainLoop() to return to allow for the scene and streams to be released.
 2020-03-06 13:28:05 -05:00
Marc-Antoine Lortie 673a1dcea5
Merge branch 'master' into sample-simpleopengl-minor-improvements 2020-03-06 10:45:58 -05:00
Marc-Antoine Lortie aa8a6122ce Fixed SimpleTexturedDirectX11 sample. 
- Removed OpenGL/Glut references in SimpleTexturedDirectX11 CMakeFile
- Moved UTFConverter from SimpleTexturedOpenGL to its own file to be able to reuse it.
- Added compile definition SHADER_PATH to allow to locate the shader files in CMakeFile
- Fixed compile warnings
- Made global pointers null to help prevent dangling references.
- Added missing members initialization in class constructors.
- Removed references to missing model "Models/mymodel.fbx"
- Fixed error when extracting model file directory
- Added missing device context assignment in ModelLoader Load method
- Fixed memory leak caused by variable 'ourModel' not deleted.
- Removed call to dev->Release() in ModelLoader.cpp
- Adjusted Release() calls in reverse order when cleaning up D3D
- Made Throwanerror implementation throw an error instead of displaying a message box
- Fixed leaking D3D resources
- Added a pointer to an ID3D11Debug to dump live objects.
 2020-03-06 10:26:51 -05:00
Kim Kulling 291d86c4e0
Merge branch 'master' into raise-cmake-minimum-version-to-3.0 2020-03-06 14:18:04 +01:00
Adrian Iusca 067677595c
Merge branch 'master' into master 2020-03-05 10:29:21 +02:00
Sebastian Matusik 8b9abc58e7 ifdef the exporters as specifying harsher linker flags than what's in default CMake causes linking issues. 2020-03-04 17:15:09 -08:00
Yingying Wang bb62249f0c fix gltf2 exporter memory crash 2020-03-04 14:52:26 -08:00
Kim Kulling 0201fc57dc
Merge pull request #3039 from Nimer-88/gltf2_broken_bones_count 
Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0
 2020-03-04 23:10:32 +01:00
Kim Kulling 0b227219b7
Merge branch 'master' into gltf2_broken_bones_count 2020-03-03 11:33:56 +01:00
Kim Kulling a254690ba0
Merge branch 'master' into raise-cmake-minimum-version-to-3.0 2020-03-02 20:44:07 +01:00
Kim Kulling 920535165d next fixed warnings 2020-03-01 13:15:45 +01:00
iamAdrianIusca 66288df49b small change 2020-03-01 12:24:34 +02:00
iamAdrianIusca ffaa3629d8 back with the emplace_back 2020-03-01 11:24:58 +02:00
Adrian Iusca ec61318443
Merge branch 'master' into master 2020-03-01 11:24:12 +02:00
iamAdrianIusca 0d8434ed34 fix 2020-03-01 11:23:55 +02:00
iamAdrianIusca 2917ab04b7 fix 2020-03-01 11:22:44 +02:00
iamAdrianIusca 89ca66f300 fix 2020-03-01 11:21:53 +02:00
iamAdrianIusca 1f4b99479d fix 2020-03-01 11:20:55 +02:00
iamAdrianIusca 3bef9382bb Merge remote-tracking branch 'origin/master' 2020-03-01 11:12:46 +02:00
iamAdrianIusca aca6aaf35d small changes 
- removed static definition
- use emplace_back instead of push_back
- changed the c++ deprecated headers
- removed some redundant std containers initialization in the destructor
- removed redundant .clear call for the std containers in the destructor
- added some const reference for some std container parameters
- other small changes in different places
 2020-03-01 11:12:37 +02:00
Kim Kulling 772774495c
Merge pull request #3040 from Nimer-88/split_by_bone_count_infinite_loop 
Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop
 2020-02-29 20:19:43 +01:00
Sebastian Matusik 710dbba52d Trimmed trailing whitespaces 2020-02-28 19:19:10 -08:00
Sebastian Matusik 496fcd35c1 Trimmed trailing whitespaces 2020-02-28 19:17:53 -08:00
Sebastian Matusik 5f35d62d61 Fix for #3037 cause glTF2Importer creating bunch of bones with 0 for vertex with index 0 2020-02-28 18:43:47 -08:00
Sebastian Matusik 22311883ce Fix for #3037 [FATAL] SplitByBoneCountProcess::SplitMesh goes into infinite loop 2020-02-28 18:42:22 -08:00
Kim Kulling f343d3eec2
Merge pull request #3022 from iamAdrianIusca/master 
small improvements in the CMakeLists.txt file
 2020-02-28 22:52:59 +01:00
Adrian Iusca 440629f1d2
Merge branch 'master' into master 2020-02-26 20:27:52 +02:00
Marc-Antoine Lortie c5aa817bda
Merge branch 'master' into sample-simpleopengl-minor-improvements 2020-02-26 12:44:25 -05:00
Kim Kulling 5eca30e274
Merge pull request #3010 from jcarpent/master 
pkg-config: fix include path
 2020-02-26 18:35:46 +01:00
Marc-Antoine Lortie ed5aab9495 Fixed and changed a few things. 
- Removed references to test models with relative path.
- Fixed a compile warning.
- Added usage message.
 2020-02-26 12:19:06 -05:00
Nikita Shubin 3c081f5f70 [RFC] cmake: targets: check lib or lib64 path 
Linkage against lib or lib64 should be taken into assumption.

Without it we get:

The imported target "assimp::assimp" references the file

     "/usr/lib/libassimp.so.5"

When compiling against x86_64 target. The library of couse exits in
/usr/lib64.

see:
https://cmake.org/cmake/help/v3.17/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.html

As i am not a master of cmake this should be double checked if
it doesn't break anything.

Signed-off-by: Nikita Shubin <NShubin@topcon.com>
 2020-02-26 17:06:22 +03:00