thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More triangle work

Browse source 
svn-id: r33286
This commit is contained in:
Vicent Marti 2008-07-25 11:13:47 +00:00
parent 1c0bceecd5
commit 078ac062e7
2 changed files with 5 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
graphics/VectorRenderer.cpp
View file

@ -521,18 +521,13 @@ drawTriangle(int x, int y, int w, int h, TriangleOrientation orient) {
if (Base::_dynamicData != 0) if (Base::_dynamicData != 0)
orient = (TriangleOrientation)Base::_dynamicData; orient = (TriangleOrientation)Base::_dynamicData;
int newW = w * 3 / 4; int newW = w / 2;
if (newW % 2) newW++; if (newW % 2) newW++;
switch(orient) { switch(orient) {
case kTriangleUp: case kTriangleUp:
case kTriangleDown: case kTriangleDown:
// #ifdef VECTOR_RENDERER_FAST_TRIANGLES drawTriangleFast(x + (newW / 2), y + (h / 2) - (newW / 2), newW, (orient == kTriangleDown), color, Base::_fillMode);
// if (w == h)
drawTriangleFast(x + (w / 2) - w * 3 / 8, y + w / 4, newW, (orient == kTriangleDown), color, Base::_fillMode);
// else
// #endif
// drawTriangleVertAlg(x, y, w, h, (orient == kTriangleDown), color, Base::_fillMode);
break; break;
case kTriangleLeft: case kTriangleLeft:
@ -543,12 +538,7 @@ drawTriangle(int x, int y, int w, int h, TriangleOrientation orient) {
if (Base::_strokeWidth > 0) if (Base::_strokeWidth > 0)
if (Base::_fillMode == kFillBackground || Base::_fillMode == kFillGradient) { if (Base::_fillMode == kFillBackground || Base::_fillMode == kFillGradient) {
#ifdef VECTOR_RENDERER_FAST_TRIANGLES drawTriangleFast(x + (newW / 2), y + (h / 2) - (newW / 2), newW, (orient == kTriangleDown), _fgColor, kFillDisabled);
if (w == h)
drawTriangleFast(x, y, w, (orient == kTriangleDown), _fgColor, kFillDisabled);
else
#endif
drawTriangleVertAlg(x, y, w, h, (orient == kTriangleDown), _fgColor, kFillDisabled);
} }
} }

4
gui/ThemeDefaultXML.cpp
View file

@ -107,14 +107,14 @@ bool ThemeRenderer::loadDefaultXML() {
"<drawdata id = 'popup_idle' cache = false>" "<drawdata id = 'popup_idle' cache = false>"
"<drawstep func = 'square' stroke = 0 fg_color = '0, 0, 0' fill = 'gradient' gradient_start = '214, 113, 8' gradient_end = '240, 200, 25' shadow = 3 />" "<drawstep func = 'square' stroke = 0 fg_color = '0, 0, 0' fill = 'gradient' gradient_start = '214, 113, 8' gradient_end = '240, 200, 25' shadow = 3 />"
"<drawstep func = 'triangle' fg_color = '0, 0, 0' fill = 'foreground' width = '12' height = '12' xpos = '-16' ypos = 'center' orientation = 'bottom' />" "<drawstep func = 'triangle' fg_color = '0, 0, 0' fill = 'foreground' width = 'height' height = 'auto' xpos = 'right' ypos = 'center' orientation = 'bottom' />"
"<text font = 'text_default' vertical_align = 'center' horizontal_align = 'right'/>" "<text font = 'text_default' vertical_align = 'center' horizontal_align = 'right'/>"
"</drawdata>" "</drawdata>"
"<drawdata id = 'popup_hover' cache = false>" "<drawdata id = 'popup_hover' cache = false>"
"<drawstep func = 'square' stroke = 0 fg_color = '0, 0, 0' fill = 'gradient' gradient_start = '214, 113, 8' gradient_end = '240, 200, 25' shadow = 0 />" "<drawstep func = 'square' stroke = 0 fg_color = '0, 0, 0' fill = 'gradient' gradient_start = '214, 113, 8' gradient_end = '240, 200, 25' shadow = 0 />"
"<drawstep func = 'triangle' fg_color = '0, 0, 0' fill = 'foreground' width = '12' height = '12' xpos = '-16' ypos = 'center' orientation = 'bottom' />" "<drawstep func = 'triangle' fg_color = '0, 0, 0' fill = 'foreground' width = 'height' height = 'auto' xpos = 'right' ypos = 'center' orientation = 'bottom' />"
"<text font = 'text_hover' vertical_align = 'center' horizontal_align = 'right' />" "<text font = 'text_hover' vertical_align = 'center' horizontal_align = 'right' />"
"</drawdata>" "</drawdata>"