Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,309 Commits 19 Branches 43 Tags
4e414eb4ef01f80f11408469fd0ccaca8a22ccc9
Commit Graph

8309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iamAdrianIusca
4e414eb4ef Merge remote-tracking branch 'origin/master' 2020-02-21 20:17:49 +02:00
iamAdrianIusca
f28b087d16 small improvements in the CMakeLists.txt file 
If ASSIMP_NO_EXPORT is not defined:
- don't add the macro for the exporters
- don't include the files for all the exporter
- don't display any messages about what exporters are enabled or not
 2020-02-21 20:17:38 +02:00
Adrian Iusca
93d1586f44 Merge branch 'master' into master 2020-02-19 21:31:24 +02:00
Kim Kulling
bc3ed5f702 Merge pull request #3021 from malortie/fix-simpletexturedopengl-memory-leaks 
Fixed memory leaks in SimpleTexturedOpenGL sample.
 2020-02-19 20:13:02 +01:00
Marc-Antoine Lortie
4d27fccd0b Fixed memory leaks in SimpleTexturedOpenGL sample. 
- Added function "cleanup" to centralize release of resources.
- Added function "freeTextureIds" to free textureIds memory.
- Added call to freeTextureIds in LoadGLTextures to free memory before it is allocated again.
- Made several changes in KillGLWindow to prevent certain Win32 handle/resources
 from being released more than once.
 2020-02-19 13:17:45 -05:00
Adrian Iusca
93de396373 Merge branch 'master' into master 2020-02-19 16:03:33 +02:00
Kim Kulling
8639bbabc7 Merge pull request #3020 from assimp/kimkulling-clangformat 
Keep post-processor intentions
 2020-02-19 12:35:09 +01:00
Kim Kulling
8d6d8e2e38 Update .clang-format 
Update clang.format to keep formatting of hashes in include file to optimize readabilaty.
 2020-02-19 10:42:30 +01:00
iamAdrianIusca
4de0237167 small fix 2020-02-18 21:55:35 +02:00
iamAdrianIusca
a5524ffcd9 more changes 2020-02-18 19:02:14 +02:00
iamAdrianIusca
ad52c5c5f6 .clear in destructor is redundant 2020-02-18 18:56:09 +02:00
iamAdrianIusca
bf85fc1386 small changes 2020-02-18 18:50:48 +02:00
iamAdrianIusca
016c0a8665 small changes 2020-02-18 18:42:59 +02:00
iamAdrianIusca
76908002c6 Merge remote-tracking branch 'origin/master' 2020-02-18 18:25:17 +02:00
iamAdrianIusca
d0922230a9 fixed the = default on the destructor 2020-02-18 18:24:52 +02:00
Adrian Iusca
0811a69dab Merge branch 'master' into master 2020-02-18 18:02:25 +02:00
iamAdrianIusca
485e474a0c Merge remote-tracking branch 'origin/master' 2020-02-18 18:02:03 +02:00
iamAdrianIusca
a65bac27e9 fixed the make_unique 2020-02-18 18:01:53 +02:00
Kim Kulling
10c84c9226 Merge pull request #3015 from malortie/fix-simpletexturedopengl-sample 
Fixed SimpleTexturedOpenGL sample.
 2020-02-18 14:24:26 +01:00
Kim Kulling
51ebe1abfb Merge branch 'master' into fix-simpletexturedopengl-sample 2020-02-17 23:22:06 +01:00
Kim Kulling
919da48cdc Merge pull request #3016 from assimp/kimkulling-patch-1-1 
Update .clang-format
 2020-02-16 15:36:58 +01:00
Kim Kulling
eb8abfa02c Update .clang-format 
Disable tabs.
 2020-02-16 12:37:46 +01:00
Marc-Antoine Lortie
d9042e4609 Fixed SimpleTexturedOpenGL sample. 
Several places in the sample's code were calling Unicode versions of Win32 functions with "multibyte" strings. A few changes were required to fix it.

I added a class "UTFConverter", which handles calls to unicode/multibyte string conversions. This should help minimize the impacts on code change in case C++'s codecvt_utf8 ever changes.

In addition, seveal memory leaks have been found, but these fixes will come in another PR because it goes beyond the scope of this PR.

DevIL.lib was removed in CMakeFiles.txt, as it is unused in the sample.

Here is a list of the changes:

- Fixed MB string calls to Unicode functions.
- Added class UTFConverter to handle string conversions.
- Removed reference to DevIL.lib.
- Fixed compile warnings.
 2020-02-15 18:02:12 -05:00
