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

Remove .b3d usage in stk-code

Browse Source
This commit is contained in:
Benau 2017-08-21 16:02:06 +08:00
parent a8e20101f8
commit ad369b88da
10 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
data/items.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0"?>
<items>
<bonus-box model="gift-box.b3d" lowmodel="gift-box-low.b3d" glow="31 202 253"/>
<banana model="banana.b3d" lowmodel="banana-low.b3d" glow="197 152 37"/>
<nitro-big model="nitrotank-big.b3d" lowmodel="nitrotank-big-low.b3d" glow="0 70 158"/>
<nitro-small model="nitrotank-small.b3d" lowmodel="nitrotank-small-low.b3d" glow="0 70 158"/>
<bonus-box model="gift-box.spm" lowmodel="gift-box-low.spm" glow="31 202 253"/>
<banana model="banana.spm" lowmodel="banana-low.spm" glow="197 152 37"/>
<nitro-big model="nitrotank-big.spm" lowmodel="nitrotank-big-low.spm" glow="0 70 158"/>
<nitro-small model="nitrotank-small.spm" lowmodel="nitrotank-small-low.spm" glow="0 70 158"/>
<!-- While a bubble gum technically
isn't an item, it is internally
handled as one, so list it here -->
<bubblegum model="bubblegum.b3d" lowmodel="bubblegum-low.b3d" glow="246 150 209"/>
<bubblegum-nolok model="bubblegum-nolok.b3d" lowmodel="bubblegum-nolok-low.b3d"/>
<!-- <easter-egg model="easter_egg.b3d" /> -->
<easter-egg model="easter_egg.b3d" />
<bubblegum model="bubblegum.spm" lowmodel="bubblegum-low.spm" glow="246 150 209"/>
<bubblegum-nolok model="bubblegum-nolok.spm" lowmodel="bubblegum-nolok-low.spm"/>
<!-- <easter-egg model="easter_egg.spm" /> -->
<easter-egg model="easter_egg.spm" />
</items>

12
data/powerup.xml
View File

@ -2,17 +2,17 @@
<powerup>
<item name="zipper" icon="zipper_collect.png" />
<item name="bowling" icon="bowling-icon.png"
model="bowling.b3d" speed="4.0"
model="bowling.spm" speed="4.0"
min-height="0.2" max-height="1.0"
force-updown="1" force-to-target="40"
max-distance="25" />
<item name="bubblegum" icon="bubblegum-icon.png" />
<item name="cake" icon="cake-icon.png"
model="cake.b3d" speed="50"
model="cake.spm" speed="50"
min-height="0.2" max-height="1.0"
force-updown="25" max-distance="90" />
<item name="anchor" icon="anchor-icon.png"
model="anchor.b3d" />
model="anchor.spm" />
<item name="switch" icon="swap-icon.png" />
<item name="swatter" icon="swatter-icon.png" />
<!-- interval: How long a single bounce takes.
@ -56,7 +56,7 @@
tunneling.
-->
<item name="rubber-ball" icon="rubber_ball-icon.png"
model="rubber_ball.b3d" speed="35.0"
model="rubber_ball.spm" speed="35.0"
scale="1 1 1" interval="1"
max-height="4.0" min-height="0"
fast-ping-distance="50"
@ -67,9 +67,9 @@
squash-slowdown="0.5" squash-duration="2"
delete-time="5.0" max-height-difference="10" />
<item name="parachute" icon="parachute-icon.png"
model="parachute.b3d" />
model="parachute.spm" />
<item name="plunger" icon="plunger-icon.png"
model="plunger.b3d" speed="35"
model="plunger.spm" speed="35"
min-height="0.2" max-height="1.0"
force-updown="35" force-to-target="15"
max-distance="25" />

16
src/items/attachment_manager.cpp
View File

