[gnome-getting-started-docs] fix glitches in task switching and responding.
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-getting-started-docs] fix glitches in task switching and responding.
- Date: Thu, 15 Nov 2012 15:13:45 +0000 (UTC)
commit ad1f5eee130486565b3a9113dcf53d186605c550
Author: Jakub Steiner <jimmac gmail com>
Date: Thu Nov 15 15:42:07 2012 +0100
fix glitches in task switching and responding.
- separate the typewriter function from the render (now loads with project)
- fix various layer glitches
- unbreak transcoding again
- both need re-rendering
animation/gnome-responding-to-messages.blend | Bin 2692864 -> 2686896 bytes
animation/gnome-responding-to-messages.py | 36 ++++++--------------
animation/gnome-task-switching.blend | Bin 2608988 -> 2591928 bytes
animation/gnome-task-switching.py | 4 +-
getting-started/C/animation.xml | 1 +
getting-started/C/figures/changing-wallpaper.webm | Bin 2369443 -> 2369443 bytes
getting-started/C/figures/launching-apps.webm | Bin 5085128 -> 5085128 bytes
getting-started/C/figures/task-switching.webm | Bin 7757183 -> 7757183 bytes
getting-started/C/figures/yelp-intro.webm | Bin 3993402 -> 3993402 bytes
getting-started/Makefile.am | 6 ++-
getting-started/cs/figures/changing-wallpaper.webm | Bin 2430079 -> 2430079 bytes
getting-started/cs/figures/launching-apps.webm | Bin 4945812 -> 4945812 bytes
getting-started/cs/figures/task-switching.webm | Bin 7754435 -> 7754435 bytes
getting-started/cs/figures/yelp-intro.webm | Bin 4011719 -> 4011719 bytes
14 files changed, 18 insertions(+), 29 deletions(-)
---
diff --git a/animation/gnome-responding-to-messages.blend b/animation/gnome-responding-to-messages.blend
index d1903f6..0d413d3 100644
Binary files a/animation/gnome-responding-to-messages.blend and b/animation/gnome-responding-to-messages.blend differ
diff --git a/animation/gnome-responding-to-messages.py b/animation/gnome-responding-to-messages.py
index 10fb89d..9133ae3 100644
--- a/animation/gnome-responding-to-messages.py
+++ b/animation/gnome-responding-to-messages.py
@@ -1,26 +1,7 @@
-import bpy,os
+import bpy,os,re
from xml.etree import ElementTree as ET
-def typewriteit(scene):
- typewrite = bpy.data.objects['typewriter'].data.body
- typewrite2 = bpy.data.objects['typewriter2'].data.body
- #psani zacina v sekvenci na 152
- if bpy.context.scene.frame_current >= 152:
- i = int((bpy.context.scene.frame_current-152)/2)
- else:
- i = 0
- if bpy.context.scene.frame_current >= 640:
- j = int((bpy.context.scene.frame_current-640)/2)
- else:
- j = 0
- if bpy.context.scene.frame_current >= 1024:
- k = int((bpy.context.scene.frame_current-1024)/2)
- else:
- k = 0
- #print(typewrite, i, typewrite[:i])
- bpy.data.objects['bubble.response'].data.body = typewrite[:i]
- bpy.data.objects['bubble.response2'].data.body = typewrite2[:j]
- bpy.data.objects['bubble.response3'].data.body = typewrite3[:k]
+
def render(lang):
#bpy.context.scene.render.resolution_percentage =
@@ -34,10 +15,17 @@ def render(lang):
bpy.ops.render.render(animation=True)
else:
print('already rendered')
-
+ transcodepath = "../getting-started/" + lang + "/figures/"
+ regexobj = re.search(r"^(.*\/)(.*)-(\d*)-(\d*)(\.avi)$", bpy.context.scene.render.frame_path())
+ webmfile = regexobj.group(2) + ".webm"
+ transcodecmd = "ffmpeg -y -i " + bpy.context.scene.render.frame_path() + " -b:v 8000k " + transcodepath + webmfile
+ if (not os.path.isfile(transcodepath+webmfile)):
+ os.system(transcodecmd)
+ else:
+ print('already transcoded',transcodepath + webmfile)
+
#translates strings and calls render
def main():
- global typewrite
t = {}
#unfortunately no decent fonts have â
@@ -56,6 +44,4 @@ def main():
render(lang)
if __name__ == '__main__':
- bpy.app.handlers.frame_change_pre.append(typewriteit)
main()
- bpy.app.handlers.frame_change_pre.pop(0)
diff --git a/animation/gnome-task-switching.blend b/animation/gnome-task-switching.blend
index 94af0f1..df36683 100644
Binary files a/animation/gnome-task-switching.blend and b/animation/gnome-task-switching.blend differ
diff --git a/animation/gnome-task-switching.py b/animation/gnome-task-switching.py
index 235e94c..1ee708e 100644
--- a/animation/gnome-task-switching.py
+++ b/animation/gnome-task-switching.py
@@ -4,8 +4,8 @@ from xml.etree import ElementTree as ET
def typewriteit(scene):
typewrite = bpy.data.objects['typewriter'].data.body
#psani zacina v sekvenci na 151
- if bpy.context.scene.frame_current >= 151:
- i = int((bpy.context.scene.frame_current-152)/3)
+ if bpy.context.scene.frame_current >= 915:
+ i = int((bpy.context.scene.frame_current-915)/3)
else:
i = 0
#print(typewrite, i, typewrite[:i])
diff --git a/getting-started/C/animation.xml b/getting-started/C/animation.xml
index ed9ea71..fa63c68 100644
--- a/getting-started/C/animation.xml
+++ b/getting-started/C/animation.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
<titles>
<t id='title-launch'>Launching Applications</t>
<t id='title-gettingstarted'>Getting Started</t>
diff --git a/getting-started/C/figures/changing-wallpaper.webm b/getting-started/C/figures/changing-wallpaper.webm
index e362f5c..b734cb5 100644
Binary files a/getting-started/C/figures/changing-wallpaper.webm and b/getting-started/C/figures/changing-wallpaper.webm differ
diff --git a/getting-started/C/figures/launching-apps.webm b/getting-started/C/figures/launching-apps.webm
index fe16c4c..dfeca03 100644
Binary files a/getting-started/C/figures/launching-apps.webm and b/getting-started/C/figures/launching-apps.webm differ
diff --git a/getting-started/C/figures/task-switching.webm b/getting-started/C/figures/task-switching.webm
index ea8d13d..44a331b 100644
Binary files a/getting-started/C/figures/task-switching.webm and b/getting-started/C/figures/task-switching.webm differ
diff --git a/getting-started/C/figures/yelp-intro.webm b/getting-started/C/figures/yelp-intro.webm
index 1ae74ed..6c114d8 100644
Binary files a/getting-started/C/figures/yelp-intro.webm and b/getting-started/C/figures/yelp-intro.webm differ
diff --git a/getting-started/Makefile.am b/getting-started/Makefile.am
index d1ff18f..d6d4944 100644
--- a/getting-started/Makefile.am
+++ b/getting-started/Makefile.am
@@ -5,9 +5,11 @@ HELP_ID = getting-started
HELP_LINGUAS = cs
HELP_MEDIA = \
- figures/apps.png \
+ figures/changing-wallpaper.png \
+ figures/launching-apps.png \
figures/online.png \
- figures/search.png
+ figures/search.png \
+ figures/task-switching.png
HELP_FILES = \
animation.xml \
diff --git a/getting-started/cs/figures/changing-wallpaper.webm b/getting-started/cs/figures/changing-wallpaper.webm
index 4459544..a2cac90 100644
Binary files a/getting-started/cs/figures/changing-wallpaper.webm and b/getting-started/cs/figures/changing-wallpaper.webm differ
diff --git a/getting-started/cs/figures/launching-apps.webm b/getting-started/cs/figures/launching-apps.webm
index 0eb4d33..511e132 100644
Binary files a/getting-started/cs/figures/launching-apps.webm and b/getting-started/cs/figures/launching-apps.webm differ
diff --git a/getting-started/cs/figures/task-switching.webm b/getting-started/cs/figures/task-switching.webm
index 5229961..591ed22 100644
Binary files a/getting-started/cs/figures/task-switching.webm and b/getting-started/cs/figures/task-switching.webm differ
diff --git a/getting-started/cs/figures/yelp-intro.webm b/getting-started/cs/figures/yelp-intro.webm
index 9336cec..a51eca6 100644
Binary files a/getting-started/cs/figures/yelp-intro.webm and b/getting-started/cs/figures/yelp-intro.webm differ
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]