Commit Graph

332 Commits

Author SHA1 Message Date
Sergey Sharybin
6d125e159d i18n: code clean-up
- Move all translation-related declarations to BLF_translation.h
- Reverted some changes to match trunk svn rev40365
2011-09-20 07:39:25 +00:00
Sergey Sharybin
8dbc7a3ba3 Merging r40345 through r40365 from trunk into soc-2011-garlic 2011-09-19 15:47:05 +00:00
Brecht Van Lommel
5c7b5c0b51 Blenfont: fix use incorrect clear of ascii glyph cache, leading to crash
when toggling use antialising user preference. Also fix some other use of
uninitialized memory found by valgrind.
2011-09-19 14:09:13 +00:00
Sergey Sharybin
1c0bdad835 svn merge -r40222:40344 ^/trunk/blender 2011-09-19 10:48:15 +00:00
Campbell Barton
b17a62d1b3 replace strnlen with BLI_strnlen & some style changes. 2011-09-18 11:25:50 +00:00
Campbell Barton
53845a37d9 blf - further shrink drawing functions & some style changes. 2011-09-18 10:34:13 +00:00
Campbell Barton
249b41762a blf code - no functional changes.
- remove saniy checks from blf_font.c, the callers now check instead.
- move duplicate code into defines (may move into static functions).
- move kerning checks into const values set at the start of the function, rather then checking on every character.
2011-09-18 09:48:09 +00:00
Sergey Sharybin
66a679d71f i18n: replace gnu unifont with droid sans font
- Static variables can be initialized with constants only.
- Removed bunifont.ttf.c from datafiles -- it's not actually a
  data file. Unicode font loading stuff is not in blenkernel/font.c
- Allocate as much memory for unzipped data as it's needed.
  Default read chunk is 512Kb.
- Fixed regression (or just a typo) in setting utf locale.
- Default locale set to en_US:en works fine now.
- Commented put Nepali language in user preferences -- it's
  not supported by current droid font and imo it's better to
  have nice font for languages we actually have translation for
  rather than allowing to choose more languages in user preferences.
2011-09-17 20:50:22 +00:00
Campbell Barton
100313db6e Speedup for font drawing, every letter was character was calling:
glGetIntegerv(GL_TEXTURE_2D_BINDING_EXT, &cur_tex);

... with shadow enabled glGetFloatv(GL_CURRENT_COLOR, color) was called twice per character as well.


Now only call glGetFloatv(GL_CURRENT_COLOR, ...) once per string and only when drawing with shadow or blur, texture bind is stored in the font.

Gives 8% overall FPS speedup when displaying heavy UI in my test.
2011-09-17 10:45:20 +00:00
Xiao Xiangquan
e07b807357 fix NULL check for getenv("LANGUAGE") 2011-09-16 08:32:46 +00:00
Xiao Xiangquan
4212d2ecb5 Add Nepali translation 2011-09-15 16:51:55 +00:00
Sergey Sharybin
0eda51f2ea Fixing issues with i18n stuff:
- Make gettext stuff draw-time. so switching between languages
  can happens without restart now.
- Added option to translate visible interface (menus, buttons, labels)
  and tooltips. Now it's possible to have english UI and localized tooltips.
- Clean-up sources, do not use gettext stuff for things which can be
  collected with RNA.
- Fix issues with windows 64bit and ru_RU locale on my desktop
  (it was codepage issue).
- Added operator "Get Messages" which generates new text block with
  with all strings collected from RNA.
- Changed script for updating blender.pot so now it appends
  messages collected from rna to automatically gathered messages.
  To update .pot you have to re-generate messages.txt using "Get Messages"
  operator and then run update_pot script.
- Clean up old translation stuff which wasn't used and most probably
  wouldn't be used.
- Return back "International Fonts" option, so if it's disabled, no
  gettext lookups happens on draw.
- Merged read_homefile function back. No need in splitting it.

TODO:
- Custom fonts and font size.
  Current font isn't nice at least for russian locale, it's
  difficult to read it.
- Put references to messages.txt so gettext can merge translation when
  name/description of some property changes.
