summaryrefslogtreecommitdiff
path: root/external/libgltf
AgeCommit message (Collapse)Author
2016-05-30configure: set BOOST_CPPFLAGS also in --without-system-boost caseMichael Stahl
Simplify the makefiles. Change-Id: Ia695961e936e4a1ffdaff73eb56adc3c3905ed0c
2015-11-12Avoid mesa_headers on X11, also link with -lGL only where necesssaryTor Lillqvist
The GLEW headers are enough, and what we actually use in these places. In addition to handling GL extension things in its dynamic fashion, GLEW headers also have declarations for standard, non-extension, OpenGL API, including xgl and wgl ones. Most likely we don't need mesa_headers on Windows or OS X either, and can drop them completely. Change-Id: Ic0d8d6238c862f8fe4a74e99e95344dcbf540980
2015-09-09externals: remove various obsolete MSVC2012 specific flagsMichael Stahl
Change-Id: I8848d042a008c21e407d9610161b5c67d2137a18
2015-09-02Fix libgltf on MSVC 14.0David Ostrovsky
Change-Id: I3fda18b1d26e8c7ff509cdd33e44e75671c6157d Reviewed-on: https://gerrit.libreoffice.org/18212 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2015-02-19libgltf: Fix build on windows x64 bitDavid Ostrovsky
Change-Id: Ie467540f17b9c7240cada6b55daa96820c6c02a1 Reviewed-on: https://gerrit.libreoffice.org/14542 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-11-10external: fortunately boost no longer requires config_host.mkMichael Stahl
Change-Id: I8f2176500bf620cd5e4cdf434e6122b6163b3e0f
2014-10-02fdo#82430: MSVC build: avoid using SSE2 instructions in some externalsMichael Stahl
Hopefully this should fix up the most important external libraries. Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400
2014-09-17Bye bye VS2010Tor Lillqvist
Change-Id: I9d16f4f0df42ae4b046bc1e4ac4fba95c4b9d785
2014-08-29Simplify some $ENABLE_DEBUG expressionsStephan Bergmann
Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c
2014-08-29Upgrade libgltf to 0.0.1Zolnai Tamás
News in this version: - Solve some limitations of walkthrough mode (fdo#81425) - Multisampling (better rendering quality, mainly at the edges) - Better error handling (no crash in case of invalid input file) Change-Id: I46fdf56b00476614487fbcc04178e43e33a01794 Reviewed-on: https://gerrit.libreoffice.org/11179 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
2014-08-18libgltf: check for #version string in the shader before add an own one.Zolnai Tamás
Change-Id: I69dbbabc5774cbce7943e77f41bb42ed7a118bcf
2014-08-17libgltf: Append shader language version to the shader filesZolnai Tamás
In general glTF shader files does not contain version directives and in some case it make shader compiler using GLSL 1.1 which leads to that the shader compiler fails. So we need to append the choosen version number which is GLSL 1.3 in case of libgltf, but this also means that from that point OpenGL 3.0 is the new reuirements since GLSL 1.3 is available only from that version. Change-Id: Ic4382266432ea474aeb3e603b32a998b9aeed280
2014-08-09VS2013: Override ToolsVersion settingThomas Arnhold
Otherwise those external projects will fail, because with only VS2013 installed there is no ToolsVersion 4.0 (which is set inside the VC projects files). http://msdn.microsoft.com/en-us/library/bb383985.aspx Change-Id: I144ba1ef95372226ebadb082e3a78155cca316fd
2014-08-06Drop unneeded libgltf autotools changesJan-Marek Glogowski
For whatever reason the tinderboxes still try to regenerate the autotools based files, even after applying the generated file change after the template changes. These patches aren't needed, as the original problem is the CPPFLAGS environment visibility, so we drop them. Change-Id: Idb5caf662c997221337416686313101ad2193e40
2014-08-06Fix libgltf dbgutil buildJan-Marek Glogowski
The libgltf configure.ac script changes the autotools user variables CFLAGS and CXXFLAGS, which is not allowed and can overwrite user settings (which it does for the -D_GLIBCXX_DEBUG flag). So this moves the special compile settings to seperate variables and passes them to AM_CXXFLAGS and AM_CPPFLAGS, so the library actually gets compiled with libstdc++ debug objects. Change-Id: I00989f5fb629a6aac43ee5a2eb287b0491a3b86d
2014-08-05libgltf: rename pathces dir to patchesSimon Danner
Change-Id: Ibd28dcdab17b1248d62205e5bf94d0c92c3f8841 Reviewed-on: https://gerrit.libreoffice.org/10750 Reviewed-by: Zolnai Tamás <tamas.zolnai@collabora.com> Tested-by: Zolnai Tamás <tamas.zolnai@collabora.com>
2014-08-05libgltf: remove obsolete patchZolnai Tamás
Change-Id: Iec8a026f43cdcf1801f530e6303a9557374c92c7
2014-08-05libgltf: missing <cstdio> includeZolnai Tamás
Change-Id: I69ac77f954434c080a70ae9833ee60a99d7f9eef
2014-08-05libgltf: fix dbgutil buildZolnai Tamás
Change-Id: Icc5105d0668d5e4e3eb58bbaed6b2f059c30be99
2014-07-23make libgltf compile on OSXMarkus Mohrhard
Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8
2014-07-16fdo#81182: glTF window size does not match with the scene size after resizingZolnai Tamás
When viewport changed it is necessary to resize the whole scene. Calling releasFbo removes size dependent objects and triggers creating the new ones with the new size. Change-Id: Ibd8be1e92be92da31add4a30aa799f0995b1cc88
2014-07-14Update libgltf: various fixes, memory usage optimization (second try)Zolnai Tamás
Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Change-Id: Ie0f65be3312688196fcca634eb396c577f991073 Reviewed-on: https://gerrit.libreoffice.org/10274 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-07-14Revert "Update libgltf: various fixes, memory usage optimization"Zolnai Tamás
This reverts commit fc40081993d29c422fd19bb80f4d9db06b4dce0d. Some files are missing from the new tarball, so revert this until this is fixed.
2014-07-14Update libgltf: various fixes, memory usage optimizationZolnai Tamás
Fixes in the new tarball (beside the upstreamed bug fixes): - In walkthrough mode camera is moved relative to the current camera position and not relative to the initial camera position. - The right FPS numbers are displayed under Linux. - Some memory optimization to avoid running out of memory in case of huge models. - Other freedesktop bugs: fdo#81205, fdo#81207, fdo#81250 Change-Id: Iba90d43e13dac7792072877d83d17fb1bcbfaae4
2014-07-12enable debug informations for gltf in debug buildsMarkus Mohrhard
Change-Id: I81fc7ebc77a67d2d64dd74e1dec0ce7ffbb1b19b
2014-07-11VS2013: Adjust libgltf to 12.0 vcproj versionDavid Ostrovsky
Change-Id: I076c998f5c843b60ac5624381e51271a0924043f Reviewed-on: https://gerrit.libreoffice.org/10161 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2014-07-06Revert "fix OpenGL error in libgltf"Markus Mohrhard
New tarball already contains the fix for it. This reverts commit 6f855fed653d6cdbfb30f8cd579d5d8d7f108aba.
2014-07-06fix OpenGL error in libgltfMarkus Mohrhard
The code tried to free a program as a shader Change-Id: I47de706044a5756cf972d9fdb38cac2ca1355414
2014-07-04libgltf: Stop a memory leakZolnai Tamás
Change-Id: I7f3f5cfcdc368907670d58b07300889ea8452340
2014-06-28libgltf: fix Linux-with-check buildZolnai Tamás
It seems some of the warnings are treated as errors in Linux-with-check builds. Change-Id: I9ed876ba634d944c022838a625164f06f100a7df
2014-06-27libgltf: make 'Requires' valid in libgltf-0.0.pc fileZolnai Tamás
Thanks to Rene Engelhard for help to make it valid. Plus glu is not used, so remove it. Change-Id: I5e3631e9b3d24c2b1d9044192d7c0a55c234f7c0
2014-06-27libgltf: use WHITESPACEZolnai Tamás
Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0
2014-06-27libgltf: fix wrong include path to config_$(gb_Side)Zolnai Tamás
Change-Id: I63d1822fd08c997a9432ed09ada6d5299bc658b1
2014-06-27libgltf: it seems gb_SPACE is not that we need hereZolnai Tamás
Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd
2014-06-26libgltf: compiler error fixes: missing include and missing namespaceZolnai Tamás
Thanks to Rene Engelhard for the report and the fixes. Change-Id: Ia14980bdbcd9e714b1e9cd41f04af9371aa22371
2014-06-26Revert "external/libgltf: Hack in missing -fPIC"Stephan Bergmann
This reverts commit 5da85a21241f09a0b2d7796bc952806a1a863592, bb9078e3dee48afc4c2bd8006a892924f8b38b39 "libgltf: use --with-pick [sic]" had already added --with-pic.
2014-06-26external/libgltf: Hack in missing -fPICStephan Bergmann
Change-Id: Ied0fe5f376bf17bd931f440e57d15b22ab6db86e
2014-06-25libgltf: remove dependencies of config.h.inZolnai Tamás
It seems something is wrong with the files in the libgltf tarball (maybe wrong timestamps?), because config.h.in is always regenerated by make (autoheader). It causes build problems so just remove the deps for this time. Change-Id: I404c29673987d7c8f75ec8fe4978173593c75a2f
2014-06-25libgltf: try again with this configure patchZolnai Tamás
Touch only the configure but not the configure.ac Change-Id: Iee93036f2378f29530ffae9be8b4324e8425d2ec
2014-06-25libgltf: replace configure patch to avoid using autoreconfZolnai Tamás
Change-Id: Idcab012af9c27c4fed31c07ce230816d1c61d605
2014-06-25libgltf: use --with-pickZolnai Tamás
Change-Id: Ide01491460c9c81ed044be762c7dd07e8a5ca575
2014-06-25libgltf: try to fix the MSVC2010 buildMichael Stahl
Change-Id: I8dde439d19be45d5039904b6e917b17ca0ee4758
2014-06-25libgltf: add patch to find the headers in WORKDIRMichael Stahl
Change-Id: I8570511be7c1d6de94ee82e18bad5b00b36d99bb
2014-06-25libgltf: variable names need module prefixMichael Stahl
Change-Id: Id144a483fe5576cdd546ac5da87890dc61f964b3
2014-06-25Update libgltf: new build system and various fixesZolnai Tamás
Building: - The new tarball has reasonable build system so build libgltf as external package instead of compiling source files directly. - Freetype dependancy is removed Improvements comes with the new libgltf - Can rotate the models too (orbit mode) - Two camera handling mode: walkthrough and orbit (press M to change). - gltf_animation_set_time() works - FPS can be displayed without freetype (press F) Additional notes: - There were some bugs/regressions which are fixed during the integration (see patches). - License files are uddated now. - libgltf building is enabled only on those platforms on which gltf support actually works (windows and linux) Change-Id: Ia6c9c4da53a9b4fedba0d73aa5791489f8ad424b Reviewed-on: https://gerrit.libreoffice.org/9895 Reviewed-by: Zolnai Tamás <zolnaitamas2000@gmail.com> Tested-by: Zolnai Tamás <zolnaitamas2000@gmail.com>
2014-06-13libgltf: fix up this patch, some forgotten changesZolnai Tamás
Change-Id: I0fe3ee06d8112207f3ae3e0e8e40fa74d043ce11
2014-06-13glTF: Avoid segmentation fault when one of the input files can't be loadedZolnai Tamás
libgltf: Parser releases the glTFHandle, but it was not connected to the corresponding handle by RenderScene::initScene. So when rendering stopped during file loading because of missing file, Parser's handle member was an uninitialized pointer so it crashed by calling release method. Change-Id: I80099195341766f474143014d5949703d47a6fd8
2014-05-28Patching libgltf: fix wrong deallocation methodZolnai Tamás
Change-Id: I05c5650c1e43cf9ac4156e8d74073bf92ac0c4df (cherry picked from commit 3ce0f83cec6d2ee1467523209df633c5a2487f71)
2014-05-28libgltf: solve this memory leak problem on a better way 2Zolnai Tamás
Handle those cases when file loading failes. Release *.json file on a different way since it is allocated by libgltf (inside the glTFHandle). (cherry picked from commit fafc1e29c1f060c1a44361a0445300f9786ad6f4) Change-Id: Idf6c6971a8ac1b342d89dc4f61a62624183e01d0
2014-05-27Patching libgltf: the passed texture bitmaps are RGBA buffersZolnai Tamás
Change-Id: I53f6a97820da12e89d567e1bc10226fa27cafd84