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

Converted glow color back fro floating point to integers (upon artists requests).

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14691 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-12-09 20:02:43 +00:00
parent f2df11e5a0
commit 0076bec269
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
data/items.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<items> <items>
<bonus-box model="gift-box.b3d" lowmodel="gift-box-low.b3d" glow="0.12 0.79 0.99"/> <bonus-box model="gift-box.b3d" lowmodel="gift-box-low.b3d" glow="31 202 253"/>
<banana model="banana.b3d" lowmodel="banana-low.b3d" glow="0.77 0.60 0.15"/> <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.00 0.27 0.62"/> <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.00 0.27 0.62"/> <nitro-small model="nitrotank-small.b3d" lowmodel="nitrotank-small-low.b3d" glow="0 70 158"/>
<!-- While a bubble gum technically <!-- While a bubble gum technically
isn't an item, it is internally isn't an item, it is internally
handled as one, so list it here --> handled as one, so list it here -->
<bubblegum model="bubblegum.b3d" lowmodel="bubblegum-low.b3d" glow="0.96 0.59 0.82"/> <bubblegum model="bubblegum.b3d" lowmodel="bubblegum-low.b3d" glow="246 150 209"/>
<bubblegum-nolok model="bubblegum-nolok.b3d" lowmodel="bubblegum-nolok-low.b3d"/> <bubblegum-nolok model="bubblegum-nolok.b3d" lowmodel="bubblegum-nolok-low.b3d"/>
<!-- <easter-egg model="easter_egg.b3d" /> --> <!-- <easter-egg model="easter_egg.b3d" /> -->
<easter-egg model="easter_egg.b3d" /> <easter-egg model="easter_egg.b3d" />

14
src/io/xml_node.cpp
View File

@ -281,16 +281,16 @@ int XMLNode::get(const std::string &attribute, video::SColorf *color) const
std::vector<std::string> v = StringUtils::split(s,' '); std::vector<std::string> v = StringUtils::split(s,' ');
if(v.size()==3) if(v.size()==3)
{ {
color->set((float)atof(v[0].c_str()), color->set((float)atof(v[0].c_str())/255.0f,
(float)atof(v[1].c_str()), (float)atof(v[1].c_str())/255.0f,
(float)atof(v[2].c_str())); (float)atof(v[2].c_str())/255.0f);
} }
else if(v.size()==4) else if(v.size()==4)
{ {
color->set((float)atof(v[3].c_str()), // set takes ARGB, but we use RGBA color->set((float)atof(v[3].c_str())/255.0f, // set takes ARGB, but we use RGBA
(float)atof(v[0].c_str()), (float)atof(v[0].c_str())/255.0f,
(float)atof(v[1].c_str()), (float)atof(v[1].c_str())/255.0f,
(float)atof(v[2].c_str())); (float)atof(v[2].c_str())/255.0f);
} }
else else
return 0; return 0;