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
Léo Terziman
18ef31cc06
Merge remote-tracking branch 'official/master' into contrib
2015-03-09 11:31:15 +01:00
Kim Kulling
79db48a0d1
openddl-parser: latest greatest.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-09 10:17:23 +01:00
Alexander Gessler
7d3d66936b
Merge pull request #483 from DenisMikhalev/issue-482
...
Use material names, set default direction to UP_Y, process extra tag
2015-03-08 22:15:39 +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
Kim Kulling
d4c0529514
Merge pull request #481 from abma/master
...
addition to c4997f16db
(#476 )
2015-03-08 10:30:07 +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
Madrich
5fedf5279c
Merge pull request #2 from assimp/master
...
Update from assimp Master
2015-03-05 22:14:43 +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
Kim Kulling
1e4e105bae
Merge pull request #476 from abma/master
...
remove "register" keyword:
2015-03-03 09:26:25 +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
579382ad91
Merge pull request #472 from assimp/fix471
...
Update IfcLoader to use numeric_limits<uint32_t> instead of UINT32_MAX, ...
2015-02-28 14:27:59 +01:00