2011-09-15 13:20:18 +00:00
Sergey Sharybin
30293dc2ca svn merge -r39834:40222 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-15 13:02:37 +00:00
Campbell Barton
afbb207a99 minor edits to ascii draw function, unused var warning. 2011-09-14 02:45:44 +00:00
Campbell Barton
156e96762b fix for changing font sizes with recent utf8 speedup 2011-09-12 09:12:34 +00:00
Campbell Barton
c400046702 speedup font drawing:
for ascii characters in a utf8 string use glyph_ascii_table lookup rather than call blf_glyph_search(), otherwise fallback to blf_utf8_next() and blf_glyph_search().
2011-09-11 08:12:16 +00:00
Xiao Xiangquan
8ff7f6104e fix the setenv bug on windows 2011-09-06 05:18:02 +00:00
Xiao Xiangquan
981f7fcd0d merge with trunk r39834 2011-09-01 15:08:32 +00:00
Xiao Xiangquan
5b91a783cf fix for windows locale setting 2011-08-31 07:31:02 +00:00
Campbell Barton
79249f8aed fix [#28430] Image with Stampinfo does not get saved correctly with alpha 2011-08-31 01:05:40 +00:00
Campbell Barton
b20c9b0ba3 minor edits, pep8 - also correct float -> double promotion for blf. 2011-08-30 10:49:58 +00:00
Xiao Xiangquan
18d95a8462 fix a small bug , and update language-packs 2011-08-16 16:58:35 +00:00
Xiao Xiangquan
3a8c7be9e4 code clear, insert blf_gettext.c to blf.c 2011-08-12 13:43:21 +00:00
Xiao Xiangquan
8454f2b8b3 complete the language-select feature 2011-07-25 17:05:43 +00:00
Xiao Xiangquan
96bbf550b0 small fix for the ui language selection 2011-07-22 16:34:23 +00:00
Xiao Xiangquan
08645d9293 switch language in User Preference's System page. with some known switch failure bugs 2011-07-22 14:14:28 +00:00
Xiao Xiangquan
77926a7f9d select uiStyle according to UserDef and update lang-packs 2011-07-16 18:28:24 +00:00
Xiao Xiangquan
b429af10d0 merge from trunk #37722 2011-06-24 03:30:50 +00:00
Xiao Xiangquan
9a2f36b50f handle SpaceType and UserPref popups 2011-06-20 10:07:46 +00:00
Xiao Xiangquan
a40e1302ae Almost complete the i18n system, including:
Copy unifont..ttf.gz from source tree to target datafile path( now ONLY works with cmake );
Set the locale the same with system's setting;
If need unicode font, unzip and load unifont when init ui styles;
Apply gettext() to labels in space_info.py, who are the main menu items.

Each of these should have been commit one by one. As they work well according to my tests, so I just lazily send a long list.
2011-06-02 11:22:22 +00:00
Xiao Xiangquan
0fc21dde4e Add BLF_gettext(msgid) for C, and blf.gettext(msgid) for Python. 2011-05-30 11:03:16 +00:00
Campbell Barton
eabb444106 minor cleanup: make functions static, use NULL for pointer comparisons,
also fixed a possible bug assigning incorrect DPX function types to
imbuf.
2011-05-10 13:11:36 +00:00
Campbell Barton
015a32d01c new BLF functions
- BLF_height_max
- BLF_width_max
- BLF_descender
- BLF_ascender

use for tooltip and image stamp.
2011-05-04 15:09:48 +00:00
Campbell Barton
03c362f1ab fix [#27221] stamp text bug in lower lines 2011-04-30 08:54:06 +00:00
Campbell Barton
a7507e945d fix [#26803] Libs paths are case sensitive in windows
use case insensitive path comparison on windows: BLI_path_cmp
2011-04-06 06:03:48 +00:00
Campbell Barton
1c3679a5b0 fix [#26442] blender crash when turning off antialiasing fonts
ASCII lookup table wasn't being freed when when the rest of the glyphs were.

Also found own bug where mesh stat text was using wrong sized array (char[3] as char[4]).
2011-03-10 13:49:46 +00:00
Nathan Letwory
b9e70c743b doxygen: blender/blenfont tagged. 2011-02-27 20:42:42 +00:00
Nathan Letwory
5b607701a7 doxygen: prevent GPL license block from being parsed as doxygen comment. 2011-02-23 10:52:22 +00:00
Ton Roosendaal
8089f857ad Too many ifdefs made me miss the fact variables were declared inside
function...
2011-02-22 12:17:45 +00:00
Ton Roosendaal
1ad603c39e No idea why this goes wrong, but I can't get preprocessor output with
cmake here.

Somehow in OSX a function call doesn't return but enters a next function.
Will find around if someone else can make an OSX preprocessed version
of this C file. With this commit things go fine, and it's a sane check
anyway.
2011-02-22 12:01:57 +00:00
Diego Borghetti
65ce537c6c Rename global_ft_lib and make it static.
Remove the XXX code from blf_glyph.c and use the pointer
inside the FontBLF struct.

If still have problem, let me know.
2011-02-19 13:43:22 +00:00
Ton Roosendaal
ac35ee4bd5 Bugfix #26135
User Preferences
Using "no AA font" crashed, caused by commit to make static variables.
However, how this was ever meant to work... using such globals has to be
treated carefully. Fixed for now with XXX warning for Diego :)

Thanks to reporter Susanne H. to point at the right code!
2011-02-18 16:13:13 +00:00
Campbell Barton
1b25f48542 clear some unused warnings 2011-02-17 12:05:09 +00:00
Campbell Barton
7748860aeb doc generation support for excluding some modules, without this a full rebuild takes too long to test changes.
also include own function definitions for blf_dir.c.
2011-02-16 05:18:10 +00:00
Campbell Barton
ba0d167d2a more vars made static 2011-02-14 18:20:10 +00:00
Campbell Barton
b4eb7fd4c0 fix for error building. 2011-02-13 12:50:40 +00:00
Campbell Barton
0955c664aa fix for warnings from Sparse static source code checker, mostly BKE/BLI and python functions.
- use NULL rather then 0 where possible (makes code & function calls more readable IMHO).
- set static variables and functions (exposed some unused vars/funcs).
- use func(void) rather then func() for definitions.
2011-02-13 10:52:18 +00:00
Campbell Barton
867fc4b463 enforce string limits (reported by pedantic checking tools & some developers).
mostly replace strcpy with BLI_strncpy and multiple strcat's with a BLI_snprintf().
also fix possible crash if CWD isnt available.
2011-02-13 03:21:27 +00:00
Campbell Barton
89c617a116 remove nan-makefiles 2011-01-30 15:29:22 +00:00
Campbell Barton
63018144ba remove redundant assignments & unused vars.
also minor functional changes
- OBJECT_OT_make_links_data() type property is now assigned to the operator property (so popup menu can find it)
- removing BG image now returns cancelled if no image is removed.
2011-01-12 03:41:12 +00:00