platform/upstream/assimp.git
8 years agoAdds importing blender material.
ciechowoj [Mon, 16 May 2016 19:17:58 +0000 (21:17 +0200)]
Adds importing blender material.

8 years agofix for https://github.com/assimp/assimp/issues/887: add missing define.
Kim Kulling [Mon, 16 May 2016 09:24:04 +0000 (11:24 +0200)]
fix for https://github.com/assimp/assimp/issues/887: add missing define.

8 years agoiSIBImporter: fix possible dereferncing of a null pointer.
Kim Kulling [Sun, 15 May 2016 17:56:29 +0000 (19:56 +0200)]
iSIBImporter: fix possible dereferncing of a null pointer.

8 years agoOpenGEX: fix coverity findings.
Kim Kulling [Sun, 15 May 2016 16:57:10 +0000 (18:57 +0200)]
OpenGEX: fix coverity findings.

8 years agoMerge branch 'feature/opengex_missing_features'
Kim Kulling [Sat, 14 May 2016 08:36:46 +0000 (10:36 +0200)]
Merge branch 'feature/opengex_missing_features'

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 14 May 2016 08:10:33 +0000 (10:10 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoOpenGEX: fix coverity findings.
Kim Kulling [Sat, 14 May 2016 08:10:05 +0000 (10:10 +0200)]
OpenGEX: fix coverity findings.

8 years agoMerge pull request #885 from otgerrogla/master
Kim Kulling [Tue, 10 May 2016 21:38:54 +0000 (23:38 +0200)]
Merge pull request #885 from otgerrogla/master

Fixed GLTF bugs, and added a few test models

8 years agoFixed GLTF bugs, and added a few test models
Otger [Tue, 10 May 2016 14:25:15 +0000 (16:25 +0200)]
Fixed GLTF bugs, and added a few test models

8 years agoRegression test suite: add ogex-files to database.
Kim Kulling [Mon, 9 May 2016 21:55:55 +0000 (23:55 +0200)]
Regression test suite: add ogex-files to database.

8 years agoMerge pull request #881 from assimp/feature/opengex_missing_features
Kim Kulling [Mon, 9 May 2016 19:19:09 +0000 (21:19 +0200)]
Merge pull request #881 from assimp/feature/opengex_missing_features

Feature/opengex missing features

8 years agoOpenGEX: new camra model.
Kim Kulling [Mon, 9 May 2016 18:50:22 +0000 (20:50 +0200)]
OpenGEX: new camra model.

8 years agoOpenGEX: add light impl and add examples.
Kim Kulling [Mon, 9 May 2016 18:43:22 +0000 (20:43 +0200)]
OpenGEX: add light impl and add examples.

8 years agoCameraObj: load camera data in the correct way.
Kim Kulling [Sun, 8 May 2016 20:31:16 +0000 (22:31 +0200)]
CameraObj: load camera data in the correct way.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sun, 8 May 2016 10:23:02 +0000 (12:23 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoAdd STEP to list of exporters
Alexander Gessler [Sun, 8 May 2016 09:56:15 +0000 (11:56 +0200)]
Add STEP to list of exporters

8 years agoAdd 3MF to readme, mark glTF as partial support
Alexander Gessler [Sun, 8 May 2016 09:55:18 +0000 (11:55 +0200)]
Add 3MF to readme, mark glTF as partial support

8 years agoOpenGEX: fix invalid access to textures. Next steps to camera and light.
Kim Kulling [Sun, 8 May 2016 09:09:53 +0000 (11:09 +0200)]
OpenGEX: fix invalid access to textures. Next steps to camera and light.

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 7 May 2016 16:01:21 +0000 (18:01 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoMerge pull request #879 from gorilux/master
Kim Kulling [Sat, 7 May 2016 16:00:13 +0000 (18:00 +0200)]
Merge pull request #879 from gorilux/master

Added 3MF importer

8 years agoFixed compile issue for travis-ci
Gorilux [Sat, 7 May 2016 13:36:05 +0000 (15:36 +0200)]
Fixed compile issue for travis-ci

8 years agoRemoved override keywords so compilation success on gcc 4.6
Gorilux [Sat, 7 May 2016 13:15:00 +0000 (15:15 +0200)]
Removed override keywords so compilation success on gcc 4.6

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Gorilux [Sat, 7 May 2016 12:18:17 +0000 (14:18 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agoAdded 3MF importer
Gorilux [Sat, 7 May 2016 12:16:33 +0000 (14:16 +0200)]
Added 3MF importer

8 years agoaiLight: fix a typo.
Kim Kulling [Sat, 7 May 2016 09:16:33 +0000 (11:16 +0200)]
aiLight: fix a typo.

8 years agoMerge pull request #877 from assimp/followups
Alexander Gessler [Thu, 5 May 2016 18:40:54 +0000 (20:40 +0200)]
Merge pull request #877 from assimp/followups

Followups

8 years agoRevert previous glTF fix (e5233283efa2b84a1bf) because it breaks ODR as pointed out...
Alexander Gessler [Thu, 5 May 2016 17:11:33 +0000 (19:11 +0200)]
Revert previous glTF fix (e5233283efa2b84a1bf) because it breaks ODR as pointed out by @turol, instead just make importer depend on the necessary definitions.

8 years agoAdd using namespace std on top of assxml exporter so vsnprintf is found no matter...
Alexander Gessler [Thu, 5 May 2016 17:05:02 +0000 (19:05 +0200)]
Add using namespace std on top of assxml exporter so vsnprintf is found no matter where it lives.

8 years agoMerge pull request #876 from assimp/travisfix
Alexander Gessler [Thu, 5 May 2016 15:59:04 +0000 (17:59 +0200)]
Merge pull request #876 from assimp/travisfix

Fix travis compile: glTFImporter chokes on unavailability of WriteLaz…

8 years agoUpdate regression test suite.
Alexander Gessler [Thu, 5 May 2016 14:59:26 +0000 (16:59 +0200)]
Update regression test suite.

gltf could be a regression, left a question here: https://github.com/assimp/assimp/pull/697

8 years agoFix travis compile: glTFImporter chokes on unavailability of WriteLazyDict<T>. It...
Alexander Gessler [Thu, 5 May 2016 14:37:55 +0000 (16:37 +0200)]
Fix travis compile: glTFImporter chokes on unavailability of WriteLazyDict<T>. It does not use it directly, but instantiation of LazyDict<T> creates a reference.

My understanding is that compilers were correct in rejecting this, but I may be missing some detail of C++' template instantiation rules.

8 years agoMerge pull request #875 from assimp/acgmay16
Alexander Gessler [Thu, 5 May 2016 14:04:10 +0000 (16:04 +0200)]
Merge pull request #875 from assimp/acgmay16

MSVC11 fixes

8 years agoAssimp mostly uses unsigned int where it perhaps should've used size_t, nonetheless...
Alexander Gessler [Thu, 5 May 2016 13:41:50 +0000 (15:41 +0200)]
Assimp mostly uses unsigned int where it perhaps should've used size_t, nonetheless SPBC insisted on size_t, causing lots of noisy compile warnings.

8 years agoFix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std.
Alexander Gessler [Thu, 5 May 2016 13:41:12 +0000 (15:41 +0200)]
Fix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std.

8 years agoSTEPFile.h: delete deleted copy ctor and move ctors. Class has a const member, so...
Alexander Gessler [Thu, 5 May 2016 13:40:36 +0000 (15:40 +0200)]
STEPFile.h: delete deleted copy ctor and move ctors. Class has a const member, so implicit creation is off anyway. Enables pre cpp11 compilation.

8 years agoMerge pull request #854 from tomacd/fix_scene_combiner
Alexander Gessler [Thu, 5 May 2016 13:07:09 +0000 (15:07 +0200)]
Merge pull request #854 from tomacd/fix_scene_combiner

fix SceneCombiner copy of aiNode not setting mParent field

8 years agoMerge pull request #863 from mpersano/master
Kim Kulling [Tue, 3 May 2016 19:55:17 +0000 (21:55 +0200)]
Merge pull request #863 from mpersano/master

Fix texture coords exporting on binary PLY files

8 years agoMerge pull request #868 from otgerrogla/master
Kim Kulling [Thu, 28 Apr 2016 20:56:41 +0000 (22:56 +0200)]
Merge pull request #868 from otgerrogla/master

Fixed a few GLTF importer/exporter bugs

8 years agoRemoved rogue comma
Otger [Thu, 28 Apr 2016 19:34:31 +0000 (21:34 +0200)]
Removed rogue comma

8 years agoFixed gcc compilation error
Otger [Thu, 28 Apr 2016 19:22:01 +0000 (21:22 +0200)]
Fixed gcc compilation error

8 years agoFixed crashes when files were not found, and fixed some warnings
Otger [Thu, 28 Apr 2016 18:50:01 +0000 (20:50 +0200)]
Fixed crashes when files were not found, and fixed some warnings

8 years agoOpenGEX: prepare light- and camera-node and object.
Kim Kulling [Thu, 28 Apr 2016 18:20:40 +0000 (20:20 +0200)]
OpenGEX: prepare light- and camera-node and object.

8 years agoFixed a few GLTF importer/exporter bugs
Otger [Thu, 28 Apr 2016 16:44:47 +0000 (18:44 +0200)]
Fixed a few GLTF importer/exporter bugs

8 years agoReplace std:.endl by backslash n.
Kim Kulling [Wed, 27 Apr 2016 15:59:12 +0000 (17:59 +0200)]
Replace std:.endl by backslash n.

8 years agoReplace std::endl by using backslash n.
Kim Kulling [Wed, 27 Apr 2016 15:58:40 +0000 (17:58 +0200)]
Replace std::endl by using backslash n.

8 years agoVS2015-code analysis: fix finding ( index var type too small ).
Kim Kulling [Sat, 23 Apr 2016 07:43:20 +0000 (09:43 +0200)]
VS2015-code analysis: fix finding ( index var type too small ).

8 years agoMerge branch 'master' of https://github.com/assimp/assimp
Kim Kulling [Sat, 23 Apr 2016 07:42:57 +0000 (09:42 +0200)]
Merge branch 'master' of https://github.com/assimp/assimp

8 years agocmake build env: add missing license info.
Kim Kulling [Sat, 23 Apr 2016 07:42:27 +0000 (09:42 +0200)]
cmake build env: add missing license info.

8 years agocmake env: add license info.
Kim Kulling [Sat, 23 Apr 2016 07:42:05 +0000 (09:42 +0200)]
cmake env: add license info.

8 years agoFix texture coords exporting on binary PLY files
mpersano [Fri, 22 Apr 2016 19:09:45 +0000 (16:09 -0300)]
Fix texture coords exporting on binary PLY files

8 years agoMerge pull request #861 from v4hn/no-locallib
Kim Kulling [Fri, 22 Apr 2016 09:54:40 +0000 (11:54 +0200)]
Merge pull request #861 from v4hn/no-locallib

only check a library folder if it actually exists

8 years agoonly check a library folder if it actually exists
Michael Görner [Fri, 22 Apr 2016 09:35:44 +0000 (11:35 +0200)]
only check a library folder if it actually exists

otherwise this breaks for no reason if /usr/local/lib is missing.

8 years agoregression ui: add default editor for linux.
Kim Kulling [Thu, 21 Apr 2016 17:19:06 +0000 (19:19 +0200)]
regression ui: add default editor for linux.

8 years agotravis: fix a typo.
Kim Kulling [Thu, 21 Apr 2016 16:21:32 +0000 (18:21 +0200)]
travis: fix a typo.

8 years agoregression test suite: fix usage of run.
Kim Kulling [Thu, 21 Apr 2016 15:24:01 +0000 (17:24 +0200)]
regression test suite: fix usage of run.

8 years agotravis: fix usage of runner script for regression testsuite.
Kim Kulling [Thu, 21 Apr 2016 15:14:54 +0000 (17:14 +0200)]
travis: fix usage of runner script for regression testsuite.

8 years agoMerge pull request #860 from Squareys/fix-pi
Kim Kulling [Thu, 21 Apr 2016 15:07:27 +0000 (17:07 +0200)]
Merge pull request #860 from Squareys/fix-pi

Fix Mistake in last Pullrequest

8 years agoFix mistake while switching to new PI constants
Squareys [Thu, 21 Apr 2016 13:22:33 +0000 (15:22 +0200)]
Fix mistake while switching to new PI constants

From previous pullrequest (https://github.com/assimp/assimp/pull/859),
commit 7c0e40a3f4126ce336a6b1daa258e3ee1b6a25f5 introduced the error.

Thanks @mosra for catching it!

Signed-off-by: Squareys <Squareys@googlemail.com>
8 years agoMerge pull request #859 from Squareys/fix-pi
Kim Kulling [Thu, 21 Apr 2016 08:58:10 +0000 (10:58 +0200)]
Merge pull request #859 from Squareys/fix-pi

Add definition for PI and PI_2

8 years agoAdd definition for PI and PI_2
Squareys [Thu, 21 Apr 2016 06:17:06 +0000 (08:17 +0200)]
Add definition for PI and PI_2

M_PI and M_PI_2 are not C++ standard and are therefore not present, in
MinGW-w64 gcc 5.1.0 for example. We therefore replace it with an own
definition.

Since math.h was only included for M_PI and M_PI_2 makros, we can now
remove it.

Signed-off-by: Squareys <Squareys@googlemail.com>
8 years agoCMake build: enabme c++11 for mingw.
Kim Kulling [Wed, 20 Apr 2016 22:02:28 +0000 (00:02 +0200)]
CMake build: enabme c++11 for mingw.

8 years agocloses https://github.com/assimp/assimp/issues/857
Kim Kulling [Wed, 20 Apr 2016 21:27:59 +0000 (23:27 +0200)]
closes https://github.com/assimp/assimp/issues/857

8 years agoUpdate run.py
Kim Kulling [Wed, 20 Apr 2016 10:37:48 +0000 (12:37 +0200)]
Update run.py

resolve conflict.

8 years agoRegression test suite: update run.
Kim Kulling [Tue, 19 Apr 2016 22:04:26 +0000 (00:04 +0200)]
Regression test suite: update run.

8 years agoregression ui: add missing functionalities for setup, version and update.
Kim Kulling [Tue, 19 Apr 2016 14:01:21 +0000 (16:01 +0200)]
regression ui: add missing functionalities for setup, version and update.

8 years agoRegression Testsuite: update database.
Kim Kulling [Tue, 19 Apr 2016 06:49:14 +0000 (08:49 +0200)]
Regression Testsuite: update database.

8 years agoAssxml exporter: Make some local functions static.
Kim Kulling [Tue, 19 Apr 2016 06:48:37 +0000 (08:48 +0200)]
Assxml exporter: Make some local functions static.

8 years agoBlender Importer: fix review findings.
Kim Kulling [Tue, 19 Apr 2016 06:45:04 +0000 (08:45 +0200)]
Blender Importer: fix review findings.

8 years agoRegression ui: add functionality to open the log.
Kim Kulling [Mon, 18 Apr 2016 14:13:18 +0000 (16:13 +0200)]
Regression ui: add functionality to open the log.

8 years agofix SceneCombiner copy of aiNode not setting mParent field
tomacd [Mon, 18 Apr 2016 09:28:21 +0000 (11:28 +0200)]
fix SceneCombiner copy of aiNode not setting mParent field

8 years agoassxml export: make local functions static.
Kim Kulling [Sun, 17 Apr 2016 21:29:46 +0000 (23:29 +0200)]
assxml export: make local functions static.

8 years agoAssxml io function: use vsprintf for var-argument list.
Kim Kulling [Sun, 17 Apr 2016 19:33:11 +0000 (21:33 +0200)]
Assxml io function: use vsprintf for var-argument list.

8 years agoAssxmlExporter: fix crash in writing header info in VS2015.
Kim Kulling [Sat, 16 Apr 2016 16:42:49 +0000 (18:42 +0200)]
AssxmlExporter: fix crash in writing header info in VS2015.

8 years agoUpdate run.py
Kim Kulling [Sat, 16 Apr 2016 13:16:35 +0000 (15:16 +0200)]
Update run.py

Regression: fix typo.

8 years agoRegression test suite: fix typo.
Kim Kulling [Sat, 16 Apr 2016 06:41:31 +0000 (08:41 +0200)]
Regression test suite: fix typo.

8 years agoUpdate run.py
Kim Kulling [Wed, 13 Apr 2016 07:21:26 +0000 (09:21 +0200)]
Update run.py

Regression tests: fix python2.7-style logs via print

8 years agoRegression tests: fix invalid log statement.
Kim Kulling [Tue, 12 Apr 2016 21:18:08 +0000 (23:18 +0200)]
Regression tests: fix invalid log statement.

8 years agoRegression tests: reenable support for travis.
Kim Kulling [Tue, 12 Apr 2016 16:47:42 +0000 (18:47 +0200)]
Regression tests: reenable support for travis.

8 years agoRegression test suite: fix typo.
Kim Kulling [Tue, 12 Apr 2016 16:46:32 +0000 (18:46 +0200)]
Regression test suite: fix typo.

8 years agotest: add pk3 to blacklist for regression
Kim Kulling [Mon, 11 Apr 2016 22:02:31 +0000 (00:02 +0200)]
test: add pk3 to blacklist for regression

8 years agoLWS: remove broken model.
Kim Kulling [Fri, 8 Apr 2016 17:23:24 +0000 (19:23 +0200)]
LWS: remove broken model.

8 years agoRegression test suite: remove broken model.
Kim Kulling [Fri, 8 Apr 2016 16:55:33 +0000 (18:55 +0200)]
Regression test suite: remove broken model.

8 years agoC++11-Support: remove boost.
Kim Kulling [Thu, 7 Apr 2016 19:31:04 +0000 (21:31 +0200)]
C++11-Support: remove boost.

8 years agoMerge pull request #850 from mensinda/no-boost
Kim Kulling [Wed, 6 Apr 2016 19:16:23 +0000 (21:16 +0200)]
Merge pull request #850 from mensinda/no-boost

Replaced boost with c++11 features

8 years agoUpdate appveyor.yml
Kim Kulling [Wed, 6 Apr 2016 19:15:48 +0000 (21:15 +0200)]
Update appveyor.yml

Stop support for VS2010

8 years agoDeleted move constructor of LazyObject
mensinda [Wed, 6 Apr 2016 19:03:54 +0000 (21:03 +0200)]
Deleted move constructor of LazyObject

8 years agoFixed AnimEvaluator.cpp
mensinda [Wed, 6 Apr 2016 15:28:09 +0000 (17:28 +0200)]
Fixed AnimEvaluator.cpp

8 years agoRenamed Math.h --> MathFunctions.h
mensinda [Wed, 6 Apr 2016 14:54:03 +0000 (16:54 +0200)]
Renamed Math.h --> MathFunctions.h

8 years agoTry fixing clang builds
mensinda [Wed, 6 Apr 2016 09:10:12 +0000 (11:10 +0200)]
Try fixing clang builds

8 years agoRemoved boost/noncopyable.hpp
mensinda [Wed, 6 Apr 2016 08:51:18 +0000 (10:51 +0200)]
Removed boost/noncopyable.hpp

8 years agoRemoved boost from CMakeLists.txt
mensinda [Wed, 6 Apr 2016 08:29:41 +0000 (10:29 +0200)]
Removed boost from CMakeLists.txt

8 years agoMoved gcd and lcm implemetation
mensinda [Wed, 6 Apr 2016 08:21:59 +0000 (10:21 +0200)]
Moved gcd and lcm implemetation

8 years agoReplaced boost::timer with std::chrono
mensinda [Wed, 6 Apr 2016 08:13:02 +0000 (10:13 +0200)]
Replaced boost::timer with std::chrono

8 years agoReplaced boost::tuple with std::tuple
mensinda [Tue, 5 Apr 2016 22:17:21 +0000 (00:17 +0200)]
Replaced boost::tuple with std::tuple

8 years agoReplaced boost::format with internal formater
mensinda [Tue, 5 Apr 2016 22:03:05 +0000 (00:03 +0200)]
Replaced boost::format with internal formater

8 years agoreplaced boost smart pointers with c++11 smart pointers
mensinda [Tue, 5 Apr 2016 21:23:53 +0000 (23:23 +0200)]
replaced boost smart pointers with c++11 smart pointers

8 years agoReplaced depreacated std::auto_ptr with std::unique_ptr
mensinda [Tue, 5 Apr 2016 20:56:11 +0000 (22:56 +0200)]
Replaced depreacated std::auto_ptr with std::unique_ptr

8 years agoReplaced BOOST_FOREACH with c++11 ranged for loops
mensinda [Tue, 5 Apr 2016 20:53:54 +0000 (22:53 +0200)]
Replaced BOOST_FOREACH with c++11 ranged for loops

8 years agoReplaced boost::thread with std::thread
mensinda [Tue, 5 Apr 2016 20:27:40 +0000 (22:27 +0200)]
Replaced boost::thread with std::thread

8 years agoRegression test suite: add ui for simpler text execution.
Kim Kulling [Tue, 5 Apr 2016 20:02:02 +0000 (22:02 +0200)]
Regression test suite: add ui for simpler text execution.