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 |
Rahul Sheth
|
1b37b74f9e
|
Hunter fixes for stb_image
|
2021-07-07 17:01:19 -04:00 |
|
Kim Kulling
|
d33cf1dc0c
|
Merge branch 'master' into x3d_pugi_migration
|
2021-06-06 16:06:08 +02:00 |
|
Kim Kulling
|
84db4d3a08
|
Update CMakeLists.txt
|
2021-06-03 23:56:52 +02:00 |
|
Kim Kulling
|
742250c5fb
|
Update CMakeLists.txt
|
2021-06-03 23:42:07 +02:00 |
Jean-François Verdon
|
799384f2b8
|
Adding the required c flag to compile zip files using gcc 4.9
|
2021-05-22 17:36:39 +02:00 |
|
Kim Kulling
|
350f2ea1d3
|
Fix build and merged master.
|
2021-05-06 21:36:25 +02:00 |
|
Kim Kulling
|
52228a93f8
|
Fix X3DGeohelper.
|
2021-05-06 21:07:38 +02:00 |
|
Kim Kulling
|
da0543972b
|
Fix parsing for AMF-Files.
|
2021-04-03 10:25:03 +02:00 |
|
Kim Kulling
|
c669c8f1eb
|
Merge branch 'master' into update_copyrights
|
2021-02-28 12:18:41 +01:00 |
|
Kim Kulling
|
9e8dbd0ca5
|
Update copyrights to 2021.
|
2021-02-28 12:17:54 +01:00 |
|
RichardTea
|
aa10b56bc2
|
Fix draco linking for Hunter/Normal
|
2021-02-01 14:29:24 +00:00 |
|
Kim Kulling
|
5fbbba2fac
|
Merge branch 'master' into issue_2195_draco
|
2021-01-31 16:02:57 +01:00 |
|
Kim Kulling
|
79eb9ecc86
|
Update all minimum cmake req to 3.10
|
2021-01-29 21:05:46 +01:00 |
|
RichardTea
|
fe97ff6474
|
Draco platform libraries have different names
On Windows it's draco.dll/lib
On Linux/macOS draco_shared.dylib & draco_static.lib
|
2021-01-26 17:19:41 +00:00 |
|
RichardTea
|
c917e6513f
|
Merge branch 'master' into issue_2195_draco
|
2021-01-26 16:43:46 +00:00 |
|
RichardTea
|
3a7d0f5656
|
Add Draco to cmakelists
Initial pass. Not yet used.
Add Draco library to assimp build and link
|
2021-01-26 15:58:14 +00:00 |
Matt Pharr
|
1042845414
|
Merge branch 'master' of https://github.com/assimp/assimp into tdb/pbrt3_exporter
|
2021-01-11 19:57:10 -08:00 |
Jean-Louis
|
54be7ac582
|
Update unzip contrib
|
2020-12-24 01:53:40 +01:00 |
Biswapriyo Nath
|
e2af015a57
|
Common: Fix GCC error invalid conversion in MINGW.
|
2020-12-11 21:43:09 +05:30 |
tellypresence
|
6db5b7046f
|
Provide option for rapidjson no-member-iterator define
Originally added to fix warning on MSVC but breaks android build
|
2020-12-09 20:21:43 +09:00 |
Silvio Traversaro
|
3b5212067c
|
Fix CMake config generation
Use standard CMake function to generate the CMake config files.
|
2020-10-14 23:55:28 +02:00 |
|
Rahul Sheth
|
f12e6eb6f4
|
Update Hunter for pugixml
|
2020-10-12 16:30:03 -04:00 |
|
Kim Kulling
|
52826a03f8
|
remove all hunter-dependencies for pugixml.
|
2020-10-05 18:53:42 +02:00 |