v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,705 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

2705 Commits (baddcc2f3405cf307bf3bf6be245252af74bebe7)

Author SHA1 Message Date
Léo Terziman 469db95cd5 Merge remote-tracking branch 'official/master' into contrib 2014-12-18 10:42:29 +01:00
Alexander Gessler 7a850a4131 Merge pull request #429 from abma/master 
fix some errors/warnings found by static code analyzer
 2014-12-17 01:02:35 +01:00
abma b1221ade64 fix some errors/warnings found by static code analyzer 2014-12-16 23:41:10 +01:00
Kim Kulling 7694561121 remove dead code from main CMakeLists.txt. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-12-16 22:34:24 +01:00
Léo Terziman 3303f97f13 Merge remote-tracking branch 'official/master' into contrib 2014-12-16 17:48:30 +01:00
Alexander Gessler b6cc8d6da9 Add link to AssimpPascal headers 
See https://github.com/ev1313/Pascal-Assimp-Headers
 2014-12-12 02:43:15 +01:00
Alexander Gessler 29c09b24e7 Merge pull request #421 from heandreas/master 
Added binary ply exporter.
 2014-12-12 00:05:26 +01:00
Andreas Henne ab7754ab2a Code style changes. 2014-12-11 23:05:09 +01:00
Alexander Gessler 1e943d9fd4 Merge pull request #427 from sth519/patch-2 
Update README.md for the iOS port
 2014-12-10 19:48:55 +01:00
sth da93f5eb78 Update README.md for the iOS port 
Just a small update to reflect the current state of the iOS port.
 2014-12-10 19:37:18 +01:00
Alexander Gessler 585e7c69fb Merge pull request #423 from enkore/master 
Fix some issues in jassimp
 2014-12-06 23:56:45 +01:00
enkore fdf78fc13b README: Add a few lines on how to compile jassimp-native 2014-12-06 15:53:56 +01:00
enkore 6b4cbeea40 Fix outright compiler error in jassimp.cpp 2014-12-06 15:52:44 +01:00
enkore 6829af0dd6 Fix broken ant build 2014-12-06 15:52:26 +01:00
Andreas Henne 33f9745b62 Formatting changes. 2014-12-05 19:40:09 +01:00
Andreas Henne 4550279629 Added binary ply exporter. 2014-12-05 17:25:18 +01:00
Kim Kulling 06f80024cb Merge pull request #418 from xantares/patch-1 
remove useless ASSIMP_BUILD_STATIC_LIB option
 2014-12-04 17:20:38 +01:00
Kim Kulling 6c7b623d1b add missing unittest, 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-12-03 21:23:27 +01:00
Kim Kulling 96661ae4cd fix the build 2014-12-02 08:51:20 +01:00
Kim Kulling 15e0175007 fix compiler warning. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-12-01 23:35:57 +01:00
Kim Kulling 951431db94 add missing documentation. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-12-01 21:27:48 +01:00
Kim Kulling bc0fd00e96 Merge pull request #414 from l337r007/collada-tristrips 
Collada: tristrip support: helps a lot :-). Thanks for that!
 2014-12-01 20:48:10 +01:00
