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

11444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Justin Carpentier
ba925e8860 Merge branch 'master' into master 2020-02-18 17:23:02 +01: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
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
221e56769f Merge branch 'master' into kimkulling_dev 2020-02-16 19:56:26 +01:00
Kim Kulling
92da00329f Update irrArray.h 
fix init ordering.
 2020-02-16 18:10:52 +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
d75f46280d Update irrString.h 
fiix ordering of initializiation
 2020-02-16 15:32:29 +01:00
Kim Kulling
ec3a5620d0 Update AssxmlExporter.cpp 
Fix the build.
 2020-02-16 15:04:18 +01:00
Kim Kulling
ada4f51d5b Merge branch 'master' into kimkulling_dev 2020-02-16 13:10:41 +01:00
Kim Kulling
b3d894ee73 Update CMakeLists.txt 
temporary disable iiXml test until xml-parser migration is ready.
 2020-02-16 13:06:38 +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
Marc-Antoine Lortie
be4fe131d5 Made changes to write compiled binaries to a common directory. 
The following changes were tested with the following projects:

- assimp DLL
- unit tests
- tools/assimp_cmd
- tools/assimp viewer
- samples/SimpleOpenGL
- samples/SimpleTexturedDirectx11
- samples/SimpleTexturedOpenGL

For each program listed above, the results were tested when (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) is true and false.

Also, the "lib" in SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib") was changed to "bin" to allow DLLs to be written to executables/launchables programs directory.
 2020-02-15 13:10:11 -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
Justin Carpentier
1e828cb8bb pkg-config: fix include path 2020-02-14 15:57:06 +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
Inho Lee
d04df3e7c5 A bug when importing multiple gltf files 
meshOffsets are not cleared when importing multiple gltf files
 2020-02-14 08:41:55 +01: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