Commit Graph

2571 Commits (0cee21ce3c049c48658c914a103f6efcca215006)

Author SHA1 Message Date
Alexander Gessler 0cee21ce3c COB: code cleanup. 2015-04-13 21:52:09 +02:00
Alexander Gessler b3a3558da3 Re-gen IFC parsing code with alphabetic order of types. This hopefully gives a stable diff base for the future. 2015-04-13 21:42:50 +02:00
Alexander Gessler 6e5ca257de Merge branch 'master' of https://github.com/assimp/assimp 2015-04-13 21:39:25 +02:00
Alexander Gessler 55ca72e1c8 Make order of classes in generated IFC parsing code deterministic. 2015-04-13 21:38:36 +02:00
ulf 28de609a56 Merge branch 'master' of https://github.com/assimp/assimp 2015-04-13 16:02:02 +02:00
ulf 806d3ac8e1 - IFC reader regenerated from schema to include IfcArbitraryProfileDefWithVoids
- implemented IfcArbitraryProfileDefWithVoids to fix solar panel covers in test\models-nonbsd\IFC\rac_basic_sample_project.ifc
- warning: another dirty hack on top of dirty hacks - one day all these CSG implementations will blow up in our faces. Mark my words.
2015-04-13 16:01:33 +02:00
Kim Kulling 53681b10ea Merge pull request #532 from arris69/Travis_mingw
Travis mingw
2015-04-12 20:11:16 +02:00
Alexander Gessler e2f234707a Fix possible crash in SceneCombiner when the destinations scene has mPrivate==null. Fixes #401. 2015-04-12 19:53:24 +02:00
Ser Lev Arris 5f58188de5 mingwin headers are a bit 'outdated' 2015-04-12 19:12:48 +02:00
Ser Lev Arris 20e23fbd0a i see no reason to check it with clang too. 2015-04-12 19:10:10 +02:00
Alexander Gessler 13b5b01032 Merge pull request #531 from arris69/cmake_cleanup
double definition, i'd better open my eyes...
2015-04-12 19:08:54 +02:00
Ser Lev Arris 2f372c0ac5 add the mingw compile step 2015-04-12 19:05:27 +02:00
Ser Lev Arris cdeb95611d double definition, should better open my eyes... 2015-04-12 18:16:49 +02:00
Alexander Gessler d1ea4405ed Merge pull request #528 from arris69/Fix_static_and_shared_builds
add static flag for exe build if no shared build is requested
2015-04-08 21:08:56 +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
Ser Lev Arris 7a6c00ca11 looks like cmake is per design not for building static executables, clang too. =%-| 2015-04-08 12:34:54 +02:00
arris69 297e1d2117 it's a difference if it's set to OFF or it's undefined... 2015-04-07 16:07:29 +02:00
Ser Lev Arris fb7661c430 add static flag for exe build if no shared build is requested 2015-04-07 08:20:27 +02:00
Kim Kulling e5a6cd087d Merge branch 'master' of https://github.com/assimp/assimp 2015-04-06 14:56:26 +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
Alexander Gessler b5e3e18bf0 Cleanup Readme 2015-04-06 13:24:03 +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
Kim Kulling c0e3540ec1 use size_t instead of unsigned int ( static code analysis finding ).
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:07 +02:00
Alexander Gessler 50d5c5c4ef Merge pull request #527 from VirusFree/pr_strtol10_64
fix for strtol10_64
2015-04-05 17:25:50 +02:00
Alexander Gessler 9a7f90220a Merge pull request #526 from VirusFree/pr_OpenGEX_textureCoords_init
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 17:05:16 +02:00
George Papadopoulos 54ce3d843f fix for strtol10_64 2015-04-05 16:40:40 +03:00
George Papadopoulos 6a1522ded8 [OpenGEXImporter] Correctly initialize m_textureCoords array 2015-04-05 16:29:33 +03:00
Alexander Gessler 253871faa5 Merge pull request #525 from VirusFree/pr_strtol
add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime)
2015-04-05 15:06:24 +02:00
George Papadopoulos da3c347a57 add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime) 2015-04-05 15:19:55 +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 a50fa5f1de add missing doc in obj importer.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:24 +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
Alexander Gessler 010a154ed1 Merge pull request #521 from arris69/Travis_apt-get_for_mingw
catch apt-get problem for wine install
2015-04-01 10:18:18 +02:00
Ser Lev Arris 0c4fb363e1 never work on a 13'' screen... 2015-03-31 22:55:07 +02:00
Ser Lev Arris 6fd3863198 catch apt-get problem for wine install and install packages for MinGW + sample apps 2015-03-31 21:35:58 +02:00
Alexander Gessler dcc8aa092a Merge pull request #517 from arris69/FixJava_final
Fix java final (afterparty)
2015-03-31 20:56:29 +02:00
Alexander Gessler 00006239cb Merge pull request #518 from arris69/Build_with_Android_NDK
maybe Fixes assimp/assimp#516
2015-03-31 20:55:38 +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
Ser Lev Arris c2e6e3439e sry, one fi too less... 2015-03-29 11:59:57 +02:00
Ser Lev Arris ef7009f2c3 maybe Fixes assimp/assimp#516 2015-03-29 11:51:17 +02:00
Kim Kulling 20ad00b5e5 Merge branch 'master' of https://github.com/assimp/assimp 2015-03-28 20:47:17 +01:00
Ser Lev Arris 38a1abc908 ... method name ... 2015-03-28 15:01:01 +01:00
Ser Lev Arris 19d9b31d56 makro »lprintf« substitution gcc warnings cleanup 2015-03-28 14:45:21 +01:00
Alexander Gessler f96b49a112 Merge pull request #515 from assimp/regression-suite-fixes
Regression suite fixes II
2015-03-28 14:38:51 +01:00
Ser Lev Arris 311c1ecadb typo in method name fixed 2015-03-28 14:32:06 +01:00