@ -48,14 +48,14 @@ struct initAttachmentType {Attachment::AttachmentType attachment;
static const initAttachmentType iat[]=
{
{Attachment::ATTACH_PARACHUTE, "parachute.b3d", "parachute-attach-icon.png" },
{Attachment::ATTACH_BOMB, "bomb.b3d", "bomb-attach-icon.png" },
{Attachment::ATTACH_ANVIL, "anchor.b3d", "anchor-attach-icon.png" },
{Attachment::ATTACH_SWATTER, "swatter.b3d", "swatter-icon.png" },
{Attachment::ATTACH_NOLOKS_SWATTER, "swatter_nolok.b3d", "swatter-icon.png" },
{Attachment::ATTACH_TINYTUX, "reset-button.b3d", "reset-attach-icon.png" },
{Attachment::ATTACH_BUBBLEGUM_SHIELD, "bubblegum_shield.b3d", "shield-icon.png" },
{Attachment::ATTACH_NOLOK_BUBBLEGUM_SHIELD, "bubblegum_shield_nolok.b3d", "shield-icon.png" },
{Attachment::ATTACH_PARACHUTE, "parachute.spm", "parachute-attach-icon.png" },
{Attachment::ATTACH_BOMB, "bomb.spm", "bomb-attach-icon.png" },
{Attachment::ATTACH_ANVIL, "anchor.spm", "anchor-attach-icon.png" },
{Attachment::ATTACH_SWATTER, "swatter.spm", "swatter-icon.png" },
{Attachment::ATTACH_NOLOKS_SWATTER, "swatter_nolok.spm", "swatter-icon.png" },
{Attachment::ATTACH_TINYTUX, "reset-button.spm", "reset-attach-icon.png" },
{Attachment::ATTACH_BUBBLEGUM_SHIELD, "bubblegum_shield.spm", "shield-icon.png" },
{Attachment::ATTACH_NOLOK_BUBBLEGUM_SHIELD, "bubblegum_shield_nolok.spm", "shield-icon.png" },
{Attachment::ATTACH_MAX, "", "" },
};

2
src/items/swatter.cpp
View File

@ -75,7 +75,7 @@ Swatter::Swatter(AbstractKart *kart, bool was_bomb,
if (m_removing_bomb)
{
m_scene_node->setMesh(irr_driver->getAnimatedMesh(
file_manager->getAsset(FileManager::MODEL,"swatter_anim2.b3d") ) );
file_manager->getAsset(FileManager::MODEL,"swatter_anim.spm") ) );
m_scene_node->setRotation(core::vector3df(0.0, -180.0, 0.0));
m_scene_node->setAnimationSpeed(0.9f);
m_scene_node->setCurrentFrame(0.0f);

2
src/karts/kart_model.cpp
View File

@ -770,7 +770,7 @@ void KartModel::loadHeadlights(const XMLNode &node)
const XMLNode* child = node.getNode(i);
if (child->getName() == "object")
{
// <object position="-0.168000 0.151288 0.917929" model="TuxHeadlight.b3d"/>
// <object position="-0.168000 0.151288 0.917929" model="TuxHeadlight.spm"/>
core::vector3df position;
child->get("position", &position);

4
src/main.cpp
View File

@ -421,7 +421,7 @@ void handleXmasMode()
} // switch m_xmas_mode
if(xmas)
kart_properties_manager->setHatMeshName("christmas_hat.b3d");
kart_properties_manager->setHatMeshName("christmas_hat.spm");
} // handleXmasMode
// ============================================================================
/** Determines if Easter Ears should be used
@ -478,7 +478,7 @@ void handleEasterEarMode()
int day, month, year;
StkTime::getDate(&day, &month, &year);
if (isEasterMode(day, month, year, /*before_after_days*/5))
kart_properties_manager->setHatMeshName("easter_ears.b3d");
kart_properties_manager->setHatMeshName("easter_ears.spm");
} // handleEasterMode
// ============================================================================

12
src/modes/three_strikes_battle.cpp
View File