Kim Kulling 7a31a68cfc adapt c-api to get ImporterDesc for a given loader ( see https://github.com/assimp/assimp/issues/412 ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-12-01 20:34:15 +01:00
Wolfgang Herget 926b7e98cc Tristripped version of cube.dae generated using openscenegraph. 
Command line used:
OSG_OPTIMIZER="TRISTRIP_GEOMETRY" osgconv cube.dae cube_tristrips.dae
 2014-12-01 18:08:21 +01:00
Kim Kulling 1f13158b31 fix vs2013 compiler warnings and add missing doxygen tags. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-11-29 12:12:32 +01:00
Kim Kulling 098ddd3a95 make copy constructor and a assignment operator private to avoid misuse of helper class scope guard 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-11-29 11:56:39 +01:00
Kim Kulling 26ac1e2c72 update gitignore file. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-11-29 11:35:48 +01:00
Kim Kulling 9f80a2a2a9 update parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-11-29 11:33:49 +01:00
Kim Kulling 005ddf9733 Merge pull request #419 from sth519/patch-1 
Default to latest installed iOS SDK by default
 2014-11-29 11:27:35 +01:00
sth519 4050f42ef1 Default to latest installed iOS SDK by default 
The iOS 7.1 SDK isn't available anymore in the current version of Xcode, so the script doesn't work without modification.
By setting IOS_SDK_VERSION to an empty value, the script will default to a symlink* which always points to the latest installed SDK.

* /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk
 2014-11-27 14:37:46 +01:00
xantares d13b51b467 Update build.sh 2014-11-27 09:27:46 +01:00
xantares 5c6921e2ea remove useless ASSIMP_BUILD_STATIC_LIB option 
BUILD_SHARED_LIBS must be used instead
 2014-11-27 08:58:29 +01:00
Alexander Gessler e707a07ff9 Merge pull request #416 from olitheolix/python3_quicktest 
Python3 quicktest
 2014-11-23 09:56:29 +01:00
Oliver Nagy 1e9f3a802d PEP8 and updated docu strings. 2014-11-23 15:42:19 +11:00
Oliver Nagy 3721b19a61 pyassimp/quicktest now runs without installing pyassimp first. 2014-11-23 15:42:11 +11:00
Oliver Nagy fc039ee0e2 pyassimp/quicktest is now Python 3 compatible. 2014-11-23 15:23:31 +11:00
Alexander Gessler b450ecbed2 Merge pull request #415 from olitheolix/master 
Replaced 'xrange' by 'range' to maintain Python 3.x compatibility.
 2014-11-22 13:25:08 +01:00
Oliver Nagy f12a0a3b1c Replaced 'xrange' by 'range' to maintain Python 3.x compatibility. 2014-11-22 16:24:32 +11:00
Wolfgang Herget c08a5581dd ColladaParser::CopyVertex: don't make a local copy of the vertex' indices. 
Instead, we address the relevant indices in the main vector directly by
adding the input offsets to the per-vertex base offset.
 2014-11-20 17:53:06 +01:00
Wolfgang Herget 8dead93504 ColladaParser: don't arbitrarily limit number of per-vertex attributes. 2014-11-20 16:42:41 +01:00
Wolfgang Herget ca3ce4703d Rename ColladaParser::CopyPrimitive to ::CopyVertex. 
That's a bit closer to what the function actually does.
 2014-11-20 13:12:09 +01:00
Wolfgang Herget 13a157ea66 For Polylists, manually compute the start offset outside CopyPrimitive. 2014-11-20 13:10:15 +01:00
Johannes Ebersold e568c2df9d ColladaParser::ReadIndexData: don't rely on the specified number of primitives. 
Especially TriStrips don't specify triangle count upfront, so one needs to
sum up the count of triangles read from all <p> tags in a tristrip collection.
 2014-11-19 14:40:43 +01:00
Johannes Ebersold 72f67ea0cd Whitespace changes 2014-11-19 14:40:42 +01:00
Johannes Ebersold 593484829b Add Function ColladaParser::ReadPrimTriStrips. 
This does the index mangling for reading tristrips.
 2014-11-19 14:40:42 +01:00
Johannes Ebersold 0f40dcca7e Add calculation for nuber of Primitives for TriStrips 2014-11-19 14:40:42 +01:00
Johannes Ebersold 7c4bf383d7 Move vertex copy operation into switch statement. 
We will be adding special handling for Tristrips in an upcoming commit,
which unfortunately doesn't map to a common copy loop as it is.
 2014-11-19 14:40:42 +01:00
Johannes Ebersold 4ef244f672 Extract function ColladaParser::CopyPrimitive 2014-11-19 14:40:42 +01:00
Johannes Ebersold 70d2c8571b ColladaParser::ReadPrimitives: get rid of "idx" iterator. 
We will be adding non-sequential access to the indices vector in one of the upcoming commits.
 2014-11-19 14:04:49 +01:00
Johannes Ebersold 543bd5c0d0 ColladaParser::ReadPrimitives: rename "a" to currentPrimitive 2014-11-19 13:51:22 +01:00