Commit Graph

60 Commits

Author SHA1 Message Date
6bc81d4e78 Simplify some $ENABLE_DEBUG expressions
Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c
2014-08-29 17:14:53 +02:00
a60cc58021 Upgrade libgltf to 0.0.1
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-29 05:01:31 -05:00
6be202585f libgltf: check for #version string in the shader before add an own one.
Change-Id: I69dbbabc5774cbce7943e77f41bb42ed7a118bcf
2014-08-18 09:24:43 +02:00
c67026f270 libgltf: Append shader language version to the shader files
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-17 09:26:33 +02:00
0b684fa3e9 VS2013: Override ToolsVersion setting
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-09 16:47:52 +02:00
c7b975c412 Drop unneeded libgltf autotools changes
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-06 13:55:02 +02:00
1f23cc159d Fix libgltf dbgutil build
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-06 12:05:56 +02:00
4d5ec5a0c3 libgltf: rename pathces dir to patches
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-05 11:24:34 +00:00
841d50ec23 libgltf: remove obsolete patch
Change-Id: Iec8a026f43cdcf1801f530e6303a9557374c92c7
2014-08-05 11:47:43 +02:00
d085bba913 libgltf: missing <cstdio> include
Change-Id: I69ac77f954434c080a70ae9833ee60a99d7f9eef
2014-08-05 11:47:43 +02:00
dabfe7dd02 libgltf: fix dbgutil build
Change-Id: Icc5105d0668d5e4e3eb58bbaed6b2f059c30be99
2014-08-05 11:17:20 +02:00
887c088f20 make libgltf compile on OSX
Change-Id: Ie39292137f931bfd557f66c485e104cf5d5089b8
2014-07-23 21:51:42 +02:00
3cd7c0f6b6 fdo#81182: glTF window size does not match with the scene size after resizing
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-16 14:49:02 +02:00
11b328103f Update libgltf: various fixes, memory usage optimization (second try)
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-14 12:35:52 +00:00
ae4004548a Revert "Update libgltf: various fixes, memory usage optimization"
This reverts commit fc40081993d29c422fd19bb80f4d9db06b4dce0d.

Some files are missing from the new tarball, so revert
this until this is fixed.
2014-07-14 11:04:51 +02:00
fc40081993 Update libgltf: various fixes, memory usage optimization
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-14 10:40:57 +02:00
717f8a87a7 enable debug informations for gltf in debug builds
Change-Id: I81fc7ebc77a67d2d64dd74e1dec0ce7ffbb1b19b
2014-07-12 14:25:05 +02:00
705473c9bd VS2013: Adjust libgltf to 12.0 vcproj version
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-11 11:36:56 +00:00
237426e104 Revert "fix OpenGL error in libgltf"
New tarball already contains the fix for it.

This reverts commit 6f855fed653d6cdbfb30f8cd579d5d8d7f108aba.
2014-07-06 05:05:45 +02:00
6f855fed65 fix OpenGL error in libgltf
The code tried to free a program as a shader

Change-Id: I47de706044a5756cf972d9fdb38cac2ca1355414
2014-07-06 03:43:07 +02:00
8ea270213b libgltf: Stop a memory leak
Change-Id: I7f3f5cfcdc368907670d58b07300889ea8452340
2014-07-04 16:47:38 +02:00
a2648efa67 libgltf: fix Linux-with-check build
It seems some of the warnings are treated as errors
in Linux-with-check builds.

Change-Id: I9ed876ba634d944c022838a625164f06f100a7df
2014-06-28 12:37:55 +02:00
4bdbc1c93b libgltf: make 'Requires' valid in libgltf-0.0.pc file
Thanks to Rene Engelhard for help to make it valid.

Plus glu is not used, so remove it.

Change-Id: I5e3631e9b3d24c2b1d9044192d7c0a55c234f7c0
2014-06-27 19:19:46 +02:00
b05b970daa libgltf: use WHITESPACE
Change-Id: I47ca82d5f08431c8af8b8a85cfbfd083ebd6fda0
2014-06-27 15:09:10 +02:00
ab028bf00e libgltf: fix wrong include path to config_$(gb_Side)
Change-Id: I63d1822fd08c997a9432ed09ada6d5299bc658b1
2014-06-27 14:24:42 +02:00
c7d6541f5d libgltf: it seems gb_SPACE is not that we need here
Change-Id: I099f2bb007cdd29db25a99ca84e53115a12379bd
2014-06-27 13:41:36 +02:00
481a17b6a6 libgltf: compiler error fixes: missing include and missing namespace
Thanks to Rene Engelhard for the report and the fixes.

