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

2983 Commits (06b27e69c7f1d589a31cca8339b63af99ce9e7b7)

Author SHA1 Message Date
Gargaj 397989e169 Null-terminate string 
In theory it shouldn't be necessary since the length is specified but there are parts like https://github.com/assimp/assimp/blob/master/code/MaterialSystem.cpp#L74 that depend on it.
 2014-09-26 01:29:23 +02:00
Kim Kulling a5afbcf29c refactoring: remove duplicate code. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-23 23:34:05 +02:00
Alexander Gessler d228dbeab7 Merge pull request #394 from abma/master 
use std:: namespace for most cmath functions:
 2014-09-22 16:12:36 -07:00
abma 775b26e614 use std:: namespace for most cmath functions: 
http://en.cppreference.com/w/cpp/header/cmath
 2014-09-23 00:43:33 +02:00
Kim Kulling b359deb7fd update: 
- add assert test in obj-import
- fix material token in Obj.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-21 20:37:36 +02:00
Alexander Gessler e6eeab8c84 Merge pull request #388 from jdduke/rebase_blend_regression_db 
Rebase BLEND regression db entries
 2014-09-20 23:27:18 -07:00
Alexander Gessler f44968669f Merge pull request #391 from jdduke/fix_blend_bmesh_uvloop 
Use strict inequality when validating BMesh uvloop access
 2014-09-20 23:26:35 -07:00
Jared Duke 4dcd316430 Use strict inequality when validating BMesh uvloop access 
Change the inequality to a strict inequality when validating
BMesh uvloop access during face conversion.
 2014-09-20 10:23:21 -07:00
Jared Duke 5e114c04d2 Use Linux/GCC build for DB generation 2014-09-17 08:49:28 -07:00
Jared Duke 083d5630ef Use VC11 build for DB generation 2014-09-17 07:30:55 -07:00
Jared Duke c8661ab055 Rebase BLEND regression db entries 
Now that .blend import works properly for non-BMesh-containing meshes,
all .blend regression test cases should now succeed. Rebase accordingly.
 2014-09-16 17:47:55 -07:00
Alexander Gessler 6a8f69ad5d Merge pull request #386 from jdduke/rebase_fbx_fov 
Rebase FBX regression db entries
 2014-09-16 09:37:37 -07:00
Alexander Gessler aac40dd5b8 Merge pull request #385 from jdduke/fix_blend_and_rebase_regression_tests 
Fix non-BMesh-containing .blend import
 2014-09-16 01:10:53 -07:00
Alexander Gessler f7f906ec70 Merge pull request #387 from Kvalme/master 
Fix gcc warnings. (initialization order)
 2014-09-16 01:09:55 -07:00
Jared Duke 046b7e5f47 Rebase FBX regression db entries 
The FBX importer now properly parses field-of-view tokens. Rebase
only the failing FBX entries to accomodate the fix, also removing
the comment noting the (now incorrect) comment about improper import
of the FOV property.
 2014-09-15 18:14:38 -07:00
Jared Duke c482458cae Fix non-BMesh containing .blend import 
BlenderBMeshConverter was erroneously asserting that it contained valid
mesh upon construction. The assertion should only occur when
triangulation is requested, allowing non-BMesh blender meshes to load
properly.

Note that this fixes a number of .blend regression tests that are
currently baselined as failures.
 2014-09-15 17:19:33 -07:00
Denis Biryukov ab6b5a7b21 Fix gcc warnings. (initialization order) 2014-09-15 23:35:03 +04:00
Alexander Gessler f2d26222fc Merge pull request #383 from jdduke/blender_fix_uv_conversion 
Fix crash for Blender poly to face conversion without UVs
 2014-09-13 14:47:51 -07:00
Jared Duke 35c9a33718 Fix crash for Blender poly to face conversion without UVs 
BlenderBMeshConverter assumes that the BMesh has UVs, but that is not
always the case. Handle the non-UV case by only adding a T face when
UVs are present.
 2014-09-13 09:43:00 -07:00
Alexander Gessler 875e65a86a Merge pull request #381 from jdduke/fix_bsp_null_check 
Fix null check in Q3BSPFileImporter
 2014-09-12 23:08:56 -07:00
Jared Duke 485aa8b39d Fix null check in Q3BSPFileImporter 
Reverse the null condition, preventing invalid texture stream
dereferencing. Fixes #380.
 2014-09-12 19:37:10 -07:00
