Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,959 Commits 19 Branches 43 Tags
225b6fa1663a77fa79392e08e3b7ea2519a02b70
Commit Graph

3862 Commits

Author SHA1 Message Date
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
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
c59878e427 Merge branch 'master' of github.com:assimp/assimp 
Conflicts:
	code/ColladaLoader.cpp
 2015-03-15 00:18:39 +01:00
Madrich
c4eb04bb8c Fix XFile name for $ and {} 
Memleak copy constructor
 2015-03-14 20:52:53 +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
8b1b12682f Add ExportProperties 2015-03-14 14:03:14 +01: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
Wil Shipley
90a07713c0 Added 'const' to () operator on CompareVector 
So it can build on clang.
 2015-03-11 16:55:21 -07: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
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
Léo Terziman
18ef31cc06 Merge remote-tracking branch 'official/master' into contrib 2015-03-09 11:31:15 +01:00
DenisMikhalev
c410512173 Use material names, set default direction to UP_Y, process extra tag 2015-03-08 22:37:48 +03:00
Kim Kulling
727888ea10 Merge pull request #480 from turol/subdiv-memory 
Free edges map before recursive calls to reduce memory consumption
 2015-03-08 10:32:26 +01:00
abma
873ae5db3f addition to c4997f16db 
(thanks turol)
 2015-03-08 03:26:25 +01:00
Turo Lamminen
c89274d366 Free edges map before recursive calls to reduce memory consumption 2015-03-08 00:16:48 +02:00
ulf
76c69205b1 - reintroduced IFC openings to floors and ceilings. Were disabled for some unknown reasons, I hope I didn't break anything. Everything I tested works fine. 2015-03-06 14:14:45 +01:00
ulf
03a7f36858 Merge branch 'master' of https://github.com/assimp/assimp 2015-03-05 20:18:00 +01:00
ulf
a2c9904d59 - Bugfix: polygon-bounded half space clipping now assumes plane in correct coordinate space 
- Bugfix: closing polygon loop along boundary polygon now correctly projects boundary vertices to polygon plane
 2015-03-05 20:17:26 +01:00
ulf
0cdc528e01 - Bugfix: IFC loader tested squared length against non-squared epsilon in RemoveDegenerates() 2015-03-03 15:56:09 +01:00
abma
c4997f16db remove "register" keyword: 
clang warns: 'register' storage class specifier is deprecated
http://stackoverflow.com/questions/10675072/is-the-register-keyword-still-used
 2015-03-02 23:44:02 +01:00
Alexander Gessler
b1e8c192db Merge pull request #464 from turol/master 
Clean up some warnings
 2015-02-28 14:41:26 +01:00
Alexander Gessler
f6f8462113 Update IfcLoader to use numeric_limits<uint32_t> instead of UINT32_MAX, fixes gcc build and is more consistent with the rest of the codebase. Fixes #471. 2015-02-28 13:40:10 +01:00
Turo Lamminen
5a74e07f5f Mark some more functions with AI_WONT_RETURN 2015-02-27 23:09:12 +02:00
Turo Lamminen
dfd171be6d Remove unnecessary semicolons after FBXDocument property declarations 2015-02-27 23:09:12 +02:00
Turo Lamminen
308884f144 Remove unnecessary semicolons after function definition 
Picked up by clang -Wextra-semi
 2015-02-27 23:09:12 +02:00
Turo Lamminen
e8bcad0840 Silence a warning and add an assertion 
Another false positive uninitialized variable. Actually it's only false
if ToOutputVertexIndex does't return NULL which should only happen if
index is out of bounds. Add assertion to make sure of that.
 2015-02-27 23:09:03 +02:00
ulf
b71ded1ad0 - manually merged C4D importer code from acgessler branch 
- manually merged IFC bugfixes and improvements from schrompf branch
 2015-02-23 14:23:28 +01:00
Léo Terziman
2274c96e3b Merge remote-tracking branch 'official/master' into contrib 2015-02-18 17:22:44 +01:00
Léo Terziman
d9a2293491 Improved handling of transparency in collada importer 
+ started preliminary support for RGB_ZERO collada transparency mode
+ added option to manually invert transparency values to deal with broken exporters that don't follow the specs
 2015-02-18 17:20:03 +01:00
Alexander Gessler
51b790c482 ColladaLoader: format. 2015-02-15 22:26:59 +01:00
Alexander Gessler
ce1302cd71 Fix VC12 warning "empty but controlled statement found". 2015-02-15 22:20:34 +01:00
Alexander Gessler
aae0f7e7b1 3DSExporter: export materials first, then meshes. Our own importer requires this. 2015-02-15 22:12:19 +01:00
Kim Kulling
0292868917 add geomentry node handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-14 16:12:09 +01:00
Turo Lamminen
570d02ff6e Silence more uninitialized variable warnings 
These are false positives since aiMaterial::Get will have written to output
if it returns AI_SUCCESS but the compiler can't see that.
 2015-02-13 13:15:26 +02:00
Turo Lamminen
f708d0b122 Silence some uninitialized variable warnings 
These are false positives but the compiler isn't smart enough to see that.
Also it might make more sense to use switch here.
 2015-02-13 12:21:59 +02:00
Turo Lamminen
84a9514d4b Fix warning about possibly uninitialized variable 
It might be better to move FindEmptyUVChannel call earlier
 2015-02-13 12:14:39 +02:00
Kim Kulling
bd1168af30 fix invalid line endling handling. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:46:02 +01:00
Kim Kulling
9e87fa178a add property parsing to opengex parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 20:09:26 +01:00
Kim Kulling
c3e2fa0761 - untabify obj parser. 
- bugfix openddl: latest version

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-10 19:31:23 +01:00