Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,681 Commits 19 Branches 43 Tags
afec2e2c4951830708587bb4df8bcf45a1e7c101
Commit Graph

687 Commits

Author SHA1 Message Date
Kim Kulling
ab3c17419e fix warning 2019-09-22 12:27:44 +02:00
Kim Kulling
94c488d7ea fix compiler warnings. 2019-09-22 10:15:44 +02:00
Kim Kulling
69087abc56 Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor. 2019-09-21 16:36:22 +02:00
Kim Kulling
f5dcd5060f add missing namespace." 2019-09-17 22:11:58 +02:00
Kim Kulling
2edcf82f5a add missing include. 2019-09-17 21:58:46 +02:00
Kim Kulling
8b95479bb0 closes https://github.com/assimp/assimp/issues/2598: introduce getEpsilon 2019-09-15 19:25:37 +02:00
Kim Kulling
28d0300dbe Merge branch 'master' into gltf_add_ortho_cam 2019-09-11 09:32:14 +02:00
Kim Kulling
d91eebf347 Add ortho camera. 2019-09-10 22:13:54 +02:00
RevoluPowered
ddc26e1c46 Added maya stingray support for textures 2019-09-08 19:15:27 +01:00
RevoluPowered
da97f1be79 Implemented basic PBR materials into assimp. 
This adds the following texture types:
- BASE_COLOR
- NORMAL_CAMERA
- EMISSION_COLOR
- METALNESS
- DIFFUSE_ROUGHNESS

This is the first small change required.
We only support maya right now.
 2019-09-08 19:15:27 +01:00
Mike Samsonov
873a358ce4 A crash in the aiMesh descructor 2019-09-05 11:44:02 +01:00
Gordon MacPherson
abdd853ca5 FIX missing update call for scale to post process 2019-08-27 15:50:50 +01:00
Gordon MacPherson
db8606ba57 Fix typo 2019-08-21 23:32:31 +01:00
Gordon MacPherson
0d29203e24 Prototype unit system for assimp generic enough to be used across formats. 2019-08-21 21:41:41 +01:00
Kim Kulling
7ee7946dc5 Update scene.h 
use #include <cstdlib> only if the compiler is used to compile c++ code.
 2019-08-18 09:40:13 +02:00
Kim Kulling
a9b4909a2f Merge branch 'master' into patch-1 2019-08-14 21:21:18 +02:00
Kim Kulling
a2ee19e86d Merge branch 'master' into collada_zae 2019-08-14 20:02:53 +02:00
Kim Kulling
4c1e8fe9c3 Update config.h.in 
closes https://github.com/assimp/assimp/issues/2570: fix a typo.
 2019-08-09 20:30:12 +02:00
follower
1e6eac9e65 Fix error when building assimp on older Mac OS X version. 
Prevents this error when building with Mac OS X 10.9 SDK:

    error: no member named 'atoi' in namespace 'std'; did you mean simply 'atoi'?
 2019-08-02 04:44:21 +12:00
RichardTea
9b78060a4a Add copyright headers to ZipArchiveIOSystem 2019-07-25 10:14:42 +01:00
Kim Kulling
41ea607739 Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
kimkulling
8f74508e40 Fix missing doc in config.h 2019-07-12 16:28:36 +02:00
kimkulling
53c0f91305 Add unittest for json. 2019-07-12 16:08:51 +02:00
RichardTea
2c7f607e7c Create ZipArchiveIOSystem 
Moved IOSystem Unzip functionality out of D3MF Importer into include/assimp
Cleaned up and more efficient:
Don't map the archive until the caller opens a file or requests the contents list
Don't extract any files until they are opened
Store the location of the data within the ZIP and extract it later if the file is opened.
 2019-07-12 11:22:17 +01:00
