apply new patches to before the dubious applied/reverted merge

This commit is contained in:
Bart Cools 2014-06-19 14:34:34 +02:00
parent 07b6579529
commit a9de201874
2 changed files with 41 additions and 14 deletions

View File

@ -115,7 +115,7 @@ void SkillLevelWidget::setSize(const int x, const int y, const int w, const int
m_h = h;
// -- sizes
m_bar_w = w/2;
m_bar_w = 3*(w/2)/4;
m_bar_h = h;
m_label_w = w/2;
m_label_h = h;

53
test.sh
View File

@ -1,20 +1,47 @@
#!/bin/bash
mkdir -p ../batch
count=1
#for numkarts in 4; do
# for laps in 4 10; do
for ((mass = 50; mass <= 500; mass=$mass+10)) do
sed -i -e "s/mass\ value\ =\ \"[0-9]*/mass\ value\ =\ \"$mass/g" ../stk-assets/karts/sara/kart.xml
for run in {1..10}; do
echo $count/450
./cmake_build/bin/supertuxkart.app/Contents/MacOS/supertuxkart -R --mode=3 --numkarts=1 --with-profile --profile-laps=3 --kart=sara --ai=beastie,beastie,beastie --no-graphics > /dev/null
grep "profile" ~/Library/Application\ Support/SuperTuxKart/stdout.log > ../batch/$mass.$run.txt
let "count = $count + 1"
tracks='snowmountain city lighthouse olivermath hacienda startrack farm zengarden'
karts='beastie sara elephpant tuxley'
laps=1
for track in $tracks; do
#beastie is the current kart
#sara is the light kart
#tuxley is the medium kart
#elephpant is the heavy kart
for kart in $karts; do
for run in {1..50}; do
for lap in $laps; do
./cmake_build/bin/supertuxkart.app/Contents/MacOS/supertuxkart -R --mode=3 --numkarts=1 --track=$track --with-profile --profile-laps=$lap --kart=$kart --ai=beastie,beastie,beastie --no-graphics > /dev/null
grep "profile" ~/Library/Application\ Support/SuperTuxKart/stdout.log > ../batch/$track.$kart.$run.txt
done
done
done
done
for track in "cave" "city" "scotland" "jungle" "lighthouse" "hacienda" "fortmagma"; do
./cmake_build/bin/supertuxkart.app/Contents/MacOS/supertuxkart -R --mode=3 --track=$track --with-profile --profile-laps=1 > /dev/null
done
#for track in ../stk-assets/tracks/*/track.xml; do
# grep "internal" "$track"
# if grep -q "internal" "$track" ; then
# continue;
# else
# if grep -q "arena" "$track" ; then
# continue;
# else
# if grep -q "soccer" "$track" ; then
# continue;
# else
# a=${track%%/track.xml};
# trackname=${a##../stk-assets/tracks/};
# fi
# fi
# fi
# if [ $trackname = "minel" ] || [ $trackname = "mines" ]; then
# continue;
# fi