Kim Kulling db582ee024 bugfix: replace nullptr with NULL: 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-12 18:12:18 +02:00
Kim Kulling 49c9786b0a update: avoid mesh generation on heap, when the mesh will be empty ( obj-loader ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-12 15:40:50 +02:00
Kim Kulling 7dff0c6d52 refactoring: remove not use iosystem. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-09-12 12:05:42 +02: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 2aba4a8d1d Merge pull request #378 from MGinshe/patch-1 
small typo fix
 2014-09-11 18:30:25 +02:00
Ryan Cole af4c30bc77 small typo fix 
renamed getNumVertives to getNumVertices.
 2014-09-12 01:48:41 +12:00
Jared Duke 0008f845b0 Merge pull request #376 from jdduke/make_fast_atof_test_cpp03 
Remove std::isnan and std::isinf usage from utFastAtof test
 2014-09-09 16:46:58 -07:00
Jared Duke 43c82b0b38 Remove std::isnan and std::isinf usage from utFastAtofTest 
These functions were added in C++11, and should not be used nakedly
in the current code base. Replace them with suitable C++03 constructs.
 2014-09-09 16:34:10 -07:00
Kim Kulling e0ea8169e3 Merge pull request #374 from jdduke/test_atof 
Add tests for fast_atof
 2014-09-09 10:04:41 +02:00
Jared Duke 0e28416104 Add tests for fast_atof 
The custom implementation for fast_atof currently lacks test coverage,
making it susceptiple to regressions with future changes. Add some
basic test coverage, in addition to a few documented cases that are
known to fail.
 2014-09-08 17:30:21 -07:00
Kim Kulling 302aec6be4 Merge pull request #372 from jdduke/gtest_pr_final 
Replace cppunit with the googletest framework
 2014-09-08 08:50:07 +02:00
Jared Duke 66e608a393 Replace cppunit with the googletest framework 
The GTest framework has a more active support base, and natively
supports CMake. Introduce it as an external dependency (using CMake's
ExternalProject_Add), replacing cppunit and porting the associated unit
tests.
 2014-09-07 16:52:03 -07:00
Alexander Gessler a51a0b36f0 Merge pull request #361 from assimp/travis 
Travis - Add regression suite to CI build
 2014-09-06 00:35:00 -07:00
Kim Kulling c3b35f3933 update: add endline. 2014-09-06 09:19:28 +02:00
Alexander Gessler 460566197b Travis: fix echo failing 2014-09-06 00:14:50 -07:00
Alexander Gessler 1249171bba Regression tests: output list of failures in Travis terminal output 2014-09-05 23:56:49 -07:00
acgessler 72eb2e0c4e Merge branch 'travis' of github.com:assimp/assimp into travis 2014-09-05 21:20:35 -07:00
acgessler 5a0c7058b5 regression tests: ignore pond.0.ply file due to overly long runtime. 2014-09-05 21:20:07 -07:00
Alexander Gessler fd84970596 Regression tests: run.py should not block on user input if used for CI. 2014-09-04 23:18:20 -07:00
Alexander Gessler 11dc89d455 Update .travis.yml 2014-09-04 23:06:47 -07:00
Alexander Gessler 19a50b9a9e Update .travis.yml 2014-09-04 22:56:08 -07:00
acgessler 9e24acb187 Try running regression tests from travis 2014-09-04 22:42:51 -07:00
acgessler 48b138d575 Add cmake install to travis build. 2014-09-04 22:42:00 -07:00
acgessler 1c27d3c565 Regression test suite: look for assimp_cmd binary in current folder first. 2014-09-04 21:04:39 -07:00
acgessler 185f01963f LWO: replace legacy reinterpret_cast based code by memcpy to solve Android SIGBUS problems due to unaligned accesses. Fixes #351 2014-09-04 20:49:48 -07:00
acgessler 1a594b861a Collada: use a counter instead of clock() to generate unique names. Closes #357 2014-09-04 18:50:37 -07:00
Kim Kulling ed9a466c30 update: 
- add OpenGEX parser sceleton
- add base datatypes for OpenGEX support.
 2014-09-04 19:41:14 +02:00
Kim Kulling b1c80d8eb4 Merge pull request #359 from mikedh/master 
Added load from file object functionality to pyassimp.load
 2014-09-04 11:29:04 +02:00
Michael Dawson-Haggerty 8d27a27445 fixed docstrings 2014-09-04 01:21:37 -04:00