Kim Kulling [Wed, 30 Dec 2015 19:04:16 +0000 (20:04 +0100)]
coverity findings: add missing initializations.
Kim Kulling [Wed, 30 Dec 2015 19:02:35 +0000 (20:02 +0100)]
coverity findings: add missind intialization in STEPFile.
Kim Kulling [Wed, 30 Dec 2015 18:43:57 +0000 (19:43 +0100)]
coverity findings: initialize lookup table for materials.
Kim Kulling [Wed, 30 Dec 2015 15:33:54 +0000 (16:33 +0100)]
coverity findings: initialize index counter in line splitter.
Kim Kulling [Wed, 30 Dec 2015 14:38:30 +0000 (15:38 +0100)]
Coverity findings: fix resource leak in PlyLoader.cpp.
Kim Kulling [Wed, 30 Dec 2015 14:35:26 +0000 (15:35 +0100)]
Coverity finding: remove not used function.
Kim Kulling [Tue, 29 Dec 2015 19:46:41 +0000 (20:46 +0100)]
travis config: remove coverity config from master branch.
Kim Kulling [Tue, 29 Dec 2015 19:17:20 +0000 (20:17 +0100)]
travis config: still fighting with tabs.
Kim Kulling [Tue, 29 Dec 2015 19:09:26 +0000 (20:09 +0100)]
travis config: fix more invalid tabs and one typo.
Kim Kulling [Tue, 29 Dec 2015 19:06:33 +0000 (20:06 +0100)]
travis config: remove erroreous tab intention.
Kim Kulling [Tue, 29 Dec 2015 15:19:42 +0000 (16:19 +0100)]
coverity: enable automatic coverity scan.
Kim Kulling [Mon, 28 Dec 2015 12:02:04 +0000 (13:02 +0100)]
rapidjson: add apple-specific constructor with size_t.
Kim Kulling [Sun, 27 Dec 2015 19:36:54 +0000 (20:36 +0100)]
glTF: usage of (hopefully) correct data type for size types: closes https://github.com/assimp/assimp/issues/723
Kim Kulling [Sat, 26 Dec 2015 23:19:11 +0000 (00:19 +0100)]
https://github.com/assimp/assimp/issues/714: fix null pointer access with
unknown texture.
Kim Kulling [Sat, 26 Dec 2015 23:15:14 +0000 (00:15 +0100)]
Fix typo.
Kim Kulling [Sat, 26 Dec 2015 23:07:37 +0000 (00:07 +0100)]
https://github.com/assimp/assimp/issues/728: XCode fix.
Kim Kulling [Sat, 26 Dec 2015 20:02:32 +0000 (21:02 +0100)]
github.com/assimp/assimp/issues/730: use correct define check
Kim Kulling [Sun, 20 Dec 2015 19:23:16 +0000 (20:23 +0100)]
Travis: disable regression test suite.
Alexander Gessler [Sun, 20 Dec 2015 14:59:42 +0000 (15:59 +0100)]
Merge pull request #703 from terziman/master
Improvement of collada transparency handling
Alexander Gessler [Sat, 19 Dec 2015 23:06:58 +0000 (00:06 +0100)]
Merge pull request #713 from ov/normalize-safe
GenVertexNormalsProcess produces invalid results for specific input
Alexander Gessler [Sat, 19 Dec 2015 23:06:02 +0000 (00:06 +0100)]
Merge pull request #721 from luho383/fbx_file_import
Fix for FBX Files that do not have a Comma on a new line in a data block
Alexander Gessler [Sat, 19 Dec 2015 23:04:45 +0000 (00:04 +0100)]
Merge pull request #719 from luho383/master
FBX Import fix
Alexander Gessler [Sat, 19 Dec 2015 23:03:42 +0000 (00:03 +0100)]
Merge pull request #726 from dankex/localref
Use SmartLocalRef to automatically release localrefs in jassimp.cpp
Danke Xie [Sat, 19 Dec 2015 17:12:35 +0000 (09:12 -0800)]
Make SmartLocalRef non-copyable
Danke Xie [Sat, 19 Dec 2015 09:21:59 +0000 (01:21 -0800)]
Use SmartLocalRef to automatically release localrefs in jassimp.cpp
- Add SmartLocalRef class
- Use it to automatically delete localrefs of Java objects, generated
by FindClass, createInstance, getField, NewStringUTF, etc.
- Tested with models with more than 512 nodes.
Kim Kulling [Fri, 18 Dec 2015 12:16:02 +0000 (13:16 +0100)]
Merge pull request #725 from coderextreme/master
Added GenericValue(unsigned long) to document.h
carlsonsolutiondesign [Thu, 17 Dec 2015 22:02:06 +0000 (17:02 -0500)]
Only test for __APPLE__ here to avoid conflicts with Linux (and maybe Windows)
carlsonsolutiondesign [Thu, 17 Dec 2015 17:16:25 +0000 (12:16 -0500)]
Copies the GenericValue(uint64_t) to a GenericValue(unsigned long) for compilation on Mac OS X 10.11.2. Not compiled on Windows yet. Will have to reboot and install Visual Studio or equivalent to compile, so I'm hoping someone else can look at the code and merge for Windows and Linux. Thanks!
John Carlson [Thu, 17 Dec 2015 14:53:56 +0000 (09:53 -0500)]
Merge pull request #1 from assimp/master
Pull from master 12-17-2015
lutz.hoeren [Thu, 17 Dec 2015 10:48:44 +0000 (11:48 +0100)]
Fix for FBX Files that do not have a Comma on a new line in a data block
lutz.hoeren [Wed, 16 Dec 2015 14:26:10 +0000 (15:26 +0100)]
Merge branch 'master' of https://github.com/luho383/assimp
lutz.hoeren [Tue, 8 Dec 2015 11:26:41 +0000 (12:26 +0100)]
Only read Element Data when there is a valid Mapping Information
Kim Kulling [Mon, 14 Dec 2015 17:49:46 +0000 (18:49 +0100)]
Merge branch 'ov-issue-707'
Kim Kulling [Mon, 14 Dec 2015 17:42:31 +0000 (18:42 +0100)]
Update readme.
Kim Kulling [Mon, 14 Dec 2015 17:39:32 +0000 (18:39 +0100)]
New obj regression data.
Kim Kulling [Mon, 14 Dec 2015 17:38:01 +0000 (18:38 +0100)]
New db.zip.
Kim Kulling [Mon, 14 Dec 2015 17:12:14 +0000 (18:12 +0100)]
Regression: updated test db.
Kim Kulling [Mon, 14 Dec 2015 16:46:54 +0000 (17:46 +0100)]
Merge branch 'issue-707' of https://github.com/ov/assimp into ov-issue-707
Kim Kulling [Mon, 14 Dec 2015 08:29:31 +0000 (09:29 +0100)]
Merge pull request #716 from rmitton/empty_objmtl
Added support for empty .MTL files.
Kim Kulling [Mon, 14 Dec 2015 08:12:17 +0000 (09:12 +0100)]
Merge pull request #715 from rmitton/doc_fixes
Tiny misc fixes for documentation
Kim Kulling [Mon, 14 Dec 2015 08:09:52 +0000 (09:09 +0100)]
Merge pull request #717 from rmitton/sib_import
Importer for Nevercenter Silo SIB files.
rmitton [Mon, 14 Dec 2015 06:14:19 +0000 (22:14 -0800)]
Importer for Silo SIB files.
Wrote an importer for Nevercenter Silo's binary SIB model format
rmitton [Mon, 14 Dec 2015 06:13:25 +0000 (22:13 -0800)]
Added support for empty .MTL files.
Some programs such as Silo export an empty .MTL file if you export a
.OBJ that doesn't use any materials. This patch allows the loading of
such files.
rmitton [Mon, 14 Dec 2015 06:12:25 +0000 (22:12 -0800)]
Tiny misc fixes for documentation
Vitaly Ovchinnikov [Mon, 14 Dec 2015 02:37:27 +0000 (15:37 +1300)]
a speedup
Vitaly Ovchinnikov [Mon, 14 Dec 2015 02:31:49 +0000 (15:31 +1300)]
Normalize() is replaced with NormalizeSafe() to prevent invalid vectors generation
Vitaly Ovchinnikov [Sun, 13 Dec 2015 19:32:09 +0000 (08:32 +1300)]
trimming spaces around material names
Vitaly Ovchinnikov [Sun, 13 Dec 2015 10:10:31 +0000 (23:10 +1300)]
a small fix
Vitaly Ovchinnikov [Sun, 13 Dec 2015 09:54:50 +0000 (22:54 +1300)]
this patch fixes multiple objects generation in OBJ reader if faces are prepended with 'usemtl' line
Kim Kulling [Fri, 11 Dec 2015 13:09:59 +0000 (14:09 +0100)]
Merge pull request #705 from Vertexwahn/master
Added custom target that copies generated libs and bin files to lib32/lib64 and bin32/64 folder
Vertexwahn [Fri, 11 Dec 2015 09:33:47 +0000 (10:33 +0100)]
Improved Findassimp.cmake to support VS2013. Added deployment of VS2013 libs and dll files.
Alexander Gessler [Thu, 10 Dec 2015 20:49:24 +0000 (21:49 +0100)]
Merge pull request #706 from expipiplus1/spelling
Correct spelling
Vertexwahn [Thu, 10 Dec 2015 16:58:55 +0000 (17:58 +0100)]
Improved Findassimp.cmake to support VS2015.
Joe Hermaszewski [Thu, 10 Dec 2015 16:19:33 +0000 (16:19 +0000)]
Correct spelling
Vertexwahn [Thu, 10 Dec 2015 16:15:27 +0000 (17:15 +0100)]
Added custom target that copies generated libs and bin files to lib32/lib64 and bin32/64 folder
Vertexwahn [Thu, 10 Dec 2015 15:52:03 +0000 (16:52 +0100)]
Merge pull request #1 from assimp/master
Merge
Kim Kulling [Wed, 9 Dec 2015 22:52:15 +0000 (23:52 +0100)]
Merge pull request #704 from Vertexwahn/master
Added missing DLL suffix for VS2015 build.
Kim Kulling [Wed, 9 Dec 2015 22:50:00 +0000 (23:50 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Wed, 9 Dec 2015 22:49:03 +0000 (23:49 +0100)]
ColladaParser: use initializer lists again.
Vertexwahn [Wed, 9 Dec 2015 20:58:29 +0000 (21:58 +0100)]
Added missing DLL suffix for VS2015 build.
Kim Kulling [Wed, 9 Dec 2015 14:07:58 +0000 (15:07 +0100)]
Update ColladaParser.cpp
Introduce workaround again to fix the build.
Kim Kulling [Wed, 9 Dec 2015 11:10:31 +0000 (12:10 +0100)]
Update ColladaParser.cpp
Try to close resource leak.
Kim Kulling [Tue, 8 Dec 2015 20:33:08 +0000 (21:33 +0100)]
Regression test: fix deprecated python print call.
Kim Kulling [Tue, 8 Dec 2015 19:36:31 +0000 (20:36 +0100)]
fix build
Léo Terziman [Tue, 8 Dec 2015 14:25:13 +0000 (15:25 +0100)]
Merge remote-tracking branch 'official/master' into contrib
Léo Terziman [Tue, 8 Dec 2015 14:24:07 +0000 (15:24 +0100)]
In collada: implemented all missing transparency features from standard (ie RGB_ZERO, RGB_ONE and A_ZERO)
+ removed user option to invert transparency as it does not seem to be needed anymore
+ fixed bug in default reflectivity value
lutz.hoeren [Tue, 8 Dec 2015 11:26:41 +0000 (12:26 +0100)]
Only read Element Data when there is a valid Mapping Information
Kim Kulling [Mon, 7 Dec 2015 19:43:01 +0000 (20:43 +0100)]
try to fix build.
Kim Kulling [Sun, 6 Dec 2015 15:49:10 +0000 (16:49 +0100)]
glTF: check if exporter option has broke someting.
Kim Kulling [Sun, 6 Dec 2015 11:20:11 +0000 (12:20 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sun, 6 Dec 2015 11:18:33 +0000 (12:18 +0100)]
assimp/issues/702: fix resource leak and use initializer list for all
attributes of the loader instance.
Kim Kulling [Thu, 3 Dec 2015 12:19:38 +0000 (13:19 +0100)]
Merge pull request #699 from otgerp/master
glTF exporter + improved the importer (and code refactor)
Otger [Wed, 2 Dec 2015 20:06:22 +0000 (21:06 +0100)]
Merge
Kim Kulling [Wed, 2 Dec 2015 18:58:43 +0000 (19:58 +0100)]
Importer: fix overflowImporter: fix overflow.
Kim Kulling [Wed, 2 Dec 2015 13:54:29 +0000 (14:54 +0100)]
Uinittests: add missing license info headers.
Kim Kulling [Tue, 1 Dec 2015 18:34:54 +0000 (19:34 +0100)]
README: add glTF to readme.md
Kim Kulling [Mon, 30 Nov 2015 11:52:49 +0000 (12:52 +0100)]
Build: remove deprecated third party lib from cmake
Otger [Sun, 29 Nov 2015 20:20:31 +0000 (21:20 +0100)]
Updated CMAKE - removed removed package inclusion
Otger [Sun, 29 Nov 2015 20:17:05 +0000 (21:17 +0100)]
Merge branch 'master' of git://github.com/assimp/assimp
Otger [Sun, 29 Nov 2015 20:11:38 +0000 (21:11 +0100)]
Fixing gcc errors - second attempt
Kim Kulling [Sun, 29 Nov 2015 19:37:05 +0000 (20:37 +0100)]
Contrib: remove deprecated pacakgeContrib: remove deprecated pacakge..
Otger [Sun, 29 Nov 2015 19:17:06 +0000 (20:17 +0100)]
Fixed gcc warnings and errors
Otger [Sun, 29 Nov 2015 18:13:51 +0000 (19:13 +0100)]
Implemented basic glTF exporter and improved the importer (plus some code refactor)
Kim Kulling [Sat, 28 Nov 2015 11:05:55 +0000 (12:05 +0100)]
Importer: fix doxygen comment style to default.
Kim Kulling [Sat, 28 Nov 2015 09:06:26 +0000 (10:06 +0100)]
assimp/assimp/issues/698: Increase upper limits for hints.
Kim Kulling [Fri, 27 Nov 2015 07:54:32 +0000 (08:54 +0100)]
Merge pull request #697 from otgerp/master
Basic glTF support (experimental)
Otger [Fri, 27 Nov 2015 01:31:18 +0000 (02:31 +0100)]
Fixed gcc errors
Otger [Fri, 27 Nov 2015 00:24:45 +0000 (01:24 +0100)]
Merge
Otger [Fri, 27 Nov 2015 00:16:48 +0000 (01:16 +0100)]
Created exporter class and fixed a few bugs
Kim Kulling [Thu, 26 Nov 2015 19:53:41 +0000 (20:53 +0100)]
Merge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Thu, 26 Nov 2015 19:49:00 +0000 (20:49 +0100)]
glTF: add importer to registry and try to parse json.
Kim Kulling [Thu, 26 Nov 2015 13:06:09 +0000 (14:06 +0100)]
Merge pull request #692 from dankex/instance_image
instance_image support for sample2D in Collada 1.5
Kim Kulling [Thu, 26 Nov 2015 12:50:34 +0000 (13:50 +0100)]
Merge pull request #674 from suikki/master
FBX import: If animation is not defining keys for all vector components (x, y and z), use the node transform as the default value.
Otger [Thu, 26 Nov 2015 01:36:22 +0000 (02:36 +0100)]
Experimental support for glTF
Otger [Thu, 26 Nov 2015 01:33:39 +0000 (02:33 +0100)]
Added RapidJSON to contrib
Kim Kulling [Wed, 25 Nov 2015 21:31:23 +0000 (22:31 +0100)]
glTF: add missing attribute buffer for text streams.
Kim Kulling [Wed, 25 Nov 2015 21:03:39 +0000 (22:03 +0100)]
glTF: add jsn reader + example model to work on.
Kim Kulling [Tue, 24 Nov 2015 20:26:34 +0000 (21:26 +0100)]
Merge pull request #694 from OtgerRP/master
Support for FBX embedded textures
Otger [Tue, 24 Nov 2015 16:51:11 +0000 (17:51 +0100)]
Ignore FBX 'PP' type connections (they were stopping the file parsing)
Otger [Tue, 24 Nov 2015 15:33:31 +0000 (16:33 +0100)]
Updated dumps for FBX files