Commit Graph

3089 Commits (b0148641e96500079402c7a7a40e3f53f106f41a)

Author SHA1 Message Date
Otger d72443d6b0 Fixed gcc warnings and errors 2015-11-29 20:17:06 +01:00
Otger 4f757cdf5a Implemented basic glTF exporter and improved the importer (plus some code refactor) 2015-11-29 19:13:51 +01:00
Kim Kulling 91a6ff7f0e Importer: fix doxygen comment style to default. 2015-11-28 12:05:55 +01:00
Kim Kulling ba35c97e9d assimp/assimp/issues/698: Increase upper limits for hints. 2015-11-28 10:06:26 +01:00
Kim Kulling 75f7d93434 Merge pull request #697 from otgerp/master
Basic glTF support (experimental)
2015-11-27 08:54:32 +01:00
Otger 5942d60aea Fixed gcc errors 2015-11-27 02:31:18 +01:00
Otger 526027999b Merge 2015-11-27 01:44:06 +01:00
Otger b307ec643d Created exporter class and fixed a few bugs 2015-11-27 01:16:48 +01:00
Kim Kulling fc6f35dab2 Merge branch 'master' of https://github.com/assimp/assimp 2015-11-26 20:53:41 +01:00
Kim Kulling 502d9f17b6 glTF: add importer to registry and try to parse json. 2015-11-26 20:49:00 +01:00
Kim Kulling a655467b59 Merge pull request #692 from dankex/instance_image
instance_image support for sample2D in Collada 1.5
2015-11-26 14:06:09 +01:00
Kim Kulling 398c1361d3 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.
2015-11-26 13:50:34 +01:00
Otger 148a20a703 Experimental support for glTF 2015-11-26 02:36:22 +01:00
Otger 64a020965f Added RapidJSON to contrib 2015-11-26 02:33:39 +01:00
Kim Kulling 702ef1a513 glTF: add missing attribute buffer for text streams. 2015-11-25 22:31:23 +01:00
Kim Kulling db8845d2b2 glTF: add jsn reader + example model to work on. 2015-11-25 22:03:39 +01:00
Kim Kulling 65d366dad0 Merge pull request #694 from OtgerRP/master
Support for FBX embedded textures
2015-11-24 21:26:34 +01:00
Otger a51d9a3884 Ignore FBX 'PP' type connections (they were stopping the file parsing) 2015-11-24 17:51:11 +01:00
Otger 3c358a8e34 Updated dumps for FBX files 2015-11-24 16:33:31 +01:00
Kim Kulling 1daeef42ad Merge pull request #696 from yig/patch-1
aiGetExportFormatDescription() no longer uses free'd memory
2015-11-24 09:10:03 +01:00
Yotam Gingold da013350f9 aiGetExportFormatDescription() no longer uses free'd memory
aiGetExportFormatDescription() now creates an Exporter object at the beginning of the function, so that a call to `GetExportFormatDescription()` doesn't access free'd memory.
2015-11-23 23:50:25 -05:00
Otger c876dce82b Fixed crashes for Video with no content 2015-11-23 21:46:55 +01:00
Kim Kulling 032fbe3fe5 Merge branch 'master' of https://github.com/assimp/assimp 2015-11-23 21:29:51 +01:00
Kim Kulling 70540616ce issue 693: add missing release call in c-export interface. 2015-11-23 21:28:35 +01:00
Otger f94bc8d66e Initial support for FBX embedded textures 2015-11-23 19:49:54 +01:00
Danke Xie 24b68b1e3d Support instance_image in Collada 1.5 files
The <instance_image> tag in sampler2D elements is not expected by
ColladaParser. This patch parses the instance_image element and
gets the image ID.
2015-11-19 17:36:23 -08:00
Kim Kulling 916cfb9d53 Merge pull request #690 from dankex/light
Add new light type 'ambient' to match light.h
2015-11-16 23:01:40 +01:00
Kim Kulling 9721759da4 Merge pull request #691 from dankex/androidjni
Fix AndroidJNI header path in CMakelists.txt
2015-11-16 13:40:44 +01:00
Danke Xie 57d7085fb8 Fix AndroidJNI header path in CMakelists.txt 2015-11-15 22:53:11 -08:00
Danke Xie 40ee575322 Add new light type 'ambient' to match light.h 2015-11-15 16:49:39 -08:00
Kim Kulling 7cc90c106f Merge pull request #689 from umlaeute/debian-fixes-3.2
Debian fixes 3.2
2015-11-15 09:59:23 +01:00
IOhannes m zmölnig 7806e991d9 Convert Windows-1252 charset to UTF-8
Windows-1252, seriously?
(this hard-to-detect weirdo charset really makes some problems with some
cmdline text-tool)
2015-11-13 23:01:49 +01:00
IOhannes m zmölnig 989e8af3fb fix argument check for assimp cmdline tool
`assimp cmpdump` expects two files as arguments.
so we need to check for at least 2 extra arguments (rather than only check
for !<1 and access both)
2015-11-13 22:33:53 +01:00
IOhannes m zmölnig 756cfd4f74 fix compilation on BigEndian
cannot pass a function by reference where an lvalue is expected
(only applies to bigendian, where a macro expands to a byteswap function)

Closes https://github.com/assimp/assimp/issues/613
2015-11-13 22:33:20 +01:00
Kim Kulling e6ac1ed66a glTF-Importer: add files. 2015-11-08 20:29:05 +01:00
Kim Kulling 02ad376631 assimp/issues/685: add test for correct usage. 2015-11-07 10:00:55 +01:00
Kim Kulling c318d648ff CMake: set version number to 3.2 2015-11-03 19:47:37 +01:00
Kim Kulling 655cb65ab2 Version: increase version from 3.1.1 to 3.2. 2015-11-03 19:43:02 +01:00
Kim Kulling 2fa797949b Update Readme.md
The 3000. commit :-)
2015-11-03 17:12:56 +01:00
Kim Kulling 54c77e78b3 Update INSTALL
Add missing win32-build info and fix one missing statement for unix-build.
2015-11-03 10:51:13 +01:00
Kim Kulling 2997d4308f Merge branch 'master' of https://github.com/assimp/assimp 2015-11-02 21:09:54 +01:00
Kim Kulling 0ea4682586 Collada Export test: fix unit test for lightsCollada Export test: fix unit
test for lights..
2015-11-02 21:09:26 +01:00
Kim Kulling 50b98faae6 Merge pull request #682 from DaveJarvis/patch-1
Unix build instructions
2015-11-02 21:05:55 +01:00
Dave Jarvis 97d5b1c822 Unix build instructions
Added actual instructions rather than telling people to go read about where to find the instructions to read. Note that simple Windows instructions should be added as well.
2015-11-01 15:57:29 -08:00
Kim Kulling c642d9f25e Collada exporter: fix access violation. 2015-11-01 15:15:39 +01:00
Kim Kulling 95c20cb5ab Collada exporter: fix invalid access to already release scene after
reimporting exported scene.
2015-11-01 13:48:55 +01:00
Kim Kulling 6be8df5fde Boost::tuple: fix compiler-specifc test. 2015-11-01 12:20:35 +01:00
Kim Kulling eadc6116c0 OpenDDLParser: latest greatest. 2015-10-31 09:43:34 +01:00
Kim Kulling 6f75ea5702 Merge branch 'master' of https://github.com/assimp/assimp 2015-10-31 09:07:21 +01:00
Alexander Gessler 4fb7e3a779 Merge pull request #677 from turol/explicit-constructors
Mark single-parameter constructors explicit
2015-10-29 13:55:17 +01:00