Commit Graph

96 Commits (988acd00f10e5334ea2903b0ef7b0df2b6529f9b)

Author SHA1 Message Date
Kim Kulling 670278da82 Merge branch 'master' of https://github.com/assimp/assimp 2015-05-29 20:46:10 +02:00
Kim Kulling 5e1fc39448 Add parsing of texture nodes of OpenGEX-format importer. 2015-05-29 20:45:31 +02:00
Richard 2de6dd4973 Refactor: Delete unused variable 2015-05-17 20:02:58 -06:00
Richard 6ae9797648 Refactor: Initialize members in declaration order; initialize POD arrays 2015-05-17 20:01:51 -06:00
Richard d25c36960a Refactor: Initialize all POD members 2015-05-17 19:57:11 -06:00
Kim Kulling fd3a0d4a9d fix name handling of geoemtryobjectname nodes
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:27:05 +02:00
Kim Kulling 5357772cf5 fix build.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 14:31:23 +02:00
Kim Kulling d5699cc89f fox build: add missing include for ai_assert.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 13:47:33 +02:00
Kim Kulling 31cce98680 fix color handling in opengex importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 12:54:59 +02:00
Kim Kulling 995bc41d57 color node handling opengex
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 11:57:39 +02:00
Kim Kulling eb1ee61420 fix code reading findings: use of std::copy
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:48 +02:00
Kim Kulling e4b84ff48a fix mem leak.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:47:14 +02:00
Kim Kulling 02ee002878 fix build for vs2013
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:38:53 +02:00
Kim Kulling 444a77e170 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-16 11:10:21 +02:00
Kim Kulling ead3e8d275 first version of material handling for opengex
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:10:12 +02:00
abma 611778045d fix for upstream changes 2015-04-16 02:55:41 +02:00
Kim Kulling 1899de6ea9 remove dead code.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-14 12:03:51 +02:00
Kim Kulling ed57fac879 create node tree
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-08 20:43:55 +02:00
Kim Kulling ecf390d51f set the correct reference to meshes.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-06 14:56:12 +02:00
Kim Kulling 22fc756d4a - fix double initialization.
- use correct number of vectors for dynamic array.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 23:17:16 +02:00
Kim Kulling df1134b1a3 - initiate texture coordinate array.
- use correct number of vertices for vertex array,

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:47 +02:00
George Papadopoulos 6a1522ded8 [OpenGEXImporter] Correctly initialize m_textureCoords array 2015-04-05 16:29:33 +03:00
Kim Kulling 3fa6882384 generate unique indices for importes vertices in opengex importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:59 +02:00
Kim Kulling 65cb05f381 fix invalid index counter.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-02 01:10:53 +02:00
Kim Kulling 45cc0b582a fix creation of unused mesh instance.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-31 12:18:57 +02:00
Kim Kulling 754897d1aa add imported meshes from OpenGEX-importer to scene.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 23:54:32 +02:00
Kim Kulling 8857f26efb fix: add setup for number of copied vertex attributes.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 12:04:28 +02:00
Kim Kulling 7f3b044b83 add import of index array data.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 11:55:57 +02:00
Kim Kulling 0e11cfbe6f add copy op for positions, normals and texture coordinates.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-29 18:53:23 +02:00
Kim Kulling aa9dd6a14b - check property name before setting up the primitive type for meshes.
- fix lookup for vertex attribute type lookup.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-28 12:08:59 +01:00
Kim Kulling b17a1255a1 add setup for mesh primitives and prepare vertex array copy ops.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-26 20:17:26 +01:00
Kim Kulling 7a01f77a08 fix invalid lookup for token type in opengex-parser. 2015-03-25 21:35:32 +01:00
Kim Kulling 23b3728254 add setup of transformation information in opengex importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-24 00:08:42 +01:00
Kim Kulling 0995f3662d prepare handlers for missing nodes.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 16:56:28 +01:00
Kim Kulling 70aafa478d avoid copying of private struct.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:38:15 +01:00
Kim Kulling b0753c38de fix code reading finding: rename definition.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:37:11 +01:00
Kim Kulling f15d62194b add nodestack to deal with node hierarchy.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-18 21:37:57 +01:00
Kim Kulling 59633d172f implementation for mesh resolving.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-17 14:25:40 +01:00
Kim Kulling 207906f039 first parsing of references and geometry objects.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-16 20:34:42 +01:00
Kim Kulling 0292868917 add geomentry node handling.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-14 16:12:09 +01:00
Kim Kulling 9e87fa178a add property parsing to opengex parser.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-10 20:09:26 +01:00
Kim Kulling 124f408976 add property parsing.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 19:52:06 +01:00
Kim Kulling 303a6893fc fix the build.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 13:23:32 +01:00
Kim Kulling 20b3ce6a40 replace opengexparser by using openddl-parser.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 12:47:53 +01:00
Kim Kulling 75d3c8e9f2 update: metric parsing ongoing.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-12 12:00:03 +02:00
Kim Kulling 8126dce94d update: add sceleton for OpenGEX importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-08-27 23:00:19 +02:00