55eb89d476
Merge pull request #3013 from malortie/common-directory-for-compiled-binaries
...
Made changes to write compiled binaries to a common directory.
2020-02-22 21:01:56 +01:00
2d382c5e76
Merge branch 'master' into common-directory-for-compiled-binaries
2020-02-22 09:05:28 +01:00
f3c89b0bd7
Merge branch 'master' into master
2020-02-21 20:23:42 +02:00
4e414eb4ef
Merge remote-tracking branch 'origin/master'
2020-02-21 20:17:49 +02:00
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
3f5136b7b2
Merge branch 'master' into master
2020-02-19 21:52:57 +01:00
848922feae
Merge pull request #3014 from iamAdrianIusca/master
...
small changes
2020-02-19 21:47:33 +01:00
93d1586f44
Merge branch 'master' into master
2020-02-19 21:31:24 +02:00
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
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
93de396373
Merge branch 'master' into master
2020-02-19 16:03:33 +02:00
8639bbabc7
Merge pull request #3020 from assimp/kimkulling-clangformat
...
Keep post-processor intentions
2020-02-19 12:35:09 +01:00
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
4de0237167
small fix
2020-02-18 21:55:35 +02:00
a5524ffcd9
more changes
2020-02-18 19:02:14 +02:00
ad52c5c5f6
.clear in destructor is redundant
2020-02-18 18:56:09 +02:00
bf85fc1386
small changes
2020-02-18 18:50:48 +02:00
016c0a8665
small changes
2020-02-18 18:42:59 +02:00
76908002c6
Merge remote-tracking branch 'origin/master'
2020-02-18 18:25:17 +02:00
d0922230a9
fixed the = default on the destructor
2020-02-18 18:24:52 +02:00
ba925e8860
Merge branch 'master' into master
2020-02-18 17:23:02 +01:00
0811a69dab
Merge branch 'master' into master
2020-02-18 18:02:25 +02:00
485e474a0c
Merge remote-tracking branch 'origin/master'
2020-02-18 18:02:03 +02:00
a65bac27e9
fixed the make_unique
2020-02-18 18:01:53 +02:00
10c84c9226
Merge pull request #3015 from malortie/fix-simpletexturedopengl-sample
...
Fixed SimpleTexturedOpenGL sample.
2020-02-18 14:24:26 +01:00
51ebe1abfb
Merge branch 'master' into fix-simpletexturedopengl-sample
2020-02-17 23:22:06 +01:00
919da48cdc
Merge pull request #3016 from assimp/kimkulling-patch-1-1
...
Update .clang-format
2020-02-16 15:36:58 +01:00
eb8abfa02c
Update .clang-format
...
Disable tabs.
2020-02-16 12:37:46 +01:00
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
4f44b4d25f
Merge branch 'master' into master
2020-02-15 23:32:40 +02:00
024b5e60bc
Merge remote-tracking branch 'origin/master'
2020-02-15 23:29:26 +02:00
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
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
a0000e5be4
Merge pull request #3003 from iamAdrianIusca/master
...
minor code improvements for the obj code
2020-02-15 10:55:26 +01:00
00a104efde
Merge branch 'master' into master
2020-02-14 20:58:13 +01:00
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
bdd5e52176
Merge branch 'master' into search-invalid-textures-missing-texture-types
2020-02-14 18:04:30 +01:00
1e828cb8bb
pkg-config: fix include path
2020-02-14 15:57:06 +01:00
1473c6616b
Merge branch 'master' into master
2020-02-14 12:56:14 +01:00
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
d662b25b17
Merge branch 'master' into master
2020-02-14 13:40:15 +02:00
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
523e6c9f73
Merge branch 'master' into gltf-camera-pos
2020-02-14 08:21:54 +01:00
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
b62bd38c71
Fix: GLTF animation works on RTS not matrix; fix matrix related bug.
2020-02-14 02:11:12 +00:00
56a71f22e1
Merge branch 'master' into master
2020-02-14 01:04:46 +02:00
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
25feb77982
more minor changes
2020-02-13 00:38:56 +02:00
6f1870681b
reduced the scope of iStep variable
2020-02-13 00:27:30 +02:00
24cdb1f221
revert small change
2020-02-13 00:21:04 +02:00
Kim Kulling
Adrian Iusca
iamAdrianIusca
Marc-Antoine Lortie
Justin Carpentier
Inho Lee
Hui.Du