[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11823] branches/soc-2007-hcube: Merge 11621:11822.
Csaba Hruska
csaba.hruska at gmail.com
Sat Aug 25 15:36:05 CEST 2007
Revision: 11823
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11823
Author: hcube
Date: 2007-08-25 15:36:05 +0200 (Sat, 25 Aug 2007)
Log Message:
-----------
Merge 11621:11822.
Modified Paths:
--------------
branches/soc-2007-hcube/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/soc-2007-hcube/config/darwin-config.py
branches/soc-2007-hcube/intern/bmfont/BMF_Api.h
branches/soc-2007-hcube/intern/bmfont/intern/BMF_Api.cpp
branches/soc-2007-hcube/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/soc-2007-hcube/intern/bmfont/intern/BMF_BitmapFont.h
branches/soc-2007-hcube/po/it.po
branches/soc-2007-hcube/projectfiles_vc7/blender/ftfont/FTF_ftfont.vcproj
branches/soc-2007-hcube/release/datafiles/blenderbuttons
branches/soc-2007-hcube/release/scripts/bpymodules/BPyObject.py
branches/soc-2007-hcube/release/scripts/console.py
branches/soc-2007-hcube/release/scripts/export_fbx.py
branches/soc-2007-hcube/release/scripts/export_obj.py
branches/soc-2007-hcube/release/scripts/mesh_unfolder.py
branches/soc-2007-hcube/release/scripts/scripttemplate_pyconstraint.py
branches/soc-2007-hcube/source/blender/blenkernel/BKE_bad_level_calls.h
branches/soc-2007-hcube/source/blender/blenkernel/BKE_deform.h
branches/soc-2007-hcube/source/blender/blenkernel/BKE_key.h
branches/soc-2007-hcube/source/blender/blenkernel/BKE_node.h
branches/soc-2007-hcube/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2007-hcube/source/blender/blenkernel/intern/constraint.c
branches/soc-2007-hcube/source/blender/blenkernel/intern/curve.c
branches/soc-2007-hcube/source/blender/blenkernel/intern/deform.c
branches/soc-2007-hcube/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2007-hcube/source/blender/blenkernel/intern/exotic.c
branches/soc-2007-hcube/source/blender/blenkernel/intern/key.c
branches/soc-2007-hcube/source/blender/blenkernel/intern/node.c
branches/soc-2007-hcube/source/blender/blenloader/intern/writefile.c
branches/soc-2007-hcube/source/blender/ftfont/FTF_Api.h
branches/soc-2007-hcube/source/blender/ftfont/intern/FTF_TTFont.h
branches/soc-2007-hcube/source/blender/include/BIF_editaction.h
branches/soc-2007-hcube/source/blender/include/BIF_language.h
branches/soc-2007-hcube/source/blender/include/BSE_editipo.h
branches/soc-2007-hcube/source/blender/include/blendef.h
branches/soc-2007-hcube/source/blender/include/butspace.h
branches/soc-2007-hcube/source/blender/makesdna/DNA_curve_types.h
branches/soc-2007-hcube/source/blender/nodes/SHD_node.h
branches/soc-2007-hcube/source/blender/python/BPY_extern.h
branches/soc-2007-hcube/source/blender/python/BPY_interface.c
branches/soc-2007-hcube/source/blender/python/api2_2x/Draw.c
branches/soc-2007-hcube/source/blender/python/api2_2x/Material.c
branches/soc-2007-hcube/source/blender/python/api2_2x/Mesh.c
branches/soc-2007-hcube/source/blender/python/api2_2x/Types.c
branches/soc-2007-hcube/source/blender/python/api2_2x/doc/Mesh.py
branches/soc-2007-hcube/source/blender/python/api2_2x/gen_utils.c
branches/soc-2007-hcube/source/blender/python/api2_2x/gen_utils.h
branches/soc-2007-hcube/source/blender/python/api2_2x/rgbTuple.c
branches/soc-2007-hcube/source/blender/src/blenderbuttons.c
branches/soc-2007-hcube/source/blender/src/buttons_editing.c
branches/soc-2007-hcube/source/blender/src/buttons_object.c
branches/soc-2007-hcube/source/blender/src/buttons_shading.c
branches/soc-2007-hcube/source/blender/src/drawaction.c
branches/soc-2007-hcube/source/blender/src/drawipo.c
branches/soc-2007-hcube/source/blender/src/drawnode.c
branches/soc-2007-hcube/source/blender/src/drawtime.c
branches/soc-2007-hcube/source/blender/src/editaction.c
branches/soc-2007-hcube/source/blender/src/editipo.c
branches/soc-2007-hcube/source/blender/src/editipo_lib.c
branches/soc-2007-hcube/source/blender/src/editipo_mods.c
branches/soc-2007-hcube/source/blender/src/header_action.c
branches/soc-2007-hcube/source/blender/src/header_ipo.c
branches/soc-2007-hcube/source/blender/src/interface.c
branches/soc-2007-hcube/source/blender/src/language.c
branches/soc-2007-hcube/source/blender/src/sculptmode.c
branches/soc-2007-hcube/source/blender/src/space.c
branches/soc-2007-hcube/source/blender/src/vpaint.c
branches/soc-2007-hcube/source/creator/creator.c
Added Paths:
-----------
branches/soc-2007-hcube/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
Modified: branches/soc-2007-hcube/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/soc-2007-hcube/config/darwin-config.py
===================================================================
--- branches/soc-2007-hcube/config/darwin-config.py 2007-08-25 11:15:57 UTC (rev 11822)
+++ branches/soc-2007-hcube/config/darwin-config.py 2007-08-25 13:36:05 UTC (rev 11823)
@@ -48,8 +48,8 @@
BF_FMOD = LIBDIR + '/fmod'
WITH_BF_OPENEXR = 'true'
-BF_OPENEXR = '/usr/local'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR'
+BF_OPENEXR = '${LCGDIR}/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
WITH_BF_DDS = 'true'
Modified: branches/soc-2007-hcube/intern/bmfont/BMF_Api.h
===================================================================
--- branches/soc-2007-hcube/intern/bmfont/BMF_Api.h 2007-08-25 11:15:57 UTC (rev 11822)
+++ branches/soc-2007-hcube/intern/bmfont/BMF_Api.h 2007-08-25 13:36:05 UTC (rev 11823)
@@ -89,13 +89,25 @@
int BMF_GetStringWidth(BMF_Font* font, char* str);
/**
+ * Returns the bounding box of a string of characters.
+ * @param font The font to use.
+ * @param str The string.
+ * @param llx Lower left x coord
+ * @param lly Lower left y coord
+ * @param urx Upper right x coord
+ * @param ury Upper right y coord
+ */
+void BMF_GetStringBoundingBox(BMF_Font* font, char* str, float*llx, float *lly, float *urx, float *ury);
+
+
+/**
* Returns the bounding box of the font. The width and
* height represent the bounding box of the union of
* all glyps. The minimum and maximum values of the
* box represent the extent of the font and its positioning
* about the origin.
*/
-void BMF_GetBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r);
+void BMF_GetFontBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r);
/**
* Convert the given @a font to a texture, and return the GL texture
Modified: branches/soc-2007-hcube/intern/bmfont/intern/BMF_Api.cpp
===================================================================
--- branches/soc-2007-hcube/intern/bmfont/intern/BMF_Api.cpp 2007-08-25 11:15:57 UTC (rev 11822)
+++ branches/soc-2007-hcube/intern/bmfont/intern/BMF_Api.cpp 2007-08-25 13:36:05 UTC (rev 11823)
@@ -150,11 +150,18 @@
return ((BMF_BitmapFont*)font)->GetStringWidth(str);
}
+void BMF_GetStringBoundingBox(BMF_Font* font, char* str, float*llx, float *lly, float *urx, float *ury){
+ if (!font){
+ *llx = *lly = *urx = *ury = 0;
+ }else{
+ ((BMF_BitmapFont*)font)->GetStringBoundingBox(str, llx, lly, urx, ury);
+ }
+}
-void BMF_GetBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r)
+void BMF_GetFontBoundingBox(BMF_Font* font, int *xmin_r, int *ymin_r, int *xmax_r, int *ymax_r)
{
if (!font) return;
- ((BMF_BitmapFont*)font)->GetBoundingBox(*xmin_r, *ymin_r, *xmax_r, *ymax_r);
+ ((BMF_BitmapFont*)font)->GetFontBoundingBox(*xmin_r, *ymin_r, *xmax_r, *ymax_r);
}
int BMF_GetFontTexture(BMF_Font* font) {
Modified: branches/soc-2007-hcube/intern/bmfont/intern/BMF_BitmapFont.cpp
===================================================================
--- branches/soc-2007-hcube/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-08-25 11:15:57 UTC (rev 11822)
+++ branches/soc-2007-hcube/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-08-25 13:36:05 UTC (rev 11823)
@@ -107,7 +107,7 @@
return length;
}
-void BMF_BitmapFont::GetBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax)
+void BMF_BitmapFont::GetFontBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax)
{
xMin = m_fontData->xmin;
yMin = m_fontData->ymin;
@@ -115,6 +115,27 @@
yMax = m_fontData->ymax;
}
+void BMF_BitmapFont::GetStringBoundingBox(char* str, float*llx, float *lly, float *urx, float *ury)
+{
+ unsigned char c;
+ int length = 0;
+ int ascent = 0;
+ int descent = 0;
+
+ while ( (c = (unsigned char) *str++) ) {
+ length += m_fontData->chars[c].advance;
+ int d = m_fontData->chars[c].yorig;
+ int a = m_fontData->chars[c].height - m_fontData->chars[c].yorig;
+ if(a > ascent) ascent = a;
+ if(d > descent) descent = d;
+ }
+ *llx = (float)0;
+ *lly = (float)-descent;
+ *urx = (float)length;
+ *ury = (float)ascent;
+}
+
+
int BMF_BitmapFont::GetTexture()
{
int fWidth = m_fontData->xmax - m_fontData->xmin;
Modified: branches/soc-2007-hcube/intern/bmfont/intern/BMF_BitmapFont.h
===================================================================
--- branches/soc-2007-hcube/intern/bmfont/intern/BMF_BitmapFont.h 2007-08-25 11:15:57 UTC (rev 11822)
+++ branches/soc-2007-hcube/intern/bmfont/intern/BMF_BitmapFont.h 2007-08-25 13:36:05 UTC (rev 11823)
@@ -76,8 +76,20 @@
* box represent the extent of the font and its positioning
* about the origin.
*/
- void GetBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax);
+ void GetFontBoundingBox(int & xMin, int & yMin, int & xMax, int & yMax);
+
+ /**
+ * Returns the bounding box of a string of characters.
+ * @param font The font to use.
+ * @param str The string.
+ * @param llx Lower left x coord
+ * @param lly Lower left y coord
+ * @param urx Upper right x coord
+ * @param ury Upper right y coord
+ */
+ void GetStringBoundingBox(char* str, float*llx, float *lly, float *urx, float *ury);
+
/**
* Convert the font to a texture, and return the GL texture
* ID of the texture. If the texture ID is bound, text can
Modified: branches/soc-2007-hcube/po/it.po
===================================================================
--- branches/soc-2007-hcube/po/it.po 2007-08-25 11:15:57 UTC (rev 11822)
+++ branches/soc-2007-hcube/po/it.po 2007-08-25 13:36:05 UTC (rev 11823)
@@ -1,22 +1,18 @@
-# translation of it-244.po to Italian
-# translation of it.po to Italian
# Italian translation for blender
#
-msgid ""
-msgstr ""
-"Project-Id-Version: it-244\n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-07-07 01:40+0100\n"
-"Last-Translator: Skynet_italy <fiott at tin.it>\n"
-"Language-Team: <it at li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Italian\n"
-"X-Poedit-Country: ITALY\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: KBabel 1.11.4\n"
-"X-Poedit-Bookmarks: 221,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
+#"Project-Id-Version: it-245\n"
+#"POT-Creation-Date: \n"
+#"PO-Revision-Date: 2007-08-23 00:10+0100\n"
+#"Last-Translator: Skynet_italy <fiott at tin.it>\n"
+#"Language-Team: <it at li.org>\n"
+#"MIME-Version: 1.0\n"
+#"Content-Type: text/plain; charset=UTF-8\n"
+#"Content-Transfer-Encoding: 8bit\n"
+#"X-Poedit-Language: Italian\n"
+#"X-Poedit-Country: ITALY\n"
+#"X-Poedit-SourceCharset: utf-8\n"
+#"X-Generator: KBabel 1.11.4\n"
+#"X-Poedit-Bookmarks: 221,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
msgid " - sys evt"
msgstr " - sys evt"
@@ -409,22 +405,22 @@
msgstr "Specifica quanto stretta deve essere l'onda"
msgid "Vert.Groups"
-msgstr "Gruppi Vert."
+msgstr "Gruppo Vert."
msgid "Enable VertexGroups defining deform"
-msgstr "Abilita i Gruppi di vertici per definire la deformazione"
+msgstr "Abilita VGroup per la deformazione"
msgid "Envelopes"
msgstr "Inviluppi"
msgid "Enable Bone Envelopes defining deform"
-msgstr "Abilita Inviluppo Ossa che definiscono la deformazione"
+msgstr "Abilita Inviluppo Ossa per la deformazione"
msgid "Falloff: "
msgstr "Decadimento: "
msgid "If not zero, the distance from hook where influence ends"
-msgstr "Se diverso da zero, la distanza dal gancio dove l'influenza finisce"
+msgstr "Se diverso da zero , é la distanza dal gancio a dove finisce l'influenza"
msgid "Force: "
msgstr "Forza:"
@@ -442,7 +438,7 @@
msgstr "Ricentra"
msgid "Sets hook center to cursor position"
-msgstr "Imposta il centro del gancio alla posizione del cursore"
+msgstr "Imposta il centro del gancio dalla posizione del cursore"
msgid "Select"
msgstr "Seleziona"
@@ -694,7 +690,7 @@
msgstr "Inclina:"
msgid "Italic angle of the characters"
-msgstr "inclinazione caratteri in corsivo"
+msgstr "Inclinazione caratteri in corsivo"
msgid "Y offset:"
msgstr "Offset Y:"
@@ -709,13 +705,13 @@
msgstr "Spessore sottolineatura"
msgid "Textbox to show settings for"
-msgstr "Box di testo da visualizzare i settagi per"
+msgstr "Box di testo da visualizzare i settaggi per"
msgid "Insert"
msgstr "Inserisci"
msgid "Insert a new text frame after the current one"
-msgstr "Inserisce una nuova cornice dopo la corrente"
+msgstr "Inserisce una nuova cornice di testo dopo la corrente"
msgid "Delete current text frame and shift the others up"
msgstr "Cancella la cornice di testo corrente e sposta in alto le altre"
@@ -814,7 +810,7 @@
msgstr "Risol U:"
msgid "The amount of new points interpolated per control vertex pair"
-msgstr "Quantità di nuovi punti interpolati per coppia di vertici di controllo"
+msgstr "Quantità di nuovi punti interpolati per la coppia di vertici di controllo"
msgid "Curve Tools1"
msgstr "Strumenti Curve 1"
@@ -829,7 +825,7 @@
msgstr "Rivoluzione"
msgid "Spin selected 360 degrees"
-msgstr "Rivoluzione selezionati di 360 gradi"
+msgstr "Rivoluzione selezionata di 360 gradi"
msgid "Hide"
msgstr "Nascondi"
@@ -877,7 +873,7 @@
msgstr "PathLen:"
msgid "If no speed Ipo was set, the amount of frames of the path"
-msgstr "Se non impostata la Ipo di velocità, il numero di fotogrammi del percorso"
+msgstr "Se la velocità di Ipo non é impostata, é il numero di fotogrammi del percorso"
msgid "CurvePath"
msgstr "CurvaPerc"
@@ -889,13 +885,13 @@
msgstr "SeguiCurva"
msgid "Makes curve path children to rotate along path"
-msgstr "Genera la Curva percorso figlio per ruotare lungo il percorso"
+msgstr "Genera la Curva percorso figli per la rotazione lungo il percorso"
msgid "CurveStretch"
msgstr "StiraCurva"
msgid "Option for curve-deform: makes deformed child to stretch along entire path"
-msgstr "Opzione per deformazione con curva: deforma il figlio per allungarlo lungo l'intero percorso"
+msgstr "Opzione per deformazione con curva: deforma il figlio allungandolo lungo l'intero percorso"
msgid "PathDist Offs"
msgstr "PercDist Scost"
@@ -934,7 +930,7 @@
msgstr "SmRisol:"
msgid "Bevel resolution when depth is non-zero and not using a bevel object"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list