@ -51,7 +51,7 @@ ThreeStrikesBattle::ThreeStrikesBattle() : WorldWithRank()
m_insert_tire = 0;
m_tire = irr_driver->getMesh(file_manager->getAsset(FileManager::MODEL,
"tire.b3d") );
"tire.spm") );
irr_driver->grabAllTextures(m_tire);
m_total_rescue = 0;
@ -375,7 +375,7 @@ void ThreeStrikesBattle::update(float dt)
if(m_insert_tire == 1)
{
tire_offset = core::vector3df(0.0f, 0.0f, 0.0f);
tire = file_manager->getAsset(FileManager::MODEL,"tire.b3d");
tire = file_manager->getAsset(FileManager::MODEL,"tire.spm");
scale = 0.5f;
radius = 0.5f;
body_shape = PhysicalObject::MP_CYLINDER_Y;
@ -387,13 +387,13 @@ void ThreeStrikesBattle::update(float dt)
radius = m_tire_radius[m_insert_tire-2];
tire_offset = m_tire_offsets[m_insert_tire-2];
if (m_insert_tire == 2)
tire = m_tire_dir+"/wheel-rear-left.b3d";
tire = m_tire_dir+"/wheel-rear-left.spm";
else if(m_insert_tire == 3)
tire = m_tire_dir+"/wheel-front-left.b3d";
tire = m_tire_dir+"/wheel-front-left.spm";
else if(m_insert_tire == 4)
tire = m_tire_dir+"/wheel-front-right.b3d";
tire = m_tire_dir+"/wheel-front-right.spm";
else if(m_insert_tire == 5)
tire = m_tire_dir+"/wheel-rear-right.b3d";
tire = m_tire_dir+"/wheel-rear-right.spm";
if(!file_manager->fileExists(tire))
{
m_insert_tire--;

6
src/states_screens/feature_unlocked.cpp
View File

@ -216,13 +216,13 @@ void FeatureUnlockedCutScene::addTrophy(RaceManager::Difficulty difficulty)
switch (difficulty)
{
case RaceManager::DIFFICULTY_EASY:
model = file_manager->getAsset(FileManager::MODEL,"trophy_bronze.b3d");
model = file_manager->getAsset(FileManager::MODEL,"trophy_bronze.spm");
break;
case RaceManager::DIFFICULTY_MEDIUM:
model = file_manager->getAsset(FileManager::MODEL,"trophy_silver.b3d");
model = file_manager->getAsset(FileManager::MODEL,"trophy_silver.spm");
break;
case RaceManager::DIFFICULTY_HARD:
model = file_manager->getAsset(FileManager::MODEL,"trophy_gold.b3d");
model = file_manager->getAsset(FileManager::MODEL,"trophy_gold.spm");
break;
default:
assert(false);

6
src/states_screens/grand_prix_win.cpp
View File

@ -376,11 +376,11 @@ void GrandPrixWin::setKarts(const std::string idents_arg[3])
TrackObjectPresentationMesh* meshPresentation = currObj->getPresentation<TrackObjectPresentationMesh>();
if (meshPresentation != NULL)
{
if (meshPresentation->getModelFile() == "gpwin_podium1.b3d")
if (meshPresentation->getModelFile() == "gpwin_podium1.spm")
m_podium_steps[0] = currObj;
else if (meshPresentation->getModelFile() == "gpwin_podium2.b3d")
else if (meshPresentation->getModelFile() == "gpwin_podium2.spm")
m_podium_steps[1] = currObj;
else if (meshPresentation->getModelFile() == "gpwin_podium3.b3d")
else if (meshPresentation->getModelFile() == "gpwin_podium3.spm")
m_podium_steps[2] = currObj;
}
}

2
src/states_screens/kart_selection.cpp
View File

@ -844,7 +844,7 @@ void KartSelectionScreen::updateKartWidgetModel(int widget_id,
{
w3->clearModels();
w3->addModel(irr_driver->getAnimatedMesh(
file_manager->getAsset(FileManager::MODEL, "chest.b3d") )->getMesh(20),
file_manager->getAsset(FileManager::MODEL, "chest.spm") )->getMesh(20),
Vec3(0,0,0), Vec3(15.0f, 15.0f, 15.0f) );
w3->update(0);