Commit ef3a8c03558c4a5e3016858697a7d5a579c273f8
2004-09-30T08:15:43
Code to turn off display lists.
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 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501
diff --git a/src/FTExtrdGlyph.cpp b/src/FTExtrdGlyph.cpp
index 4b33a9c..f00a9e4 100644
--- a/src/FTExtrdGlyph.cpp
+++ b/src/FTExtrdGlyph.cpp
@@ -6,7 +6,7 @@
#include "FTVectoriser.h"
-FTExtrdGlyph::FTExtrdGlyph( FT_GlyphSlot glyph, float d)
+FTExtrdGlyph::FTExtrdGlyph( FT_GlyphSlot glyph, float d, bool useDisplayList)
: FTGlyph( glyph),
glList(0),
depth(d)
@@ -26,99 +26,106 @@ FTExtrdGlyph::FTExtrdGlyph( FT_GlyphSlot glyph, float d)
}
unsigned int tesselationIndex;
- glList = glGenLists(1);
- glNewList( glList, GL_COMPILE);
+
+ if(useDisplayList)
+ {
+ glList = glGenLists(1);
+ glNewList( glList, GL_COMPILE);
+ }
- vectoriser.MakeMesh( 1.0);
- glNormal3d(0.0, 0.0, 1.0);
-
- unsigned int horizontalTextureScale = glyph->face->size->metrics.x_ppem * 64;
- unsigned int verticalTextureScale = glyph->face->size->metrics.y_ppem * 64;
+ vectoriser.MakeMesh( 1.0);
+ glNormal3d(0.0, 0.0, 1.0);
+
+ unsigned int horizontalTextureScale = glyph->face->size->metrics.x_ppem * 64;
+ unsigned int verticalTextureScale = glyph->face->size->metrics.y_ppem * 64;
+
+ const FTMesh* mesh = vectoriser.GetMesh();
+ for( tesselationIndex = 0; tesselationIndex < mesh->TesselationCount(); ++tesselationIndex)
+ {
+ const FTTesselation* subMesh = mesh->Tesselation( tesselationIndex);
+ unsigned int polyonType = subMesh->PolygonType();
+
+ glBegin( polyonType);
+ for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
+ {
+ FTPoint point = subMesh->Point(pointIndex);
+
+ glTexCoord2f( point.x / horizontalTextureScale,
+ point.y / verticalTextureScale);
+
+ glVertex3f( point.x / 64.0f,
+ point.y / 64.0f,
+ 0.0f);
+ }
+ glEnd();
+ }
+
+ vectoriser.MakeMesh( -1.0);
+ glNormal3d(0.0, 0.0, -1.0);
+
+ mesh = vectoriser.GetMesh();
+ for( tesselationIndex = 0; tesselationIndex < mesh->TesselationCount(); ++tesselationIndex)
+ {
+ const FTTesselation* subMesh = mesh->Tesselation( tesselationIndex);
+ unsigned int polyonType = subMesh->PolygonType();
+
+ glBegin( polyonType);
+ for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
+ {
+ FTPoint point = subMesh->Point(pointIndex);
+
+ glTexCoord2f( subMesh->Point(pointIndex).x / horizontalTextureScale,
+ subMesh->Point(pointIndex).y / verticalTextureScale);
+
+ glVertex3f( subMesh->Point( pointIndex).x / 64.0f,
+ subMesh->Point( pointIndex).y / 64.0f,
+ -depth);
+ }
+ glEnd();
+ }
+
+ int contourFlag = vectoriser.ContourFlag();
+
+ for( size_t c = 0; c < vectoriser.ContourCount(); ++c)
+ {
+ const FTContour* contour = vectoriser.Contour(c);
+ unsigned int numberOfPoints = contour->PointCount();
- const FTMesh* mesh = vectoriser.GetMesh();
- for( tesselationIndex = 0; tesselationIndex < mesh->TesselationCount(); ++tesselationIndex)
- {
- const FTTesselation* subMesh = mesh->Tesselation( tesselationIndex);
- unsigned int polyonType = subMesh->PolygonType();
-
- glBegin( polyonType);
- for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
+ glBegin( GL_QUAD_STRIP);
+ for( unsigned int j = 0; j <= numberOfPoints; ++j)
+ {
+ unsigned int pointIndex = ( j == numberOfPoints) ? 0 : j;
+ unsigned int nextPointIndex = ( pointIndex == numberOfPoints - 1) ? 0 : pointIndex + 1;
+
+ FTPoint point = contour->Point(pointIndex);
+
+ FTPoint normal = GetNormal( point, contour->Point(nextPointIndex));
+ glNormal3f( normal.x, normal.y, 0.0f);
+
+ if( contourFlag & ft_outline_reverse_fill)
{
- FTPoint point = subMesh->Point(pointIndex);
-
glTexCoord2f( point.x / horizontalTextureScale,
point.y / verticalTextureScale);
-
- glVertex3f( point.x / 64.0f,
- point.y / 64.0f,
- 0.0f);
+
+ glVertex3f( point.x / 64.0f, point.y / 64.0f, 0.0f);
+ glVertex3f( point.x / 64.0f, point.y / 64.0f, -depth);
}
- glEnd();
- }
-
- vectoriser.MakeMesh( -1.0);
- glNormal3d(0.0, 0.0, -1.0);
-
- mesh = vectoriser.GetMesh();
- for( tesselationIndex = 0; tesselationIndex < mesh->TesselationCount(); ++tesselationIndex)
- {
- const FTTesselation* subMesh = mesh->Tesselation( tesselationIndex);
- unsigned int polyonType = subMesh->PolygonType();
-
- glBegin( polyonType);
- for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
+ else
{
- FTPoint point = subMesh->Point(pointIndex);
-
- glTexCoord2f( subMesh->Point(pointIndex).x / horizontalTextureScale,
- subMesh->Point(pointIndex).y / verticalTextureScale);
-
- glVertex3f( subMesh->Point( pointIndex).x / 64.0f,
- subMesh->Point( pointIndex).y / 64.0f,
- -depth);
- }
- glEnd();
- }
-
- int contourFlag = vectoriser.ContourFlag();
-
- for( size_t c = 0; c < vectoriser.ContourCount(); ++c)
- {
- const FTContour* contour = vectoriser.Contour(c);
- unsigned int numberOfPoints = contour->PointCount();
-
- glBegin( GL_QUAD_STRIP);
- for( unsigned int j = 0; j <= numberOfPoints; ++j)
- {
- unsigned int pointIndex = ( j == numberOfPoints) ? 0 : j;
- unsigned int nextPointIndex = ( pointIndex == numberOfPoints - 1) ? 0 : pointIndex + 1;
-
- FTPoint point = contour->Point(pointIndex);
-
- FTPoint normal = GetNormal( point, contour->Point(nextPointIndex));
- glNormal3f( normal.x, normal.y, 0.0f);
-
- if( contourFlag & ft_outline_reverse_fill)
- {
- glTexCoord2f( point.x / horizontalTextureScale,
- point.y / verticalTextureScale);
-
- glVertex3f( point.x / 64.0f, point.y / 64.0f, 0.0f);
- glVertex3f( point.x / 64.0f, point.y / 64.0f, -depth);
- }
- else
- {
- glTexCoord2f( point.x / horizontalTextureScale,
- point.y / verticalTextureScale);
-
- glVertex3f( point.x / 64.0f, point.y / 64.0f, -depth);
- glVertex3f( point.x / 64.0f, point.y / 64.0f, 0.0f);
- }
+ glTexCoord2f( point.x / horizontalTextureScale,
+ point.y / verticalTextureScale);
+
+ glVertex3f( point.x / 64.0f, point.y / 64.0f, -depth);
+ glVertex3f( point.x / 64.0f, point.y / 64.0f, 0.0f);
}
- glEnd();
- }
+ }
+ glEnd();
+ }
- glEndList();
+ if(useDisplayList)
+ {
+ glEndList();
+ }
}
diff --git a/src/FTOutlineGlyph.cpp b/src/FTOutlineGlyph.cpp
index 3d96f5c..ebe8861 100644
--- a/src/FTOutlineGlyph.cpp
+++ b/src/FTOutlineGlyph.cpp
@@ -2,7 +2,7 @@
#include "FTVectoriser.h"
-FTOutlineGlyph::FTOutlineGlyph( FT_GlyphSlot glyph)
+FTOutlineGlyph::FTOutlineGlyph( FT_GlyphSlot glyph, bool useDisplayList)
: FTGlyph( glyph),
glList(0)
{
@@ -20,21 +20,29 @@ FTOutlineGlyph::FTOutlineGlyph( FT_GlyphSlot glyph)
return;
}
- glList = glGenLists(1);
- glNewList( glList, GL_COMPILE);
- for( unsigned int c = 0; c < numContours; ++c)
- {
- const FTContour* contour = vectoriser.Contour(c);
-
- glBegin( GL_LINE_LOOP);
- for( unsigned int pointIndex = 0; pointIndex < contour->PointCount(); ++pointIndex)
- {
- FTPoint point = contour->Point(pointIndex);
- glVertex2f( point.x / 64.0f, point.y / 64.0f);
- }
- glEnd();
- }
- glEndList();
+ if(useDisplayList)
+ {
+ glList = glGenLists(1);
+ glNewList( glList, GL_COMPILE);
+ }
+
+ for( unsigned int c = 0; c < numContours; ++c)
+ {
+ const FTContour* contour = vectoriser.Contour(c);
+
+ glBegin( GL_LINE_LOOP);
+ for( unsigned int pointIndex = 0; pointIndex < contour->PointCount(); ++pointIndex)
+ {
+ FTPoint point = contour->Point(pointIndex);
+ glVertex2f( point.x / 64.0f, point.y / 64.0f);
+ }
+ glEnd();
+ }
+
+ if(useDisplayList)
+ {
+ glEndList();
+ }
}
diff --git a/src/FTPolyGlyph.cpp b/src/FTPolyGlyph.cpp
index 5580c40..9fdb16a 100644
--- a/src/FTPolyGlyph.cpp
+++ b/src/FTPolyGlyph.cpp
@@ -2,7 +2,7 @@
#include "FTVectoriser.h"
-FTPolyGlyph::FTPolyGlyph( FT_GlyphSlot glyph)
+FTPolyGlyph::FTPolyGlyph( FT_GlyphSlot glyph, bool useDisplayList)
: FTGlyph( glyph),
glList(0)
{
@@ -24,30 +24,37 @@ FTPolyGlyph::FTPolyGlyph( FT_GlyphSlot glyph)
vectoriser.MakeMesh( 1.0);
- glList = glGenLists( 1);
- glNewList( glList, GL_COMPILE);
+ if( useDisplayList)
+ {
+ glList = glGenLists( 1);
+ glNewList( glList, GL_COMPILE);
+ }
- const FTMesh* mesh = vectoriser.GetMesh();
- for( unsigned int index = 0; index < mesh->TesselationCount(); ++index)
- {
- const FTTesselation* subMesh = mesh->Tesselation( index);
- unsigned int polyonType = subMesh->PolygonType();
+ const FTMesh* mesh = vectoriser.GetMesh();
+ for( unsigned int index = 0; index < mesh->TesselationCount(); ++index)
+ {
+ const FTTesselation* subMesh = mesh->Tesselation( index);
+ unsigned int polyonType = subMesh->PolygonType();
- glBegin( polyonType);
- for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
- {
- FTPoint point = subMesh->Point(pointIndex);
-
- glTexCoord2f( point.x / horizontalTextureScale,
- point.y / verticalTextureScale);
-
- glVertex3f( point.x / 64.0f,
- point.y / 64.0f,
- 0.0f);
- }
- glEnd();
- }
- glEndList();
+ glBegin( polyonType);
+ for( unsigned int pointIndex = 0; pointIndex < subMesh->PointCount(); ++pointIndex)
+ {
+ FTPoint point = subMesh->Point(pointIndex);
+
+ glTexCoord2f( point.x / horizontalTextureScale,
+ point.y / verticalTextureScale);
+
+ glVertex3f( point.x / 64.0f,
+ point.y / 64.0f,
+ 0.0f);
+ }
+ glEnd();
+ }
+
+ if(useDisplayList)
+ {
+ glEndList();
+ }
}
diff --git a/test/FTGLExtrdFont.cpp-Test.cpp b/test/FTGLExtrdFont.cpp-Test.cpp
index 85f1aca..971bcfe 100644
--- a/test/FTGLExtrdFont.cpp-Test.cpp
+++ b/test/FTGLExtrdFont.cpp-Test.cpp
@@ -14,6 +14,8 @@ class FTGLExtrdFontTest : public CppUnit::TestCase
CPPUNIT_TEST_SUITE( FTGLExtrdFontTest);
CPPUNIT_TEST( testConstructor);
CPPUNIT_TEST( testRender);
+ CPPUNIT_TEST( testBadDisplayList);
+ CPPUNIT_TEST( testGoodDisplayList);
CPPUNIT_TEST_SUITE_END();
public:
@@ -53,7 +55,42 @@ class FTGLExtrdFontTest : public CppUnit::TestCase
CPPUNIT_ASSERT( extrudedFont->Error() == 0);
CPPUNIT_ASSERT( glGetError() == GL_NO_ERROR);
}
+
+ void testBadDisplayList()
+ {
+ buildGLContext();
+
+ FTGLExtrdFont* extrudedFont = new FTGLExtrdFont( FONT_FILE);
+ extrudedFont->FaceSize(18);
+
+ int glList = glGenLists(1);
+ glNewList( glList, GL_COMPILE);
+ extrudedFont->Render(GOOD_ASCII_TEST_STRING);
+
+ glEndList();
+
+ CPPUNIT_ASSERT( glGetError() == GL_INVALID_OPERATION);
+ }
+
+ void testGoodDisplayList()
+ {
+ buildGLContext();
+
+ FTGLExtrdFont* extrudedFont = new FTGLExtrdFont( FONT_FILE);
+ extrudedFont->FaceSize(18);
+
+ extrudedFont->UseDisplayList(false);
+ int glList = glGenLists(1);
+ glNewList( glList, GL_COMPILE);
+
+ extrudedFont->Render(GOOD_ASCII_TEST_STRING);
+
+ glEndList();
+
+ CPPUNIT_ASSERT( glGetError() == GL_NO_ERROR);
+ }
+
void setUp()
{}
diff --git a/test/FTGLOutlineFont-Test.cpp b/test/FTGLOutlineFont-Test.cpp
index 636238b..ed8b50d 100644
--- a/test/FTGLOutlineFont-Test.cpp
+++ b/test/FTGLOutlineFont-Test.cpp
@@ -14,6 +14,8 @@ class FTGLOutlineFontTest : public CppUnit::TestCase
CPPUNIT_TEST_SUITE( FTGLOutlineFontTest);
CPPUNIT_TEST( testConstructor);
CPPUNIT_TEST( testRender);
+ CPPUNIT_TEST( testBadDisplayList);
+ CPPUNIT_TEST( testGoodDisplayList);
CPPUNIT_TEST_SUITE_END();
public:
@@ -54,6 +56,41 @@ class FTGLOutlineFontTest : public CppUnit::TestCase
CPPUNIT_ASSERT( glGetError() == GL_NO_ERROR);
}
+ void testBadDisplayList()
+ {
+ buildGLContext();
+
+ FTGLOutlineFont* outlineFont = new FTGLOutlineFont( FONT_FILE);
+ outlineFont->FaceSize(18);
+
+ int glList = glGenLists(1);
+ glNewList( glList, GL_COMPILE);
+
+ outlineFont->Render(GOOD_ASCII_TEST_STRING);
+
+ glEndList();
+
+ CPPUNIT_ASSERT( glGetError() == GL_INVALID_OPERATION);
+ }
+
+ void testGoodDisplayList()
+ {
+ buildGLContext();
+
+ FTGLOutlineFont* outlineFont = new FTGLOutlineFont( FONT_FILE);
+ outlineFont->FaceSize(18);
+
+ outlineFont->UseDisplayList(false);
+ int glList = glGenLists(1);
+ glNewList( glList, GL_COMPILE);
+
+ outlineFont->Render(GOOD_ASCII_TEST_STRING);
+
+ glEndList();
+
+ CPPUNIT_ASSERT( glGetError() == GL_NO_ERROR);
+ }
+
void setUp()
{}
diff --git a/test/FTGLPolygonFont-Test.cpp b/test/FTGLPolygonFont-Test.cpp
index 0d7a96e..08a40e2 100644
--- a/test/FTGLPolygonFont-Test.cpp
+++ b/test/FTGLPolygonFont-Test.cpp
@@ -14,6 +14,8 @@ class FTGLPolygonFontTest : public CppUnit::TestCase
CPPUNIT_TEST_SUITE( FTGLPolygonFontTest);
CPPUNIT_TEST( testConstructor);
CPPUNIT_TEST( testRender);
+ CPPUNIT_TEST( testBadDisplayList);
+ CPPUNIT_TEST( testGoodDisplayList);
CPPUNIT_TEST_SUITE_END();
public:
@@ -55,6 +57,41 @@ class FTGLPolygonFontTest : public CppUnit::TestCase
CPPUNIT_ASSERT( glGetError() == GL_NO_ERROR);
}
+ void testBadDisplayList()
+ {
+ buildGLContext();
+
+ FTGLPolygonFont* polygonFont = new FTGLPolygonFont( FONT_FILE);
+ polygonFont->FaceSize(18);
+
+ int glList = glGenLists(1);
+ glNewList( glList, GL_COMPILE);
+
+ polygonFont->Render(GOOD_ASCII_TEST_STRING);
+
+ glEndList();
+
+ CPPUNIT_ASSERT( glGetError() == GL_INVALID_OPERATION);
+ }
+
+ void testGoodDisplayList()
+ {
+ buildGLContext();
+
+ FTGLPolygonFont* polygonFont = new FTGLPolygonFont( FONT_FILE);
+ polygonFont->FaceSize(18);
+
+ polygonFont->UseDisplayList(false);
+ int glList = glGenLists(1);
+ glNewList( glList, GL_COMPILE);
+
+ polygonFont->Render(GOOD_ASCII_TEST_STRING);
+
+ glEndList();
+
+ CPPUNIT_ASSERT( glGetError() == GL_NO_ERROR);
+ }
+
void setUp()
{}