ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing bubblegum dropping before state

Browse Source
This commit is contained in:
Benau
2018-11-29 14:57:24 +08:00
parent 443919b6b7
commit 8bf4f36259
3 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/items/item.cpp
View File

@@ -80,7 +80,7 @@ void ItemState::setDisappearCounter()
void ItemState::initItem(ItemType type, const Vec3& xyz, const Vec3& normal)
{
m_xyz = xyz;
m_normal = normal;
m_original_rotation = shortestArcQuat(Vec3(0, 1, 0), normal);
m_original_type = ITEM_NONE;
m_ticks_till_return = 0;
setDisappearCounter();
@@ -171,7 +171,6 @@ Item::Item(ItemType type, const Vec3& xyz, const Vec3& normal,
m_distance_2 = 1.2f;
initItem(type, xyz, normal);
m_graphical_type = type;
m_original_rotation = shortestArcQuat(Vec3(0, 1, 0), normal);
m_listener = NULL;
LODNode* lodnode =
@@ -204,7 +203,7 @@ Item::Item(ItemType type, const Vec3& xyz, const Vec3& normal,
m_node->setAutomaticCulling(scene::EAC_FRUSTUM_BOX);
m_node->setPosition(xyz.toIrrVector());
Vec3 hpr;
hpr.setHPR(m_original_rotation);
hpr.setHPR(getOriginalRotation());
m_node->setRotation(hpr.toIrrHPR());
m_node->grab();
} // Item(type, xyz, normal, mesh, lowres_mesh)
@@ -219,9 +218,8 @@ Item::Item(const Vec3& xyz, float distance, TriggerItemListener* trigger)
: ItemState(ITEM_TRIGGER)
{
m_distance_2 = distance*distance;
initItem(ITEM_TRIGGER, xyz, /*normal not required*/Vec3(0,0,0));
initItem(ITEM_TRIGGER, xyz, /*normal not required*/Vec3(0,1,0));
m_graphical_type = ITEM_TRIGGER;
m_original_rotation = btQuaternion(0, 0, 0, 1);
m_node = NULL;
m_listener = trigger;
m_was_available_previously = true;
@@ -343,7 +341,7 @@ void Item::handleNewMesh(ItemType type)
spmn->setGlowColor(ItemManager::get()->getGlowColor(type));
}
Vec3 hpr;
hpr.setHPR(m_original_rotation);
hpr.setHPR(getOriginalRotation());
m_node->setRotation(hpr.toIrrHPR());
#endif
} // handleNewMesh
@@ -370,8 +368,9 @@ void Item::updateGraphics(float dt)
getOriginalType() == ITEM_NONE && !isUsedUp());
m_node->setVisible(is_visible);
m_node->setPosition(getXYZ().toIrrVector());
if (!m_was_available_previously && isAvailable() )
if (!m_was_available_previously && isAvailable())
{
// This item is now available again - make sure it is not
// scaled anymore.
@@ -387,9 +386,9 @@ void Item::updateGraphics(float dt)
fmodf((float)(World::getWorld()->getTicksSinceStart() +
getTicksTillReturn()) / 40.0f, M_PI * 2);
btMatrix3x3 m;
m.setRotation(m_original_rotation);
m.setRotation(getOriginalRotation());
btQuaternion r = btQuaternion(m.getColumn(1), angle) *
m_original_rotation;
getOriginalRotation();
Vec3 hpr;
hpr.setHPR(r);
m_node->setRotation(hpr.toIrrHPR());
@@ -397,20 +396,24 @@ void Item::updateGraphics(float dt)
m_node->setVisible(true);
m_node->setScale(core::vector3df(1, 1, 1)*(1 - time_till_return));
}
if (isAvailable() && rotating())
if (isAvailable())
{
// have it rotate
float angle =
fmodf((float)World::getWorld()->getTicksSinceStart() / 40.0f,
M_PI * 2);
btMatrix3x3 m;
m.setRotation(m_original_rotation);
btQuaternion r = btQuaternion(m.getColumn(1), angle) *
m_original_rotation;
Vec3 hpr;
hpr.setHPR(r);
if (rotating())
{
// have it rotate
float angle =
fmodf((float)World::getWorld()->getTicksSinceStart() / 40.0f,
M_PI * 2);
btMatrix3x3 m;
m.setRotation(getOriginalRotation());
btQuaternion r = btQuaternion(m.getColumn(1), angle) *
getOriginalRotation();
hpr.setHPR(r);
}
else
hpr.setHPR(getOriginalRotation());
m_node->setRotation(hpr.toIrrHPR());
} // if item is available
m_was_available_previously = isAvailable();

28
src/items/item.hpp
View File

@@ -128,7 +128,7 @@ private:
* (in case that a client would get a different (or no) normal from a
* raycast).
*/
Vec3 m_normal;
btQuaternion m_original_rotation;
/** The 'owner' of the item, i.e. the kart that dropped this item.
* Is NULL if the item is part of the track. */
@@ -318,8 +318,15 @@ public:
/** Returns the normal of the ItemState. */
const Vec3 getNormal() const
{
return m_normal;
return quatRotate(m_original_rotation, Vec3(0.0f, 1.0f, 0.0f));
}
// ------------------------------------------------------------------------
/** Returns the original rotation of the item. */
const btQuaternion& getOriginalRotation() const
{
return m_original_rotation;
}
}; // class ItemState
// ============================================================================
@@ -330,14 +337,6 @@ class Item : public ItemState, public NoCopy
{
private:
/** Stores the original rotation of an item. This is used in
* case of a switch to restore the rotation of a bubble gum
* (bubble gums don't rotate, but it will be replaced with
* a nitro which rotates, and so overwrites the original
* rotation). */
btQuaternion m_original_rotation;
/** Scene node of this item. */
LODNode *m_node;
@@ -416,7 +415,7 @@ public:
{
if (getPreviousOwner() == kart && getDeactivatedTicks() > 0)
return false;
Vec3 lc = quatRotate(m_original_rotation, xyz - getXYZ());
Vec3 lc = quatRotate(getOriginalRotation(), xyz - getXYZ());
// Don't be too strict if the kart is a bit above the item
lc.setY(lc.getY() / 2.0f);
return lc.length2() < m_distance_2;
@@ -446,13 +445,6 @@ public:
if(left) return m_avoidance_points[0];
return m_avoidance_points[1];
} // getAvoidancePoint
// ------------------------------------------------------------------------
/** Returns the normal of the item. */
const Vec3 getNormal() const
{
return quatRotate(m_original_rotation, Vec3(0,1,0));
}
// ------------------------------------------------------------------------
scene::ISceneNode *getSceneNode()
{

2
src/items/item_manager.cpp
View File

@@ -265,8 +265,6 @@ Item* ItemManager::dropNewItem(ItemState::ItemType type,
const Vec3 *server_xyz,
const Vec3 *server_normal)
{
if (NetworkConfig::get()->isNetworking() &&
NetworkConfig::get()->isClient() && !server_xyz) return NULL;
Vec3 normal, pos;
const Material* material_hit;
if (!server_xyz)