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

MILESTONE: bitmap showing with key color transparency implemented!

Browse source 
- SurfaceKeyColored class handles blitting of keycolor transparency data
- ImageMap tested - Rect and Polygon areas seem to be working as expected

svn-id: r32950
This commit is contained in:
Stephen Kennedy 2008-07-07 21:10:58 +00:00
parent 43c0fb8d89
commit 641e3d752e
9 changed files with 165 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

36
backends/common/virtual-keyboard-parser.cpp
View file

@ -40,6 +40,9 @@ VirtualKeyboardParser::VirtualKeyboardParser(VirtualKeyboard *kbd) : XMLParser()
_callbacks["layout"] = &VirtualKeyboardParser::parserCallback_Layout;
_callbacks["map"] = &VirtualKeyboardParser::parserCallback_Map;
_callbacks["area"] = &VirtualKeyboardParser::parserCallback_Area;
_closedCallbacks["keyboard"] = &VirtualKeyboardParser::parserCallback_KeyboardClosed;
_closedCallbacks["mode"] = &VirtualKeyboardParser::parserCallback_ModeClosed;
}
bool VirtualKeyboardParser::keyCallback(Common::String keyName) {
@ -49,6 +52,13 @@ bool VirtualKeyboardParser::keyCallback(Common::String keyName) {
return (this->*(_callbacks[_activeKey.top()->name]))();
}
bool VirtualKeyboardParser::closedKeyCallback(Common::String keyName) {
if (!_closedCallbacks.contains(_activeKey.top()->name))
return true;
return (this->*(_closedCallbacks[_activeKey.top()->name]))();
}
bool VirtualKeyboardParser::parserCallback_Keyboard() {
ParserNode *kbdNode = getActiveNode();
@ -59,7 +69,6 @@ bool VirtualKeyboardParser::parserCallback_Keyboard() {
if (_kbdParsed)
return parserError("Only a single keyboard element is allowed");
_kbdParsed = true;
if (!kbdNode->values.contains("initial_mode"))
return parserError("Keyboard element must contain initial_mode attribute");
@ -89,6 +98,13 @@ bool VirtualKeyboardParser::parserCallback_Keyboard() {
return true;
}
bool VirtualKeyboardParser::parserCallback_KeyboardClosed() {
_kbdParsed = true;
if (!_keyboard->_initialMode)
return parserError("Initial mode of keyboard pack not defined");
return true;
}
bool VirtualKeyboardParser::parserCallback_Mode() {
ParserNode *modeNode = getActiveNode();
@ -146,6 +162,12 @@ bool VirtualKeyboardParser::parserCallback_Mode() {
return true;
}
bool VirtualKeyboardParser::parserCallback_ModeClosed() {
if (!_mode->image)
return parserError("'%s' layout missing from '%s' mode", _mode->resolution.c_str(), _mode->name.c_str());
return true;
}
bool VirtualKeyboardParser::parserCallback_Event() {
ParserNode *evtNode = getActiveNode();
@ -262,15 +284,14 @@ bool VirtualKeyboardParser::parserCallback_Area() {
Common::String shape = areaNode->values["shape"];
if (shape == "rect") {
Common::Rect *rect = _mode->imageMap.createRectArea(areaNode->values["target"]);
int x1, y1, x2, y2;
if (!parseIntegerKey(areaNode->values["coords"].c_str(), 4, &x1, &y1, &x2, &y2))
return parserError("Invalid coords for rect area");
Common::Rect rect(x1, y1, x2, y2);
_mode->imageMap.addRectMapArea(rect, areaNode->values["target"]);
rect->left = x1; rect->top = y1; rect->right = x2; rect->bottom = y2;
} else if (shape == "poly") {
Common::StringTokenizer tok (areaNode->values["coords"], ", ");
Common::Polygon poly;
Common::Polygon *poly = _mode->imageMap.createPolygonArea(areaNode->values["target"]);
for (Common::String st = tok.nextToken(); !st.empty(); st = tok.nextToken()) {
int x, y;
if (sscanf(st.c_str(), "%d", &x) != 1)
@ -278,11 +299,10 @@ bool VirtualKeyboardParser::parserCallback_Area() {
st = tok.nextToken();
if (sscanf(st.c_str(), "%d", &y) != 1)
return parserError("Invalid coords for polygon area");
poly.addPoint(x, y);
poly->addPoint(x, y);
}
if (poly.getPointCount() < 3)
if (poly->getPointCount() < 3)
return parserError("Invalid coords for polygon area");
_mode->imageMap.addPolygonMapArea(poly, areaNode->values["target"]);
} else
return parserError("Area shape '%s' not known", shape.c_str());