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

8304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kimkulling
bb4eab3ff2 Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all 2020-03-11 17:42:28 +01:00
kimkulling
19b40397a9 fix misor findings. 2020-03-11 17:42:10 +01:00
Kim Kulling
b4344cc7cf Update CMakeLists.txt 
Remove empty option.
 2020-03-11 16:51:12 +01:00
kimkulling
69551e81ed Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all 2020-03-11 10:15:25 +01:00
kkulling
f8757322be fix warnings 2020-03-11 09:43:55 +01:00
Kim Kulling
7e7555a91b fix compiler warnings in tools and test- 2020-03-11 00:43:44 +01:00
Kim Kulling
02e5698a38 fix linker issues. 2020-03-09 22:49:32 +01:00
Kim Kulling
e8d2b84017 clean all warnings for vs-2019 2020-03-08 21:24:01 +01:00
Kim Kulling
920535165d next fixed warnings 2020-03-01 13:15:45 +01:00
Kim Kulling
fb3c3048a5 Merge branch 'master' into enable_vs_warning_all 2020-02-18 14:47:38 +01:00
Kim Kulling
6e13381bdb next warnings. 2020-02-18 14:41:19 +01: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
22118dff1d Merge branch 'master' into enable_vs_warning_all 2020-02-16 15:37:48 +01:00
Kim Kulling
c2bfbdacf4 fix more warnings. 2020-02-16 15:37:20 +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
Kim Kulling
4a3ecbea14 disable arning for irrXml. 2020-02-15 11:43:35 +01:00
Kim Kulling
b072614fad disable warnings for zib. 2020-02-15 11:40:26 +01: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
693aa5c1d6 Enable all warnings for Visual Studio. 2020-02-14 20:50:17 +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
Kim Kulling
5e979d72c9 Merge branch 'master' into FBXParser_check_inputlength_fix 2020-02-10 23:59:13 +01:00
Kim Kulling
c722061f18 Merge pull request #2969 from LoicFr/master 
Import/export of embedded texture names for the glTF/glTF2 format
 2020-02-10 23:58:40 +01:00
Kim Kulling
471f9b23c9 Merge branch 'master' into master 2020-02-10 21:37:01 +01:00
Kim Kulling
c6000db3be Merge pull request #2994 from iamAdrianIusca/master 
Small changes in the CMake file
 2020-02-10 21:07:52 +01:00
Kim Kulling
d38e541e89 Merge branch 'master' into master 2020-02-09 20:43:12 +01:00