Commit Graph

3607 Commits (b68ad60b52003e268eeecf19da87cc6d10d2e5cc)

Author SHA1 Message Date
Kim Kulling 301b6798c5 aiLight: fix a typo. 2016-05-07 11:16:33 +02:00
Alexander Gessler a931d2bac6 Merge pull request #877 from assimp/followups
Followups
2016-05-05 20:40:54 +02:00
Alexander Gessler 0b79d1ebda Revert previous glTF fix (e5233283ef) because it breaks ODR as pointed out by @turol, instead just make importer depend on the necessary definitions. 2016-05-05 19:11:33 +02:00
Alexander Gessler f5327a99ba Add using namespace std on top of assxml exporter so vsnprintf is found no matter where it lives. 2016-05-05 19:05:02 +02:00
Alexander Gessler 92b1431be3 Merge pull request #876 from assimp/travisfix
Fix travis compile: glTFImporter chokes on unavailability of WriteLaz…
2016-05-05 17:59:04 +02:00
Alexander Gessler c80fe16323 Update regression test suite.
gltf could be a regression, left a question here: https://github.com/assimp/assimp/pull/697
2016-05-05 16:59:26 +02:00
Alexander Gessler e5233283ef 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.
2016-05-05 16:37:55 +02:00
Alexander Gessler 174a598759 Merge pull request #875 from assimp/acgmay16
MSVC11 fixes
2016-05-05 16:04:10 +02:00
Alexander Gessler 896120b76a 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. 2016-05-05 15:41:50 +02:00
Alexander Gessler 167bc579c5 Fix MSVC11 compile error in AssxmlExporter.cpp -- vsnprintf is not in std. 2016-05-05 15:41:12 +02:00
Alexander Gessler 1daae7b7b9 STEPFile.h: delete deleted copy ctor and move ctors. Class has a const member, so implicit creation is off anyway. Enables pre cpp11 compilation. 2016-05-05 15:40:36 +02:00
Alexander Gessler e7fd168114 Merge pull request #854 from tomacd/fix_scene_combiner
fix SceneCombiner copy of aiNode not setting mParent field
2016-05-05 15:07:09 +02:00
Kim Kulling e9b93788ca Merge pull request #863 from mpersano/master
Fix texture coords exporting on binary PLY files
2016-05-03 21:55:17 +02:00
Richard Selneck 12613720ff Fix macro used for detecting IRR support 2016-05-02 18:24:26 -04:00
Kim Kulling 8449afad71 Merge pull request #868 from otgerrogla/master
Fixed a few GLTF importer/exporter bugs
2016-04-28 22:56:41 +02:00
Otger 11e52dc3d7 Removed rogue comma 2016-04-28 21:34:31 +02:00
Otger 2fe401fc54 Fixed gcc compilation error 2016-04-28 21:22:01 +02:00
Otger 64f78e003f Fixed crashes when files were not found, and fixed some warnings 2016-04-28 20:50:01 +02:00
Kim Kulling 46e7ae5dc0 OpenGEX: prepare light- and camera-node and object. 2016-04-28 20:20:40 +02:00
Otger d9b365eb90 Fixed a few GLTF importer/exporter bugs 2016-04-28 18:44:47 +02:00
Kim Kulling 97145a7f20 Replace std:.endl by backslash n. 2016-04-27 17:59:12 +02:00
Kim Kulling 5192b837da Replace std::endl by using backslash n. 2016-04-27 17:58:40 +02:00
Kim Kulling 7468ca5c35 VS2015-code analysis: fix finding ( index var type too small ). 2016-04-23 09:43:20 +02:00
Kim Kulling fcd1f21231 Merge branch 'master' of https://github.com/assimp/assimp 2016-04-23 09:42:57 +02:00
Kim Kulling 388694e349 cmake build env: add missing license info. 2016-04-23 09:42:27 +02:00
Kim Kulling 829e56df0c cmake env: add license info. 2016-04-23 09:42:05 +02:00
mpersano 473d2ca052 Fix texture coords exporting on binary PLY files 2016-04-22 16:09:45 -03:00
Kim Kulling 2a3c2e3a21 Merge pull request #861 from v4hn/no-locallib
only check a library folder if it actually exists
2016-04-22 11:54:40 +02:00
Michael Görner f1a984bd3b only check a library folder if it actually exists
otherwise this breaks for no reason if /usr/local/lib is missing.
2016-04-22 11:35:44 +02:00
Kim Kulling f905f5700f regression ui: add default editor for linux. 2016-04-21 19:19:06 +02:00
Kim Kulling af75390f8d travis: fix a typo. 2016-04-21 18:21:32 +02:00
Kim Kulling f9cba1c4ea regression test suite: fix usage of run. 2016-04-21 17:24:01 +02:00
Kim Kulling 53263953c5 travis: fix usage of runner script for regression testsuite. 2016-04-21 17:14:54 +02:00
Kim Kulling b120454bdd Merge pull request #860 from Squareys/fix-pi
Fix Mistake in last Pullrequest
2016-04-21 17:07:27 +02:00
Squareys 6bc36eb2b6 Fix mistake while switching to new PI constants
From previous pullrequest (https://github.com/assimp/assimp/pull/859),
commit 7c0e40a3f4 introduced the error.

Thanks @mosra for catching it!

Signed-off-by: Squareys <Squareys@googlemail.com>
2016-04-21 15:23:14 +02:00
Kim Kulling 6107ead295 Merge pull request #859 from Squareys/fix-pi
Add definition for PI and PI_2
2016-04-21 10:58:10 +02:00
Squareys 7c0e40a3f4 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>
2016-04-21 08:17:06 +02:00
Kim Kulling 019226c119 CMake build: enabme c++11 for mingw. 2016-04-21 00:02:28 +02:00
Kim Kulling 2f9c33e3e9 closes https://github.com/assimp/assimp/issues/857 2016-04-20 23:27:59 +02:00
Kim Kulling 69ac97d709 Update run.py
resolve conflict.
2016-04-20 12:37:48 +02:00
Kim Kulling c122bb2def Regression test suite: update run. 2016-04-20 00:04:26 +02:00
Kim Kulling 3659570292 regression ui: add missing functionalities for setup, version and update. 2016-04-19 16:01:21 +02:00
Kim Kulling 0ec1e91722 Regression Testsuite: update database. 2016-04-19 08:49:14 +02:00
Kim Kulling 22dc22778d Assxml exporter: Make some local functions static. 2016-04-19 08:48:37 +02:00
Kim Kulling 1b94b8969f Blender Importer: fix review findings. 2016-04-19 08:45:04 +02:00
Kim Kulling e74425dbc3 Regression ui: add functionality to open the log. 2016-04-18 16:13:18 +02:00
tomacd 5a8c15d826 fix SceneCombiner copy of aiNode not setting mParent field 2016-04-18 11:28:21 +02:00
Kim Kulling de39c49c4c assxml export: make local functions static. 2016-04-17 23:29:46 +02:00
Kim Kulling a6e7938696 Assxml io function: use vsprintf for var-argument list. 2016-04-17 21:33:11 +02:00
Kim Kulling dec93efc92 AssxmlExporter: fix crash in writing header info in VS2015. 2016-04-16 18:42:49 +02:00