Menu
▾
▴
performous-commit — SCM commits
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(25) |
Jul
(288) |
Aug
(119) |
Sep
(31) |
Oct
(59) |
Nov
(458) |
Dec
(359) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
(268) |
Feb
(26) |
Mar
(36) |
Apr
(48) |
May
(119) |
Jun
(37) |
Jul
(173) |
Aug
(429) |
Sep
(137) |
Oct
(156) |
Nov
(59) |
Dec
(45) |
| 2011 |
Jan
(398) |
Feb
(257) |
Mar
(49) |
Apr
(5) |
May
(34) |
Jun
(11) |
Jul
(38) |
Aug
(12) |
Sep
(1) |
Oct
(49) |
Nov
(5) |
Dec
(10) |
| 2012 |
Jan
(21) |
Feb
(32) |
Mar
(20) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(173) |
Aug
|
Sep
(25) |
Oct
(6) |
Nov
(44) |
Dec
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:19
|
Module: performous Branch: dance Commit: 76b732d09e4ce8f354513fbddc0c711a1f1d6f2e Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Sat Dec 5 18:38:37 2009 +0100 Fixed logo position in all screens. --- themes/default/configuration_bg.svg | 2 +- themes/default/intro_bg.svg | 2 +- themes/default/practice_bg.svg | 2 +- themes/default/songs_bg.svg | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:18
|
Module: performous
Branch: dance
Commit: f406fc93f47b383aaeab2e3c39ae1d6a90dc1317
Author: Miguel Sánchez de León Peque <peq...@ho...>
Date: Sat Dec 5 18:29:30 2009 +0100
Fixed dialog text quality
---
game/dialog.hh | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/game/dialog.hh b/game/dialog.hh
index b6ca088..65b7d8e 100644
--- a/game/dialog.hh
+++ b/game/dialog.hh
@@ -3,6 +3,7 @@
#include "opengl_text.hh"
#include "fs.hh"
#include "surface.hh"
+#include "configuration.hh"
/// class for printing dialogues
class Dialog {
@@ -11,7 +12,7 @@ class Dialog {
Dialog(std::string const& text):
m_text(text),
m_dialog(getThemePath("warning.svg")),
- m_svgText(getThemePath("dialog_txt.svg"))
+ m_svgText(getThemePath("dialog_txt.svg"), config["graphic/text_lod"].f())
{
m_dialog.dimensions.fixedWidth(0.8);
}
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:15
|
Module: performous
Branch: dance
Commit: 9c1cd8e4779101e2617d053ddb75f8240e9cd124
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Dec 5 19:20:24 2009 +0200
Use text_lod for selected menu item too
---
game/theme.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/theme.cc b/game/theme.cc
index a11ed03..69feb9b 100755
--- a/game/theme.cc
+++ b/game/theme.cc
@@ -43,7 +43,7 @@ ThemeConfiguration::ThemeConfiguration():
ThemeIntro::ThemeIntro():
Theme(getThemePath("intro_bg.svg")),
back_h(getThemePath("menu_back_highlight.svg")),
- option_selected(getThemePath("menu_option_selected.svg")),
+ option_selected(getThemePath("menu_option_selected.svg"), config["graphic/text_lod"].f()),
comment(getThemePath("menu_comment.svg"), config["graphic/text_lod"].f()),
comment_bg(getThemePath("menu_comment_bg.svg"))
{
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:14
|
Module: performous Branch: dance Commit: 83dd5d279fda6ad5e17982005ed8e3b24c2ae60c Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Sat Dec 5 03:06:12 2009 +0100 Icon updated. --- themes/default/icon.bmp | Bin 3126 -> 3126 bytes themes/default/icon.png | Bin 2630 -> 6108 bytes themes/default/icon.svg | 195 ++++++++++++++++++++++++++++++++++++----------- 3 files changed, 149 insertions(+), 46 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:14
|
Module: performous
Branch: dance
Commit: 8a07936067e48beee8d3a061e6b8c7ac3fcb6a54
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Dec 5 14:01:13 2009 +0100
Added track name to highscore display
---
game/database.cc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/game/database.cc b/game/database.cc
index 5b06dda..d04741c 100644
--- a/game/database.cc
+++ b/game/database.cc
@@ -113,8 +113,8 @@ void Database::queryPerSongHiscore (std::ostream & os, boost::shared_ptr<Song> s
{
os << i+1 << ".\t"
<< m_players.lookup(hi[i].playerid) << "\t"
- // << hi[i].track << "\t"
- << hi[i].score << "\n";
+ << hi[i].score << "\t"
+ << "(" << hi[i].track << ")\n";
}
}
@@ -125,8 +125,8 @@ void Database::queryPerPlayerHiscore (std::ostream & os, std::string const& trac
{
os << i+1 << ".\t"
<< m_songs.lookup(hi[i].songid) << "\t"
- // << hi[i].track << "\t"
- << hi[i].score << "\n";
+ << hi[i].score << "\t"
+ << "(" << hi[i].track << ")\n";
}
}
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:10
|
Module: performous Branch: dance Commit: 00268586b0074661e1dcf9945341ebe93298d678 Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Sat Dec 5 02:42:47 2009 +0100 Fixed excessive CPU consumption in main menu. --- game/screen_intro.cc | 4 +- game/theme.cc | 5 +- game/theme.hh | 2 +- themes/default/intro_configure.svg | 395 ++++++------------------------- themes/default/menu_option_selected.svg | 6 +- 5 files changed, 82 insertions(+), 330 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:45:01
|
Module: performous Branch: dance Commit: bd75d6b1d43f1a0308dc697f81e621719bf983c0 Author: Xaldyz <xa...@us...> Date: Fri Dec 4 23:43:05 2009 +0100 Fixed flush for main.cc Added std::ios::binary in ifstream for I/O problem in Windows Defined m_help in screen_sing.cc/screen_sing.hh only for non-Windows platform Modified CMakeLists.txt with audio.cpp to add a workaround (Windows only) Modified win32/install.sh to disable shared library of ffmpeg, that causes crashes on performous startup Deleted copy of portaudio.patch, because last time simple i forgot to delete it before a push :) --- game/3dobject.cc | 12 +- game/main.cc | 2 + game/midifile.cc | 2 +- game/screen_sing.cc | 17 +- game/screen_sing.hh | 2 + game/songparser.hh | 6 +- game/surface.cc | 16 +- libs/libda/plugins/CMakeLists.txt | 337 +++++++++++++------------- libs/libda/src/CMakeLists.txt | 14 + libs/libda/src/audio.cpp | 4 + libs/plugin++/include/plugin++/plugin.hpp | 6 +- tools/ipu_decode.cpp | 10 +- win32/install.sh | 2 +- win32/portaudio - Copia.patch | 380 ----------------------------- 14 files changed, 228 insertions(+), 582 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:59
|
Module: performous
Branch: dance
Commit: e9516b593b2573e392e0b4b6746b6de3901ded65
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Dec 4 17:34:43 2009 +0100
Added shared data dir outside prefix (gentoo requirement)
---
game/configuration.cc | 6 +++++-
game/fs.cc | 9 +++++++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/game/configuration.cc b/game/configuration.cc
index 26d41b6..c40686e 100644
--- a/game/configuration.cc
+++ b/game/configuration.cc
@@ -316,7 +316,11 @@ void readConfig() {
typedef std::vector<std::string> ConfigList;
ConfigList config_list;
char const* root = getenv("PERFORMOUS_ROOT");
- if (root) config_list.push_back(std::string(root) + "/" SHARED_DATA_DIR CONFIG_SCHEMA);
+ if( SHARED_DATA_DIR[0] == '/' ) {
+ config_list.push_back(SHARED_DATA_DIR CONFIG_SCHEMA);
+ } else {
+ if (root) config_list.push_back(std::string(root) + "/" SHARED_DATA_DIR CONFIG_SCHEMA);
+ }
fs::path exec = plugin::execname();
if (!exec.empty()) config_list.push_back(exec.parent_path().string() + "/../" SHARED_DATA_DIR CONFIG_SCHEMA);
ConfigList::const_iterator it = std::find_if(config_list.begin(), config_list.end(), static_cast<bool(&)(fs::path const&)>(fs::exists));
diff --git a/game/fs.cc b/game/fs.cc
index 852529a..3d3fc30 100644
--- a/game/fs.cc
+++ b/game/fs.cc
@@ -88,8 +88,13 @@ std::string getPath(fs::path const& filename) {
dirs.push_back(xdg_data_home ? xdg_data_home / shortDir : getHomeDir() / ".local" / shareDir);
}
#endif
- // Adding relative path from executable
- dirs.push_back(plugin::execname().parent_path().parent_path() / shareDir);
+ if( shareDir.string()[0] == '/' ) {
+ // Adding absolute path
+ dirs.push_back(shareDir);
+ } else {
+ // Adding relative path from executable
+ dirs.push_back(plugin::execname().parent_path().parent_path() / shareDir);
+ }
#ifndef _WIN32
// Adding XDG_DATA_DIRS
{
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:57
|
Module: performous
Branch: dance
Commit: 97663ba0d761e887a845644ebb5aef108de07dda
Author: Lasse Karkkainen <tro...@tr...>
Date: Thu Dec 3 22:37:39 2009 +0200
Testing another approach for plugin framework (hopefully making it work on Windows)
---
libs/plugin++/include/plugin++/plugin.hpp | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/libs/plugin++/include/plugin++/plugin.hpp b/libs/plugin++/include/plugin++/plugin.hpp
index 1258481..7edc2e6 100644
--- a/libs/plugin++/include/plugin++/plugin.hpp
+++ b/libs/plugin++/include/plugin++/plugin.hpp
@@ -57,10 +57,14 @@ namespace plugin {
// being a static member variable of this class to ensure that it gets
// initialized when it is used the first time. If it were static member,
// the initialization (on program startup) might occur too late.
- static map_t& map() {
+#ifdef PLUGIN_MASTER
+ static map_t& PLUGIN_REGISTRY_API map() {
static map_t m;
return m;
}
+#else
+ static map_t& PLUGIN_REGISTRY_API map();
+#endif
public:
/** An iterator for browsing the available keys. **/
class iterator:
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:55
|
Module: performous
Branch: dance
Commit: 620b590650f95b9100249769e91334cf11204caf
Author: Miguel Sánchez de León Peque <peq...@ho...>
Date: Thu Dec 3 21:06:45 2009 +0100
Box for selected option centered
---
game/screen_intro.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 66a0fc6..ecf48c9 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -49,7 +49,7 @@ void ScreenIntro::manageEvent(SDL_Event event) {
void ScreenIntro::draw_menu_options() {
for (unsigned i = 0; i < m_menuOptions.size(); i++) {
if (i == selected) {
- theme->back_h.dimensions.left(-0.4).center(-0.1 + i*0.08);
+ theme->back_h.dimensions.left(-0.4).center(-0.097 + i*0.08);
theme->back_h.draw();
theme->option_selected.dimensions.left(-0.35).center(-0.1 + i*0.08);
theme->option_selected.draw(m_menuOptions[i].name);
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:53
|
Module: performous
Branch: dance
Commit: 0b61b1b7711f42243ea98981f5626d162443c1f6
Author: Miguel Sánchez de León Peque <peq...@ho...>
Date: Thu Dec 3 21:01:02 2009 +0100
Comments font changed.
---
game/screen_intro.cc | 2 +-
themes/default/menu_comment.svg | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index d316c43..66a0fc6 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -5,7 +5,7 @@
#include "record.hh"
ScreenIntro::ScreenIntro(std::string const& name, Audio& audio, Capture& capture): Screen(name), m_audio(audio), m_capture(capture), selected() {
- m_menuOptions.push_back(new MenuOption("Perform", "Songs", "intro_sing.svg", "Search songs database and start performing!"));
+ m_menuOptions.push_back(new MenuOption("Perform", "Songs", "intro_sing.svg", "Start performing!"));
m_menuOptions.push_back(new MenuOption("Practice", "Practice", "intro_practice.svg", "Check your skills or test the microphones"));
m_menuOptions.push_back(new MenuOption("Configure", "Configuration", "intro_configure.svg", "Configure game options"));
m_menuOptions.push_back(new MenuOption("Quit", "", "intro_quit.svg", "Leave the game"));
diff --git a/themes/default/menu_comment.svg b/themes/default/menu_comment.svg
index 836039d..a42342b 100755
--- a/themes/default/menu_comment.svg
+++ b/themes/default/menu_comment.svg
@@ -62,15 +62,15 @@
showgrid="false"
inkscape:window-maximized="1" />
<text
- x="1.8177605"
- y="17.063263"
- style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;display:inline;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS"
+ x="1.2611415"
+ y="16.780357"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter"
id="text10203"
xml:space="preserve"
sodipodi:linespacing="125%"
transform="scale(1.0082228,0.99184427)"><tspan
- x="1.8177605"
- y="17.063263"
+ x="1.2611415"
+ y="16.780357"
id="tspan10205"
- style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS">Comment</tspan></text>
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter">Comment</tspan></text>
</svg>
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:51
|
Module: performous
Branch: dance
Commit: 33f224635c1e6dcbf2e485c6a39c144f19824f47
Author: Miguel Sánchez de León Peque <peq...@ho...>
Date: Thu Dec 3 20:38:03 2009 +0100
Fixed Logo position on IntroScreen
---
themes/default/intro_bg.svg | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/themes/default/intro_bg.svg b/themes/default/intro_bg.svg
index c808fe5..ae5c64f 100644
--- a/themes/default/intro_bg.svg
+++ b/themes/default/intro_bg.svg
@@ -593,7 +593,7 @@
id="g3952"
transform="translate(-2.6135359,3.2274215)" />
<g
- transform="translate(38.862478,-17.929078)"
+ transform="translate(38.862478,2.0709221)"
id="g3873">
<path
id="text3236"
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:49
|
Module: performous
Branch: dance
Commit: 1bf71b0052a62a75e7e158a343066427fea08c74
Author: Miguel Sánchez de León Peque <peq...@ho...>
Date: Thu Dec 3 19:50:45 2009 +0100
Resizeable menu. Comments will also be displayed when the aspect ratio is changed.
---
game/screen_intro.cc | 4 ++--
themes/default/intro_configure.svg | 12 ++++++------
themes/default/menu_comment.svg | 12 ++++++------
themes/default/menu_comment_bg.svg | 35 +++++++++++++++++++++--------------
4 files changed, 35 insertions(+), 28 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index aa3edfe..d316c43 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -63,9 +63,9 @@ void ScreenIntro::draw_menu_options() {
void ScreenIntro::draw() {
theme->bg.draw();
m_menuOptions[selected].image.draw();
- theme->comment_bg.dimensions.center().center(0.336);
+ theme->comment_bg.dimensions.center().screenBottom(-0.01);
theme->comment_bg.draw();
- theme->comment.dimensions.left(-0.45).center(0.336);
+ theme->comment.dimensions.left(-0.45).screenBottom(-0.028);
theme->comment.draw(m_menuOptions[selected].comment);
draw_menu_options();
if (m_dialog) m_dialog->draw();
diff --git a/themes/default/intro_configure.svg b/themes/default/intro_configure.svg
index 3c863c7..62569ca 100644
--- a/themes/default/intro_configure.svg
+++ b/themes/default/intro_configure.svg
@@ -44,9 +44,9 @@
bordercolor="#666666"
pagecolor="#ffffff"
id="base"
- inkscape:zoom="0.43503001"
- inkscape:cx="707.79902"
- inkscape:cy="400.43025"
+ inkscape:zoom="1.74012"
+ inkscape:cx="542.38104"
+ inkscape:cy="467.16116"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:current-layer="g2911-6"
@@ -316,11 +316,11 @@
sodipodi:type="inkscape:persp3d" />
<filter
inkscape:collect="always"
- id="filter3942">
+ id="filter3651">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="11.89846"
- id="feGaussianBlur3944" />
+ id="feGaussianBlur3653" />
</filter>
</defs>
<text
@@ -352,7 +352,7 @@
d="m -662.10043,-996.96443 c -26.42907,0.31062 -53.33604,14.71361 -64.00362,39.52245 -2.14098,2.63628 -2.12279,8.02891 -4.87138,9.28929 -109.93748,-0.0693 -219.875,-0.21667 -329.81247,-0.12424 -5.652,-18.87058 -17.5616,-39.21228 -38.3224,-43.5179 -28.099,-6.22446 -60.5886,-5.14908 -83.6463,13.9554 -14.2658,11.22274 -26.637,26.24038 -31.5938,44 -1.0239,8.44178 7.285,16.76924 15.8096,14.1108 20.8127,-1.60526 40.8516,-12.32826 61.9716,-9.07955 6.6538,2.97582 8.3757,11.85778 10.6563,18.28125 1.9507,8.20214 2.1408,19.02414 -4.8125,24.90625 -10.8912,5.83792 -23.8262,4.67796 -35.625,7.3125 -13.9259,1.79716 -27.984,4.81763 -40.1562,12 18.6914,33.54702 61.7596,47.58043 98.1606,39.14497 24.3587,-4.1628 43.9036,-23.73812 51.4956,-46.61372 110.23955,0.0599 220.47912,0.14396 330.71872,0.125 5.60381,19.42915 18.34673,40.23886 39.75,43.875 27.93378,5.99231 60.02369,4.31154 82.6875,-14.75 13.9785,-11.28851 26.41263,-26.03632 30.96875,-43.71875 1.0279,-8.42535 -7.17734,-16.6018 -15.625,-14.0625 -21.06347,1.75414 -41.30627,12.6513 -62.65625,9.03125 -5.11927,-1.97895 -6.1151,-8.58102 -8.53125,-12.96875 -3.1942,-9.20476 -4.62078,-21.41372 2.1875,-29.3125 9.43049,-6.52177 21.5301,-4.84768 32.2789,-7.51736 15.29568,-1.83888 31.12608,-4.57971 44.56485,-12.57639 -15.81941,-28.68423 -49.6161,-43.0859 -81.59375,-41.3125 z"
id="rect2874-8-7-5" />
<path
- style="fill:#ffffff;fill-opacity:1;display:inline;filter:url(#filter3942)"
+ style="fill:#ffffff;fill-opacity:1;display:inline;filter:url(#filter3651)"
d="m -661.88168,-997.08943 c -26.47854,-0.0438 -53.85737,14.22035 -64.71875,39.0625 -2.2217,2.82322 -2.26188,8.37645 -5.125,9.74924 -109.94789,-0.10763 -219.89581,-0.14691 -329.84377,-0.12424 -5.5038,-18.94926 -17.72,-39.50328 -38.5425,-43.54241 -27.492,-6.13598 -58.9908,-5.04917 -81.9575,12.85491 -14.775,11.07638 -27.2007,26.34402 -32.75,44.125 -1.8337,8.20257 5.3365,16.59682 13.8126,15.46875 9.275,-0.51659 18.0457,-3.83721 27.2277,-5.11555 12.6301,-3.0352 25.9112,-7.55634 38.8973,-3.50945 8.4529,11.40982 13.6565,28.87256 4.9374,41.3125 -10.0009,7.03993 -22.9617,5.23054 -34.3353,8.00434 -14.8962,1.85722 -29.9734,4.75354 -43.0709,12.30816 18.4898,33.05688 60.431,47.11661 96.5,39.65625 24.9401,-3.73652 45.5334,-23.41907 53.2812,-47.0625 110.25001,0.0599 220.5,0.14397 330.75002,0.125 5.59018,18.861 17.48225,39.44812 38.375,43.46875 28.85975,6.78689 62.1557,4.74796 85.375,-15.34375 13.4955,-11.21486 25.37132,-25.90713 29.75,-43.09375 0.91437,-8.73107 -7.83268,-15.93854 -16.34375,-13.84375 -15.50451,2.48183 -30.75207,7.0661 -46.125,9.6875 -6.0258,0.5723 -13.08596,1.2209 -18.21875,-1.8125 -8.13386,-11.32563 -12.82423,-28.26366 -4.59375,-40.5 9.90168,-7.25217 22.93195,-5.38236 34.27267,-8.16199 14.91391,-1.80662 30.04328,-4.68887 43.10233,-12.40051 -15.65471,-28.41088 -48.99752,-42.8563 -80.65625,-41.3125 z"
id="rect2874-8-7-9" />
<path
diff --git a/themes/default/menu_comment.svg b/themes/default/menu_comment.svg
index 23e3f70..836039d 100755
--- a/themes/default/menu_comment.svg
+++ b/themes/default/menu_comment.svg
@@ -12,8 +12,8 @@
version="1.0"
x="0"
y="0"
- width="106"
- height="23"
+ width="80"
+ height="20"
id="svg559"
sodipodi:version="0.32"
inkscape:version="0.47pre4 r22446"
@@ -63,14 +63,14 @@
inkscape:window-maximized="1" />
<text
x="1.8177605"
- y="20.087931"
- style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;display:inline;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS"
+ y="17.063263"
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;display:inline;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS"
id="text10203"
xml:space="preserve"
sodipodi:linespacing="125%"
transform="scale(1.0082228,0.99184427)"><tspan
x="1.8177605"
- y="20.087931"
+ y="17.063263"
id="tspan10205"
- style="font-size:24px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS">Comment</tspan></text>
+ style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;font-family:Comic Sans MS;-inkscape-font-specification:Comic Sans MS">Comment</tspan></text>
</svg>
diff --git a/themes/default/menu_comment_bg.svg b/themes/default/menu_comment_bg.svg
index 15f6303..e324e40 100644
--- a/themes/default/menu_comment_bg.svg
+++ b/themes/default/menu_comment_bg.svg
@@ -11,7 +11,7 @@
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="1000"
- height="51"
+ height="35"
id="svg2919"
version="1.1"
inkscape:version="0.47pre4 r22446"
@@ -58,7 +58,7 @@
x2="0"
y1="768"
x1="0"
- gradientTransform="matrix(1,0,0,0.98,-3.1907349e-7,298.72223)"
+ gradientTransform="matrix(1.0001729,0,0,0.66978968,-0.08644188,537.20848)"
gradientUnits="userSpaceOnUse"
id="linearGradient2917"
xlink:href="#linearGradient5448"
@@ -70,6 +70,13 @@
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 0.5 : 1"
sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective2821"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
</defs>
<sodipodi:namedview
id="base"
@@ -79,8 +86,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.70710678"
- inkscape:cx="472.87473"
- inkscape:cy="116.23028"
+ inkscape:cx="403.07156"
+ inkscape:cy="55.181507"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
@@ -105,20 +112,20 @@
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
- transform="translate(0,-1001.3622)">
+ transform="translate(0,-1017.3622)">
<rect
- style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.00187743;stroke-opacity:1"
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.82833934;stroke-opacity:1"
id="rect3982-4"
- width="1003.7961"
- height="49.998123"
- x="-1.8940613"
- y="1001.8631" />
+ width="1003.9697"
+ height="34.171661"
+ x="-1.9808303"
+ y="1017.7764" />
<rect
style="fill:url(#linearGradient2917);fill-opacity:1;stroke:none"
id="rect3982"
- width="1000"
- height="49"
- x="0"
- y="1002.3622" />
+ width="1000.1728"
+ height="33.489483"
+ x="-0.086441576"
+ y="1018.1177" />
</g>
</svg>
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:48
|
Module: performous
Branch: dance
Commit: 3430f76f3c78f33334d775724be7e10c3b283650
Author: Miguel Sánchez de León Peque <peq...@ho...>
Date: Thu Dec 3 19:31:01 2009 +0100
Little changes on new theme and code related to the menu.
---
game/screen_intro.cc | 6 +-
game/theme.cc | 5 +-
game/theme.hh | 10 ++-
themes/default/intro_bg.svg | 14 ----
themes/default/menu_comment_bg.svg | 124 +++++++++++++++++++++++++++++++
themes/default/menu_option_selected.svg | 6 +-
6 files changed, 141 insertions(+), 24 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index aa272ef..aa3edfe 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -51,8 +51,8 @@ void ScreenIntro::draw_menu_options() {
if (i == selected) {
theme->back_h.dimensions.left(-0.4).center(-0.1 + i*0.08);
theme->back_h.draw();
- theme->option.dimensions.left(-0.35).center(-0.1 + i*0.08);
- theme->option.draw(m_menuOptions[i].name);
+ theme->option_selected.dimensions.left(-0.35).center(-0.1 + i*0.08);
+ theme->option_selected.draw(m_menuOptions[i].name);
} else {
theme->option.dimensions.left(-0.35).center(-0.1 + i*0.08);
theme->option.draw(m_menuOptions[i].name);
@@ -63,6 +63,8 @@ void ScreenIntro::draw_menu_options() {
void ScreenIntro::draw() {
theme->bg.draw();
m_menuOptions[selected].image.draw();
+ theme->comment_bg.dimensions.center().center(0.336);
+ theme->comment_bg.draw();
theme->comment.dimensions.left(-0.45).center(0.336);
theme->comment.draw(m_menuOptions[selected].comment);
draw_menu_options();
diff --git a/game/theme.cc b/game/theme.cc
index 1df16ea..4feb1b1 100755
--- a/game/theme.cc
+++ b/game/theme.cc
@@ -44,8 +44,9 @@ ThemeIntro::ThemeIntro():
Theme(getThemePath("intro_bg.svg")),
back_h(getThemePath("menu_back_highlight.svg")),
option(getThemePath("menu_option.svg"), config["graphic/text_lod"].f()),
- comment(getThemePath("menu_comment.svg"), config["graphic/text_lod"].f())
+ option_selected(getThemePath("menu_option_selected.svg")),
+ comment(getThemePath("menu_comment.svg"), config["graphic/text_lod"].f()),
+ comment_bg(getThemePath("menu_comment_bg.svg"))
{
- option.setHighlight(getThemePath("menu_option_selected.svg"));
back_h.dimensions.fixedHeight(0.08f);
}
diff --git a/game/theme.hh b/game/theme.hh
index bef2aeb..7ee2ad8 100755
--- a/game/theme.hh
+++ b/game/theme.hh
@@ -62,10 +62,14 @@ struct ThemeConfiguration: Theme {
/// theme for intro screen
struct ThemeIntro: Theme {
ThemeIntro();
- /// back highlight
+ /// back highlight for selected option
Surface back_h;
- /// menu option
+ /// menu option text
SvgTxtTheme option;
- /// menu comment
+ /// menu selected option text
+ SvgTxtTheme option_selected;
+ /// menu comment text
SvgTxtTheme comment;
+ /// menu comment background
+ Surface comment_bg;
};
diff --git a/themes/default/intro_bg.svg b/themes/default/intro_bg.svg
index 7709edb..c808fe5 100644
--- a/themes/default/intro_bg.svg
+++ b/themes/default/intro_bg.svg
@@ -592,20 +592,6 @@
<g
id="g3952"
transform="translate(-2.6135359,3.2274215)" />
- <rect
- style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.00187743;stroke-opacity:1"
- id="rect3982-4"
- width="1003.7961"
- height="49.998123"
- x="-2.2971582"
- y="716.00092" />
- <rect
- style="fill:url(#linearGradient5460);fill-opacity:1;stroke:none"
- id="rect3982"
- width="1000"
- height="50"
- x="0"
- y="716" />
<g
transform="translate(38.862478,-17.929078)"
id="g3873">
diff --git a/themes/default/menu_comment_bg.svg b/themes/default/menu_comment_bg.svg
new file mode 100644
index 0000000..15f6303
--- /dev/null
+++ b/themes/default/menu_comment_bg.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="1000"
+ height="51"
+ id="svg2919"
+ version="1.1"
+ inkscape:version="0.47pre4 r22446"
+ sodipodi:docname="menu_comment_bg.svg">
+ <defs
+ id="defs2921">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective2927" />
+ <inkscape:perspective
+ id="perspective2908"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5448"
+ id="linearGradient5460"
+ gradientUnits="userSpaceOnUse"
+ x1="0"
+ y1="768"
+ x2="0"
+ y2="713.1153"
+ gradientTransform="translate(0,-2)" />
+ <linearGradient
+ id="linearGradient5448">
+ <stop
+ style="stop-color:#beb7c8;stop-opacity:1;"
+ offset="0"
+ id="stop5450" />
+ <stop
+ style="stop-color:#beb7c8;stop-opacity:0;"
+ offset="1"
+ id="stop5452" />
+ </linearGradient>
+ <linearGradient
+ y2="713.1153"
+ x2="0"
+ y1="768"
+ x1="0"
+ gradientTransform="matrix(1,0,0,0.98,-3.1907349e-7,298.72223)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient2917"
+ xlink:href="#linearGradient5448"
+ inkscape:collect="always" />
+ <inkscape:perspective
+ id="perspective2956"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.70710678"
+ inkscape:cx="472.87473"
+ inkscape:cy="116.23028"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1280"
+ inkscape:window-height="726"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata2924">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-1001.3622)">
+ <rect
+ style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.00187743;stroke-opacity:1"
+ id="rect3982-4"
+ width="1003.7961"
+ height="49.998123"
+ x="-1.8940613"
+ y="1001.8631" />
+ <rect
+ style="fill:url(#linearGradient2917);fill-opacity:1;stroke:none"
+ id="rect3982"
+ width="1000"
+ height="49"
+ x="0"
+ y="1002.3622" />
+ </g>
+</svg>
diff --git a/themes/default/menu_option_selected.svg b/themes/default/menu_option_selected.svg
index f3dc52a..2cbccc6 100755
--- a/themes/default/menu_option_selected.svg
+++ b/themes/default/menu_option_selected.svg
@@ -17,7 +17,7 @@
id="svg559"
sodipodi:version="0.32"
inkscape:version="0.47pre4 r22446"
- sodipodi:docname="menu_comment.svg"
+ sodipodi:docname="menu_option_selected.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs2522">
@@ -37,7 +37,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@@ -54,7 +54,7 @@
pagecolor="#ffffff"
id="base"
inkscape:zoom="3.5638182"
- inkscape:cx="63.312761"
+ inkscape:cx="53.491625"
inkscape:cy="28.662714"
inkscape:window-x="0"
inkscape:window-y="25"
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:45
|
Module: performous Branch: dance Commit: a2d1908aed9cafdd7e9ed5d5f315b8297be76ae5 Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Thu Dec 3 17:53:26 2009 +0100 Fixed text display; Wanted gradients? Here they are! ;-). --- game/screen_intro.cc | 9 +- themes/default/configuration_bg.svg | 54 ++++- themes/default/intro_bg.svg | 466 +++++++++++-------------------- themes/default/menu_back_highlight.svg | 26 +- themes/default/menu_comment.svg | 156 ++--------- themes/default/menu_option.svg | 158 ++--------- themes/default/menu_option_selected.svg | 158 ++--------- themes/default/practice_bg.svg | 185 ++++++------- 8 files changed, 391 insertions(+), 821 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:43
|
Module: performous Branch: dance Commit: a3f62e7b8fbe95aacf87c15b40c4d5f8618d3fc1 Author: Tapio Vierros <tap...@gm...> Date: Thu Dec 3 17:06:10 2009 +0200 Added Frets on Fire song dirs to search path. --- data/schema.xml | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/data/schema.xml b/data/schema.xml index a535623..60fcd55 100644 --- a/data/schema.xml +++ b/data/schema.xml @@ -212,9 +212,12 @@ to save the current settings to XML. <!-- System preferences --> <entry name="system/path_songs" type="string_list"> <stringvalue>/usr/local/share/games/ultrastar/songs/</stringvalue> + <stringvalue>/usr/local/share/games/fretsonfire/data/songs/</stringvalue> <stringvalue>/usr/share/games/ultrastar/songs/</stringvalue> + <stringvalue>/usr/share/games/fretsonfire/data/songs/</stringvalue> <stringvalue>../songs/</stringvalue><!-- For Windows where the program is started in bin/ --> <stringvalue>~/.ultrastar/songs/</stringvalue> + <stringvalue>~/.fretsonfire/songs/</stringvalue> <locale name="C"> <short>Song folders</short> <long>Where to recursively look for songs.</long> |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:41
|
Module: performous Branch: dance Commit: 56642c54ac94f9d84daec6efaa8fd720828cf58e Author: Miguel Sánchez de León Peque <peq...@ho...> Date: Thu Dec 3 16:03:02 2009 +0100 New menu. Working on the theme. --- game/menu.cc | 6 +- game/menu.hh | 6 +- game/screen_intro.cc | 24 +- game/screen_intro.hh | 3 + game/theme.cc | 9 +- game/theme.hh | 8 +- themes/default/configuration_bg.svg | 6 +- themes/default/intro_bg.svg | 534 ++++++++++++++++++++++++++++++- themes/default/intro_configure.svg | 85 ++++-- themes/default/intro_practice.svg | 51 ++-- themes/default/intro_quit.svg | 81 ++++-- themes/default/intro_sing.svg | 36 ++- themes/default/intro_top.svg | 308 ------------------ themes/default/menu_back_highlight.svg | 272 ++++++++++++++++ themes/default/menu_comment.svg | 182 +++++++++++ themes/default/menu_option.svg | 182 +++++++++++ themes/default/menu_option_selected.svg | 182 +++++++++++ 17 files changed, 1563 insertions(+), 412 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:40
|
Module: performous
Branch: dance
Commit: 9183546df284a5961921b9812ec5136f46374eb4
Author: Lasse Karkkainen <tro...@tr...>
Date: Wed Dec 2 22:11:50 2009 +0200
Revert "Link to static ffmpeg (Windows). DLLs causes a ntdll exception" because it makes building fail on Linux (undefined references).
This reverts commit 6cc6cd6f133f1ab794016ec3800de9c5c9448316.
---
cmake/Modules/FindAVCodec.cmake | 2 +-
cmake/Modules/FindAVFormat.cmake | 2 +-
cmake/Modules/FindAVUtil.cmake | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/Modules/FindAVCodec.cmake b/cmake/Modules/FindAVCodec.cmake
index 36d5258..400ac58 100644
--- a/cmake/Modules/FindAVCodec.cmake
+++ b/cmake/Modules/FindAVCodec.cmake
@@ -38,7 +38,7 @@ if(AVCodec_INCLUDE_DIR)
endif(AVCodec_INCLUDE_DIR)
find_library(AVCodec_LIBRARY
- NAMES libavcodec.a avcodec
+ NAMES libavcodec.dll.a avcodec
PATHS ${AVCodec_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindAVFormat.cmake b/cmake/Modules/FindAVFormat.cmake
index 15421e6..b02d2a6 100644
--- a/cmake/Modules/FindAVFormat.cmake
+++ b/cmake/Modules/FindAVFormat.cmake
@@ -36,7 +36,7 @@ if(AVFormat_INCLUDE_DIR)
endif(AVFormat_INCLUDE_DIR)
find_library(AVFormat_LIBRARY
- NAMES libavformat.a avformat
+ NAMES libavformat.dll.a avformat
PATHS ${AVFormat_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindAVUtil.cmake b/cmake/Modules/FindAVUtil.cmake
index 764d05c..99bfbfb 100644
--- a/cmake/Modules/FindAVUtil.cmake
+++ b/cmake/Modules/FindAVUtil.cmake
@@ -34,7 +34,7 @@ if(AVUtil_INCLUDE_DIR)
endif(AVUtil_INCLUDE_DIR)
find_library(AVUtil_LIBRARY
- NAMES libavutil.a avutil
+ NAMES libavutil.dll.a avutil
PATHS ${AVUtil_PKGCONF_LIBRARY_DIRS}
)
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:37
|
Module: performous
Branch: dance
Commit: fce6aab809de2b3ba647667523c0bd8eda70d577
Author: Lasse Karkkainen <tro...@tr...>
Date: Wed Dec 2 21:16:31 2009 +0200
Try fixing linking issues on Mac (and Windows)
Conflicts:
libs/libda/plugins/CMakeLists.txt
---
libs/libda/plugins/CMakeLists.txt | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/libs/libda/plugins/CMakeLists.txt b/libs/libda/plugins/CMakeLists.txt
index 4606599..5ba820d 100644
--- a/libs/libda/plugins/CMakeLists.txt
+++ b/libs/libda/plugins/CMakeLists.txt
@@ -126,18 +126,18 @@ if(PLUGIN_GSTREAMER)
add_library(da_audio_dev_gst MODULE audio_dev_gst.cpp)
target_link_libraries(da_audio_dev_gst ${GStreamer_LIBRARIES})
install(TARGETS da_audio_dev_gst DESTINATION ${LibDA_PLUGIN_DIR})
- if(APPLE)
- target_link_libraries(da_audio_dev_gst da)
- endif(APPLE)
+ if(APPLE OR WIN32)
+ target_link_libraries(da_audio_dev_gst da plugin++ ${Boost_LIBRARIES})
+ endif(APPLE OR WIN32)
endif(PLUGIN_GSTREAMER)
if(PLUGIN_JACK)
include_directories(${Jack_INCLUDE_DIRS})
add_library(da_audio_dev_jack MODULE audio_dev_jack.cpp)
target_link_libraries(da_audio_dev_jack ${Jack_LIBRARIES})
- if(APPLE)
- target_link_libraries(da_audio_dev_jack da)
- endif(APPLE)
+ if(APPLE OR WIN32)
+ target_link_libraries(da_audio_dev_jack da plugin++ ${Boost_LIBRARIES})
+ endif(APPLE OR WIN32)
install(TARGETS da_audio_dev_jack DESTINATION ${LibDA_PLUGIN_DIR})
endif(PLUGIN_JACK)
@@ -147,10 +147,7 @@ if(PLUGIN_PORTAUDIO)
target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} ${Portaudio_LIBRARIES})
install(TARGETS da_audio_dev_pa${Portaudio_VERSION} DESTINATION ${LibDA_PLUGIN_DIR})
if(APPLE OR WIN32)
- target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} da)
- if(WIN32)
- target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} plugin++)
- endif(WIN32)
+ target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} da plugin++ ${Boost_LIBRARIES})
endif(APPLE OR WIN32)
endif(PLUGIN_PORTAUDIO)
@@ -165,7 +162,7 @@ if(PLUGIN_TESTING)
add_library(da_audio_dev_tone MODULE audio_dev_tone.cpp)
install(TARGETS da_audio_dev_tone DESTINATION ${LibDA_PLUGIN_DIR})
if(APPLE OR WIN32)
- target_link_libraries(da_audio_dev_tone da plugin++)
+ target_link_libraries(da_audio_dev_tone da plugin++ ${Boost_LIBRARIES})
endif(APPLE OR WIN32)
endif(PLUGIN_TESTING)
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:34
|
Module: performous
Branch: dance
Commit: 5fe5ea60a5e6c6b2c527b3432ebe035dc223b802
Author: Tapio Vierros <tap...@gm...>
Date: Wed Dec 2 19:30:03 2009 +0200
Changed INI parser video gap to follow FoFiX SVN spec.
---
game/songparser-ini.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/songparser-ini.cc b/game/songparser-ini.cc
index 1e79706..6b6a048 100644
--- a/game/songparser-ini.cc
+++ b/game/songparser-ini.cc
@@ -46,11 +46,11 @@ void SongParser::iniParse() {
boost::trim(value);
if (key == "name") s.title = value;
else if (key == "artist") s.artist = value;
- // These are added features (not part of FoF)
+ // These are added features (not part of FoF, though video is supported in FoFiX SVN)
else if (key == "cover") s.cover = value;
else if (key == "background") s.background = value;
else if (key == "video") s.video = value;
- else if (key == "videogap") assign(s.videoGap, value);
+ else if (key == "video_start_time") { assign(s.videoGap, value); s.videoGap/=1000.0; }
// End of added features
}
if (s.title.empty() || s.artist.empty()) throw std::runtime_error("Required header fields missing");
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:31
|
Module: performous
Branch: dance
Commit: 6cc6cd6f133f1ab794016ec3800de9c5c9448316
Author: Xaldyz <xa...@us...>
Date: Wed Dec 2 16:29:53 2009 +0100
Link to static ffmpeg (Windows). DLLs causes a ntdll exception
---
cmake/Modules/FindAVCodec.cmake | 2 +-
cmake/Modules/FindAVFormat.cmake | 2 +-
cmake/Modules/FindAVUtil.cmake | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/Modules/FindAVCodec.cmake b/cmake/Modules/FindAVCodec.cmake
index 400ac58..36d5258 100644
--- a/cmake/Modules/FindAVCodec.cmake
+++ b/cmake/Modules/FindAVCodec.cmake
@@ -38,7 +38,7 @@ if(AVCodec_INCLUDE_DIR)
endif(AVCodec_INCLUDE_DIR)
find_library(AVCodec_LIBRARY
- NAMES libavcodec.dll.a avcodec
+ NAMES libavcodec.a avcodec
PATHS ${AVCodec_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindAVFormat.cmake b/cmake/Modules/FindAVFormat.cmake
index b02d2a6..15421e6 100644
--- a/cmake/Modules/FindAVFormat.cmake
+++ b/cmake/Modules/FindAVFormat.cmake
@@ -36,7 +36,7 @@ if(AVFormat_INCLUDE_DIR)
endif(AVFormat_INCLUDE_DIR)
find_library(AVFormat_LIBRARY
- NAMES libavformat.dll.a avformat
+ NAMES libavformat.a avformat
PATHS ${AVFormat_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindAVUtil.cmake b/cmake/Modules/FindAVUtil.cmake
index 99bfbfb..764d05c 100644
--- a/cmake/Modules/FindAVUtil.cmake
+++ b/cmake/Modules/FindAVUtil.cmake
@@ -34,7 +34,7 @@ if(AVUtil_INCLUDE_DIR)
endif(AVUtil_INCLUDE_DIR)
find_library(AVUtil_LIBRARY
- NAMES libavutil.dll.a avutil
+ NAMES libavutil.a avutil
PATHS ${AVUtil_PKGCONF_LIBRARY_DIRS}
)
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:29
|
Module: performous Branch: dance Commit: 5993184797a0bb42b96bb45c6fd96bb1b884a214 Author: Tapio Vierros <tap...@gm...> Date: Wed Dec 2 11:17:43 2009 +0200 Notes now disappear when hit. Holds are also handled. --- game/guitargraph.cc | 129 +++++++++++++++++++++++++++++---------------------- game/guitargraph.hh | 11 +++-- 2 files changed, 81 insertions(+), 59 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:27
|
Module: performous
Branch: dance
Commit: d88cb93f5db8961e18086a0eead2273279199193
Author: Tapio Vierros <tap...@gm...>
Date: Wed Dec 2 11:17:05 2009 +0200
Scaling capability for 3dObject::draw()
---
game/3dobject.hh | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/game/3dobject.hh b/game/3dobject.hh
index 585084b..8761ca6 100644
--- a/game/3dobject.hh
+++ b/game/3dobject.hh
@@ -63,12 +63,14 @@ class Object3d: boost::noncopyable {
generateDisplayList();
}
/// draws the object
- void draw(float x = 0, float y = 0, float z = 0) const {
+ void draw(float x = 0, float y = 0, float z = 0, float s = 1.0) const {
glTranslatef(x, y, z);
+ if (s != 1.0) glScalef(s,s,s);
if (m_texture) {
UseTexture tex(*m_texture);
glCallList(m_displist);
} else glCallList(m_displist);
+ if (s != 1.0) { float ss = 1.0/s; glScalef(ss,ss,ss); }
glTranslatef(-x, -y, -z);
}
};
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:25
|
Module: performous
Branch: dance
Commit: 44b7b85c331364dbbb4f7e5543ec05361a2b4c6b
Author: Lasse Karkkainen <tro...@tr...>
Date: Wed Dec 2 03:36:33 2009 +0200
Avoid hardcoded selection number for quit too
---
game/screen_intro.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 2c5c6d5..a11cc9b 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -34,8 +34,8 @@ void ScreenIntro::manageEvent(SDL_Event event) {
else if (key == SDLK_DOWN) ++selected;
else if (key == SDLK_UP) --selected;
else if (key == SDLK_RETURN) {
- if (selected != 3) sm->activateScreen(m_menuOptions[selected].screen);
- else sm->finished();
+ std::string screen = m_menuOptions[selected].screen;
+ if (screen.empty()) sm->finished(); else sm->activateScreen(screen);
} else if (key == SDLK_SPACE || key == SDLK_PAUSE) m_audio.togglePause();
// Normalize selected to [0, size)
selected = (m_menuOptions.size() + selected) % m_menuOptions.size();
|
|
From: Tapio V. <aa...@us...> - 2009-12-11 12:44:23
|
Module: performous
Branch: dance
Commit: 21581d5011cc85b7000d7d47f5091b87a4ccb7d2
Author: Lasse Karkkainen <tro...@tr...>
Date: Wed Dec 2 03:34:17 2009 +0200
Use menuOptions size for selection wrapping
---
game/screen_intro.cc | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/game/screen_intro.cc b/game/screen_intro.cc
index 5fdadd0..2c5c6d5 100755
--- a/game/screen_intro.cc
+++ b/game/screen_intro.cc
@@ -31,16 +31,14 @@ void ScreenIntro::manageEvent(SDL_Event event) {
if (m_dialog) { m_dialog.reset(); return; }
int key = event.key.keysym.sym;
if (key == SDLK_ESCAPE || key == SDLK_q) sm->finished();
- else if (key == SDLK_DOWN) {
- if (selected < 3) selected++;
- else selected = 0;
- } else if (key == SDLK_UP) {
- if (selected > 0) selected--;
- else selected = 3;
- } else if (key == SDLK_RETURN) {
+ else if (key == SDLK_DOWN) ++selected;
+ else if (key == SDLK_UP) --selected;
+ else if (key == SDLK_RETURN) {
if (selected != 3) sm->activateScreen(m_menuOptions[selected].screen);
else sm->finished();
} else if (key == SDLK_SPACE || key == SDLK_PAUSE) m_audio.togglePause();
+ // Normalize selected to [0, size)
+ selected = (m_menuOptions.size() + selected) % m_menuOptions.size();
} else if (event.type == SDL_JOYBUTTONDOWN) {
int button = event.jbutton.button;
if (button == 9) sm->activateScreen("Songs");
|
