d822930848
Fixed: Initialize members in MDCFileData
2015-07-02 20:51:46 -06:00
eaf63bd04b
Fixed: Initialize members in SMDLoader
2015-07-02 20:51:46 -06:00
65ada2596f
Fixed: Initialize members in PlyParser
2015-07-02 20:51:46 -06:00
5cc43ecfad
Fixed: Initialize members in XFileHelper
2015-07-02 20:51:46 -06:00
3543bb7e5f
Fixed: Initialize members in IRRLoader
2015-07-02 20:51:46 -06:00
2f0786068d
Fixed: Initialize members in MDLFileData
2015-07-02 20:51:46 -06:00
c014a2ed21
Fixed: Initialize members in BVHLoader
2015-07-02 20:51:45 -06:00
7cc46ebc22
Fixed: Initialize member sin ASEImporter
2015-07-02 20:51:45 -06:00
a9a8796f71
Fixed: Initialize members in ACLoader
2015-07-02 20:51:45 -06:00
d899f4db57
Fixed: Initialize members in 3DS loader
2015-07-02 20:51:45 -06:00
4619625b84
OpenGEX: add class for exporter.
2015-07-01 20:43:37 +02:00
eee32a5668
Refactor: Expand tags to 4 spaces
2015-06-28 16:12:51 -06:00
4ec76d88f0
Refactor: Use LF for line endings
2015-06-28 16:11:05 -06:00
e4b0c27a2e
Refactor: Strip trailing whitespace
2015-06-28 16:09:18 -06:00
83de707587
Refactor: Expand tabs to 4 spaces
2015-06-28 16:04:15 -06:00
a96a595a7a
Refactor: Trim trailing whitespace
2015-06-28 16:01:32 -06:00
4c1a0507fe
Refactor: Line endings are LF, not CRLF
2015-06-28 15:59:33 -06:00
8326535445
Implemented: Add editor config for source code
2015-06-28 15:50:57 -06:00
1d96486437
Refactored: Reformat CMake files to conform to editor config
2015-06-28 15:50:57 -06:00
2bfc353fde
License info: update year info.
2015-06-28 21:48:25 +02:00
db3aea4b18
Remove finding from code analysis.
2015-06-28 21:06:20 +02:00
6249a1c06f
CMake: add comment for openddl-parser configuration.
2015-06-23 21:28:13 +02:00
85e2f47dc8
Merge pull request #523 from turol/afl-fixes
...
More crash fixes
2015-06-22 16:56:51 +02:00
328cae8a81
Added mesh name importing to .X ascii format.
2015-06-20 17:35:30 -05:00
ff145bfac5
Removed unused variable
2015-06-19 14:24:34 +01:00
927c9cb3ce
Fixes random crash when loading fbx files
2015-06-19 14:04:30 +01:00
b8c12fdc6f
CodeQuality improvements
...
Several small code improvements based on a cppcheck result
2015-06-05 09:52:06 +02:00
36a9f2be1a
Merge pull request #577 from g-pechorin/patch-4
...
not-git (and "nested" builds)
2015-06-04 23:46:05 +02:00
1a2f4ed105
Merge pull request #575 from g-pechorin/patch-3
...
ASSBIN comments seem incorrect
2015-05-31 23:18:17 +02:00
9c26f229a3
- OpenDDL-Parser: latest greatest.
...
- Add support of OpenGEX-texture types.
2015-05-31 20:36:55 +02:00
72b87ec526
removed x64 warnings
2015-05-31 13:35:10 +01:00
6ddb67b321
corrected misinformation in the documentation
...
> corrected note saying that the header was 500 bytes long (512 bytes are written and the number 512 is given elsewhere)
> altered confusing language about how long the chunks are ("length of chunk" implies the number includes the chunk-header. chunk-data-length less so, and reflects the fact that the number written doesn't include the chunk-header)
> removed mistake about how texture coordinates are encoded (the last release, and the current head both write texture coordinates as 3 float components regardless of what they actually are)
2015-05-30 23:40:17 +01:00
6cc32a946b
Fix transformation parsing for OpenGEX-parser.
2015-05-29 20:50:09 +02:00
670278da82
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-29 20:46:10 +02:00
5e1fc39448
Add parsing of texture nodes of OpenGEX-format importer.
2015-05-29 20:45:31 +02:00
de6f0f2a7d
Creating the functionality to list all Importer descriptions and the number of importers available.
2015-05-26 08:40:43 -03:00
4cbce374b6
Code Cleanups
...
- add initializers to classes
- fix %i/%u for unsigned ints
- remove unused vars
- pass by reference
2015-05-24 11:55:37 -04:00
9538b7ed42
Merge pull request #570 from wise86-android/colladaExportLightAndCamera
...
Collada export light and camera
2015-05-23 12:06:23 +02:00
26b3328f3b
fix xml syntax + more deap test
2015-05-23 11:03:56 +02:00
5ad6179bc5
export the light in the collada file
2015-05-19 23:15:18 +02:00
b1d085b6a9
fix the foruma for compute the mAngleOuterCone values
2015-05-19 23:08:31 +02:00
2c194f629a
fix macro for be uesed with expression
2015-05-19 21:57:51 +02:00
28cc934bb9
Fix overlapping merges
2015-05-18 09:51:09 -04:00
7cd8cc1b1f
Merge pull request #560 from asmaloney/fixes/init_cleanup
...
Fix inits and a couple of empty checks
2015-05-18 09:49:59 +02:00
9cbef8cba3
Refactor: Initialize members in declaration order; prefer initialization over assignment
2015-05-17 20:50:58 -06:00
cac8707121
Refactor: Delete unused field
2015-05-17 20:48:04 -06:00
4a5e9352d6
Refactor: Delete unused functions
2015-05-17 20:46:56 -06:00
a34adb8450
Refactor: Delete unused functions
2015-05-17 20:45:16 -06:00
814ef32dce
Refactor: Delete unused fields
2015-05-17 20:43:25 -06:00
5bb09377cb
Refactor: Delete unused variable
2015-05-17 20:40:35 -06:00
7b3fa5ebc2
Refactor: Delete unused forward decls, delete unused function
2015-05-17 20:22:31 -06:00
79c916daf4
Refactor: Remove unused variable
2015-05-17 20:05:05 -06:00
2de6dd4973
Refactor: Delete unused variable
2015-05-17 20:02:58 -06:00
6ae9797648
Refactor: Initialize members in declaration order; initialize POD arrays
2015-05-17 20:01:51 -06:00
d25c36960a
Refactor: Initialize all POD members
2015-05-17 19:57:11 -06:00
8c94e51e90
Refactor: Delete unused functions
2015-05-17 19:47:13 -06:00
fbf90a28ff
Fixed: Ensure variable is always initialized before use
2015-05-17 19:46:01 -06:00
63520d562a
Refactor: Initialize members in declaration order; prefer initialization over assignment
2015-05-17 19:42:30 -06:00
bf4a73e42e
Refactor: Remove unused member variable
2015-05-17 19:42:07 -06:00
91ca983d5f
- Workaround for Collada exporter in SketchUp 15.3.331 (possibly others) where it'll export the wrong "count" when exporting "lines".
...
- When I encounter this condition I just print a warning and use the actual number of points in the file instead of the number they give, as opposed to throwing an exception and bailing on the whole file.
- For an example of this kind of file see https://3dwarehouse.sketchup.com/warehouse/getpubliccontent?contentId=e4587719-2609-49ed-a2f6-20b98d1215f3&fn=Kartell-GE.zip
- Some people have complained about this on http://forums.sketchup.com/t/bug-in-lines-exported-at-collada-format/8145
2015-05-17 18:36:17 -07:00
c014bb977c
- add missing initialization of several class members
...
- prefer check for empty() over check for size() in OptimizeGraph (empty() is guaranteed to be constant time, size() is not)
- fix a couple of incorrect indentations
2015-05-17 20:48:23 -04:00
fb4eb83e84
add the ability to export cameras information in a collada file
2015-05-17 20:54:45 +02:00
98b234020b
Fixed AssBin loader.
...
File reads were used in ai_assert. The function has side effects, so it should not be used in an assert.
Fixed AddGTest.cmake.
There was an issue regarding Xcode project file. The path of libgtest.a was incorrectly set.
2015-05-16 23:39:24 +09:00
a1268bf864
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-12 21:52:25 +02:00
0fe8e739c3
Use "wb" when writing binary STL exports, fixes #556 .
2015-05-12 21:51:27 +02:00
e3c29b7e4b
Merge pull request #554 from assimp/fix-obj-material-name-spaces
...
OBJ: Support spaces in material names, fixes #545 .
2015-05-12 21:44:07 +02:00
faea2ecccc
OBJ: Support spaces in material names, fixes #545 .
...
Adding test file.
2015-05-10 23:50:18 +02:00
b4f5c57b3e
allow to compile only enabled loaders
2015-05-06 23:15:15 +02:00
70722ad318
Merge branch 'master' of https://github.com/assimp/assimp
2015-05-05 22:27:13 +02:00
fd3a0d4a9d
fix name handling of geoemtryobjectname nodes
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-05-05 22:27:05 +02:00
b6d91ec11a
Fix Path functions
...
Fix XFilePrefix for mesh name
Add Color for faces in Step Export
2015-05-02 12:19:20 +02:00
2dde962f0d
FilePath Functions in DefaultIOSystems
...
Replacements in Exporters
2015-05-02 01:56:20 +02:00
148207a073
Fix removed AssimpPCH
2015-05-01 23:16:44 +02:00
71ae322e7b
Merge pull request #5 from assimp/master
...
Update Fork
2015-05-01 23:01:33 +02:00
58a72d9302
Fix Warnings
...
Add Time in Step File
2015-05-01 22:19:40 +02:00
ca8a3909be
Add StepExporter.cpp(stp) Export
...
Fix XFile
2015-05-01 21:40:51 +02:00
4acb1d4c92
Removed FORCE attribute from CMake variable LIBRARY_SUFFIX
2015-05-01 14:13:28 +02:00
2a7e49423a
Merge pull request #547 from assimp/acgessler-patch-2
...
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
2015-04-30 15:19:01 +02:00
5357772cf5
fix build.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 14:31:23 +02:00
d5699cc89f
fox build: add missing include for ai_assert.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 13:47:33 +02:00
31cce98680
fix color handling in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-30 12:54:59 +02:00
78faabf0fa
Fix one-off in STEPFileEncoding causing UTF32 character decoding to fail.
2015-04-30 02:37:35 +02:00
880cb473b0
Merge pull request #546 from terziman/master
...
Minor improvments & bug fixes
2015-04-30 02:35:52 +02:00
c99bd9825a
Fixed bug introduced by misleading names in materials properties between "type" parameters of function referring to the "semantic" field of properties (and NOT the type field...)
2015-04-29 18:13:16 +02:00
2f8f0b1b02
Merge branch 'master' of https://github.com/assimp/assimp
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Conflicts:
code/ObjFileParser.cpp
2015-04-29 13:18:51 +02:00
995bc41d57
color node handling opengex
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-29 11:57:39 +02:00
ca2e47b205
Fixed some typos
2015-04-29 09:26:11 +02:00
91c751a03a
Added missing header
2015-04-28 12:29:39 +02:00
5b9af11f9b
Merge remote-tracking branch 'official/master' into contrib
2015-04-28 12:04:53 +02:00
5c890c1a90
Merge pull request #544 from aru/cygwin-build-fix
...
Modifying files to let assimp build under cygwin.
2015-04-21 15:56:40 -07:00
956fde6e66
Renaming ByteSwap.h to ByteSwapper.h to let assimp compile under cygwin.
2015-04-20 17:49:02 -05:00
7043551068
Modifying files to let assimp build under cygwin.
2015-04-20 17:36:47 -05:00
55ae853c2e
Fix compilation with libc++
2015-04-19 10:55:58 +02:00
eb1ee61420
fix code reading findings: use of std::copy
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:48 +02:00
68ca2ca427
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-18 19:17:19 +02:00
08886e28d7
use <> include bracket style.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-18 19:17:10 +02:00
27c6552ae8
Merge pull request #538 from cubeman99/master
...
Added NaN check when outputting normals in PLY exporter, to avoid '-1.#IND'
2015-04-18 07:29:37 -07:00
b38572d1bc
std::fabs from cmath should be right
2015-04-17 23:50:14 -04:00
b575acf2b6
std::absf to std::fabsf
2015-04-17 23:38:54 -04:00
e86d40e4e2
Added infinity check for outputting PLY normals
2015-04-17 23:29:26 -04:00
76dd9467b2
fix win32-build for assimp_viewer .
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-17 20:02:55 +02:00
f435712273
Fix Mac build issues (clang 6.0 compiling x86_64)
2015-04-17 06:42:58 +02:00
f00101f496
Added include of qnan.h (now that AssimpPCH.h include was taken out)
2015-04-16 21:30:50 -04:00
3545d805d2
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-16 20:40:16 -04:00
fa626aa855
Added NaN check when outputting normals in PLY exporter, to avoid outputting '-1.#IND'
2015-04-16 18:01:24 -04:00
d12868adc4
use correct type in forward declaration.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:32:35 +02:00
97946e25c9
fix travis build
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 12:09:06 +02:00
e4b84ff48a
fix mem leak.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:47:14 +02:00
02ee002878
fix build for vs2013
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:38:53 +02:00
444a77e170
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-16 11:10:21 +02:00
ead3e8d275
first version of material handling for opengex
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-16 11:10:12 +02:00
1c1f3c25f8
awww, merge error
2015-04-16 03:13:19 +02:00
611778045d
fix for upstream changes
2015-04-16 02:55:41 +02:00
8c45a4dc3b
Merge remote-tracking branch 'origin'
...
Conflicts:
code/C4DImporter.cpp
code/OgreImporter.h
2015-04-16 01:03:00 +02:00
bf4913b5c9
remove AssimpPCH.h: fixes #534
2015-04-16 01:00:17 +02:00
470ad98281
fix "headercheck":
...
part of https://github.com/assimp/assimp/issues/534
2015-04-15 21:22:26 +02:00
56e8dc5a43
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-14 12:04:47 +02:00
1899de6ea9
remove dead code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-14 12:03:51 +02:00
0cee21ce3c
COB: code cleanup.
2015-04-13 21:52:09 +02:00
b3a3558da3
Re-gen IFC parsing code with alphabetic order of types. This hopefully gives a stable diff base for the future.
2015-04-13 21:42:50 +02:00
28de609a56
Merge branch 'master' of https://github.com/assimp/assimp
2015-04-13 16:02:02 +02:00
806d3ac8e1
- IFC reader regenerated from schema to include IfcArbitraryProfileDefWithVoids
...
- implemented IfcArbitraryProfileDefWithVoids to fix solar panel covers in test\models-nonbsd\IFC\rac_basic_sample_project.ifc
- warning: another dirty hack on top of dirty hacks - one day all these CSG implementations will blow up in our faces. Mark my words.
2015-04-13 16:01:33 +02:00
e2f234707a
Fix possible crash in SceneCombiner when the destinations scene has mPrivate==null. Fixes #401 .
2015-04-12 19:53:24 +02:00
ed57fac879
create node tree
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-08 20:43:55 +02:00
ecf390d51f
set the correct reference to meshes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-06 14:56:12 +02:00
22fc756d4a
- fix double initialization.
...
- use correct number of vectors for dynamic array.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 23:17:16 +02:00
df1134b1a3
- initiate texture coordinate array.
...
- use correct number of vertices for vertex array,
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:47 +02:00
c0e3540ec1
use size_t instead of unsigned int ( static code analysis finding ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-05 21:19:07 +02:00
50d5c5c4ef
Merge pull request #527 from VirusFree/pr_strtol10_64
...
fix for strtol10_64
2015-04-05 17:25:50 +02:00
9a7f90220a
Merge pull request #526 from VirusFree/pr_OpenGEX_textureCoords_init
...
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 17:05:16 +02:00
54ce3d843f
fix for strtol10_64
2015-04-05 16:40:40 +03:00
6a1522ded8
[OpenGEXImporter] Correctly initialize m_textureCoords array
2015-04-05 16:29:33 +03:00
da3c347a57
add strtol10_64 and fix FBX text parsing for int_64 (for animation KTime)
2015-04-05 15:19:55 +03:00
3fa6882384
generate unique indices for importes vertices in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:59 +02:00
a50fa5f1de
add missing doc in obj importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-04 18:52:24 +02:00
65cb05f381
fix invalid index counter.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-04-02 01:10:53 +02:00
681c32d5ec
AC3D: Throw DeadlyImportError when too many vertices instead of out-of-memory exception
...
Valgrind can't throw an exception when running out of memory. The program
wil just crash. This fixes it in some cases but not all.
2015-04-01 20:52:58 +03:00
bf5c9413f9
AC3D: Throw exception when encountering a bad vertex index
2015-04-01 16:22:46 +03:00
16c57ab1d3
AC3D: Throw exception on too many vertices instead of crashing
2015-04-01 16:22:06 +03:00
3e728e80eb
Obj: Change asserts to exceptions
...
These can be triggered by malformed input file so they can't be assertions.
2015-04-01 16:13:46 +03:00
4c28f31f43
X: Throw error when scene contains no root node
...
Otherwise MakeLeftHandedProcess will crash.
2015-04-01 16:11:53 +03:00
8cdf9467c5
MD3: Fix assertion failures when filename doesn't contain '.'
2015-04-01 16:09:59 +03:00
9f9774403d
Remove assertion when too long message attempted
...
Since these can be caused by malformed input files assert is the wrong thing.
2015-04-01 16:03:06 +03:00
45cc0b582a
fix creation of unused mesh instance.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-31 12:18:57 +02:00
754897d1aa
add imported meshes from OpenGEX-importer to scene.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 23:54:32 +02:00
8857f26efb
fix: add setup for number of copied vertex attributes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 12:04:28 +02:00
7f3b044b83
add import of index array data.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-30 11:55:57 +02:00
0e11cfbe6f
add copy op for positions, normals and texture coordinates.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-29 18:53:23 +02:00
20ad00b5e5
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-28 20:47:17 +01:00
8d3853022a
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-28 13:44:11 +01:00
a77f9419a2
XGLLoader: set aiImporterFlags_SupportCompressedFlavour flag.
2015-03-28 13:09:18 +01:00
51514994f3
Merge pull request #512 from VirusFree/pr_FBX_Animations
...
[FBX] add support for multiple animations
2015-03-28 12:56:56 +01:00
aa9dd6a14b
- check property name before setting up the primitive type for meshes.
...
- fix lookup for vertex attribute type lookup.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-28 12:08:59 +01:00
454b85a0ad
Improved prototype of Importer & Exporter SetProperty* functions for better integration with tools such as SWIG
2015-03-27 10:56:03 +01:00
60d58901a5
Merge remote-tracking branch 'official/master' into contrib
...
Conflicts:
code/ColladaParser.cpp
include/assimp/config.h
2015-03-27 09:55:21 +01:00
6824c8cbfe
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-26 22:45:20 +01:00
8666b614c6
Fix non-determinism in XGL importer output due to std::multimap value ordering not guaranteed < C++11.
...
One step closer to a fully reproducible regression test suite.
2015-03-26 22:45:00 +01:00
08ba782bd5
[FBX] add support for multiple animations (by using LocalStart/LocalStop in takes)
...
+ change key type from uint to int (fixes bugs from negative int_t becoming a junk uint_t value )
+ detect and ignore channels with no keys in the specified take start/stop window
+ add test model with multiple animations
2015-03-26 23:23:38 +02:00
b17a1255a1
add setup for mesh primitives and prepare vertex array copy ops.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-26 20:17:26 +01:00
ca4385fcf2
fix compiler warning ( signed against unsigned ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-26 10:11:14 +01:00
7a01f77a08
fix invalid lookup for token type in opengex-parser.
2015-03-25 21:35:32 +01:00
23b3728254
add setup of transformation information in opengex importer.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-24 00:08:42 +01:00
14324c60cf
Add missing ASSIMP_BUILD_NO_C4D_IMPORTER check to C4DImporter.cpp. Fixes #503 .
2015-03-22 17:53:53 +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
816ceeda69
Eliminated error in MSVC.
2015-03-20 14:18:26 +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
59b0819866
STL loader can now handle more than one mesh in a single ascii file.
2015-03-19 17:27:06 +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
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
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
7d7ccfd630
fix compiler warning.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-03-17 14:24:28 +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
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
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
c59878e427
Merge branch 'master' of github.com:assimp/assimp
...
Conflicts:
code/ColladaLoader.cpp
2015-03-15 00:18:39 +01:00
c4eb04bb8c
Fix XFile name for $ and {}
...
Memleak copy constructor
2015-03-14 20:52:53 +01:00
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
edd3ed9e8f
Back PretransformVertice Change
...
Fix Node Name in XFileExport
2015-03-14 19:48:08 +01:00
56da80bc6e
Copy constructor ExportProperties
...
Fix name dummy node in PreTransformVertices
2015-03-14 19:03:44 +01:00
290a16eea5
Copy constructor for ExportProperties
...
Export Propertie defines in config.h
Remove unnecessary
2015-03-14 16:31:33 +01:00
8b1b12682f
Add ExportProperties
2015-03-14 14:03:14 +01:00
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
90a07713c0
Added 'const' to () operator on CompareVector
...
So it can build on clang.
2015-03-11 16:55:21 -07:00
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
f120a75617
Merge remote-tracking branch 'official/master' into contrib
2015-03-10 15:40:03 +01:00
18e6a8fbdb
improved handling of commas in fast_atof
2015-03-10 15:39:27 +01:00
62676b56aa
Adds safety and prevents crashes for damaged files
2015-03-09 19:40:13 +03:00
ba4689fd05
Whitespace
2015-03-09 12:33:13 +02:00
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
18ef31cc06
Merge remote-tracking branch 'official/master' into contrib
2015-03-09 11:31:15 +01:00
c410512173
Use material names, set default direction to UP_Y, process extra tag
2015-03-08 22:37:48 +03:00
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
873ae5db3f
addition to c4997f16db
...
(thanks turol)
2015-03-08 03:26:25 +01:00
c89274d366
Free edges map before recursive calls to reduce memory consumption
2015-03-08 00:16:48 +02:00
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
03a7f36858
Merge branch 'master' of https://github.com/assimp/assimp
2015-03-05 20:18:00 +01:00
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
0cdc528e01
- Bugfix: IFC loader tested squared length against non-squared epsilon in RemoveDegenerates()
2015-03-03 15:56:09 +01:00
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
b1e8c192db
Merge pull request #464 from turol/master
...
Clean up some warnings
2015-02-28 14:41:26 +01:00
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
5a74e07f5f
Mark some more functions with AI_WONT_RETURN
2015-02-27 23:09:12 +02:00
dfd171be6d
Remove unnecessary semicolons after FBXDocument property declarations
2015-02-27 23:09:12 +02:00
308884f144
Remove unnecessary semicolons after function definition
...
Picked up by clang -Wextra-semi
2015-02-27 23:09:12 +02:00
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
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
2274c96e3b
Merge remote-tracking branch 'official/master' into contrib
2015-02-18 17:22:44 +01:00
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
51b790c482
ColladaLoader: format.
2015-02-15 22:26:59 +01:00
ce1302cd71
Fix VC12 warning "empty but controlled statement found".
2015-02-15 22:20:34 +01:00
aae0f7e7b1
3DSExporter: export materials first, then meshes. Our own importer requires this.
2015-02-15 22:12:19 +01:00
0292868917
add geomentry node handling.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-14 16:12:09 +01:00
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
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
84a9514d4b
Fix warning about possibly uninitialized variable
...
It might be better to move FindEmptyUVChannel call earlier
2015-02-13 12:14:39 +02:00
bd1168af30
fix invalid line endling handling.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-10 20:46:02 +01:00
9e87fa178a
add property parsing to opengex parser.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-10 20:09:26 +01:00
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
4e8f7fb802
Fix Visual Studio prefixes
2015-02-08 12:26:29 +01:00
124f408976
add property parsing.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 19:52:06 +01:00
303a6893fc
fix the build.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 13:23:32 +01:00
20b3ce6a40
replace opengexparser by using openddl-parser.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-02-07 12:47:53 +01:00
de66f15a0a
Fix division by zero
2015-02-02 16:03:24 +02:00
b93bd167ed
Fix infinite loop in STL loader error path
...
It appears that this was never tested since hitting it caused an infinite loop.
Fixes testcase hangs/c2eb1fa3e74c6ffe0cebcb1672b03140
2015-02-01 00:35:00 +02:00
fe89773c6f
Fix infinite loop in PLY parser
...
Fixes testcase hangs/9ab979ab256c70aaec9b651f32f051e9
2015-02-01 00:22:32 +02:00
6b9f9afd7a
Fix infinite loop in STL loader
...
If next character was not part of valid token and not whitespace we
would end up spinning in the loop indefinitely. Fix by using do..while
loop which always skips at least one character.
Fixes testcase hangs/73b42cd3b6d05e2ddb5c0fe5888459bc
2015-02-01 00:09:32 +02:00
08ad6ae8fe
Merge pull request #450 from turol/afl-fixes
...
Fix some bugs found with afl
2015-01-31 20:51:07 +01:00
792da49933
Fix out-of-bounds write when STL file node name is too long
2015-01-31 21:36:13 +02:00
f971b66c47
Fix out-of-bounds read in invalid compressed X file
2015-01-31 21:36:08 +02:00
063b2733fc
Merge branch 'master' into opengex_support
2015-01-31 11:09:20 +01:00
1ee4c06e4b
add openddl-parser to contrib.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2015-01-31 11:07:48 +01:00
95ad827277
Remove bogus delete[] on error path
...
mBuffer is a pointer inside a std::vector so don't try to delete[] it.
2015-01-29 23:22:56 +02:00
0108d5b1f9
Fix read past end of buffer on malformed LWOB files
2015-01-29 23:22:56 +02:00
16f9ca35d2
Fix out-of-bounds read when OFF file contains no vertices
2015-01-29 23:22:56 +02:00
af09e68654
Fix memory corruption when LWO file contains bad-sized points chunk
2015-01-29 23:22:41 +02:00
2f0675ac53
Fix memory corruption when 3DS file has more smoothing groups than faces
2015-01-29 23:18:19 +02:00
b700cd917f
Merge pull request #452 from ricortiz/FixExportedLibraryNameVariable
...
Fix exported library name variable
2015-01-29 17:24:30 +01:00
c5d048a98a
Fix crash when 3DS file contains faces but no vertices
2015-01-28 18:37:36 +02:00
cc346d3e12
Merge pull request #437 from CasperTech/master
...
Add support for component controlled matrix transforms, i.e transform(0)...
2015-01-25 19:44:27 +01:00
f62d03bd03
Merge pull request #439 from expipiplus1/master
...
Fix incorrect abs usage
2015-01-25 19:41:46 +01:00
380021e7c4
Check that zlib initialized correctly in FBX parser
...
Check the return code of inflateInit() indicates success to avoid
crashing later when zstream contains invalid data.
2015-01-24 00:00:35 -05:00
a94e668486
Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX
...
to have a consistent library name accross platforms.
2015-01-23 14:19:29 -05:00
e8d4479344
Squash incorrect abs usage
...
Replace calls to abs with a float to calls to std::abs. Before int abs(int)
was being called.
2015-01-22 20:03:13 +00:00
a09de30d83
Add support for component controlled matrix transforms, i.e transform(0)(0) etc.
2015-01-21 01:45:35 +00:00
62225f61e4
Merge branch 'master' into opengex_support
...
Conflicts:
.gitignore
2015-01-13 20:21:17 +01:00
b367d9b390
Fixed some warnings related to empty statement when using assert & building in release mode
2014-12-18 11:01:16 +01:00
469db95cd5
Merge remote-tracking branch 'official/master' into contrib
2014-12-18 10:42:29 +01:00
b1221ade64
fix some errors/warnings found by static code analyzer
2014-12-16 23:41:10 +01:00
3303f97f13
Merge remote-tracking branch 'official/master' into contrib
2014-12-16 17:48:30 +01:00
ab7754ab2a
Code style changes.
2014-12-11 23:05:09 +01:00
33f9745b62
Formatting changes.
2014-12-05 19:40:09 +01:00
4550279629
Added binary ply exporter.
2014-12-05 17:25:18 +01:00
bc0fd00e96
Merge pull request #414 from l337r007/collada-tristrips
...
Collada: tristrip support: helps a lot :-). Thanks for that!
2014-12-01 20:48:10 +01:00
7a31a68cfc
adapt c-api to get ImporterDesc for a given loader ( see https://github.com/assimp/assimp/issues/412 ).
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-12-01 20:34:15 +01:00
1f13158b31
fix vs2013 compiler warnings and add missing doxygen tags.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-29 12:12:32 +01:00
098ddd3a95
make copy constructor and a assignment operator private to avoid misuse of helper class scope guard
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-29 11:56:39 +01:00
9f80a2a2a9
update parser.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-29 11:33:49 +01:00
c08a5581dd
ColladaParser::CopyVertex: don't make a local copy of the vertex' indices.
...
Instead, we address the relevant indices in the main vector directly by
adding the input offsets to the per-vertex base offset.
2014-11-20 17:53:06 +01:00
8dead93504
ColladaParser: don't arbitrarily limit number of per-vertex attributes.
2014-11-20 16:42:41 +01:00
ca3ce4703d
Rename ColladaParser::CopyPrimitive to ::CopyVertex.
...
That's a bit closer to what the function actually does.
2014-11-20 13:12:09 +01:00
13a157ea66
For Polylists, manually compute the start offset outside CopyPrimitive.
2014-11-20 13:10:15 +01:00
e568c2df9d
ColladaParser::ReadIndexData: don't rely on the specified number of primitives.
...
Especially TriStrips don't specify triangle count upfront, so one needs to
sum up the count of triangles read from all <p> tags in a tristrip collection.
2014-11-19 14:40:43 +01:00
72f67ea0cd
Whitespace changes
2014-11-19 14:40:42 +01:00
593484829b
Add Function ColladaParser::ReadPrimTriStrips.
...
This does the index mangling for reading tristrips.
2014-11-19 14:40:42 +01:00
0f40dcca7e
Add calculation for nuber of Primitives for TriStrips
2014-11-19 14:40:42 +01:00
7c4bf383d7
Move vertex copy operation into switch statement.
...
We will be adding special handling for Tristrips in an upcoming commit,
which unfortunately doesn't map to a common copy loop as it is.
2014-11-19 14:40:42 +01:00
4ef244f672
Extract function ColladaParser::CopyPrimitive
2014-11-19 14:40:42 +01:00
70d2c8571b
ColladaParser::ReadPrimitives: get rid of "idx" iterator.
...
We will be adding non-sequential access to the indices vector in one of the upcoming commits.
2014-11-19 14:04:49 +01:00
543bd5c0d0
ColladaParser::ReadPrimitives: rename "a" to currentPrimitive
2014-11-19 13:51:22 +01:00
c7b6b5ea2f
Support lowercase 'ns' and 'ni' obj material tokens
...
Previously, the obj material parser would interpret all key tokens
starting with 'n' as 'newmtl' tokens. However, there are other tokens
that can start with 'n', namely 'ns' and 'ni' for material properties.
Make the parser robust to such cases, despite their canonical forms
being uppercase.
Resolves #410 .
2014-11-18 16:56:46 -08:00
dbf9536213
bugfix: add correct handling for metric line end for example file.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-02 20:30:45 +01:00
1a5695ff48
update: add parsing of metric nodes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-11-02 19:01:04 +01:00
6843c42da1
update:
...
- merge master into branch
- fix metrix header parsing.
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-28 21:45:09 +01:00
f84589fec4
Merge branch 'master' into opengex_support
2014-10-24 15:24:32 +02:00
cee583db06
bugfix: fix compiler warning: converting double to float.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-22 23:05:25 +02:00
940414104a
Merge remote-tracking branch 'official/master' into contrib
2014-10-13 14:10:11 +02:00
b483be3069
Merge pull request #402 from jdduke/disable_bmesh
...
Temporarily disable Blender BMesh conversion
2014-10-10 22:46:25 -07:00
a1a1bf77a8
Temporarily disable Blender BMesh conversion
...
Disable BMesh conversion while associated unresolved issues receive due
attention. Referencing #400 , #373 , #318 #315 and #132 .
2014-10-10 14:16:42 -07:00
487c9449d2
bugfix: search for token checks for the given tokenlist against the lowercased info coming from the asset file. So we also have to used a lowercased token. Thanks to Robinson for the report.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-10-10 15:59:42 +02:00
88f6e8213b
Android JNI asset extraction support (API 9+)
...
- installation fixes
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 17:05:14 +02:00
7224476ee1
Android JNI asset extraction support (API 9+)
...
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
2014-10-07 16:33:43 +02:00
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
a5afbcf29c
refactoring: remove duplicate code.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2014-09-23 23:34:05 +02:00
775b26e614
use std:: namespace for most cmath functions:
...
http://en.cppreference.com/w/cpp/header/cmath
2014-09-23 00:43:33 +02:00
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
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
6a8f69ad5d
Merge pull request #386 from jdduke/rebase_fbx_fov
...
Rebase FBX regression db entries
2014-09-16 09:37:37 -07:00
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
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
Richard
Kim Kulling
Kim Kulling
Henry Stratmann III
Marvin Pohl
rob100
Alexander Gessler
Peter LaValle
Jaime Machado Neto
Andy Maloney
wise86Android
Wil Shipley
shin_mbpr_late2013
Alexander Gessler
abma
Madrich
Madrich
Highlife1911
Léo Terziman
U-ORADEV\albihern
Łukasz Twarduś
David Jordan
ulf
George Papadopoulos
Turo Lamminen
Andreas Henne
DenisMikhalev
OgreTransporter
Johnny Dickinson
Ricardo Ortiz
Joe Hermaszewski
Tom Mettam
Andreas Henne
Andreas Henne
Wolfgang Herget
Johannes Ebersold
Jared Duke
Filip Wasil
Gargaj