Jackie9527
|
94067994cc
|
Fix warning related to format-non-iso.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
|
2023-04-01 12:29:42 +08:00 |
Kim Kulling
|
85b470a3ee
|
Merge branch 'master' into clang-cl-15.0.1-support
|
2023-03-29 21:20:25 +02:00 |
Kim Kulling
|
2acfc125c3
|
Refactoring: Make GeoUtils reusable
|
2023-03-14 20:03:14 +01:00 |
Jackie9527
|
a0c29202be
|
Add build options to fix issues with clang 15.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
|
2023-03-02 21:12:35 +08:00 |
Andy Maloney
|
e893248e7c
|
Fix several spelling mistakes & a comment
|
2023-01-01 13:31:48 -05:00 |
Kim Kulling
|
a8e50be781
|
Refactoring: Move asserthandler header to include
|
2022-12-23 16:19:39 +01:00 |
Underdisc
|
17289985a4
|
Update comment
|
2022-06-01 12:45:40 +02:00 |
Underdisc
|
02e0d1d05c
|
Remove dllexport tags from static library builds.
|
2022-06-01 12:26:04 +02:00 |
Kim Kulling
|
472e15c405
|
Merge branch 'master' into kimkulling/link_stb_image_statically_issue_4467
|
2022-05-31 17:47:43 +02:00 |
hgdagon
|
85d47dc359
|
Merge branch 'master' into assimp_resource
|
2022-05-07 18:03:44 +04:00 |
hgdagon
|
f86700f6f4
|
Merge branch 'master' into assimp_resource
|
2022-05-04 02:12:08 +04:00 |
hgdagon
|
936cc791f2
|
Move `ASSIMP_WARNINGS_AS_ERRORS` check
|
2022-05-03 13:01:20 -07:00 |
hgdagon
|
e97e7574ae
|
Merge branch 'master' into assimp_warnings_as_errors
|
2022-05-03 23:24:52 +04:00 |
U-DESKTOP-0R560PH\George
|
a7e2b3ad30
|
Fixed library names for MinGW/MSYS2
|
2022-04-30 08:14:16 -07:00 |
U-DESKTOP-0R560PH\George
|
694dc8a0c3
|
Add an option to treat warnings as errors
|
2022-04-30 08:08:34 -07:00 |
U-DESKTOP-0R560PH\George
|
94ebe71969
|
Resource script updates
|
2022-04-30 08:01:15 -07:00 |
Kim Kulling
|
7f913c180b
|
Merge branch 'master' into master
|
2022-04-19 15:23:09 +02:00 |
hgdagon
|
518d50d2e6
|
Fixes for Windows/MSYS2
|
2022-04-07 03:07:57 -07:00 |
Kim Kulling
|
97c7ab3c05
|
Move stb_image header into its own header file.
|
2022-04-05 19:53:41 +02:00 |
Kim Kulling
|
d594e6eea4
|
Merge branch 'master' into obj-pbr-explicit
|
2022-03-15 14:30:24 +01:00 |
Sergio Acereda
|
51e248909f
|
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
|
2022-03-11 22:29:59 +01:00 |
Terence Russell
|
b35879989c
|
Added missing ObjMaterial.h to CMakeLists
|
2022-03-08 20:00:22 -07:00 |
Jean-Christophe Fillion-Robin
|
33a48c6ca6
|
cmake: Fix assimp target install rule fully specifying component
This commit ensures generated install rules for the assimp target are
all consistently associated with components named after LIBASSIMP_COMPONENT
or LIBASSIMP-DEV_COMPONENT CMake variables.
It streamlines the packaging of specific components of assimp in client
projects leveraging the CPACK_INSTALL_CMAKE_PROJECTS variable.
Failing to do so leads to "/path/to/assimp-build/code/cmake_install.cmake"
file having install rules associated with a component called "Unspecified".
See https://cmake.org/cmake/help/v3.10/command/install.html#installing-targets
and https://cmake.org/cmake/help/v3.22/module/CPack.html#variable:CPACK_INSTALL_CMAKE_PROJECTS
|
2022-02-17 05:47:34 -05:00 |
Kim Kulling
|
9335cc30ab
|
INtroduce compression class to encapsulate compression via zlib
|
2022-02-06 20:42:58 +01:00 |
Kim Kulling
|
6e50b04ae0
|
Merge branch 'master' into IQM
|
2022-01-17 18:33:37 +01:00 |
Viktor Kovacs
|
c8ab39dd04
|
Merge branch 'master' into common_base64
|
2022-01-15 23:42:56 +01:00 |
Kim Kulling
|
d3e24196c0
|
Merge branch 'master' into so-unloading
|
2022-01-13 20:19:23 +01:00 |
Viktor Kovacs
|
c71f4bc95a
|
Merge branch 'master' into common_base64
|
2022-01-11 18:46:08 +01:00 |
Kim Kulling
|
d68224f2ed
|
Merge branch 'master' into patch-1
|
2022-01-10 23:45:03 +01:00 |
Kim Kulling
|
50c7301a38
|
Update copyrights
|
2022-01-10 21:13:43 +01:00 |
Ben Wolsieffer
|
629c8850ec
|
Fix imported target include directory
Fix the imported target include directory when the headers are not installed in '${CMAKE_INSTALL_PREFIX}/include'.
|
2022-01-09 20:59:14 -05:00 |
kovacsv
|
125acf9ec8
|
Merge remote-tracking branch 'origin/master' into common_base64
|
2022-01-02 19:47:57 +01:00 |
kovacsv
|
bbe12240ca
|
Move Base64 encode/decode functionality to the common folder.
|
2022-01-02 19:47:43 +01:00 |
Jérôme Leclercq
|
81fc50f612
|
CMake: Replace CMAKE_COMPILER_IS_MINGW by MINGW
See https://discourse.cmake.org/t/cmake-compiler-is-mingw-removed/4539 and https://cmake.org/cmake/help/latest/variable/MINGW.html
|
2021-12-28 15:58:37 +01:00 |
Kim Kulling
|
cab7b330ee
|
Merge branch 'master' into so-unloading
|
2021-12-20 17:58:18 +01:00 |
Garux
|
46f618a6ef
|
add Inter-Quake Model (IQM) Importer
|
2021-12-18 15:34:58 +03:00 |
rumgot
|
92aef9236f
|
Fixed cmake error: No known features for C compiler when using the assimp library from another project.
|
2021-12-14 23:54:36 +03:00 |
Thomas Nicky Thulesen
|
8b78a63b50
|
Allow dlclose of so library by avoiding unique symbols.
|
2021-11-23 20:39:48 +01:00 |
Kim Kulling
|
9ebd74bd26
|
Merge branch 'master' into win_dll_so_version
|
2021-11-20 14:16:32 +01:00 |
Kim Kulling
|
0d857bcf9f
|
Merge branch 'master' into deprecated_gltfpbr_macros
|
2021-11-20 12:35:56 +01:00 |
Ralf Habacker
|
2ceb18746b
|
Append '-SOVERSION' to DLL base file name for mingw builds to match common style
|
2021-11-18 08:17:31 +01:00 |
RichardTea
|
c24f99cd0e
|
Redefine deprecated glTF-specific PBR material macros
Intended to support Qt5 QtQuick3D until it is ported to generic PBR
macros.
|
2021-11-16 11:42:59 +00:00 |
Jérémie Dumas
|
78d72bff59
|
Fix 3MF presence test.
|
2021-11-14 08:24:27 -08:00 |
Jérémie Dumas
|
57d22e4dbf
|
Merge branch 'master' into jdumas/ziplib
|
2021-11-12 10:13:21 -08:00 |
Jeremie Dumas
|
cedf1819c3
|
Do not build ziplib when 3MF exporter is disabled.
|
2021-11-04 01:14:24 -07:00 |
Artenuvielle
|
70dfdb8f9d
|
Merge branch 'master' into x3d_pugi_migration_artenuvielle
|
2021-09-15 14:51:38 +02:00 |
Kim Kulling
|
18531e3677
|
Next iteration for c++11 features.
|
2021-09-13 22:38:20 +02:00 |
René Martin
|
3f6a371b64
|
migrated x3d importer to pugixml reader
|
2021-09-12 11:37:33 +02:00 |
René Martin
|
3001d88172
|
Merge branch 'master' into x3d_pugi_migration
|
2021-09-07 15:04:08 +02:00 |
Kim Kulling
|
4b1ff645e3
|
closes https://github.com/assimp/assimp/issues/3398: Add support for embedded textures
|
2021-08-12 21:13:07 +02:00 |