Update the font atlas

Tatsuya79 · Jan 31, 2015 · 69bc825 · 69bc825
1 parent 9fac72c
commit 69bc825
Show file tree

Hide file tree

Showing 11 changed files with 6,352 additions and 5,990 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@ Windows/x64
 Windows/ipch
 Windows/bin-release
 ui_atlas.zim.png
+ui_atlas_high.zim.png
 android/assets
 ext/_Output
 # For Mac

diff --git a/UI/ui_atlas.cpp b/UI/ui_atlas.cpp
diff --git a/android/assets/ui_atlas.zim b/android/assets/ui_atlas.zim
diff --git a/assets/ui_atlas.zim b/assets/ui_atlas.zim
diff --git a/assets/ui_atlas_lowmem.zim b/assets/ui_atlas_lowmem.zim
diff --git a/atlasscript.txt b/atlasscript.txt
@@ -1,5 +1,5 @@
 2048
-font UBUNTU24 C:/Windows/Fonts/RobotoCondensed-Regular.ttf UWER 34 -2
+font UBUNTU24 assets/RobotoCondensed-Regular.ttf UWER 34 -2
 font UBUNTU24 C:/Windows/Fonts/ARIALUNI.ttf UWEhkcRGHKVTe 30 0
 image I_SOLIDWHITE white.png copy
 image I_CROSS source_assets/image/cross.png copy

diff --git a/atlasscript_lowmem.txt b/atlasscript_lowmem.txt
@@ -1,5 +1,5 @@
 512
-font UBUNTU24 C:/Windows/Fonts/RobotoCondensed-Regular.ttf U 34 -2
+font UBUNTU24 assets/RobotoCondensed-Regular.ttf U 34 -2
 image I_SOLIDWHITE white.png copy
 image I_CROSS source_assets/image/cross.png copy
 image I_CIRCLE source_assets/image/circle.png copy

diff --git a/buildatlas.sh b/buildatlas.sh
@@ -1,4 +1,4 @@
-./native/tools/build/atlastool atlasscript.txt ui 8888 && cp ui_atlas.zim assets && mv ui_atlas.zim android/assets && mv ui_atlas.cpp ui_atlas_highmem.cpp && mv ui_atlas.h UI
+./native/tools/build/atlastool atlasscript.txt ui 8888 && cp ui_atlas.zim assets && cp ui_atlas.zim android/assets && cp ui_atlas.zim.png ui_atlas_high.zim.png && mv ui_atlas.cpp ui_atlas_highmem.cpp && mv ui_atlas.h UI
 ./native/tools/build/atlastool atlasscript_lowmem.txt ui 8888 && mv ui_atlas.zim assets/ui_atlas_lowmem.zim && mv ui_atlas.cpp ui_atlas_lowmem.cpp
 diff -I'^//.*' -D USING_QT_UI ui_atlas_highmem.cpp ui_atlas_lowmem.cpp > UI/ui_atlas.cpp
 rm ui_atlas_highmem.cpp ui_atlas_lowmem.cpp ui_atlas.h