e2c91f3d23
closes #506
2015-03-21 16:56:42 +01:00
527bf8c255
bit cleanup and wait untip issue #506 is fixed
2015-03-21 12:35:29 +01:00
8fe8e993da
Merge branch 'Build_with_Android_NDK' of https://github.com/arris69/assimp into Build_with_Android_NDK
2015-03-21 11:13:50 +01:00
a7e4babd9d
gcc_struct, old fish, but reinterpreted: 92f4c84488
2015-03-21 11:10:33 +01:00
3bd1a791c0
gcc_struct, old fish, but reinterprated: 92f4c84488
2015-03-21 11:08:06 +01:00
3e6043de70
use correct variable for compiler selection...
2015-03-21 10:54:46 +01:00
f3ed79ab41
make use of travis languages, build java jar too.
...
https://github.com/assimp/assimp/pull/505#issuecomment-84198261
2015-03-21 10:32:15 +01:00
54dcc64d33
enable some importers, skip otherbuild for test/discuss
2015-03-20 22:36:57 +01:00
448ce916c2
build don't starts? (reverted branch setting)
2015-03-20 22:06:03 +01:00
d045dbdb69
fix openddl-issue wih token type containing line end.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 21:55:19 +01:00
2dda345bdb
build don't starts? (reverted branch setting)
2015-03-20 21:41:23 +01:00
f63607e945
build don't starts?
2015-03-20 21:34:12 +01:00
23797dc8cc
for sure jassimp needs the assimp lib too
2015-03-20 21:15:57 +01:00
1ddcbf49da
use ant to compile jassimp
2015-03-20 21:11:08 +01:00
32b1579c80
install the android NDK
2015-03-20 21:05:25 +01:00
c78ed74e70
- update gitignore file.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 16:56:43 +01:00
0995f3662d
prepare handlers for missing nodes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 16:56:28 +01:00
690ebe4f1e
fix https://github.com/assimp/assimp/issues/504 : use correct define for check if OpenGEX-importer shall be used or not.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-20 13:34:48 +01:00
492fee282d
Merge pull request #3 from assimp/master
...
Update fork
2015-03-20 13:09:38 +01:00
9da69190e0
Merge pull request #502 from assimp/opengex_support
...
Opengex support
2015-03-19 19:27:05 +01:00
40d97fbd55
Merge remote-tracking branch 'origin/master' into opengex_support
2015-03-19 12:44:50 +01:00
abe82a5d73
add missing include
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 12:34:11 +01:00
40369010c3
fix usage of c++11 type nullptr.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 12:14:17 +01:00
f7e5f3ec6b
assimp: fix build with latest version of openddl-parser lib.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 12:07:16 +01:00
70aafa478d
avoid copying of private struct.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:38:15 +01:00
12efa14777
add openddl_parser directly to assimp.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:37:58 +01:00
b0753c38de
fix code reading finding: rename definition.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-19 11:37:11 +01:00
ee98c80654
Merge pull request #491 from arris69/Fix_Jassimp_for_Android
2015-03-18 23:06:23 +01:00
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
05208a5014
try to fix build of win32 crosscompile.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-17 19:43:41 +01:00
2717d51f7e
Merge remote-tracking branch 'origin/master' into opengex_support
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Conflicts:
code/ParsingUtils.h
2015-03-17 14:26:39 +01:00
59633d172f
implementation for mesh resolving.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-17 14:25:40 +01:00
0d5a2ce4c1
openddl-parser: latest greatest with fixes for invalid reference information.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-17 14:25:15 +01:00
7d7ccfd630
fix compiler warning.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-17 14:24:28 +01:00
736239cc8e
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-16 23:27:05 +01:00
b304e7b45c
Add missing break in switch statement in BlobIOSystem.h. Fixes #438 .
...
This probably didn't affect anyone for real since no on uses relative seeks.
2015-03-16 23:26:41 +01:00
599a61cad2
Restrict travis build to master branch.
...
We want the build badge on the front page to be always green. Branches can fail, that's fine, but currently this gives the impression that all of assimp is failing. Branches should do pull requests against master to get a CI build. Such PRs can be marked "do not merge" and updated indefinitely.
2015-03-16 23:20:00 +01:00
adc44d1e83
If caller provides no ExportProperties, pass a pointer to empty properties to the Exporter implementation (instead of a NULL).
2015-03-16 23:09:41 +01:00
4bf090e92c
Merge branch 'master' of https://github.com/Madrich/assimp
...
Conflicts:
code/ColladaParser.cpp
2015-03-16 23:04:16 +01:00
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
fdad4b51a1
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-16 11:35:33 +01:00
dbc7dc005d
- IfcLoader now evaluates all curve segments at both start and end. Leads to a lot of duplicates which get filtered out afterwards, but fixes the "cutting corners" phenomen that sometimes appeared in conjunction with trimmed curves
2015-03-16 11:35:07 +01:00
dca3f09940
Merge pull request #497 from assimp/regression-ci-test
...
Regression suite fixes, fix cases of non-deterministic output #1 .
2015-03-16 09:15:55 +01:00
7ee5eaafc6
Fix compile: set::erase() returns void prior to C++11.
2015-03-15 23:40:29 +01:00
16880b3dbd
Fix build after mis-merge.
2015-03-15 23:31:58 +01:00
09c15331c4
Improve error reporting during dump diffing.
2015-03-15 21:01:34 +01:00
3554301afe
Better regression test logging.
2015-03-15 15:07:17 +01:00
dc441d09e5
Blender importer: fix accidental use of uninitialized fields in the default material.
...
IMHO C++03+ guarantees zero initialization here, so it may be a MSVC-specific issue.
2015-03-15 14:42:28 +01:00
1c64c590f2
Blender importer: always sort sets of objects by their name. Previously we accidentally ordered pointers to objects by their memory address, which was non-deterministic and caused regression tests to be flaky.
2015-03-15 01:26:15 +01:00
e976cc2117
Reduce garbage errors during regression checks.
2015-03-15 01:02:18 +01:00
Ser Lev Arris
Kim Kulling
Madrich
Kim Kulling
Alexander Gessler
Alexander Gessler
ulf