Change-Id: Ia14980bdbcd9e714b1e9cd41f04af9371aa22371
2014-06-26 17:14:36 +02:00
fb48904dfa Revert "external/libgltf: Hack in missing -fPIC"
This reverts commit 5da85a21241f09a0b2d7796bc952806a1a863592,
bb9078e3dee48afc4c2bd8006a892924f8b38b39 "libgltf: use --with-pick [sic]" had
already added --with-pic.
2014-06-26 08:53:32 +02:00
5da85a2124 external/libgltf: Hack in missing -fPIC
Change-Id: Ied0fe5f376bf17bd931f440e57d15b22ab6db86e
2014-06-26 08:48:05 +02:00
3bebda9cd3 libgltf: remove dependencies of config.h.in
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-25 23:29:05 +02:00
211e07c0e0 libgltf: try again with this configure patch
Touch only the configure but not the configure.ac

Change-Id: Iee93036f2378f29530ffae9be8b4324e8425d2ec
2014-06-25 19:23:24 +02:00
c5bb272883 libgltf: replace configure patch to avoid using autoreconf
Change-Id: Idcab012af9c27c4fed31c07ce230816d1c61d605
2014-06-25 18:51:23 +02:00
bb9078e3de libgltf: use --with-pick
Change-Id: Ide01491460c9c81ed044be762c7dd07e8a5ca575
2014-06-25 18:29:38 +02:00
96ff104494 libgltf: try to fix the MSVC2010 build
Change-Id: I8dde439d19be45d5039904b6e917b17ca0ee4758
2014-06-25 17:05:11 +02:00
dfe787ef5d libgltf: add patch to find the headers in WORKDIR
Change-Id: I8570511be7c1d6de94ee82e18bad5b00b36d99bb
2014-06-25 16:58:43 +02:00
d83e66da94 libgltf: variable names need module prefix
Change-Id: Id144a483fe5576cdd546ac5da87890dc61f964b3
2014-06-25 16:58:41 +02:00
6403f2b59b Update libgltf: new build system and various fixes
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-25 13:22:29 +00:00
fd8cee8c1f libgltf: fix up this patch, some forgotten changes
Change-Id: I0fe3ee06d8112207f3ae3e0e8e40fa74d043ce11
2014-06-13 01:19:31 +02:00
6904c836b2 glTF: Avoid segmentation fault when one of the input files can't be loaded
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-06-13 00:23:37 +02:00
00e7b772b4 Patching libgltf: fix wrong deallocation method
Change-Id: I05c5650c1e43cf9ac4156e8d74073bf92ac0c4df
(cherry picked from commit 3ce0f83cec6d2ee1467523209df633c5a2487f71)
2014-05-28 15:42:07 +02:00
32f60d78b1 libgltf: solve this memory leak problem on a better way 2
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-28 13:08:11 +02:00
9c830b09a0 Patching libgltf: the passed texture bitmaps are RGBA buffers
Change-Id: I53f6a97820da12e89d567e1bc10226fa27cafd84
2014-05-27 22:17:17 +02:00
37dd6ced1e patching libgltf: stop a huge memory leak
It is ambiguos where we should free file buffers because they
are allocated by the caller code, but since gltfHandle is
deallocated inside libgltf and libgltf has a gltf_renderer_release
method for deallocation it seems better to free them by libgltf.


Conflicts:
	external/libgltf/UnpackedTarball_libgltf.mk

Change-Id: If3d9abed0514128c13cde8c1967ea80c4d27bf59
2014-05-26 23:42:17 +02:00
318ffa8824 libgltf: Update openmp-related patch to newer libgltf.
Change-Id: I6f7e8d974030169bb00fbd81a0e2190640702729
2014-05-26 16:39:23 +02:00
42f2f47330 libgltf: turn off openMP usage without any detection code.
Change-Id: Ic823109b812a3d99d8462cf67cd9aa87094bba06
2014-05-24 20:38:29 +01:00
a0ef37c55f libgltf: Another new version.
Change-Id: I784579717674f1caf68ad489d1a931936f6f9651
2014-05-24 17:52:41 +02:00
1554fc9611 libgltf: Updated version.
Change-Id: Ia394ff00421f495757cc2ce55e7b91bfebe715eb
2014-05-21 17:52:28 +02:00
f635aed5b1 libgltf: The FPS counting is not necessary in LibreOffice.
And leaving it out kills the freetype dependency :-)

Change-Id: I1fa33492da9d30a98014bae06aa196a508cedfe7
2014-05-21 10:36:54 +02:00
f933cb0a64 libgltf: Update to the new version.
Change-Id: Iffc91425d4395699a1c5f18ac10f5ed065231fdf
2014-05-21 10:36:53 +02:00
563a83a8cf libgltf: include is missing from fmod_error_handling patch, merge patches
Change-Id: I9e0e7816e6d85cb3484105de4ce49db47db72451
2014-05-06 18:31:36 +02:00