Menu
▾
▴
[Supertuxkart-commit] SF.net SVN: supertuxkart:[11511] main/trunk/src
|
From: <hik...@us...> - 2012-08-16 22:02:48
|
Revision: 11511
http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=11511&view=rev
Author: hikerstk
Date: 2012-08-16 22:02:41 +0000 (Thu, 16 Aug 2012)
Log Message:
-----------
1) Fixed crash: hovering on top of random kart in the kart selection screen
would crash since getItemModel was not static (and no ItemManager instance
exists at that time).
2) Items are now also stored in quad-based containers, which will allow the
AI to better find 'interesting' items.
Modified Paths:
--------------
main/trunk/src/items/item_manager.cpp
main/trunk/src/items/item_manager.hpp
main/trunk/src/network/race_state.cpp
main/trunk/src/states_screens/kart_selection.cpp
Modified: main/trunk/src/items/item_manager.cpp
===================================================================
--- main/trunk/src/items/item_manager.cpp 2012-08-16 05:59:04 UTC (rev 11510)
+++ main/trunk/src/items/item_manager.cpp 2012-08-16 22:02:41 UTC (rev 11511)
@@ -29,6 +29,7 @@
#include "graphics/material_manager.hpp"
#include "io/file_manager.hpp"
#include "karts/abstract_kart.hpp"
+#include "modes/linear_world.hpp"
#include "network/network_manager.hpp"
#include "tracks/quad_graph.hpp"
#include "tracks/track.hpp"
@@ -147,6 +148,18 @@
for(unsigned int i=Item::ITEM_FIRST; i<Item::ITEM_COUNT; i++)
m_switch_to.push_back((Item::ItemType)i);
setSwitchItems(stk_config->m_switch_items);
+
+ if(QuadGraph::get())
+ {
+ m_items_in_quads = new std::vector<AllItemTypes>;
+ // Entries 0 to n-1 are for the quads, entry
+ // n is for all items that are not on a quad.
+ m_items_in_quads->resize(QuadSet::get()->getNumberOfQuads()+1);
+ }
+ else
+ {
+ m_items_in_quads = NULL;
+ }
} // ItemManager
//-----------------------------------------------------------------------------
@@ -166,12 +179,15 @@
*/
ItemManager::~ItemManager()
{
+ if(m_items_in_quads)
+ delete m_items_in_quads;
for(AllItemTypes::iterator i =m_all_items.begin();
i!=m_all_items.end(); i++)
{
if(*i)
delete *i;
}
+
m_all_items.clear();
} // ~ItemManager
@@ -195,10 +211,18 @@
m_all_items.push_back(item);
item->setItemId(index);
- // Now insert into the appropriate quad list
- const Vec3 &xyz = item->getXYZ();
- int sector = QuadGraph::UNKNOWN_SECTOR;
- QuadGraph::get()->findRoadSector(xyz, §or);
+ // Now insert into the appropriate quad list, if there is a quad list
+ // (i.e. race mode has a quad graph).
+ if(m_items_in_quads)
+ {
+ const Vec3 &xyz = item->getXYZ();
+ int sector = QuadGraph::UNKNOWN_SECTOR;
+ QuadGraph::get()->findRoadSector(xyz, §or);
+ if(sector==QuadGraph::UNKNOWN_SECTOR)
+ (*m_items_in_quads)[m_items_in_quads->size()-1].push_back(item);
+ else
+ (*m_items_in_quads)[sector].push_back(item);
+ } // if m_items_in_quads
} // insertItem
//-----------------------------------------------------------------------------
@@ -244,9 +268,8 @@
/** Set an item as collected.
* This function is called on the server when an item is collected, or on
* the client upon receiving information about collected items. */
-void ItemManager::collectedItem(int item_id, AbstractKart *kart, int add_info)
+void ItemManager::collectedItem(Item *item, AbstractKart *kart, int add_info)
{
- Item *item=m_all_items[item_id];
assert(item);
item->collected(kart);
kart->collectedItem(item, add_info);
@@ -261,6 +284,15 @@
{
// Only do this on the server
if(network_manager->getMode()==NetworkManager::NW_CLIENT) return;
+
+ // We could use m_items_in_quads to to check for item hits: take the quad
+ // of the graph node of the kart, and only check items in that quad. But
+ // then we also need to check for any adjacent quads (since an item just
+ // on the order of one quad might get hit from an adjacent quad). Then
+ // it is possible that a quad is that short that we need to test adjacent
+ // of adjacent quads. And check for items outside of the track.
+ // Since at this stace item detection is by far not a bottle neck,
+ // the original, simple and stable algorithm is left in place.
for(AllItemTypes::iterator i =m_all_items.begin();
i!=m_all_items.end(); i++)
@@ -270,7 +302,7 @@
// we pass the kart and the position separately.
if((*i)->hitKart(kart, kart->getXYZ()))
{
- collectedItem(i-m_all_items.begin(), kart);
+ collectedItem(*i, kart);
} // if hit
} // for m_all_items
} // checkItemHit
@@ -292,6 +324,10 @@
m_switch_time = -1.0f;
}
+
+ // We can't simply erase items in the list: in this case the indicies
+ // stored in each item are invalid, and lead to incorrect result/crashes
+ // in deleteItem
AllItemTypes::iterator i=m_all_items.begin();
while(i!=m_all_items.end())
{
@@ -302,10 +338,8 @@
}
if((*i)->canBeUsedUp() || (*i)->getType()==Item::ITEM_BUBBLEGUM)
{
- Item *b=*i;
- AllItemTypes::iterator i_next = m_all_items.erase(i);
- delete b;
- i = i_next;
+ deleteItem( *i );
+ i++;
}
else
{
@@ -346,14 +380,40 @@
(*i)->update(dt);
if( (*i)->isUsedUp())
{
- delete *i;
- m_all_items[i-m_all_items.begin()] = NULL;
+ deleteItem( *i );
} // if usedUp
} // if *i
} // for m_all_items
} // update
//-----------------------------------------------------------------------------
+/** Removes an items from the items-in-quad list, from the list of all
+ * items, and then frees the item itself.
+ * \param The item to delete.
+ */
+void ItemManager::deleteItem(Item *item)
+{
+ // First check if the item needs to be removed from the items-in-quad list
+ if(m_items_in_quads)
+ {
+ const Vec3 &xyz = item->getXYZ();
+ int sector = QuadGraph::UNKNOWN_SECTOR;
+ QuadGraph::get()->findRoadSector(xyz, §or);
+ unsigned int indx = sector==QuadGraph::UNKNOWN_SECTOR
+ ? m_items_in_quads->size()-1
+ : sector;
+ AllItemTypes &items = (*m_items_in_quads)[indx];
+ AllItemTypes::iterator it = std::find(items.begin(), items.end(),item);
+ assert(it!=items.end());
+ items.erase(it);
+ } // if m_items_in_quads
+
+ int index = item->getItemId();
+ m_all_items[index] = NULL;
+ delete item;
+} // delete item
+
+//-----------------------------------------------------------------------------
/** Switches all items: boxes become bananas and vice versa for a certain
* amount of time (as defined in stk_config.xml.
*/
Modified: main/trunk/src/items/item_manager.hpp
===================================================================
--- main/trunk/src/items/item_manager.hpp 2012-08-16 05:59:04 UTC (rev 11510)
+++ main/trunk/src/items/item_manager.hpp 2012-08-16 22:02:41 UTC (rev 11511)
@@ -51,6 +51,11 @@
static void create();
static void destroy();
+ // ------------------------------------------------------------------------
+ /** Returns the mesh for a certain item. */
+ static scene::IMesh* getItemModel(Item::ItemType type)
+ {return m_item_mesh[type];}
+ // ------------------------------------------------------------------------
/** Return an instance of the item manager (it does not automatically
* create one, call create for that). */
static ItemManager *get() {
@@ -64,6 +69,11 @@
typedef std::vector<Item*> AllItemTypes;
AllItemTypes m_all_items;
+ /** Stores which items are on which quad. m_items_in_quads[#quads]
+ * contains all items that are not on a quad. Note that this
+ * field is undefined if no QuadGraph exist, e.g. in battle mode. */
+ std::vector< AllItemTypes > *m_items_in_quads;
+
/** What item this item is switched to. */
std::vector<Item::ItemType> m_switch_to;
@@ -72,6 +82,7 @@
float m_switch_time;
void insertItem(Item *item);
+ void deleteItem(Item *item);
// Make those private so only create/destroy functions can call them.
ItemManager();
@@ -87,18 +98,27 @@
void update (float delta);
void checkItemHit (AbstractKart* kart);
void reset ();
- void collectedItem (int item_id, AbstractKart *kart,
+ void collectedItem (Item *item, AbstractKart *kart,
int add_info=-1);
void switchItems ();
// ------------------------------------------------------------------------
- scene::IMesh* getItemModel (Item::ItemType type)
- {return m_item_mesh[type];}
- // ------------------------------------------------------------------------
/** Returns the number of items. */
unsigned int getNumberOfItems() const { return m_all_items.size(); }
// ------------------------------------------------------------------------
/** Returns a pointer to the n-th item. */
- const Item * getItem(unsigned int n) const { return m_all_items[n]; };
+ const Item* getItem(unsigned int n) const { return m_all_items[n]; };
+ // ------------------------------------------------------------------------
+ /** Returns a pointer to the n-th item. */
+ Item* getItem(unsigned int n) { return m_all_items[n]; };
+ // ------------------------------------------------------------------------
+ /** Returns a reference to the array of all items on the specified quad.
+ */
+ const AllItemTypes& getItemsInQuads(unsigned int n) const
+ {
+ assert(m_items_in_quads);
+ assert(n<(*m_items_in_quads).size());
+ return (*m_items_in_quads)[n];
+ } // getItemsInQuads
}; // ItemManager
#endif
Modified: main/trunk/src/network/race_state.cpp
===================================================================
--- main/trunk/src/network/race_state.cpp 2012-08-16 05:59:04 UTC (rev 11510)
+++ main/trunk/src/network/race_state.cpp 2012-08-16 22:02:41 UTC (rev 11511)
@@ -146,9 +146,12 @@
if(hi.m_item_id==-1) // Rescue triggered
new RescueAnimation(world->getKart(hi.m_kart_id));
else
- ItemManager::get()->collectedItem(hi.m_item_id,
+ {
+ Item *item = ItemManager::get()->getItem(hi.m_item_id);
+ ItemManager::get()->collectedItem(item,
world->getKart(hi.m_kart_id),
hi.m_add_info);
+ }
}
// 3. Projectiles
Modified: main/trunk/src/states_screens/kart_selection.cpp
===================================================================
--- main/trunk/src/states_screens/kart_selection.cpp 2012-08-16 05:59:04 UTC (rev 11510)
+++ main/trunk/src/states_screens/kart_selection.cpp 2012-08-16 22:02:41 UTC (rev 11511)
@@ -872,7 +872,7 @@
{
// Random kart
scene::IMesh* model =
- ItemManager::get()->getItemModel(Item::ITEM_BONUS_BOX);
+ ItemManager::getItemModel(Item::ITEM_BONUS_BOX);
w3->clearModels();
w3->addModel( model, Vec3(0.0f, -12.0f, 0.0f),
Vec3(35.0f, 35.0f, 35.0f) );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|