Adrian Iusca
4f44b4d25f Merge branch 'master' into master 2020-02-15 23:32:40 +02:00
iamAdrianIusca
024b5e60bc Merge remote-tracking branch 'origin/master' 2020-02-15 23:29:26 +02:00
iamAdrianIusca
5c99d6a864 very small changes 
- FIND_PACKAGE(DirectX) is already used in the samples and assimp tool cmake files - so is not needed in the main cmake fil
- other small changes
 2020-02-15 23:29:04 +02:00
Kim Kulling
a0000e5be4 Merge pull request #3003 from iamAdrianIusca/master 
minor code improvements for the obj code
 2020-02-15 10:55:26 +01:00
Kim Kulling
00a104efde Merge branch 'master' into master 2020-02-14 20:58:13 +01:00
Kim Kulling
82beb35b78 Merge pull request #3000 from malortie/search-invalid-textures-missing-texture-types 
Added missing texture types when searching for invalid textures.
 2020-02-14 20:05:58 +01:00
Kim Kulling
bdd5e52176 Merge branch 'master' into search-invalid-textures-missing-texture-types 2020-02-14 18:04:30 +01:00
Kim Kulling
1473c6616b Merge branch 'master' into master 2020-02-14 12:56:14 +01:00
Kim Kulling
f7abd61cca Merge pull request #2986 from bubba/gltf-camera-pos 
Use the translation matrix in gltf2 cameras for aiCamera.mPosition
 2020-02-14 12:55:36 +01:00
Adrian Iusca
d662b25b17 Merge branch 'master' into master 2020-02-14 13:40:15 +02:00
Kim Kulling
523e6c9f73 Merge branch 'master' into gltf-camera-pos 2020-02-14 08:21:54 +01:00
Kim Kulling
d5b7ecd2ec Merge pull request #2995 from runforu/master 
Fix: GLTF animation works on RTS not matrix; fix matrix related bug; …
 2020-02-14 08:21:29 +01:00
Hui.Du
b62bd38c71 Fix: GLTF animation works on RTS not matrix; fix matrix related bug. 2020-02-14 02:11:12 +00:00
Adrian Iusca
56a71f22e1 Merge branch 'master' into master 2020-02-14 01:04:46 +02:00
Kim Kulling
a4868a9530 Merge pull request #2985 from ms-maxvollmer/FBXMeshGeometry_checksizes_fix 
Fixed size check to use correct value
 2020-02-13 21:40:55 +01:00
iamAdrianIusca
25feb77982 more minor changes 2020-02-13 00:38:56 +02:00
iamAdrianIusca
6f1870681b reduced the scope of iStep variable 2020-02-13 00:27:30 +02:00
iamAdrianIusca
24cdb1f221 revert small change 2020-02-13 00:21:04 +02:00
Adrian Iusca
6f53e8b43b Merge branch 'master' into master 2020-02-13 00:14:20 +02:00
iamAdrianIusca
fc4dd6455a minor code improvements for the obj code 
- make use of range for loops
- make use of empty() method for the std::vector
- removed unnecessary std::string initialization
- use ' ' instead of " " for the find methods (should be "faster")
- simplified some function
- make use of emplace_back instead of push_back (should be "faster")
- other small changes
 2020-02-13 00:10:07 +02:00
Kim Kulling
f5af791633 Merge branch 'master' into FBXMeshGeometry_checksizes_fix 2020-02-12 17:58:00 +01:00
Kim Kulling
58b9dcbdc7 Merge pull request #2973 from bztsrc/master 
Additional checks on invalid input
 2020-02-12 17:22:46 +01:00
Kim Kulling
47fc3f2627 Update M3DImporter.cpp 
Fix a memoryleak.
 2020-02-12 14:54:00 +01:00
Kim Kulling
1c13c793f0 Merge branch 'master' into master 2020-02-11 22:00:22 +01:00
Kim Kulling
aed762acd7 Merge pull request #2971 from ms-maxvollmer/FBXParser_check_inputlength_fix 
Check input token length before copy
 2020-02-11 21:57:38 +01:00
Marc-Antoine Lortie
50334086cf Added missing texture types when searching for invalid textures. 2020-02-11 11:42:13 -05:00
Kim Kulling
58990d4e3f Update FBXParser.cpp 
add missing brackets.
 2020-02-10 23:59:52 +01:00