Page MenuHome
Files F1309

more_aa_fonts_20060227.txt
Public
Actions

more_aa_fonts_20060227.txt
View Options

Index: source/blender/src/drawimasel.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawimasel.c,v
retrieving revision 1.20
diff -u -u -r1.20 drawimasel.c
--- source/blender/src/drawimasel.c 28 Jan 2006 18:33:17 -0000 1.20
+++ source/blender/src/drawimasel.c 28 Feb 2006 02:07:17 -0000
@@ -61,6 +61,7 @@
#include "BIF_interface.h"
#include "BIF_interface_icons.h"
#include "BIF_imasel.h"
+#include "BIF_language.h"
#include "BIF_mywindow.h"
#include "BIF_space.h"
#include "BIF_resources.h"
@@ -495,7 +496,8 @@
}
glRasterPos2i(sx, sy);
- BMF_DrawString(G.font, naam);
+ BIF_RasterPos(sx, sy);
+ BIF_DrawString(G.font, naam, 0);
direntry = direntry->next;
sy-=IMALINESIZE;
@@ -601,7 +603,8 @@
naam[11] = 0;
glRasterPos2i(sx+32-BMF_GetStringWidth(G.fonts, naam) / 2 , sy-16);
- BMF_DrawString(G.fonts, naam);
+ BIF_RasterPos(sx+32-BMF_GetStringWidth(G.fonts, naam) / 2 , sy-16);
+ BIF_DrawString(G.fonts, naam, 0);
if ((ima) && (ima->pict) && (ima->pict->rect)){
if ( (ey > simasel->fesy) && (sy < simasel->feey)){
@@ -662,7 +665,8 @@
cpack(0xAAAAAA);
glRasterPos2i(simasel->infsx+4, simasel->infsy+6);
- BMF_DrawString(G.font, infostr);
+ BIF_RasterPos(simasel->infsx+4, simasel->infsy+6);
+ BIF_DrawString(G.font, infostr, 0);
areaview(); /* reset viewgate */
Index: source/blender/src/drawipo.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawipo.c,v
retrieving revision 1.74
diff -u -u -r1.74 drawipo.c
--- source/blender/src/drawipo.c 30 Jan 2006 23:25:42 -0000 1.74
+++ source/blender/src/drawipo.c 28 Feb 2006 02:07:19 -0000
@@ -72,6 +72,7 @@
#include "BIF_resources.h"
#include "BIF_screen.h"
#include "BIF_interface.h"
+#include "BIF_language.h"
#include "BIF_mywindow.h"
#include "BIF_space.h"
#include "BIF_toolbox.h"
@@ -128,8 +129,8 @@
str[len+1]= 0;
}
- glRasterPos2f(x, y);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.fonts, str, 0);
}
static void step_to_grid(float *step, int *macht)
Index: source/blender/src/drawtime.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawtime.c,v
retrieving revision 1.13
diff -u -u -r1.13 drawtime.c
--- source/blender/src/drawtime.c 28 Jan 2006 18:33:18 -0000 1.13
+++ source/blender/src/drawtime.c 28 Feb 2006 02:07:19 -0000
@@ -54,6 +54,7 @@
#include "BIF_gl.h"
#include "BIF_interface_icons.h"
+#include "BIF_language.h"
#include "BIF_mywindow.h"
#include "BIF_screen.h"
#include "BIF_resources.h"
@@ -112,8 +113,8 @@
glColor4ub(0, 0, 0, 0);
BIF_ThemeColor(TH_TEXT);
- glRasterPos2f(x, y);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.fonts, str, 0);
}
Index: source/blender/src/drawview.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawview.c,v
retrieving revision 1.190
diff -u -u -r1.190 drawview.c
--- source/blender/src/drawview.c 23 Feb 2006 14:45:59 -0000 1.190
+++ source/blender/src/drawview.c 28 Feb 2006 02:07:20 -0000
@@ -102,6 +102,7 @@
#include "BIF_glutil.h"
#include "BIF_interface.h"
#include "BIF_interface_icons.h"
+#include "BIF_language.h"
#include "BIF_mywindow.h"
#include "BIF_poseobject.h"
#include "BIF_previewrender.h"
@@ -943,9 +944,9 @@
/* camera name */
if (ca && (ca->flag & CAM_SHOWNAME)) {
- glRasterPos2f(x1, y1-15);
+ BIF_RasterPos(x1, y1-15);
- BMF_DrawString(G.font, G.vd->camera->id.name+2);
+ BIF_DrawString(G.font, G.vd->camera->id.name+2, 0);
}
@@ -1236,8 +1237,8 @@
else sprintf(info, "(%d) %s", CFRA, ob->id.name+2);
BIF_ThemeColor(TH_TEXT_HI);
- glRasterPos2i(30, 10);
- BMF_DrawString(G.fonts, info);
+ BIF_RasterPos(30, 10);
+ BIF_DrawString(G.fonts, info, 0);
}
Index: source/blender/src/edit.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/edit.c,v
retrieving revision 1.85
diff -u -u -r1.85 edit.c
--- source/blender/src/edit.c 22 Feb 2006 02:17:56 -0000 1.85
+++ source/blender/src/edit.c 28 Feb 2006 02:07:21 -0000
@@ -88,6 +88,7 @@
#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "BIF_interface.h"
+#include "BIF_language.h"
#include "BIF_mywindow.h"
#include "BIF_resources.h"
#include "BIF_space.h"
@@ -241,10 +242,12 @@
sprintf(str, "X %.4f Y %.4f Z %.4f Dia %.4f", dvec[0], dvec[1], dvec[2], sqrt(dvec[0]*dvec[0]+dvec[1]*dvec[1]+dvec[2]*dvec[2]));
glColor3f(0.0, 0.0, 0.0);
glRasterPos2i(15, 27);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(15, 27);
+ BIF_DrawString(G.fonts, str, 0);
glColor3f(0.7, 0.7, 0.7);
glRasterPos2i(16, 28);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(16, 28);
+ BIF_DrawString(G.fonts, str, 0);
}
else if(G.vd->persp==2) {
rcti vb;
@@ -260,10 +263,12 @@
sprintf(str, "X %.1f Y %.1f Dia %.1f", fabs(fac1), fabs(fac2), sqrt(fac1*fac1 + fac2*fac2) );
glColor3f(0.0, 0.0, 0.0);
glRasterPos2i(15, 27);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(15, 27);
+ BIF_DrawString(G.fonts, str, 0);
glColor3f(0.7, 0.7, 0.7);
glRasterPos2i(16, 28);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(16, 28);
+ BIF_DrawString(G.fonts, str, 0);
}
}
else if(curarea->spacetype==SPACE_IPO) {
@@ -279,11 +284,13 @@
sprintf(str, "Time: %.4f Y %.4f", dvec[0]-dvec[2], dvec[1]-dvec[3]);
glRasterPos2i(30, 30);
+ BIF_RasterPos(30, 30);
glColor3f(0.0, 0.0, 0.0);
- BMF_DrawString(G.fonts, str);
+ BIF_DrawString(G.fonts, str, 0);
glRasterPos2i(31, 31);
+ BIF_RasterPos(31, 31);
glColor3f(0.9, 0.9, 0.9);
- BMF_DrawString(G.fonts, str);
+ BIF_DrawString(G.fonts, str, 0);
}
glFlush();
Index: source/blender/src/editscreen.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editscreen.c,v
retrieving revision 1.123
diff -u -u -r1.123 editscreen.c
--- source/blender/src/editscreen.c 13 Feb 2006 19:27:16 -0000 1.123
+++ source/blender/src/editscreen.c 28 Feb 2006 02:07:23 -0000
@@ -81,6 +81,7 @@
#include "BIF_graphics.h"
#include "BIF_interface.h"
#include "BIF_interface_icons.h"
+#include "BIF_language.h"
#include "BIF_mainqueue.h"
#include "BIF_mywindow.h"
#include "BIF_renderwin.h"
@@ -241,7 +242,8 @@
BIF_ThemeColor(TH_MENU_TEXT); /* better than cpack(0x0) color no? (desoto) */
glRasterPos2i(20+curarea->headbutofs, 6);
- BMF_DrawString(G.font, str);
+ BIF_RasterPos(20+curarea->headbutofs, 6);
+ BIF_DrawString(G.font, str, 0);
curarea->head_swap= WIN_BACK_OK;
areawinset(curarea->win);
@@ -703,7 +705,8 @@
glColor3ub(0, 0, 0);
glRasterPos2i((prefsizx-width)/2, (prefsizy-bbuf->y)/2 + 6);
- BMF_DrawString(font, string);
+ BIF_RasterPos((prefsizx-width)/2, (prefsizy-bbuf->y)/2 + 6);
+ BIF_DrawString(font, string, 0);
}
glFlush();
@@ -3643,7 +3646,8 @@
cpack(0x0);
glRasterPos2i(x, y);
- BMF_DrawString(G.fonts, text);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.fonts, text, 0);
glFlush();
glDrawBuffer(GL_BACK);
Index: source/blender/src/filesel.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/filesel.c,v
retrieving revision 1.71
diff -u -u -r1.71 filesel.c
--- source/blender/src/filesel.c 5 Feb 2006 19:30:37 -0000 1.71
+++ source/blender/src/filesel.c 28 Feb 2006 02:07:24 -0000
@@ -86,6 +86,7 @@
#include "BIF_gl.h"
#include "BIF_interface.h"
+#include "BIF_language.h"
#include "BIF_toolbox.h"
#include "BIF_mywindow.h"
#include "BIF_editview.h"
@@ -914,46 +915,46 @@
s = files->string;
if(s) {
- glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->relname);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->relname, 0);
x += sfile->maxnamelen + 100;
- glRasterPos2i(x - BMF_GetStringWidth(G.font, files->size), y);
- BMF_DrawString(G.font, files->size);
+ BIF_RasterPos(x - BMF_GetStringWidth(G.font, files->size), y);
+ BIF_DrawString(G.font, files->size, 0);
if(sfile->flag & FILE_SHOWSHORT) return;
#ifndef WIN32
/* rwx rwx rwx */
- x += 20; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->mode1);
+ x += 20; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->mode1, 0);
- x += 30; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->mode2);
+ x += 30; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->mode2, 0);
- x += 30; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->mode3);
+ x += 30; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->mode3, 0);
/* owner time date */
- x += 30; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->owner);
+ x += 30; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->owner, 0);
#endif
- x += 60; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->time);
+ x += 60; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->time, 0);
- x += 50; glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->date);
+ x += 50; BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->date, 0);
}
else {
- glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->relname);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->relname, 0);
if(files->nr) { /* extra info */
x+= sfile->maxnamelen+20;
- glRasterPos2i(x, y);
- BMF_DrawString(G.font, files->extra);
+ BIF_RasterPos(x, y);
+ BIF_DrawString(G.font, files->extra, 0);
}
}
}
Index: source/blender/src/header_imasel.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_imasel.c,v
retrieving revision 1.10
diff -u -u -r1.10 header_imasel.c
--- source/blender/src/header_imasel.c 15 Jan 2006 13:30:56 -0000 1.10
+++ source/blender/src/header_imasel.c 28 Feb 2006 02:07:24 -0000
@@ -121,7 +121,8 @@
if (simasel->title){
xco+=25;
glRasterPos2i(xco, 4);
- BMF_DrawString(G.font, simasel->title);
+ BIF_RasterPos(xco, 4);
+ BIF_DrawString(G.font, simasel->title, 0);
xco+=BMF_GetStringWidth(G.fonts, simasel->title);
xco+=25;
}
Index: source/blender/src/header_oops.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_oops.c,v
retrieving revision 1.25
diff -u -u -r1.25 header_oops.c
--- source/blender/src/header_oops.c 28 Jan 2006 18:33:18 -0000 1.25
+++ source/blender/src/header_oops.c 28 Feb 2006 02:07:24 -0000
@@ -48,6 +48,7 @@
#include "BIF_gl.h"
#include "BIF_interface.h"
+#include "BIF_language.h"
#include "BIF_resources.h"
#include "BIF_screen.h"
#include "BIF_editoops.h"
@@ -445,7 +446,8 @@
cpack(0x0);
glRasterPos2i(xco+=XIC+10, 5);
- BMF_DrawString(uiBlockGetCurFont(block), naam);
+ BIF_RasterPos(xco+=XIC+10, 5);
+ BIF_DrawString(uiBlockGetCurFont(block), naam, 0);
}
}
Index: source/blender/src/header_sound.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_sound.c,v
retrieving revision 1.20
diff -u -u -r1.20 header_sound.c
--- source/blender/src/header_sound.c 28 Jan 2006 18:33:18 -0000 1.20
+++ source/blender/src/header_sound.c 28 Feb 2006 02:07:24 -0000
@@ -57,6 +57,7 @@
#include "BIF_editsound.h"
#include "BIF_gl.h"
#include "BIF_interface.h"
+#include "BIF_language.h"
#include "BIF_previewrender.h"
#include "BIF_resources.h"
#include "BIF_screen.h"
@@ -298,14 +299,16 @@
sprintf(naam, "Sample: %s, %d bit, %d Hz, %d samples", ch, sound->sample->bits, sound->sample->rate, sound->sample->len);
cpack(0x0);
glRasterPos2i(xco+10, 5);
- BMF_DrawString(uiBlockGetCurFont(block), naam);
+ BIF_RasterPos(xco+10, 5);
+ BIF_DrawString(uiBlockGetCurFont(block), naam, 0);
}
else
{
sprintf(naam, "No sample info available.");
cpack(0x0);
glRasterPos2i(xco+10, 5);
- BMF_DrawString(uiBlockGetCurFont(block), naam);
+ BIF_RasterPos(xco+10, 5);
+ BIF_DrawString(uiBlockGetCurFont(block), naam, 0);
}
}
Index: source/blender/src/renderwin.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/renderwin.c,v
retrieving revision 1.80
diff -u -u -r1.80 renderwin.c
--- source/blender/src/renderwin.c 24 Feb 2006 10:20:31 -0000 1.80
+++ source/blender/src/renderwin.c 28 Feb 2006 02:07:25 -0000
@@ -74,6 +74,7 @@
#include "BIF_gl.h"
#include "BIF_glutil.h"
#include "BIF_graphics.h"
+#include "BIF_language.h"
#include "BIF_screen.h"
#include "BIF_space.h"
#include "BIF_mywindow.h"
@@ -289,7 +290,8 @@
if(str) {
BIF_ThemeColor(TH_TEXT);
glRasterPos2i(12, 5);
- BMF_DrawString(G.fonts, str);
+ BIF_RasterPos(12, 5);
+ BIF_DrawString(G.fonts, str, 0);
}
BIF_SetTheme(curarea); // restore theme
@@ -381,7 +383,8 @@
glDisable(GL_BLEND);
glColor3ub(255, 255, 255);
glRasterPos2i(10, 10);
- BMF_DrawString(G.font, rw->info_text);
+ BIF_RasterPos(10, 10);
+ BIF_DrawString(G.font, rw->info_text, 0);
}
window_swap_buffers(rw->win);
Index: source/blender/src/swapbuffers.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/swapbuffers.c,v
retrieving revision 1.14
diff -u -u -r1.14 swapbuffers.c
--- source/blender/src/swapbuffers.c 17 Apr 2005 18:00:33 -0000 1.14
+++ source/blender/src/swapbuffers.c 28 Feb 2006 02:07:25 -0000
@@ -53,6 +53,7 @@
#include "BIF_gl.h"
#include "BIF_interface.h"
+#include "BIF_language.h"
#include "BIF_mywindow.h"
#include "BIF_screen.h"
#include "BIF_space.h"
@@ -163,10 +164,10 @@
glRecti(2, 2, w-4, h-4);
glColor3ub(0, 0, 0);
- glRasterPos2i(5, 5);
+ BIF_RasterPos(5, 5);
sprintf(buf, "win: %d - (%d, %d, %d, %d) %d\n", win, x, y, w, h, drawcounter++);
- BMF_DrawString(G.font, buf);
+ BIF_DrawString(G.font, buf, 0);
}
static void screen_swapbuffers_DEBUG(bScreen *sc)

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
4f/af/668ccaeed5bb0f4051c290e68034

Event Timeline