Kim Kulling
ae7b1f1a77 Merge branch 'master' into kimkulling_dev 2019-07-03 18:28:15 +02:00
Kim Kulling
96f16c7aea closes https://github.com/assimp/assimp/issues/2527: use correct macro for Assimp-exporter. 2019-07-02 19:48:53 +02:00
Martin Liska
ab55fb27c3 Fix a GCC 9 warning: 
assimp/include/assimp/material.inl: In member function 'aiReturn aiMaterial::Get(const char*, unsigned int, unsigned int, aiColor3D&) const':
assimp/include/assimp/material.inl:176:33: error: implicitly-declared 'aiColor3D& aiColor3D::operator=(const aiColor3D&)' is deprecated [-Werror=deprecated-copy]
176 |     pOut = aiColor3D(c.r,c.g,c.b);
 2019-07-02 13:38:04 +02:00
Kim Kulling
af199c50aa Merge branch 'master' into issue_2456_text_formats_precision 2019-06-26 17:31:11 +02:00
Kim Kulling
d7e442f78a Add missing file. 2019-06-24 21:48:52 +02:00
Kim Kulling
1952144445 Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev 2019-06-24 21:46:05 +02:00
Kim Kulling
26bd54ae0b PostProcesswing: add gen-aabb process to postprocessing. 2019-06-23 20:24:32 +02:00
RichardTea
bf252c4452 Add configuration of text format precision 
Define ASSIMP_AI_REAL_TEXT_PRECISION
8 when ai_real is float
16 when ai_real is double
 2019-06-20 18:11:11 +01:00
Rahul Sheth
dab8041bcd rewrite include paths for Hunter packages 2019-06-13 21:32:36 -07:00
Kim Kulling
fe4fd00a82 Merge branch 'master' into slow_xml_load 2019-06-03 22:58:02 +02:00
Mark Gillard
dff92d7733 quality-of-life improvements for Visual Studio 2019-05-27 21:14:50 +03:00
RichardTea
45c12cd5fb Update irrXMLWrapper.h 
Use std::find to find and remove null characters from XML
 2019-05-20 13:49:56 +01:00
Matias
575ef4d927 Added support for embedded textures to the FBXExporter (both binary and ASCII). Also made the FBX-namespaces more consistent (we had both Assimp::FBX:: and FBX::). Since we seem to support two types of embedded texture references (both asterisk+texture_id and filepath) I made the exporter use aiScene::GetEmbeddedTexture for looking up texture reference and integrated @loebl 's modification of the function to support the old ("*1") type of references (https://github.com/loebl/assimp/commit/e217358) 2019-05-09 14:50:22 +02:00
Kim Kulling
4155f005be Add implementation to convert from cm to m. 2019-05-06 21:21:58 +02:00
Kim Kulling
02324123e5 Fix typo in comment. 2019-05-06 19:15:28 +02:00
Kim Kulling
1203d4658c Add missing doc. 2019-05-06 18:44:30 +02:00
Kim Kulling
eb1a2586c3 add missing define in config.h.in 2019-05-05 17:44:15 +02:00
Kim Kulling
0b9c72fa94 Merge branch 'master' into collada_metadata 2019-04-29 18:49:31 +02:00
Jeongseok Lee
bcd17481e5 Fix element access operator of aiColor4D 2019-04-28 22:16:20 -07:00
RichardTea
2a3626577f Merge pull request #2 from assimp/master 
Update to Assimp Master 0973f50
 2019-04-08 14:06:36 +01:00
Matias
4884cf2172 issue_2393: Added TransparencyFactor material key 2019-04-03 12:35:09 +02:00
Kim Kulling
145c3d1589 add missing changes. 2019-03-13 19:35:36 +01:00
Kim Kulling
0a731a0bff closes https://github.com/assimp/assimp/issues/934: introduce material keys for shader types. 2019-03-13 19:32:13 +01:00
RichardTea
7d7574f189 Merge branch 'master' into ETC_Inc 2019-03-05 12:07:10 +00:00
Kim Kulling
206004c7d6 introduce simple skin-test +some findings. 2019-02-25 22:06:24 +01:00
Kim Kulling
0810b2d51b Merge branch 'master' into ETC_Inc 2019-02-15 10:20:30 +01:00