summaryrefslogtreecommitdiff
path: root/avmedia
AgeCommit message (Collapse)Author
2014-07-03glTF: improve camera movement constraintZolnai Tamás
Stop moving only on the wrong direction. Change-Id: Ic9e7f2e7814d9adcbcf707e7fb786bf17fac3125
2014-07-03glTF: constraine camera move in orbit modeZolnai Tamás
Not to get too close to / too far from the model. Too close means move into the model. Change-Id: Ie25d87c88093d4baaf98f13ab8239263b5e1bf66
2014-07-03Remove obsolete commentZolnai Tamás
Change-Id: I0cc592b245871187dd41e85be8c86e6e7878181b
2014-07-01avmedia: sal_Bool -> boolStephan Bergmann
Change-Id: Ief9b2cc517e9c0666e656737cee9a953c676a1d9
2014-07-01Activate the "suspicious cast to sal_Bool" parts of loplugin:salboolStephan Bergmann
Change-Id: I78a368ef2899b2462251b45a327fc7b1f31fe764
2014-06-25glTF rendering: moving in walktrough mode is to fastZolnai Tamás
Change-Id: I2b7869c6c14b69732db864a03a2d9b6638424cf7
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-16glTF export: Use plural folder namesZolnai Tamás
Change-Id: If17628395ede512c00b666efc5511d9711edfb5a
2014-06-13kmz2gltf: Use LO's ZipFileAccess to unzip kmzZolnai Tamás
Instead of this hacky collada2gltf patch. Change-Id: I9f15c4ee1c9ea1a1a64116691b12b696c1d63ac5
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-06-13Extract kmz and collada converter code to a seperate functionZolnai Tamás
Plus fix some problems related to temp files. e.g. kmz converter was creating temp files next to the input file. Change-Id: Ib3f367fe1c4ef3cb25f5ca1c3d06b2dde78c5e45
2014-06-12Change glTF mime type: {application -> model}/vnd.gltf+jsonZolnai Tamás
There is no an accepted mime type for glTF models yet, so follow collada's mime type: model/vnd.collada+xml. Change-Id: I1e23a95dbb0caea781dade819f8e08235cb5c1dc
2014-06-12Introduce HAVE_FEATURE_GLTF to enable/disable gltf related codeZolnai Tamás
When it is a release build then enable it only on Windows and Linux. Change-Id: I7c462aeb75e6ab60eeaa0fa42ca7853a6369b742
2014-05-30fdo#68849: Add header guards to all include filesJens Carl
Added header guards to files in directories avmedia/, basegfx/, chart2/, and connectivity/ Change-Id: I94ec438ec918ccef1c518edfd9ab4944e9e2961b Reviewed-on: https://gerrit.libreoffice.org/9555 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2014-05-29OGLFrameGrabber: use reference instead of pointerZolnai Tamás
Change-Id: Id21138ce2a5d8e764407f42afa2b21464da70e45
2014-05-29OGLWindow: no need to call update after changes, timer takes care of itZolnai Tamás
Change-Id: Ifc5ecf4ec3e385293889c82a3b678a8dbcd3edbb
2014-05-29OGLWindow: remove unused zoom levelZolnai Tamás
Zooming is solved on a more sophisticated way. Change-Id: I0386ace8a3751d708ac86ff0ddf0836c79ae603f
2014-05-29Remove accidently committed lineZolnai Tamás
Change-Id: Iace701d7473e874cc8df64349b71faa4a5493d5e
2014-05-29OGLWindow: use reference instead of pointerZolnai Tamás
Change-Id: I72ef9570ac9e7b4cb4afc2319725743098722d31
2014-05-29OGLPlayer: use more assertionsZolnai Tamás
Change-Id: I0a224a90a3e99d12809d40612b1e66d7c023aebc
2014-05-27First stop the timer, then the animation.Jan Holesovsky
Change-Id: Icd5f9f4b8e1c48176fdb73c954e1c4b7d0811516
2014-05-27Use AutoTimer instead of Timer, and add some more locking.Jan Holesovsky
Change-Id: I83a99e333a6c62bf7779e3fbbcc3e5af38bb2ca5
2014-05-29OGLPlayer: handle json parsing errorZolnai Tamás
Change-Id: I86aea12318d4e21ccadd97ad2820e31bd4580c99
2014-05-29OGLPlayer: check before dereferenceZolnai Tamás
Change-Id: I4bbaf97fe8c5def441ca106c26ad312281ed352f
2014-05-28glTF rendering: workaround for camera movementsZolnai Tamás
If the glTF contains camera movement in it moving camera by keyboard didn't work very well. Change-Id: I9300a257858d4f35c2d622654a0c2fd85eedc5ed (cherry picked from commit 968b7f807561339d0083fe0aa6e893983ca60456)
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-27glTF rendering: fix texture problemsZolnai Tamás
It seems we need mirroring. Change-Id: Id9ad7041eb09ec773e4174cb68d34a65a2c473fe
2014-05-25cppcheck: unusedFunctionThomas Arnhold
Change-Id: I81f2a4be65bbc9359e51accccb746f1e8ea48c4f
2014-05-25avmedia: call resize before player window is createdZolnai Tamás
Since b5529c8c457f442bfc43305becc0c02d6a09ee80 MediaChildWindow is depend on the media URL so it is constructed later and so one resizing is missed before creating the player window which causes to display nothing in the media player (Tools -> Media Player) Change-Id: I548e6bb73193fccd1735e8343e9c06428ee686bc
2014-05-25Partly revert 4ec3554a80f065c2d9c957d6ce7f577fb195be02Zolnai Tamás
mpEvents is freed by other object so using scoped_ptr lead to crash. Change-Id: I28c9d322b5ee5da6edf5022da18b42f59b608dec
2014-05-24libgltf: Another new version.Jan Holesovsky
Change-Id: I784579717674f1caf68ad489d1a931936f6f9651
2014-05-23avmedia: remove unused code related to fast-forwardZolnai Tamás
One part of that was removed by: 55d52165df003d253d813f3ea7085f4d89fdb3ce e.g. setRate() Change-Id: Ia5def0150029c1597cd505bbaf740a42819a7c73
2014-05-23avmedia: avoid segmentation fault during destruction of media windowZolnai Tamás
mpEvents is not initialized in the destructor any more: b5529c8c457f442bfc43305becc0c02d6a09ee80 Plus use scoped_ptr to stop memory leak. Change-Id: Idaaa274e39c1ac34270ae5b0acdd237ee5aec1c3
2014-05-23coverity#1210188 Uninitialized pointer fieldCaolán McNamara
Change-Id: Ifbf29a8601d0527695951acea57b75f25a85ed89
2014-05-22Prefer cppu::UnoType<T>::get() to ::getCppuType((T*)0) part19Julien Nabet
Change-Id: Iab50c52a132c90389992ef68c2d31df95a193ab9
2014-05-22glTF: download *.dae and *.kmz files to the temp folder before conversionZolnai Tamás
Copy them to the same folder where the conversion output is written. Change-Id: I38b93bf3fc427974cff7d6975151451a253b1cce
2014-05-22collada2gltf: fix URL problemsZolnai Tamás
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
2014-05-21libgltf: Updated version.Jan Holesovsky
Change-Id: Ia394ff00421f495757cc2ce55e7b91bfebe715eb
2014-05-21collada2gltf: Ignore case of the extension.Jan Holesovsky
Change-Id: If7f39a1a0537c561373137e6a9dcdb22b48037f0
2014-05-21gltf: Send delta when rotating, not absolute value.Jan Holesovsky
Change-Id: I2453132fedc9a38f43c3de4b110459ba7771d085
2014-05-21libgltf: Update to the new version.Jan Holesovsky
Change-Id: Iffc91425d4395699a1c5f18ac10f5ed065231fdf
2014-05-21glTF embedding: handle missing image on a better wayZolnai Tamás
Using empty tree leads to empty image url which cause problem. Change-Id: If815ce588fb303905035185404ede93fa424fcba
2014-05-20collada2gltf: output bundle path needs to be in url formatMatúš Kukan
Otherwise it does not work on Windows. It's strange though that input path has to be converted from url to native path format. At least that was my observation. Change-Id: Ia8d9e9719d927cab2ae4d928eb8066cab4588281
2014-05-19hrc and src files: squeeze multiple newlinesThomas Arnhold
for i in `find . -name *.src -or -name *.hrc`; do FILE=$(cat -s "$i"); echo "$FILE" > "$i"; done Change-Id: I2bac5ad3e1eb3c566e5c867ccf45893a19e1561e
2014-05-19libavmedia.so needs to link to librt under LinuxJeroen Nijhof
libavmedia.so links to libopencollada2gltf.a, which contains a reference to clock_gettime(). And for clock_gettime one needs to link to librt, under Linux, at least. So add -lrt when linking libavmedia.so. Change-Id: I28547c6216738b44701baaed7eaf44f5ca97e98a
2014-05-19Do not throw if there is no "images" child in json file tree.Matúš Kukan
Change-Id: I0b47ed00fecad84859ba3f1751407696878203fb
2014-05-16OGLPlayer: comment out gltf_animation_get_timeZolnai Tamás
It leads confusing behavior. Time is not set by now because set method does not work. Change-Id: I447d07d4193e25e6916ee05ee335d4cf150380a2
2014-05-16WaE: unused parameter 'fTime'Tor Lillqvist
Change-Id: I1f44de228fe09584699a1e158c32882cd9e7eac7
2014-05-16OGLPlayer: fix playing of animation in edit modeZolnai Tamás
gltf_animation_set_time doesn't work but stops the animation. Change-Id: Ia17724c36e2007451e24f97e04a09240359ad969
2014-05-16OGLPlayer: set a timer which call redrawing to show animationZolnai Tamás
Change-Id: I7c98ba61be0510e9f86cb80fda73d18f7f7957cf