94ebe71969
Resource script updates
2022-04-30 08:01:15 -07:00
7f0509ae87
Stack allocator is now inline
2022-04-21 11:33:04 +02:00
2b3c49cb93
All allocation changes
2022-04-20 12:33:39 +02:00
7f913c180b
Merge branch 'master' into master
2022-04-19 15:23:09 +02:00
518d50d2e6
Fixes for Windows/MSYS2
2022-04-07 03:07:57 -07:00
97c7ab3c05
Move stb_image header into its own header file.
2022-04-05 19:53:41 +02:00
d594e6eea4
Merge branch 'master' into obj-pbr-explicit
2022-03-15 14:30:24 +01:00
51e248909f
Avoid setting metallic/roughness/sheen/clearcoat properties when they are not found on mtl file.
2022-03-11 22:29:59 +01:00
b35879989c
Added missing ObjMaterial.h to CMakeLists
2022-03-08 20:00:22 -07:00
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
9335cc30ab
INtroduce compression class to encapsulate compression via zlib
2022-02-06 20:42:58 +01:00
6e50b04ae0
Merge branch 'master' into IQM
2022-01-17 18:33:37 +01:00
c8ab39dd04
Merge branch 'master' into common_base64
2022-01-15 23:42:56 +01:00
d3e24196c0
Merge branch 'master' into so-unloading
2022-01-13 20:19:23 +01:00
c71f4bc95a
Merge branch 'master' into common_base64
2022-01-11 18:46:08 +01:00
d68224f2ed
Merge branch 'master' into patch-1
2022-01-10 23:45:03 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
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
125acf9ec8
Merge remote-tracking branch 'origin/master' into common_base64
2022-01-02 19:47:57 +01:00
bbe12240ca
Move Base64 encode/decode functionality to the common folder.
2022-01-02 19:47:43 +01:00
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
cab7b330ee
Merge branch 'master' into so-unloading
2021-12-20 17:58:18 +01:00
46f618a6ef
add Inter-Quake Model (IQM) Importer
2021-12-18 15:34:58 +03:00
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
8b78a63b50
Allow dlclose of so library by avoiding unique symbols.
2021-11-23 20:39:48 +01:00
9ebd74bd26
Merge branch 'master' into win_dll_so_version
2021-11-20 14:16:32 +01:00
0d857bcf9f
Merge branch 'master' into deprecated_gltfpbr_macros
2021-11-20 12:35:56 +01:00
2ceb18746b
Append '-SOVERSION' to DLL base file name for mingw builds to match common style
2021-11-18 08:17:31 +01:00
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
78d72bff59
Fix 3MF presence test.
2021-11-14 08:24:27 -08:00
57d22e4dbf
Merge branch 'master' into jdumas/ziplib
2021-11-12 10:13:21 -08:00
cedf1819c3
Do not build ziplib when 3MF exporter is disabled.
2021-11-04 01:14:24 -07:00
70dfdb8f9d
Merge branch 'master' into x3d_pugi_migration_artenuvielle
2021-09-15 14:51:38 +02:00
18531e3677
Next iteration for c++11 features.
2021-09-13 22:38:20 +02:00
3f6a371b64
migrated x3d importer to pugixml reader
2021-09-12 11:37:33 +02:00
3001d88172
Merge branch 'master' into x3d_pugi_migration
2021-09-07 15:04:08 +02:00
4b1ff645e3
closes https://github.com/assimp/assimp/issues/3398 : Add support for embedded textures
2021-08-12 21:13:07 +02:00
1b37b74f9e
Hunter fixes for stb_image
2021-07-07 17:01:19 -04:00
d33cf1dc0c
Merge branch 'master' into x3d_pugi_migration
2021-06-06 16:06:08 +02:00
84db4d3a08
Update CMakeLists.txt
2021-06-03 23:56:52 +02:00
742250c5fb
Update CMakeLists.txt
2021-06-03 23:42:07 +02:00
799384f2b8
Adding the required c flag to compile zip files using gcc 4.9
2021-05-22 17:36:39 +02:00
350f2ea1d3
Fix build and merged master.
2021-05-06 21:36:25 +02:00
52228a93f8
Fix X3DGeohelper.
2021-05-06 21:07:38 +02:00
da0543972b
Fix parsing for AMF-Files.
2021-04-03 10:25:03 +02:00
c669c8f1eb
Merge branch 'master' into update_copyrights
2021-02-28 12:18:41 +01:00
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
aa10b56bc2
Fix draco linking for Hunter/Normal
2021-02-01 14:29:24 +00:00
5fbbba2fac
Merge branch 'master' into issue_2195_draco
2021-01-31 16:02:57 +01:00
79eb9ecc86
Update all minimum cmake req to 3.10
2021-01-29 21:05:46 +01:00
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
c917e6513f
Merge branch 'master' into issue_2195_draco
2021-01-26 16:43:46 +00:00
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
1042845414
Merge branch 'master' of https://github.com/assimp/assimp into tdb/pbrt3_exporter
2021-01-11 19:57:10 -08:00
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
e2af015a57
Common: Fix GCC error invalid conversion in MINGW.
2020-12-11 21:43:09 +05:30
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
3b5212067c
Fix CMake config generation
...
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
f12e6eb6f4
Update Hunter for pugixml
2020-10-12 16:30:03 -04:00
52826a03f8
remove all hunter-dependencies for pugixml.
2020-10-05 18:53:42 +02:00
23f144a7b7
pugixml: use pugixml in headeronly mode.
2020-10-05 18:44:59 +02:00
b6dde74155
adaptions to support hunter
2020-10-01 16:35:34 +02:00
d75fa2bb4b
fix invalid path.
2020-10-01 10:43:48 +02:00
c740f61f97
hunter integration: pugixml
2020-10-01 10:29:52 +02:00
effccfe2e6
Remove dead code.
2020-09-28 15:23:26 +02:00
69822fd5e6
remove pugixml from hunter
2020-09-28 10:23:25 +02:00
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
9e2c4e0cf4
Merge branch 'master' into rbsheth_hunter_rapidjson
2020-09-14 09:00:11 +02:00
59c8b4ed84
Move RapidJSON definitions to CMake
2020-08-27 16:51:06 -04:00
c359b973bb
finish migration of collada.
2020-08-26 22:31:46 +02:00
0ffcdf160e
Build formatting into DeadlyImportError
2020-08-18 16:32:34 +01:00
7e93ae4428
3MF: Migration.
2020-08-18 16:54:29 +02:00
11daed69d3
Fixed overwriting of CMake global output directory variables.
2020-08-07 16:04:39 -04:00
58b81a2590
start migrating X3D.
2020-07-26 10:17:21 +02:00
51e592123a
Fix two deletions.
2020-07-20 18:42:57 +02:00
a19e4e4112
Make clang with msvc abi work.
2020-07-20 18:28:50 +02:00
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
209a61d0e7
Update hunter and utf8cpp inclusion
2020-07-14 19:00:23 -04:00
b1369d0912
next steps.
2020-07-02 15:18:59 +02:00
9188f56839
Allow assert handling to be replaced.
2020-06-23 11:55:51 +01:00
2be731d1bf
Merge branch 'master' into pugi_xml
2020-05-22 10:09:46 +02:00
2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id
2020-05-13 20:24:53 +02:00
201347700f
fix incorrect header path on framework build
2020-05-06 16:15:23 +03:00
6e200cb0d3
Merge branch 'master' into bug-3177-dae-geo-id
...
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
ff9f3b8608
Collada: Ensure <geometry> has unique id
...
Use the "id" for mesh names by default.
Set option AI_CONFIG_IMPORT_COLLADA_USE_COLLADA_NAMES to use the mesh "name" instead
2020-04-29 17:17:46 +01:00
4488e3e745
build on Linux with gcc and clang; warning as error only for 'assimp' target
2020-04-27 23:38:33 -07:00
8c3b374486
Pbrt file exporter hello world
2020-04-06 12:12:37 -07:00
b962af93fc
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-24 21:35:22 +02:00
046f50880f
{cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule
...
When libraries are included as submodules in large projects, having an option with a generic name like "BUILD_DOCS" is not very helpful. (e.g. one project I work on includes many libraries as submodules)
It can also clash with options from other libraries which can break things.
2020-03-23 12:35:32 -04:00
bb4bcb442a
Merge branch 'master' of https://github.com/assimp/assimp
2020-03-23 10:35:06 +02:00
d5d30c898b
Optimized LimitBoneWeightsProcess. Added SmallVector to reduce heap allocations. Simplified algorithm and removed unnecessary copying.
2020-03-22 12:47:42 +02:00
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
02e5698a38
fix linker issues.
2020-03-09 22:49:32 +01:00
f3b6b78d4d
small refactorings.
2020-03-09 10:55:32 +01:00
03182c21b8
xml-migration amf - next steps.
2020-02-26 22:19:42 +01:00
919ae489fc
Merge branch 'master' into master
2020-02-25 23:32:31 +02:00
edfaaed56f
Removed uneeded expression in else() and endif() constructs.
...
The following changes were tested against building with a master copy.
For a more detailed report, please read the followings below:
The flags that were checked were the ones checked by default + the following:
ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES
The list of compilable projects in Visual Studio were the following:
- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic
The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.
UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004 .
2020-02-23 07:09:35 -05: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
8c09cd2ef3
Fixed TextureTypeToString defined multiple times.
...
- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 missing values in TextureTypeToString.
- Added 6 missing aiTextureType enum values in assimp_cmd/Info.cpp.
2020-02-06 13:19:01 -05:00
U-DESKTOP-0R560PH\George
Florian Born
Kim Kulling
Kim Kulling
Sergio Acereda
Terence Russell
Jean-Christophe Fillion-Robin
Viktor Kovacs
Ben Wolsieffer
Jérôme Leclercq
Garux
rumgot
Thomas Nicky Thulesen
Ralf Habacker
RichardTea
Jérémie Dumas
Jérémie Dumas
Artenuvielle
Rahul Sheth
Jean-François Verdon
Matt Pharr
Jean-Louis
Biswapriyo Nath
tellypresence
Silvio Traversaro
Malcolm Tyrrell
Marc-Antoine Lortie
MeyerFabian
Sercan Degirmenci
luca
Trevor David Black
napina
Andy Maloney
Adrian Iusca
Marc-Antoine Lortie
iamAdrianIusca