summaryrefslogtreecommitdiffstats
path: root/external/collada2gltf
Commit message (Collapse)AuthorAgeFilesLines
* collada2gltf: Force GLSL versionMatúš Kukan2014-11-262-0/+14
| | | | Change-Id: Ia5e29cff04c3a38d992a78b956a93103ad1042a3
* collada2gltf: drop tr1 supportJan-Marek Glogowski2014-10-012-0/+404
| | | | | | | | | | | | | | The detection code is wrong for gcc 4.6 and the tr1 code actually conflicts with the OpenCOLLADA code, because it creates an ambiguity of shared_ptr in the cpp files. Additionally most of the headers already use std::shared_ptr or std::unordered_map. Change-Id: Ibfe80e45687d34ec6fcd23339fd3f968fae402ba Reviewed-on: https://gerrit.libreoffice.org/11695 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
* Hide warning spam from collada2gltfPeter Foley2014-09-091-0/+4
| | | | | | | Change-Id: Id772a8f4ca9f46f8a36dede759495e06c8e43732 Reviewed-on: https://gerrit.libreoffice.org/11343 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
* collada2gltf: it seems better not to add #version to glTF shader filesZolnai Tamás2014-08-171-4/+6
| | | | | | | | | | | Here only handle precision. Using precision unconditionally causing problems when shader source is compiled with GLSL 1.2. The #version dircetives can be added by the glTF parser. For example libgltf implementation: https://gerrit.libreoffice.org/gitweb?p=libgltf.git;a=commit; h=e4544a8b5ca8470a96bf28c6ccdb7461e78ca293 Change-Id: I934cdfa8651a8787fbcd476cea9892bf7e89dd11
* collada2gltf: add a better name to this patchZolnai Tamás2014-08-152-2/+2
| | | | Change-Id: Ie8fb4ff71a683e986b9fec861608590cadee8612
* collada2gltf: compatibility fix: OpenGL ES 2.0 is enoughZolnai Tamás2014-08-151-1/+1
| | | | | | | That's why it was worked in some case, when OpenGL ES is available then it is the default and not the GLSL 1.1. Change-Id: I60d545e76115396433df8dc300bc13935099c776
* collada2gltf/patches: remove useless line from patchZolnai Tamás2014-08-151-1/+0
| | | | Change-Id: Ie4c291819f0f8d8a2797d26cc55e5bad1507bdaf
* collada2gltf: fix compatibility issues of *.kmz/*.dae files under linuxZolnai Tamás2014-08-152-0/+14
| | | | | | | | It seems under linux we need to specify the version number explicitly, because otherwise shader compiler will use GLSL 1.1 and will fail. Base line is GLSL 1.3 or OpenGL ES 3.0. Change-Id: Ie143275ade8d6989fda055ab96943b25ef220e9d
* fix memory leak in collada2gltfMarkus Mohrhard2014-07-122-0/+19
| | | | Change-Id: I7d4a00d94cf97e988847f11ded0de2dc0cb77828
* fix memory leak in collada2gltfMarkus Mohrhard2014-07-062-0/+26
| | | | | | Found by Lsan. Saves about 12MB per loaded model. Change-Id: Idaff5defd5affc3d9becf2a00d1e64f8d1d42e0f
* fix new[]/delete mismatch in collada2gltfMarkus Mohrhard2014-07-062-0/+13
| | | | | | Found by Asan. Change-Id: Icc73e50b7f230880dda982f1c783c86aaeaa5ca2
* kmz2gltf: Use LO's ZipFileAccess to unzip kmzZolnai Tamás2014-06-134-8666/+0
| | | | | | Instead of this hacky collada2gltf patch. Change-Id: I9f15c4ee1c9ea1a1a64116691b12b696c1d63ac5
* Update OpenCollada and collada2gltf to the newest versions.Jan Holesovsky2014-05-252-4/+3
| | | | Change-Id: Iee0b9f08843220e8ece00739ca01aa438b93965a
* kmz3collada: Workaround for missing texturesZolnai Tamás2014-05-241-1/+9
| | | | | | | | | | | | | The write-only-.dae-file-which-we-need.patch makes the converter extract only the *.dae file but textures are stored in seperate image files we need to extract too. On the other hand this patch makes the converter buildable on all platforms, since this only works on Windows originally. So for now disable this patch on Windows so here we won't loose textures but enable it on other platforms for buildability. Later we need to solve kmz conversion properly. Change-Id: Iede9e3bdd5a68a9002f5fa38da8a6459dda8d805
* collada2gltf: one more URL usage fixZolnai Tamás2014-05-231-6/+8
| | | | | | | This one caused empty images and so textures were missing. Change-Id: Ia1e93270b7f5ec560b39a41d207e84171bb2434a
* collada2gltf: move patches to an own folderZolnai Tamás2014-05-224-3/+3
| | | | Change-Id: Ife28845af92883d8090bb80283c59a0a9a350b32
* collada2gltf: fix URL problemsZolnai Tamás2014-05-222-0/+78
| | | | | | | | | | | | | | collada2gltf does not handle Windows pathes, the used COLLADABU::URI class can't parse native Windows pathes so call COLLADA2GLTFWriter with URL only. Other problems: collada2gltf uses the URL path for creating/opening files, instead of native ones. collada2gltf initializes _outputFilePath member in different way, sometimes as an URL path, sometimes as a native one, but handle it on the same way(as an URL). Change-Id: I104182653c07e7dcf6fc5b6e32c7031d59246b84
* fix .kmz support on Windows; no idea why this int was unsignedMatúš Kukan2014-05-201-1/+1
| | | | Change-Id: I08fa1c3956b48bcd65edb74add010fafa17bfe82
* No need to add -lrt for a static library.Matúš Kukan2014-05-191-6/+0
| | | | Change-Id: I8104301e9aab6e7c732e97446030c9caf6ffec66
* Fix typo: this is a static libraryZolnai Tamás2014-05-161-1/+1
| | | | Change-Id: I663e8da9ee3f4b860d727abb3783e322eedd7d9f
* Collada2gltf: add -lrt to fix compilation problemsZolnai Tamás2014-05-161-0/+6
| | | | Change-Id: I1c0c9459cb716512dc726ee96fb811d03084aa62
* Add kmz support to collada2gltf and use it.Matúš Kukan2014-05-144-0/+8661
| | | | Change-Id: I37cda0e326af00ef369c4415bcec1e03c91ce401
* Introduce Collada2gltf external libraryZolnai Tamás2014-05-136-0/+153
Change-Id: I157f175ee6ea719e98ba45133f53cb4d2c3045bb