Commit 92bc1caff6b6f7ec6ea6f32a4ae2391e864340fd
2002-12-17T04:42:33
Renamed render to Render
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415
diff --git a/include/FTBitmapGlyph.h b/include/FTBitmapGlyph.h
index 77450d4..dd1290b 100755
--- a/include/FTBitmapGlyph.h
+++ b/include/FTBitmapGlyph.h
@@ -14,8 +14,8 @@
* FTBitmapGlyph is a specialisation of FTGlyph for creating bitmaps.
*
* It provides the interface between Freetype glyphs and their openGL
- * renderable counterparts. This is an abstract class and derived classes
- * must implement the <code>render</code> function.
+ * Renderable counterparts. This is an abstract class and derived classes
+ * must implement the <code>Render</code> function.
*
* @see FTGlyphContainer
*
diff --git a/include/FTFont.h b/include/FTFont.h
index c6b9df4..005652c 100755
--- a/include/FTFont.h
+++ b/include/FTFont.h
@@ -153,14 +153,14 @@ class FTGL_EXPORT FTFont
*
* @param string 'C' style string to be output.
*/
- virtual void render( const char* string );
+ virtual void Render( const char* string );
/**
* Render a string of characters
*
* @param string wchar_t string to be output.
*/
- virtual void render( const wchar_t* string );
+ virtual void Render( const wchar_t* string );
/**
* Queries the Font for errors.
@@ -184,7 +184,7 @@ class FTGL_EXPORT FTFont
/**
* Construct the internal glyph cache.
*
- * This a list of glyphs processed for openGL rendering NOT
+ * This a list of glyphs processed for openGL Rendering NOT
* freetype glyphs.
*
* @return <code>true</code> on success.
diff --git a/include/FTGLBitmapFont.h b/include/FTGLBitmapFont.h
index 114ed3e..5e621d1 100755
--- a/include/FTGLBitmapFont.h
+++ b/include/FTGLBitmapFont.h
@@ -41,14 +41,14 @@ class FTGL_EXPORT FTGLBitmapFont : public FTFont
*
* @param string 'C' style string to be output.
*/
- void render( const char* string);
+ void Render( const char* string);
/**
* Renders a string of characters
*
* @param string 'C' style wide string to be output.
*/
- void render( const wchar_t* string);
+ void Render( const wchar_t* string);
// attributes
diff --git a/include/FTGLOutlineFont.h b/include/FTGLOutlineFont.h
index 22e694a..c658539 100755
--- a/include/FTGLOutlineFont.h
+++ b/include/FTGLOutlineFont.h
@@ -42,14 +42,14 @@ class FTGL_EXPORT FTGLOutlineFont : public FTFont
*
* @param string 'C' style string to be output.
*/
- void render( const char* string);
+ void Render( const char* string);
/**
* Renders a string of characters
*
* @param string wchar_t string to be output.
*/
- void render( const wchar_t* string);
+ void Render( const wchar_t* string);
// attributes
diff --git a/include/FTGLPixmapFont.h b/include/FTGLPixmapFont.h
index f4c9189..1a6bef4 100755
--- a/include/FTGLPixmapFont.h
+++ b/include/FTGLPixmapFont.h
@@ -43,14 +43,14 @@ class FTGL_EXPORT FTGLPixmapFont : public FTFont
*
* @param string 'C' style string to be output.
*/
- void render( const char* string);
+ void Render( const char* string);
/**
* Renders a string of characters
*
* @param string wchar_t string to be output.
*/
- void render( const wchar_t* string);
+ void Render( const wchar_t* string);
private:
diff --git a/include/FTGLTextureFont.h b/include/FTGLTextureFont.h
index 9a2a5ff..69e9e90 100755
--- a/include/FTGLTextureFont.h
+++ b/include/FTGLTextureFont.h
@@ -51,14 +51,14 @@ class FTGL_EXPORT FTGLTextureFont : public FTFont
*
* @param string 'C' style string to be output.
*/
- virtual void render( const char* string);
+ virtual void Render( const char* string);
/**
* Renders a string of characters
*
* @param string wchar_t string to be output.
*/
- virtual void render( const wchar_t* string);
+ virtual void Render( const wchar_t* string);
private:
@@ -67,7 +67,7 @@ class FTGL_EXPORT FTGLTextureFont : public FTFont
/**
* Constructs the internal glyph cache.
*
- * This a list of glyphs processed for openGL rendering NOT
+ * This a list of glyphs processed for openGL Rendering NOT
* freetype glyphs
*/
virtual bool MakeGlyphList();
diff --git a/include/FTGlyphContainer.h b/include/FTGlyphContainer.h
index f80d907..034bd70 100755
--- a/include/FTGlyphContainer.h
+++ b/include/FTGlyphContainer.h
@@ -64,13 +64,13 @@ class FTGL_EXPORT FTGlyphContainer
float Advance( unsigned int index, unsigned int next);
/**
- * renders a character
- * @param index the glyph to be rendered
+ * Renders a character
+ * @param index the glyph to be Rendered
* @param next the next glyph in the string. Used for kerning.
- * @param pen the position to render the glyph
- * @return The distance to advance the pen position after rendering
+ * @param pen the position to Render the glyph
+ * @return The distance to advance the pen position after Rendering
*/
- FTPoint render( unsigned int index, unsigned int next, FTPoint pen);
+ FTPoint Render( unsigned int index, unsigned int next, FTPoint pen);
/**
* Queries the Font for errors.
diff --git a/src/FTBitmapGlyph.cpp b/src/FTBitmapGlyph.cpp
index 8ff3dbf..0a03ca0 100755
--- a/src/FTBitmapGlyph.cpp
+++ b/src/FTBitmapGlyph.cpp
@@ -7,7 +7,7 @@ FTBitmapGlyph::FTBitmapGlyph( FT_Glyph glyph)
data(0)
{
// This function will always fail if the glyph's format isn't scalable????
- err = FT_Glyph_To_Bitmap( &glyph, ft_render_mode_mono, 0, 1);
+ err = FT_Glyph_To_Bitmap( &glyph, ft_Render_mode_mono, 0, 1);
if( err || ft_glyph_format_bitmap != glyph->format)
{
return;
diff --git a/src/FTExtrdGlyph.cpp b/src/FTExtrdGlyph.cpp
index 5441826..7edf2ad 100644
--- a/src/FTExtrdGlyph.cpp
+++ b/src/FTExtrdGlyph.cpp
@@ -90,9 +90,9 @@ FTExtrdGlyph::FTExtrdGlyph( FT_Glyph glyph, float d)
glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, -depth);
glVertex3f( contour->Point(index).x / 64.0f, contour->Point(index).y / 64.0f, 0.0f);
}
- } // for
+ }
glEnd();
- } // for
+ }
glEndList();
diff --git a/src/FTFont.cpp b/src/FTFont.cpp
index ef13936..4686da4 100755
--- a/src/FTFont.cpp
+++ b/src/FTFont.cpp
@@ -223,7 +223,7 @@ float FTFont::doAdvance( const unsigned int chr, const unsigned int nextChr)
}
-void FTFont::render( const char* string )
+void FTFont::Render( const char* string )
{
const unsigned char* c = (unsigned char*)string;
pen.x = 0; pen.y = 0;
@@ -236,7 +236,7 @@ void FTFont::render( const char* string )
}
-void FTFont::render( const wchar_t* string )
+void FTFont::Render( const wchar_t* string )
{
const wchar_t* c = string;
pen.x = 0; pen.y = 0;
@@ -253,7 +253,7 @@ void FTFont::doRender( const unsigned int chr, const unsigned int nextChr)
{
CheckGlyph( chr);
- FTPoint kernAdvance = glyphList->render( chr, nextChr, pen);
+ FTPoint kernAdvance = glyphList->Render( chr, nextChr, pen);
pen.x += kernAdvance.x;
pen.y += kernAdvance.y;
diff --git a/src/FTGLBitmapFont.cpp b/src/FTGLBitmapFont.cpp
index 51ff9e2..3f8627a 100755
--- a/src/FTGLBitmapFont.cpp
+++ b/src/FTGLBitmapFont.cpp
@@ -31,7 +31,7 @@ FTGlyph* FTGLBitmapFont::MakeGlyph( unsigned int g)
}
-void FTGLBitmapFont::render( const char* string)
+void FTGLBitmapFont::Render( const char* string)
{
glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT);
glPushAttrib( GL_ENABLE_BIT);
@@ -42,14 +42,14 @@ void FTGLBitmapFont::render( const char* string)
glDisable( GL_BLEND);
- FTFont::render( string);
+ FTFont::Render( string);
glPopAttrib();
glPopClientAttrib();
}
-void FTGLBitmapFont::render( const wchar_t* string)
+void FTGLBitmapFont::Render( const wchar_t* string)
{
glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT);
glPushAttrib( GL_ENABLE_BIT);
@@ -60,7 +60,7 @@ void FTGLBitmapFont::render( const wchar_t* string)
glDisable( GL_BLEND);
- FTFont::render( string);
+ FTFont::Render( string);
glPopAttrib();
glPopClientAttrib();
diff --git a/src/FTGLOutlineFont.cpp b/src/FTGLOutlineFont.cpp
index cfbbf2f..f787b9c 100755
--- a/src/FTGLOutlineFont.cpp
+++ b/src/FTGLOutlineFont.cpp
@@ -31,7 +31,7 @@ FTGlyph* FTGLOutlineFont::MakeGlyph( unsigned int g)
}
-void FTGLOutlineFont::render( const char* string)
+void FTGLOutlineFont::Render( const char* string)
{
glPushAttrib( GL_ENABLE_BIT | GL_HINT_BIT | GL_LINE_BIT | GL_COLOR_BUFFER_BIT);
@@ -42,14 +42,13 @@ void FTGLOutlineFont::render( const char* string)
glEnable(GL_BLEND);
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE
- FTFont::render( string);
+ FTFont::Render( string);
glPopAttrib();
-
}
-void FTGLOutlineFont::render( const wchar_t* string)
+void FTGLOutlineFont::Render( const wchar_t* string)
{
glPushAttrib( GL_ENABLE_BIT | GL_HINT_BIT | GL_LINE_BIT | GL_COLOR_BUFFER_BIT);
@@ -60,9 +59,8 @@ void FTGLOutlineFont::render( const wchar_t* string)
glEnable(GL_BLEND);
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE
- FTFont::render( string);
+ FTFont::Render( string);
glPopAttrib();
-
}
diff --git a/src/FTGLPixmapFont.cpp b/src/FTGLPixmapFont.cpp
index 7c86894..a12208b 100755
--- a/src/FTGLPixmapFont.cpp
+++ b/src/FTGLPixmapFont.cpp
@@ -31,7 +31,7 @@ FTGlyph* FTGLPixmapFont::MakeGlyph( unsigned int g)
}
-void FTGLPixmapFont::render( const char* string)
+void FTGLPixmapFont::Render( const char* string)
{
glPushAttrib( GL_ENABLE_BIT | GL_PIXEL_MODE_BIT | GL_COLOR_BUFFER_BIT);
@@ -40,14 +40,14 @@ void FTGLPixmapFont::render( const char* string)
glDisable( GL_TEXTURE_2D);
- FTFont::render( string);
+ FTFont::Render( string);
glPopAttrib();
}
-void FTGLPixmapFont::render( const wchar_t* string)
+void FTGLPixmapFont::Render( const wchar_t* string)
{
glPushAttrib( GL_ENABLE_BIT | GL_PIXEL_MODE_BIT | GL_COLOR_BUFFER_BIT);
glPushClientAttrib( GL_CLIENT_PIXEL_STORE_BIT);
@@ -57,7 +57,7 @@ void FTGLPixmapFont::render( const wchar_t* string)
glDisable( GL_TEXTURE_2D);
- FTFont::render( string);
+ FTFont::Render( string);
glPopClientAttrib();
glPopAttrib();
diff --git a/src/FTGLTextureFont.cpp b/src/FTGLTextureFont.cpp
index 4f9fbd6..e1eb022 100755
--- a/src/FTGLTextureFont.cpp
+++ b/src/FTGLTextureFont.cpp
@@ -161,27 +161,27 @@ int FTGLTextureFont::CreateTexture()
}
-void FTGLTextureFont::render( const char* string)
+void FTGLTextureFont::Render( const char* string)
{
glPushAttrib( GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT);
glEnable(GL_BLEND);
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE
- FTFont::render( string);
+ FTFont::Render( string);
glPopAttrib();
}
-void FTGLTextureFont::render( const wchar_t* string)
+void FTGLTextureFont::Render( const wchar_t* string)
{
glPushAttrib( GL_ENABLE_BIT | GL_COLOR_BUFFER_BIT);
glEnable(GL_BLEND);
glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); // GL_ONE
- FTFont::render( string);
+ FTFont::Render( string);
glPopAttrib();
}
diff --git a/src/FTGlyphContainer.cpp b/src/FTGlyphContainer.cpp
index 9f4728d..2cfb445 100755
--- a/src/FTGlyphContainer.cpp
+++ b/src/FTGlyphContainer.cpp
@@ -63,7 +63,7 @@ float FTGlyphContainer::Advance( unsigned int index, unsigned int next)
}
-FTPoint FTGlyphContainer::render( unsigned int index, unsigned int next, FTPoint pen)
+FTPoint FTGlyphContainer::Render( unsigned int index, unsigned int next, FTPoint pen)
{
FTPoint kernAdvance;
float advance = 0;
diff --git a/src/FTPixmapGlyph.cpp b/src/FTPixmapGlyph.cpp
index 1da98f1..0ced396 100755
--- a/src/FTPixmapGlyph.cpp
+++ b/src/FTPixmapGlyph.cpp
@@ -7,7 +7,7 @@ FTPixmapGlyph::FTPixmapGlyph( FT_Glyph glyph)
data(0)
{
// This function will always fail if the glyph's format isn't scalable????
- err = FT_Glyph_To_Bitmap( &glyph, ft_render_mode_normal, 0, 1);
+ err = FT_Glyph_To_Bitmap( &glyph, ft_Render_mode_normal, 0, 1);
if( err || ft_glyph_format_bitmap != glyph->format)
{
return;
diff --git a/src/FTTextureGlyph.cpp b/src/FTTextureGlyph.cpp
index b3fe4f0..a19c03c 100755
--- a/src/FTTextureGlyph.cpp
+++ b/src/FTTextureGlyph.cpp
@@ -9,7 +9,7 @@ FTTextureGlyph::FTTextureGlyph( FT_Glyph glyph, int id, int xOffset, int yOffset
activeTextureID(0)
{
// FIXME This function will always fail if the glyph's format isn't scalable????
- err = FT_Glyph_To_Bitmap( &glyph, ft_render_mode_normal, 0, 1);
+ err = FT_Glyph_To_Bitmap( &glyph, ft_Render_mode_normal, 0, 1);
if( err || glyph->format != ft_glyph_format_bitmap)
{
return;