[Libreoffice-commits] core.git: Branch 'feature/chart-3d-chart2' - external/libgltf

[Jan Holesovsky]

 external/libgltf/UnpackedTarball_libgltf.mk |    1 +
 external/libgltf/patches/smaller_fps.diff   |   28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

New commits:
commit af930e5a63cc77bf331590b807f19bf53559e12a
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed May 28 18:59:15 2014 +0200

    libgltf: Add patch to move FPS to a different place.
    
    Change-Id: I9500e431b7eb763ef2a8b70a887a1b24cb1c0579

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk b/external/libgltf/UnpackedTarball_libgltf.mk
index dfae5ec..68eb669 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
 	external/libgltf/patches/include_path_glew.patch \
 	external/libgltf/patches/include_path_freetype.patch \
+	external/libgltf/patches/smaller_fps.diff \
 	external/libgltf/patches/rgba_textures.patch \
 	external/libgltf/patches/deallocation_fix.patch \
 ))
diff --git a/external/libgltf/patches/smaller_fps.diff b/external/libgltf/patches/smaller_fps.diff
new file mode 100644
index 0000000..95dc25a
--- /dev/null
+++ b/external/libgltf/patches/smaller_fps.diff
@@ -0,0 +1,28 @@
+changeset:   780:717f918a0e00
+tag:         tip
+user:        YangZh at MCW-yZhang.MCW-CC.CN
+date:        Wed May 28 20:21:52 2014 +0800
+files:       Impress/libgltf/src/FPSCounter.cpp
+description:
+1) remove "Render Total Time" string from it
+2) move the FPS text to the bottom right corner
+3) reduce the font size to 1/3 of what it now
+
+
+diff -r 3ee778f06e4e -r 717f918a0e00 Impress/libgltf/src/FPSCounter.cpp
+--- libgltf/src/FPSCounter.cpp	Wed May 28 18:00:06 2014 +0800
++++ libgltf/src/FPSCounter.cpp	Wed May 28 20:21:52 2014 +0800
+@@ -110,11 +110,7 @@
+         }
+     }
+ 
+-    pFont->printFormattedString(20, pViewport->height - 30, 20, "FPS: %d",
+-                                mFPS);
+-    pFont->printFormattedString(20, pViewport->height - 60, 20,
+-                                "Render Total Time: %.6f ms",
+-                                mTotalTime * 1000);
++    pFont->printFormattedString(pViewport->width - 100, 30, 15, "FPS: %d",mFPS);
+     glEnable(GL_DEPTH_TEST);
+ }
+ #endif //ENABLE_FPS
+