Alexander Gessler
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
Alexander Gessler
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
Alexander Gessler
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
Alexander Gessler
4bf090e92c
Merge branch 'master' of https://github.com/Madrich/assimp
...
Conflicts:
code/ColladaParser.cpp
2015-03-16 23:04:16 +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
ulf
fdad4b51a1
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-16 11:35:33 +01:00
ulf
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
Alexander Gessler
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
Alexander Gessler
7ee5eaafc6
Fix compile: set::erase() returns void prior to C++11.
2015-03-15 23:40:29 +01:00
Alexander Gessler
16880b3dbd
Fix build after mis-merge.
2015-03-15 23:31:58 +01:00
Alexander Gessler
09c15331c4
Improve error reporting during dump diffing.
2015-03-15 21:01:34 +01:00
Alexander Gessler
3554301afe
Better regression test logging.
2015-03-15 15:07:17 +01:00
Alexander Gessler
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
Alexander Gessler
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
Alexander Gessler
e976cc2117
Reduce garbage errors during regression checks.
2015-03-15 01:02:18 +01:00
Alexander Gessler
94fd8c9c16
Remove old batch script to run unit tests.
2015-03-15 00:48:51 +01:00
Alexander Gessler
741b070c7e
Add blender 2.71 default scene as test file.
2015-03-15 00:48:16 +01:00
Alexander Gessler
c59878e427
Merge branch 'master' of github.com:assimp/assimp
...
Conflicts:
code/ColladaLoader.cpp
2015-03-15 00:18:39 +01:00
Wil Shipley
e37b306234
- Build as static library FOR REAL, not dylib.
2015-03-14 15:59:48 -07:00
Madrich
c4eb04bb8c
Fix XFile name for $ and {}
...
Memleak copy constructor
2015-03-14 20:52:53 +01:00
Alexander Gessler
3080c26a60
Add test files for previously fixed #458 .
2015-03-14 19:57:43 +01:00
Alexander Gessler
ff4e1d9446
Sub-sample axis-angle channels if the delta between two consecutive key-frame angles is >= 180 degrees. Fixes #458 .
2015-03-14 19:57:13 +01:00
Madrich
edd3ed9e8f
Back PretransformVertice Change
...
Fix Node Name in XFileExport
2015-03-14 19:48:08 +01:00
Madrich
56da80bc6e
Copy constructor ExportProperties
...
Fix name dummy node in PreTransformVertices
2015-03-14 19:03:44 +01:00
Madrich
290a16eea5
Copy constructor for ExportProperties
...
Export Propertie defines in config.h
Remove unnecessary
2015-03-14 16:31:33 +01:00
Madrich
37572f0f52
Missing include map
2015-03-14 14:22:55 +01:00
Madrich
8b1b12682f
Add ExportProperties
2015-03-14 14:03:14 +01:00
wilshipley
868f8081e7
Merge pull request #1 from assimp/master
...
I'm trying to merge in changes from the main project.
2015-03-13 18:52:55 -07:00
Wil Shipley
1b06d55975
- Needed quotes around path in case of spaces in it.
2015-03-13 18:47:31 -07:00
Wil Shipley
5438b75c60
- committing the workspace data inside the project file, too, who knows if this is correct
2015-03-13 18:47:10 -07:00
ulf
ad9d178f0a
- Bugfix: IfcLoader lost nodes and geometry when they were stored in subnodes of IfcSpace and the setting "Filter IfcSpace" was enabled
2015-03-13 15:13:53 +01:00
arris69
9094770d38
fixed light and camera access.
2015-03-13 12:52:03 +01:00
Wil Shipley
ca463fca9a
- Rearranged groups, link against C++ lib explicitly.
2015-03-13 00:37:02 -07:00
Wil Shipley
73174b7081
Hard-coded project to build static library for iOS / OS X
...
- This may not appeal to everyone, but I wanted a simple static library
Project I could include in a Xcode Workspace that would auto-build when
I built an iOS or OS X app.
- If you drag this project file into your Workspace and then add the
libassimp.x.x.a file as a dependency in your project inspector, it
should auto-build in the architecture of your choice.
2015-03-12 20:23:21 -07:00
arris69
8b22ba25ba
removed debug function and add buildfile for android ndk-build command
2015-03-12 21:24:49 +01:00
arris69
ead3b26ea9
no one ever tried this java stuff???
...
(crashes if the model has a lot of meshes...)
2015-03-12 20:37:33 +01:00
Alexander Gessler
e516a21bd9
Merge pull request #490 from wilshipley/master
...
Added 'const' to () operator on CompareVector
2015-03-12 07:57:59 +01:00
Wil Shipley
90a07713c0
Added 'const' to () operator on CompareVector
...
So it can build on clang.
2015-03-11 16:55:21 -07:00
Kim Kulling
d9d7dd31ea
fix linker error: undefined references to openddl_parser.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-11 19:05:37 +01:00
Alexander Gessler
163bbc25c7
Merge pull request #486 from DenisMikhalev/issue-2
...
Adds safety and prevents crashes for damaged files
2015-03-10 16:09:07 +01:00
Léo Terziman
f120a75617
Merge remote-tracking branch 'official/master' into contrib
2015-03-10 15:40:03 +01:00
Léo Terziman
18e6a8fbdb
improved handling of commas in fast_atof
2015-03-10 15:39:27 +01:00
DenisMikhalev
615041ba15
Add license file for ant-half.ply
2015-03-10 15:00:49 +03:00
Léo Terziman
8ae9e2b555
In Collada: Added missing description of importer specific options
2015-03-10 09:20:00 +01:00
DenisMikhalev
fa8cdb241d
Move ply file to models-nonbsd dir
2015-03-10 09:18:23 +03:00
Alexander Gessler
3c56e978f7
Merge pull request #484 from turol/master
...
Fix read past end of buffer after call to TokenMatch
2015-03-10 00:29:25 +01:00
DenisMikhalev
80bfe7929e
Adds half of file for testing crash PlyLoader
2015-03-09 19:51:04 +03:00
DenisMikhalev
62676b56aa
Adds safety and prevents crashes for damaged files
2015-03-09 19:40:13 +03:00
Turo Lamminen
ba4689fd05
Whitespace
2015-03-09 12:33:13 +02:00
Turo Lamminen
c342778f42
Fix read past end of buffer after call to TokenMatch
...
IsSpaceOrNewLine returns true on end of input (NUL character). But if
TokenMatch considers a token at end of input to match it sets "in" to
one past end of buffer. This will lead to reading past the end of
buffer on any subsequent operation.
2015-03-09 12:33:13 +02:00