Commit Graph

360 Commits (ad0d945c80fe6d6b25fc8fa85993f33d6e57282a)

Author SHA1 Message Date
Kim Kulling 18531e3677 Next iteration for c++11 features. 2021-09-13 22:38:20 +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 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 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
Kim Kulling 23f144a7b7 pugixml: use pugixml in headeronly mode. 2020-10-05 18:44:59 +02:00
kimkulling b6dde74155 adaptions to support hunter 2020-10-01 16:35:34 +02:00
kimkulling d75fa2bb4b fix invalid path. 2020-10-01 10:43:48 +02:00
kimkulling c740f61f97 hunter integration: pugixml 2020-10-01 10:29:52 +02:00
Kim Kulling effccfe2e6
Remove dead code. 2020-09-28 15:23:26 +02:00
Kim Kulling 69822fd5e6
remove pugixml from hunter 2020-09-28 10:23:25 +02:00
Kim Kulling d6892b3f58 Merge branch 'master' into pugi_xml 2020-09-25 21:00:09 +02:00
Kim Kulling 9e2c4e0cf4
Merge branch 'master' into rbsheth_hunter_rapidjson 2020-09-14 09:00:11 +02:00
Rahul Sheth 59c8b4ed84 Move RapidJSON definitions to CMake 2020-08-27 16:51:06 -04:00
Kim Kulling c359b973bb finish migration of collada. 2020-08-26 22:31:46 +02:00
Malcolm Tyrrell 0ffcdf160e Build formatting into DeadlyImportError 2020-08-18 16:32:34 +01:00
kimkulling 7e93ae4428 3MF: Migration. 2020-08-18 16:54:29 +02:00
Marc-Antoine Lortie 11daed69d3 Fixed overwriting of CMake global output directory variables. 2020-08-07 16:04:39 -04:00
Kim Kulling 58b81a2590 start migrating X3D. 2020-07-26 10:17:21 +02:00
MeyerFabian 51e592123a Fix two deletions. 2020-07-20 18:42:57 +02:00
MeyerFabian a19e4e4112 Make clang with msvc abi work. 2020-07-20 18:28:50 +02:00
MeyerFabian 13ee2306c3 build/clang-cl-windows 2020-07-20 17:04:11 +02:00
Rahul Sheth 209a61d0e7 Update hunter and utf8cpp inclusion 2020-07-14 19:00:23 -04:00
Kim Kulling b1369d0912 next steps. 2020-07-02 15:18:59 +02:00
Malcolm Tyrrell 9188f56839 Allow assert handling to be replaced. 2020-06-23 11:55:51 +01:00
Kim Kulling 2be731d1bf Merge branch 'master' into pugi_xml 2020-05-22 10:09:46 +02:00
Kim Kulling 2571b47a28
Merge branch 'master' into bug-3177-dae-geo-id 2020-05-13 20:24:53 +02:00
Sercan Degirmenci 201347700f fix incorrect header path on framework build 2020-05-06 16:15:23 +03:00
RichardTea 6e200cb0d3 Merge branch 'master' into bug-3177-dae-geo-id
Impossible merge, have discarded upstream
2020-05-04 13:59:09 +01:00
Kim Kulling f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02:00
RichardTea 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
luca 4488e3e745 build on Linux with gcc and clang; warning as error only for 'assimp' target 2020-04-27 23:38:33 -07:00
Trevor David Black 8c3b374486 Pbrt file exporter hello world 2020-04-06 12:12:37 -07:00