2004-06-03 20:38:14 +02:00
|
|
|
#include "precompiled.h"
|
|
|
|
|
|
2006-06-02 04:10:27 +02:00
|
|
|
#include "ps/Profile.h"
|
2006-04-19 07:30:02 +02:00
|
|
|
|
2006-05-13 20:50:58 +02:00
|
|
|
#include "EntityOrders.h"
|
|
|
|
|
#include "Entity.h"
|
2004-05-29 05:32:33 +02:00
|
|
|
#include "PathfindEngine.h"
|
2006-04-11 00:05:21 +02:00
|
|
|
|
2004-07-23 12:56:52 +02:00
|
|
|
|
|
|
|
|
CPathfindEngine::CPathfindEngine()
|
|
|
|
|
{
|
|
|
|
|
}
|
2004-05-29 05:32:33 +02:00
|
|
|
|
|
|
|
|
void CPathfindEngine::requestPath( HEntity entity, const CVector2D& destination )
|
|
|
|
|
{
|
2006-04-09 02:36:52 +02:00
|
|
|
/* TODO: Add code to generate high level path
|
|
|
|
|
For now, just the one high level waypoint to the final
|
|
|
|
|
destination is added
|
|
|
|
|
*/
|
|
|
|
|
CEntityOrder waypoint;
|
|
|
|
|
waypoint.m_type = CEntityOrder::ORDER_GOTO_WAYPOINT;
|
|
|
|
|
waypoint.m_data[0].location = destination;
|
# Housekeeping and pathfinder enhancements / optimization when dealing with ranged actions.
- Modified Xeromyces to no longer automatically convert element and
attribute names to lowercase, so that we can have camelCase names. We
should now be able to convert all the multi-word entity properties, like
pass_through_allies, to camelCase, like passThroughAllies, which is more
consistent with the rest of our JavaScript naming conventions. To
support the existing code that assumes lowercase element names, I made
the getElementID and getAttributeID methods (used in the EL and AT
macros) ignore case, and I changed any code that directly accessed
element names to use the right case. CEntityTemplate now converts
Names_LikeThis to names_likeThis (changing each separate "word" in the
name to camelCase). Changed the version letter in XMB filenames from A
to B to support this without requiring people to delete old XMBs.
- Enhanced the pathfinder's handling of contact paths, resulting in a
very large speedup for actions like attacking, construction, etc. The
problem was that the pathfinder used to not count a given state as the
goal unless it was exactly coincident with the target location. This is
fine when you order a unit to go exactly to a certain spot, but if
you're ordering a unit to build, gather or attack something, then the
target tile is impassable (because your target is there) and therefore
the pathfinder never declares a state final. As a result, the pathfinder
tries hundreds of extra tiles in case there is a long path that gets to
the goal, and after failing to find any path that reaches the goal, it
gives you one to the closest point it got to. To fix it, I made the
pathfinder take into account a radius around the goal in which it's OK
to be, which depends on the size of the target unit and the range of
your action.
This was SVN commit r4186.
2006-08-01 05:41:21 +02:00
|
|
|
*((float*)&waypoint.m_data[0].data) = 0.0f;
|
2006-04-09 02:36:52 +02:00
|
|
|
entity->m_orderQueue.push_front( waypoint );
|
|
|
|
|
}
|
|
|
|
|
|
# Housekeeping and pathfinder enhancements / optimization when dealing with ranged actions.
- Modified Xeromyces to no longer automatically convert element and
attribute names to lowercase, so that we can have camelCase names. We
should now be able to convert all the multi-word entity properties, like
pass_through_allies, to camelCase, like passThroughAllies, which is more
consistent with the rest of our JavaScript naming conventions. To
support the existing code that assumes lowercase element names, I made
the getElementID and getAttributeID methods (used in the EL and AT
macros) ignore case, and I changed any code that directly accessed
element names to use the right case. CEntityTemplate now converts
Names_LikeThis to names_likeThis (changing each separate "word" in the
name to camelCase). Changed the version letter in XMB filenames from A
to B to support this without requiring people to delete old XMBs.
- Enhanced the pathfinder's handling of contact paths, resulting in a
very large speedup for actions like attacking, construction, etc. The
problem was that the pathfinder used to not count a given state as the
goal unless it was exactly coincident with the target location. This is
fine when you order a unit to go exactly to a certain spot, but if
you're ordering a unit to build, gather or attack something, then the
target tile is impassable (because your target is there) and therefore
the pathfinder never declares a state final. As a result, the pathfinder
tries hundreds of extra tiles in case there is a long path that gets to
the goal, and after failing to find any path that reaches the goal, it
gives you one to the closest point it got to. To fix it, I made the
pathfinder take into account a radius around the goal in which it's OK
to be, which depends on the size of the target unit and the range of
your action.
This was SVN commit r4186.
2006-08-01 05:41:21 +02:00
|
|
|
void CPathfindEngine::requestLowLevelPath( HEntity entity, const CVector2D& destination, bool contact, float radius )
|
2006-04-09 02:36:52 +02:00
|
|
|
{
|
2006-05-13 20:50:58 +02:00
|
|
|
PROFILE_START("Pathfinding");
|
2006-04-11 00:05:21 +02:00
|
|
|
|
2006-05-13 20:50:58 +02:00
|
|
|
CVector2D source( entity->m_position.X, entity->m_position.Z );
|
2006-04-11 00:05:21 +02:00
|
|
|
|
# Housekeeping and pathfinder enhancements / optimization when dealing with ranged actions.
- Modified Xeromyces to no longer automatically convert element and
attribute names to lowercase, so that we can have camelCase names. We
should now be able to convert all the multi-word entity properties, like
pass_through_allies, to camelCase, like passThroughAllies, which is more
consistent with the rest of our JavaScript naming conventions. To
support the existing code that assumes lowercase element names, I made
the getElementID and getAttributeID methods (used in the EL and AT
macros) ignore case, and I changed any code that directly accessed
element names to use the right case. CEntityTemplate now converts
Names_LikeThis to names_likeThis (changing each separate "word" in the
name to camelCase). Changed the version letter in XMB filenames from A
to B to support this without requiring people to delete old XMBs.
- Enhanced the pathfinder's handling of contact paths, resulting in a
very large speedup for actions like attacking, construction, etc. The
problem was that the pathfinder used to not count a given state as the
goal unless it was exactly coincident with the target location. This is
fine when you order a unit to go exactly to a certain spot, but if
you're ordering a unit to build, gather or attack something, then the
target tile is impassable (because your target is there) and therefore
the pathfinder never declares a state final. As a result, the pathfinder
tries hundreds of extra tiles in case there is a long path that gets to
the goal, and after failing to find any path that reaches the goal, it
gives you one to the closest point it got to. To fix it, I made the
pathfinder take into account a radius around the goal in which it's OK
to be, which depends on the size of the target unit and the range of
your action.
This was SVN commit r4186.
2006-08-01 05:41:21 +02:00
|
|
|
if ( mLowPathfinder.findPath(source, destination, entity->m_player, radius) )
|
2006-04-11 00:05:21 +02:00
|
|
|
{
|
2006-05-13 20:50:58 +02:00
|
|
|
std::vector<CVector2D> path = mLowPathfinder.getLastPath();
|
2006-05-14 00:11:46 +02:00
|
|
|
if( path.size() > 0 )
|
2006-04-11 00:05:21 +02:00
|
|
|
{
|
2006-05-14 00:11:46 +02:00
|
|
|
std::vector<CVector2D>::iterator it;
|
|
|
|
|
CEntityOrder node;
|
|
|
|
|
for( it = path.begin(); (it+1) != path.end(); it++ )
|
2006-04-11 00:05:21 +02:00
|
|
|
{
|
2006-05-14 00:11:46 +02:00
|
|
|
if ( !contact )
|
|
|
|
|
{
|
|
|
|
|
node.m_type = CEntityOrder::ORDER_GOTO_NOPATHING;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// TODO: Is this right?
|
|
|
|
|
node.m_type = CEntityOrder::ORDER_GOTO_NOPATHING;
|
|
|
|
|
}
|
|
|
|
|
node.m_data[0].location = *it;
|
|
|
|
|
entity->m_orderQueue.push_back(node);
|
2006-04-11 00:05:21 +02:00
|
|
|
}
|
2006-05-14 00:11:46 +02:00
|
|
|
node.m_type = CEntityOrder::ORDER_PATH_END_MARKER;
|
2006-05-13 20:50:58 +02:00
|
|
|
node.m_data[0].location = *it;
|
|
|
|
|
entity->m_orderQueue.push_back(node);
|
2006-04-11 00:05:21 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// If no path was found, then unsolvable
|
|
|
|
|
// TODO: Figure out what to do in this case
|
|
|
|
|
}
|
|
|
|
|
|
2006-05-13 20:50:58 +02:00
|
|
|
PROFILE_END("Pathfinding");
|
2004-06-02 18:11:32 +02:00
|
|
|
}
|
2004-11-11 08:09:32 +01:00
|
|
|
|
# Housekeeping and pathfinder enhancements / optimization when dealing with ranged actions.
- Modified Xeromyces to no longer automatically convert element and
attribute names to lowercase, so that we can have camelCase names. We
should now be able to convert all the multi-word entity properties, like
pass_through_allies, to camelCase, like passThroughAllies, which is more
consistent with the rest of our JavaScript naming conventions. To
support the existing code that assumes lowercase element names, I made
the getElementID and getAttributeID methods (used in the EL and AT
macros) ignore case, and I changed any code that directly accessed
element names to use the right case. CEntityTemplate now converts
Names_LikeThis to names_likeThis (changing each separate "word" in the
name to camelCase). Changed the version letter in XMB filenames from A
to B to support this without requiring people to delete old XMBs.
- Enhanced the pathfinder's handling of contact paths, resulting in a
very large speedup for actions like attacking, construction, etc. The
problem was that the pathfinder used to not count a given state as the
goal unless it was exactly coincident with the target location. This is
fine when you order a unit to go exactly to a certain spot, but if
you're ordering a unit to build, gather or attack something, then the
target tile is impassable (because your target is there) and therefore
the pathfinder never declares a state final. As a result, the pathfinder
tries hundreds of extra tiles in case there is a long path that gets to
the goal, and after failing to find any path that reaches the goal, it
gives you one to the closest point it got to. To fix it, I made the
pathfinder take into account a radius around the goal in which it's OK
to be, which depends on the size of the target unit and the range of
your action.
This was SVN commit r4186.
2006-08-01 05:41:21 +02:00
|
|
|
void CPathfindEngine::requestContactPath( HEntity entity, CEntityOrder* current, float range )
|
2004-11-11 08:09:32 +01:00
|
|
|
{
|
2006-04-11 00:05:21 +02:00
|
|
|
/* TODO: Same as non-contact: need high-level planner */
|
|
|
|
|
CEntityOrder waypoint;
|
|
|
|
|
waypoint.m_type = CEntityOrder::ORDER_GOTO_WAYPOINT_CONTACT;
|
|
|
|
|
waypoint.m_data[0].location = current->m_data[0].entity->m_position;
|
# Housekeeping and pathfinder enhancements / optimization when dealing with ranged actions.
- Modified Xeromyces to no longer automatically convert element and
attribute names to lowercase, so that we can have camelCase names. We
should now be able to convert all the multi-word entity properties, like
pass_through_allies, to camelCase, like passThroughAllies, which is more
consistent with the rest of our JavaScript naming conventions. To
support the existing code that assumes lowercase element names, I made
the getElementID and getAttributeID methods (used in the EL and AT
macros) ignore case, and I changed any code that directly accessed
element names to use the right case. CEntityTemplate now converts
Names_LikeThis to names_likeThis (changing each separate "word" in the
name to camelCase). Changed the version letter in XMB filenames from A
to B to support this without requiring people to delete old XMBs.
- Enhanced the pathfinder's handling of contact paths, resulting in a
very large speedup for actions like attacking, construction, etc. The
problem was that the pathfinder used to not count a given state as the
goal unless it was exactly coincident with the target location. This is
fine when you order a unit to go exactly to a certain spot, but if
you're ordering a unit to build, gather or attack something, then the
target tile is impassable (because your target is there) and therefore
the pathfinder never declares a state final. As a result, the pathfinder
tries hundreds of extra tiles in case there is a long path that gets to
the goal, and after failing to find any path that reaches the goal, it
gives you one to the closest point it got to. To fix it, I made the
pathfinder take into account a radius around the goal in which it's OK
to be, which depends on the size of the target unit and the range of
your action.
This was SVN commit r4186.
2006-08-01 05:41:21 +02:00
|
|
|
*((float*)&waypoint.m_data[0].data) = std::max( current->m_data[0].entity->m_bounds->m_radius, range );
|
2006-04-11 00:05:21 +02:00
|
|
|
entity->m_orderQueue.push_front( waypoint );
|
|
|
|
|
|
|
|
|
|
//pathSparse( entity, current->m_data[0].entity->m_position );
|
|
|
|
|
//// For attack orders, do some additional postprocessing (replace goto/nopathing
|
|
|
|
|
//// with attack/nopathing, up until the attack order marker)
|
|
|
|
|
//std::deque<CEntityOrder>::iterator it;
|
|
|
|
|
//for( it = entity->m_orderQueue.begin(); it != entity->m_orderQueue.end(); it++ )
|
|
|
|
|
//{
|
|
|
|
|
// if( it->m_type == CEntityOrder::ORDER_PATH_END_MARKER )
|
|
|
|
|
// break;
|
|
|
|
|
// if( it->m_type == CEntityOrder::ORDER_GOTO_NOPATHING )
|
|
|
|
|
// {
|
|
|
|
|
// *it = *current;
|
|
|
|
|
// }
|
|
|
|
|
//}
|
|
|
|
|
}
|
