RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

include tag names and values in event patterns

This commit is contained in:
David Rose 2003-06-14 00:51:06 +00:00
parent 8748cad750
commit b2bdf47820
2 changed files with 61 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
panda/src/collide/collisionHandlerEvent.I
View File

@ -58,8 +58,23 @@ operator = (const CollisionHandlerEvent::SortEntries &) {
//
// %fn - the name of the "from" object's node
// %in - the name of the "into" object's node
// %ft - 't' if "from" is tangible, 'i' if intangible
// %it - 't' if "into" is tangible, 'i' if intangible
// %fs - 't' if "from" is tangible, 'i' if intangible
// %is - 't' if "into" is tangible, 'i' if intangible
// %ig - 'c' if the collision is into a
// CollisionNode, 'g' if it is a geom.
//
// %(tag)fh - '1' if "from" has the indicated tag,
// '0' if it does not.
// %(tag)ih - '1' if "into" has the indicated tag,
// '0' if it does not.
// %(tag)iH - '1' if "into" has the indicated net tag,
// '0' if it does not.
// %(tag)ft - the indicated tag value of the "from" node.
// %(tag)it - the indicated tag value of the "to" node.
// %(tag)iT - the indicated net tag value of the "to" node.
//
// Parentheses in the above are literal and should be
// included in the actual pattern.
//
// The event name will be based on the in_pattern
// string specified here, with all occurrences of the

48
panda/src/collide/collisionHandlerEvent.cxx
View File

@ -178,19 +178,33 @@ throw_event_pattern(const string &pattern, CollisionEntry *entry) {
string event;
for (size_t p = 0; p < pattern.size(); ++p) {
if (pattern[p] == '%') {
string key;
if (p + 1 < pattern.size() && pattern[p + 1] == '(') {
// Extract out the key--the name up until the closing paren.
size_t close = pattern.find(')', p + 2);
if (close != string::npos) {
key = pattern.substr(p + 2, close - (p + 2));
p = close;
}
}
// Get out the command--the two characters following the percent
// sign (or the key).
string cmd = pattern.substr(p + 1, 2);
p += 2;
if (cmd == "fn") {
event += entry->get_from_node()->get_name();
} else if (cmd == "in") {
event += entry->get_into_node()->get_name();
if (entry->has_into()) {
event += entry->get_into_node()->get_name();
}
} else if (cmd == "ft") {
} else if (cmd == "fs") {
event +=
(!entry->get_from()->is_tangible() ? 'i' : 't');
} else if (cmd == "it") {
} else if (cmd == "is") {
event +=
(entry->has_into() && !entry->get_into()->is_tangible() ? 'i' : 't');
@ -198,6 +212,32 @@ throw_event_pattern(const string &pattern, CollisionEntry *entry) {
event +=
(entry->has_into() ? 'c' : 'g');
} else if (cmd == "fh") {
event += (entry->get_from_node()->has_tag(key) ? '1' : '0');
} else if (cmd == "ih") {
if (entry->has_into()) {
event += (entry->get_into_node()->has_tag(key) ? '1' : '0');
}
} else if (cmd == "iH") {
if (entry->has_into()) {
event += (entry->get_into_node_path().has_net_tag(key) ? '1' : '0');
}
} else if (cmd == "ft") {
event += entry->get_from_node()->get_tag(key);
} else if (cmd == "it") {
if (entry->has_into()) {
event += entry->get_into_node()->get_tag(key);
}
} else if (cmd == "iT") {
if (entry->has_into()) {
event += entry->get_into_node_path().get_net_tag(key);
}
} else {
collide_cat.error()
<< "Invalid symbol in event_pattern: %" << cmd << "\n";
@ -206,7 +246,7 @@ throw_event_pattern(const string &pattern, CollisionEntry *entry) {
event += pattern[p];
}
}
if (!event.empty()) {
throw_event(event, EventParameter(entry));
}