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: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 19:32:18
|
Module: performous Branch: master Commit: bc19a2963180f5b4cfe83d930737945b2e581fce Author: Lasse Karkkainen <tro...@tr...> Date: Sun Dec 5 20:31:57 2010 +0100 Merge branch 'new-fonts' --- |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 19:32:16
|
Module: performous Branch: master Commit: fa4d3e24a06804c8587cd4042709a5153dce2073 Author: Miguel Sánchez de León Peque <msd...@gm...> Date: Sun Dec 5 18:23:31 2010 +0100 Trying DejaVu Sans font --- themes/default/configuration_value.svg | 2 +- themes/default/instrumentmenu_comment.svg | 2 +- themes/default/instrumentmenu_option.svg | 2 +- themes/default/instrumentmenu_option_selected.svg | 2 +- themes/default/mainmenu_option.svg | 2 +- themes/default/mainmenu_option_selected.svg | 2 +- themes/default/message_text.svg | 2 +- themes/default/notebarfs.svg | 2 +- themes/default/score_rank.svg | 2 +- themes/default/score_txt.svg | 2 +- themes/default/sing_lyricscurrent.svg | 2 +- themes/default/sing_lyricshighlight.svg | 2 +- themes/default/sing_lyricsnext.svg | 2 +- themes/default/sing_pbox.svg | 2 +- themes/default/sing_popup_text.svg | 2 +- themes/default/sing_score_text.svg | 2 +- themes/default/sing_timetxt.svg | 4 ++-- themes/default/vumeter_bg.svg | 12 ++++++------ 18 files changed, 24 insertions(+), 24 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 19:32:13
|
Module: performous Branch: master Commit: 6eeaf404515d458a61a4b8270ea34cc1d9ce9016 Author: Miguel Sánchez de León Peque <msd...@gm...> Date: Sat Nov 27 17:47:36 2010 +0100 Font fallback (needs some testing) --- themes/default/configuration_value.svg | 2 +- themes/default/instrumentmenu_comment.svg | 2 +- themes/default/instrumentmenu_option.svg | 2 +- themes/default/instrumentmenu_option_selected.svg | 2 +- themes/default/mainmenu_option.svg | 2 +- themes/default/mainmenu_option_selected.svg | 2 +- themes/default/message_text.svg | 2 +- themes/default/notebarfs.svg | 2 +- themes/default/score_rank.svg | 2 +- themes/default/score_txt.svg | 2 +- themes/default/sing_lyricscurrent.svg | 2 +- themes/default/sing_lyricshighlight.svg | 2 +- themes/default/sing_lyricsnext.svg | 2 +- themes/default/sing_pbox.svg | 2 +- themes/default/sing_popup_text.svg | 2 +- themes/default/sing_score_text.svg | 2 +- themes/default/sing_timetxt.svg | 4 ++-- themes/default/vumeter_bg.svg | 12 ++++++------ 18 files changed, 24 insertions(+), 24 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 19:32:13
|
Module: performous Branch: master Commit: 68003912f70c1d19a6070f43c298c5101402b2e8 Author: Miguel Sánchez de León Peque <msd...@gm...> Date: Sat Nov 27 17:34:59 2010 +0100 Changed font family to Liberation Sans --- themes/default/configuration_value.svg | 2 +- themes/default/instrumentmenu_comment.svg | 2 +- themes/default/instrumentmenu_option.svg | 2 +- themes/default/instrumentmenu_option_selected.svg | 2 +- themes/default/mainmenu_option.svg | 2 +- themes/default/mainmenu_option_selected.svg | 2 +- themes/default/message_text.svg | 2 +- themes/default/notebarfs.svg | 2 +- themes/default/score_rank.svg | 2 +- themes/default/score_txt.svg | 2 +- themes/default/sing_lyricscurrent.svg | 2 +- themes/default/sing_lyricshighlight.svg | 2 +- themes/default/sing_lyricsnext.svg | 2 +- themes/default/sing_pbox.svg | 2 +- themes/default/sing_popup_text.svg | 2 +- themes/default/sing_score_text.svg | 2 +- themes/default/sing_timetxt.svg | 4 ++-- themes/default/vumeter_bg.svg | 12 ++++++------ 18 files changed, 24 insertions(+), 24 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 19:20:27
|
Module: web
Branch: bluestyle
Commit: 8b4b50f65c088ee5d5f37949e4e34d3affa6457e
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 5 20:17:05 2010 +0100
Cleanup and fix showcase scroll on Firefox
---
htdocs-binary/showcase.js | 14 ++++++++++++++
htdocs-binary/style.css | 8 --------
htdocs-source/Model.htm | 14 +-------------
htdocs-source/index.txt | 2 +-
4 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/htdocs-binary/showcase.js b/htdocs-binary/showcase.js
new file mode 100644
index 0000000..b128f38
--- /dev/null
+++ b/htdocs-binary/showcase.js
@@ -0,0 +1,14 @@
+var img = Math.floor(Math.random() * 20);
+var anim = 0;
+function showcaseScroll() {
+ var e = document.getElementById('showcase');
+ var pos = 128 * (img + 0.5 * (1 - Math.cos(Math.PI * anim / 30)));
+ e.style.backgroundPosition = Math.round(-pos) + "px 0";
+ var timeout = 3500;
+ if (anim > 0) timeout = 16;
+ if (anim == 30) { anim = -1; ++img; }
+ ++anim;
+ setTimeout('showcaseScroll()', timeout);
+}
+showcaseScroll();
+
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index f0e4feb..e082228 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -138,14 +138,6 @@ h1 {
/*text-decoration: underline;*/
}
-#showcase {
- background: url('imgs/showcase.jpg') repeat-x;
- width: 640px;
- height: 96px;
- margin-bottom: 30px;
- -webkit-box-reflect:below 0 -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(255,255,255,0.3)));
-}
-
h3 {
font-size: 13px;
text-align: left;
diff --git a/htdocs-source/Model.htm b/htdocs-source/Model.htm
index b70bdec..f5c34bb 100644
--- a/htdocs-source/Model.htm
+++ b/htdocs-source/Model.htm
@@ -56,23 +56,11 @@
}
});
}
- var img = 0;
- var anim = 0;
- function showcaseScroll() {
- var e = document.getElementById('showcase');
- var pos = 128 * (img + 0.5 * (1 - Math.cos(Math.PI * anim / 30)));
- e.style.backgroundPositionX = Math.round(-pos) + "px";
- var timeout = 3500;
- if (anim > 0) timeout = 16;
- if (anim == 30) { anim = -1; ++img; }
- ++anim;
- setTimeout('showcaseScroll()', timeout);
- }
</script>
<!-- /TinyMCE -->
</head>
- <body onload="showcaseScroll();">
+ <body>
<div id="sitebox">
<div id="title"><img src="imgs/title.png" alt="Performous"/></div>
diff --git a/htdocs-source/index.txt b/htdocs-source/index.txt
index 29f8e97..e78ceda 100644
--- a/htdocs-source/index.txt
+++ b/htdocs-source/index.txt
@@ -1,6 +1,6 @@
The All-in-One Music Game
-<div id="showcase"></div>
+<div id="showcase" style="background: url('imgs/showcase.jpg') repeat-x; width: 640px; height: 96px; margin-bottom: 30px; -webkit-box-reflect:below 0 -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(255,255,255,0.3)));"></div><script type="text/javascript" src="showcase.js"></script>
Rock your friends or learn to sing better. If you are looking for a fun music game, this is it. No special hardware required, you may play guitar on your PC keyboard, sing on any microphone or webcam you happen to have and so on. If you do have SingStar microphones, Guitar Hero or RockBand instruments, or dance pads, just plug them into your USB ports and they will be autodetected by Performous.
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 19:20:24
|
Module: web
Branch: bluestyle
Commit: 015756b029cb050972ccf0e223f3ec182047aa59
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 5 19:59:14 2010 +0100
Fix border radius for Firefox
---
htdocs-binary/style.css | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index a42e24d..f0e4feb 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -1,5 +1,6 @@
body {
background: #000 url('bgs/fantasy_16.jpg') no-repeat;
+ /* Sadly this is too slow: background-attachment: fixed; */
background-size: 100%;
font-family: Verdana, Sans-Serif, sans;
font-size: 13px;
@@ -29,11 +30,13 @@ body {
-moz-box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.5);
padding: 10px;
border-radius: 10px;
+ -moz-border-radius: 10px;
}
/* main column */
#main {
position: relative;
border-radius: 10px;
+ -moz-border-radius: 10px;
box-shadow: 0px 0px 50px #448;
-webkit-box-shadow: 0px 0px 50px #448;
-moz-box-shadow: 0px 0px 50px #448;
@@ -85,6 +88,7 @@ body {
#menu li.selected {
background-color: #448;
border-radius: 10px;
+ -moz-border-radius: 10px;
box-shadow: 0px 0px 50px #448;
-webkit-box-shadow: 0px 0px 50px #448;
-moz-box-shadow: 0px 0px 50px #448;
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 18:49:45
|
Module: web Branch: bluestyle Commit: 0ab71d85c899da2ea7774f900e213d0c19381c08 Author: Lasse Karkkainen <tro...@tr...> Date: Sun Dec 5 19:49:32 2010 +0100 Fix songs page --- htdocs-source/songs.txt | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs-source/songs.txt b/htdocs-source/songs.txt index fde2e64..2bc9b71 100644 --- a/htdocs-source/songs.txt +++ b/htdocs-source/songs.txt @@ -10,22 +10,22 @@ You can find information on supported formats and song folder locations at the < The songs here are only repackaged by the Performous project. The packages contain license files listing the authors of the materials used and in many cases also of the Ultrastar conversion. -</p><img src="songimgs/libre.png" alt="" style="float: left"/><div style="margin-left: 280px;"><p> +</p><div><img src="songimgs/libre.png" alt="" style="vertical-align: top; display: inline-block"/><div style="vertical-align: top; display: inline-block; width: 350px; margin-left: 20px;"><p> The <strong>libre</strong> package contains songs with very permissive licenses. <strong>Free Software Song</strong> by Thor <strong>On the run</strong> by Joshua Morin Download <a href="http://sourceforge.net/projects/performous/files/ultrastar-songs-libre/ultrastar-songs-libre-3.zip">ZIP</a> (5 MB) -</p><!-- Horrible hack here, but the clear:both -method creates a gap, because it clears for the sidebar too --><br/><br/><br/><br/><br/><br/></div><p> +</p></div></div><p> -</p><img src="songimgs/restricted.png" alt="" style="float: left"/><div style="margin-left: 280px;"><p> +</p><div><img src="songimgs/restricted.png" alt="" style="vertical-align: top; display: inline-block"/><div style="vertical-align: top; display: inline-block; width: 350px; margin-left: 20px;"><p> The <strong>restricted</strong> package contains songs that use more restrictive licenses not permitting modifications and/or commercial use. <strong>I 18</strong> by Dead Smiling Pirates <strong>Northern Star</strong> by Steven Dunston <strong>Space Invaders</strong> by Pornophonique Download <a href="http://sourceforge.net/projects/performous/files/ultrastar-songs-restricted/ultrastar-songs-restricted-3.zip">ZIP</a> (10 MB) -</p><br style="clear:both"/></div><p> +</p></div></div><p> -</p><img src="songimgs/jc.jpg" alt="" style="float: left"/><div style="margin-left: 280px;"><p> +</p><div><img src="songimgs/jc.jpg" alt="" style="vertical-align: top; display: inline-block"/><div style="vertical-align: top; display: inline-block; width: 350px; margin-left: 20px;"><p> <a href="http://www.jonathancoulton.com/">Jonathan Coulton</a> collection, licensed CC by-nc-sa. <strong>A Talk with George</strong> <strong>Better</strong> @@ -52,9 +52,9 @@ Download <a href="http://sourceforge.net/projects/performous/files/ultrastar-son <strong>The Future Soon</strong> <strong>When You Go</strong> Download <a href="http://sourceforge.net/projects/performous/files/ultrastar-songs-jc/ultrastar-songs-jc-1.zip">ZIP</a> (240 MB) -</p><br style="clear:both"/></div><p> +</p></div></div><p> -</p><img src="songimgs/shearer.jpg" alt="" style="float: left"/><div style="margin-left: 280px;"><p> +</p><div><img src="songimgs/shearer.jpg" alt="" style="vertical-align: top; display: inline-block;"/><div style="vertical-align: top; display: inline-block; width: 350px; margin-left: 20px;"><p> <strong>Shearer</strong> collection, licensed CC by-nc-sa. <strong>69</strong> (with karaoke) <strong>Can't stop it</strong> (with karaoke) @@ -62,7 +62,7 @@ Download <a href="http://sourceforge.net/projects/performous/files/ultrastar-son <strong>Man Song</strong> (with karaoke) <strong>Stay with me</strong> (with karaoke) Download <a href="http://sourceforge.net/projects/performous/files/ultrastar-songs-shearer/ultrastar-songs-shearer-1.zip">ZIP</a> (50 MB) -</p><br style="clear:both"/></div><p> +</p></div></div><p> :h2:More songs? |
|
From: Peque <ms...@us...> - 2010-12-05 17:24:00
|
Module: performous Branch: new-fonts Commit: fa4d3e24a06804c8587cd4042709a5153dce2073 Author: Miguel Sánchez de León Peque <msd...@gm...> Date: Sun Dec 5 18:23:31 2010 +0100 Trying DejaVu Sans font --- themes/default/configuration_value.svg | 2 +- themes/default/instrumentmenu_comment.svg | 2 +- themes/default/instrumentmenu_option.svg | 2 +- themes/default/instrumentmenu_option_selected.svg | 2 +- themes/default/mainmenu_option.svg | 2 +- themes/default/mainmenu_option_selected.svg | 2 +- themes/default/message_text.svg | 2 +- themes/default/notebarfs.svg | 2 +- themes/default/score_rank.svg | 2 +- themes/default/score_txt.svg | 2 +- themes/default/sing_lyricscurrent.svg | 2 +- themes/default/sing_lyricshighlight.svg | 2 +- themes/default/sing_lyricsnext.svg | 2 +- themes/default/sing_pbox.svg | 2 +- themes/default/sing_popup_text.svg | 2 +- themes/default/sing_score_text.svg | 2 +- themes/default/sing_timetxt.svg | 4 ++-- themes/default/vumeter_bg.svg | 12 ++++++------ 18 files changed, 24 insertions(+), 24 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 17:11:12
|
Module: web
Branch: bluestyle
Commit: 9278ca9901fb53a58a002f28a79551a2c5c760c9
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 5 18:11:00 2010 +0100
Fix glow (shadow) effects for non-webkit browsers, give more room for page heading, add reflection effect for showcase (webkit only).
---
htdocs-binary/style.css | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 7648106..a42e24d 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -24,9 +24,9 @@ body {
#page {
height: 600px;
background-color: rgba(0,0,0,0.6);
- box-shadow: 5px 20px 50px rgba(0, 0, 0, 0.4);
+ box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.5);
-webkit-box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 5px 20px 50px rgba(0, 0, 0, 0.4);
+ -moz-box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.5);
padding: 10px;
border-radius: 10px;
}
@@ -34,11 +34,13 @@ body {
#main {
position: relative;
border-radius: 10px;
+ box-shadow: 0px 0px 50px #448;
-webkit-box-shadow: 0px 0px 50px #448;
+ -moz-box-shadow: 0px 0px 50px #448;
background: #448;
margin: 20px;
margin-left: 145px;
- margin-top: 60px;
+ margin-top: 70px;
padding: 10px;
}
#content {
@@ -56,7 +58,7 @@ body {
width: 135px;
float: left;
padding: 5px;
- margin-top: 50px;
+ margin-top: 70px;
font-size: 14px;
}
@@ -83,7 +85,9 @@ body {
#menu li.selected {
background-color: #448;
border-radius: 10px;
+ box-shadow: 0px 0px 50px #448;
-webkit-box-shadow: 0px 0px 50px #448;
+ -moz-box-shadow: 0px 0px 50px #448;
width: 150px;
}
@@ -113,7 +117,7 @@ a:hover, a:active {
}
h1 {
position: absolute;
- top: -60px;
+ top: -70px;
font-size: 40px;
color: #ddd;
/*text-shadow: 0px 0px 10px rgba(68, 68, 136, 1.0);*/
@@ -133,7 +137,9 @@ h1 {
#showcase {
background: url('imgs/showcase.jpg') repeat-x;
width: 640px;
- height: 100px;
+ height: 96px;
+ margin-bottom: 30px;
+ -webkit-box-reflect:below 0 -webkit-gradient(linear, left top, left bottom, from(transparent), color-stop(0.6, transparent), to(rgba(255,255,255,0.3)));
}
h3 {
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 16:53:32
|
Module: web
Branch: bluestyle
Commit: bac9803d3199972d8a8b68023f736ba577e181c7
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 5 17:53:08 2010 +0100
Round corners for menu selection too
---
htdocs-binary/style.css | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 1caabb6..7648106 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -82,8 +82,9 @@ body {
}
#menu li.selected {
background-color: #448;
+ border-radius: 10px;
-webkit-box-shadow: 0px 0px 50px #448;
- width: 140px;
+ width: 150px;
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 16:53:30
|
Module: web
Branch: bluestyle
Commit: 4616b0d1c9b60bd9a54b99eace344ad3acef18e9
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 5 17:46:24 2010 +0100
Fix showcase URL
---
htdocs-binary/style.css | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 24a6949..1caabb6 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -130,7 +130,7 @@ h1 {
}
#showcase {
- background: url('showcase.jpg') repeat-x;
+ background: url('imgs/showcase.jpg') repeat-x;
width: 640px;
height: 100px;
}
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 16:53:27
|
Module: web
Branch: bluestyle
Commit: c7d14e6be5c7b31c422d58f5c6c81cc13aa4c366
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 5 17:45:38 2010 +0100
Dark + glow
---
htdocs-binary/style.css | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/htdocs-binary/style.css b/htdocs-binary/style.css
index 9b72208..24a6949 100644
--- a/htdocs-binary/style.css
+++ b/htdocs-binary/style.css
@@ -22,10 +22,10 @@ body {
}
/* page */
#page {
- min-height: 600px;
- background-color: rgba(255,255,255,0.3);
+ height: 600px;
+ background-color: rgba(0,0,0,0.6);
box-shadow: 5px 20px 50px rgba(0, 0, 0, 0.4);
- -webkit-box-shadow: 5px 20px 50px rgba(0, 0, 0, 0.4);
+ -webkit-box-shadow: 0px 0px 50px rgba(0, 0, 0, 0.5);
-moz-box-shadow: 5px 20px 50px rgba(0, 0, 0, 0.4);
padding: 10px;
border-radius: 10px;
@@ -34,10 +34,8 @@ body {
#main {
position: relative;
border-radius: 10px;
+ -webkit-box-shadow: 0px 0px 50px #448;
background: #448;
- box-shadow: 3px 5px 5px rgba(0, 0, 0, 0.4);
- -webkit-box-shadow: 3px 5px 5px rgba(0, 0, 0, 0.4);
- -moz-box-shadow: 3px 5px 5px rgba(0, 0, 0, 0.4);
margin: 20px;
margin-left: 145px;
margin-top: 60px;
@@ -82,13 +80,9 @@ body {
#menu li a {
margin-left: 7px;
}
-/*
-#menu li a:hover {
- text-decoration: underline;
-}
-*/
#menu li.selected {
background-color: #448;
+ -webkit-box-shadow: 0px 0px 50px #448;
width: 140px;
}
@@ -121,7 +115,7 @@ h1 {
top: -60px;
font-size: 40px;
color: #ddd;
- text-shadow: 3px 5px 5px rgba(0, 0, 0, 0.4);
+ /*text-shadow: 0px 0px 10px rgba(68, 68, 136, 1.0);*/
}
#content h2, .mceContentBody h2 {
display: block;
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-12-05 15:16:32
|
Module: web
Branch: bluestyle
Commit: 86e30afbb0b70b253f467d2afb58b024742fbdfc
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Dec 5 16:07:23 2010 +0100
A lot of theme and content changes, TinyMCE, ...
---
htdocs-binary/bgs/fantasy_16.jpg | Bin 0 -> 161190 bytes
htdocs-binary/imgs/showcase.jpg | Bin 0 -> 106976 bytes
htdocs-binary/imgs/title.png | Bin 42038 -> 30018 bytes
htdocs-binary/style.css | 43 +-
htdocs-binary/tiny_mce/langs/en.js | 170 +
htdocs-binary/tiny_mce/license.txt | 504 +
htdocs-binary/tiny_mce/plugins/advhr/css/advhr.css | 5 +
.../tiny_mce/plugins/advhr/editor_plugin.js | 1 +
.../tiny_mce/plugins/advhr/editor_plugin_src.js | 57 +
htdocs-binary/tiny_mce/plugins/advhr/js/rule.js | 43 +
.../tiny_mce/plugins/advhr/langs/en_dlg.js | 5 +
htdocs-binary/tiny_mce/plugins/advhr/rule.htm | 57 +
.../tiny_mce/plugins/advimage/css/advimage.css | 13 +
.../tiny_mce/plugins/advimage/editor_plugin.js | 1 +
.../tiny_mce/plugins/advimage/editor_plugin_src.js | 50 +
htdocs-binary/tiny_mce/plugins/advimage/image.htm | 232 +
.../tiny_mce/plugins/advimage/img/sample.gif | Bin 0 -> 1624 bytes
.../tiny_mce/plugins/advimage/js/image.js | 443 +
.../tiny_mce/plugins/advimage/langs/en_dlg.js | 43 +
.../tiny_mce/plugins/advlink/css/advlink.css | 8 +
.../tiny_mce/plugins/advlink/editor_plugin.js | 1 +
.../tiny_mce/plugins/advlink/editor_plugin_src.js | 61 +
.../tiny_mce/plugins/advlink/js/advlink.js | 528 +
.../tiny_mce/plugins/advlink/langs/en_dlg.js | 52 +
htdocs-binary/tiny_mce/plugins/advlink/link.htm | 333 +
.../tiny_mce/plugins/advlist/editor_plugin.js | 1 +
.../tiny_mce/plugins/advlist/editor_plugin_src.js | 154 +
.../tiny_mce/plugins/autoresize/editor_plugin.js | 1 +
.../plugins/autoresize/editor_plugin_src.js | 119 +
.../tiny_mce/plugins/autosave/editor_plugin.js | 1 +
.../tiny_mce/plugins/autosave/editor_plugin_src.js | 422 +
.../tiny_mce/plugins/autosave/langs/en.js | 4 +
.../tiny_mce/plugins/bbcode/editor_plugin.js | 1 +
.../tiny_mce/plugins/bbcode/editor_plugin_src.js | 120 +
.../tiny_mce/plugins/contextmenu/editor_plugin.js | 1 +
.../plugins/contextmenu/editor_plugin_src.js | 147 +
.../plugins/directionality/editor_plugin.js | 1 +
.../plugins/directionality/editor_plugin_src.js | 82 +
.../tiny_mce/plugins/emotions/editor_plugin.js | 1 +
.../tiny_mce/plugins/emotions/editor_plugin_src.js | 43 +
.../tiny_mce/plugins/emotions/emotions.htm | 40 +
.../tiny_mce/plugins/emotions/img/smiley-cool.gif | Bin 0 -> 354 bytes
.../tiny_mce/plugins/emotions/img/smiley-cry.gif | Bin 0 -> 329 bytes
.../plugins/emotions/img/smiley-embarassed.gif | Bin 0 -> 331 bytes
.../plugins/emotions/img/smiley-foot-in-mouth.gif | Bin 0 -> 344 bytes
.../tiny_mce/plugins/emotions/img/smiley-frown.gif | Bin 0 -> 340 bytes
.../plugins/emotions/img/smiley-innocent.gif | Bin 0 -> 336 bytes
.../tiny_mce/plugins/emotions/img/smiley-kiss.gif | Bin 0 -> 338 bytes
.../plugins/emotions/img/smiley-laughing.gif | Bin 0 -> 344 bytes
.../plugins/emotions/img/smiley-money-mouth.gif | Bin 0 -> 321 bytes
.../plugins/emotions/img/smiley-sealed.gif | Bin 0 -> 325 bytes
.../tiny_mce/plugins/emotions/img/smiley-smile.gif | Bin 0 -> 345 bytes
.../plugins/emotions/img/smiley-surprised.gif | Bin 0 -> 342 bytes
.../plugins/emotions/img/smiley-tongue-out.gif | Bin 0 -> 328 bytes
.../plugins/emotions/img/smiley-undecided.gif | Bin 0 -> 337 bytes
.../tiny_mce/plugins/emotions/img/smiley-wink.gif | Bin 0 -> 351 bytes
.../tiny_mce/plugins/emotions/img/smiley-yell.gif | Bin 0 -> 336 bytes
.../tiny_mce/plugins/emotions/js/emotions.js | 22 +
.../tiny_mce/plugins/emotions/langs/en_dlg.js | 20 +
htdocs-binary/tiny_mce/plugins/example/dialog.htm | 22 +
.../tiny_mce/plugins/example/editor_plugin.js | 1 +
.../tiny_mce/plugins/example/editor_plugin_src.js | 84 +
.../tiny_mce/plugins/example/img/example.gif | Bin 0 -> 87 bytes
.../tiny_mce/plugins/example/js/dialog.js | 19 +
htdocs-binary/tiny_mce/plugins/example/langs/en.js | 3 +
.../tiny_mce/plugins/example/langs/en_dlg.js | 3 +
.../tiny_mce/plugins/fullpage/css/fullpage.css | 182 +
.../tiny_mce/plugins/fullpage/editor_plugin.js | 1 +
.../tiny_mce/plugins/fullpage/editor_plugin_src.js | 153 +
.../tiny_mce/plugins/fullpage/fullpage.htm | 571 +
.../tiny_mce/plugins/fullpage/js/fullpage.js | 471 +
.../tiny_mce/plugins/fullpage/langs/en_dlg.js | 85 +
.../tiny_mce/plugins/fullscreen/editor_plugin.js | 1 +
.../plugins/fullscreen/editor_plugin_src.js | 151 +
.../tiny_mce/plugins/fullscreen/fullscreen.htm | 109 +
.../tiny_mce/plugins/iespell/editor_plugin.js | 1 +
.../tiny_mce/plugins/iespell/editor_plugin_src.js | 54 +
.../tiny_mce/plugins/inlinepopups/editor_plugin.js | 1 +
.../plugins/inlinepopups/editor_plugin_src.js | 635 +
.../inlinepopups/skins/clearlooks2/img/alert.gif | Bin 0 -> 818 bytes
.../inlinepopups/skins/clearlooks2/img/button.gif | Bin 0 -> 280 bytes
.../inlinepopups/skins/clearlooks2/img/buttons.gif | Bin 0 -> 1195 bytes
.../inlinepopups/skins/clearlooks2/img/confirm.gif | Bin 0 -> 915 bytes
.../inlinepopups/skins/clearlooks2/img/corners.gif | Bin 0 -> 911 bytes
.../skins/clearlooks2/img/horizontal.gif | Bin 0 -> 769 bytes
.../skins/clearlooks2/img/vertical.gif | Bin 0 -> 92 bytes
.../inlinepopups/skins/clearlooks2/window.css | 100 +
.../tiny_mce/plugins/inlinepopups/template.htm | 387 +
.../plugins/insertdatetime/editor_plugin.js | 1 +
.../plugins/insertdatetime/editor_plugin_src.js | 83 +
.../tiny_mce/plugins/layer/editor_plugin.js | 1 +
.../tiny_mce/plugins/layer/editor_plugin_src.js | 212 +
.../tiny_mce/plugins/legacyoutput/editor_plugin.js | 1 +
.../plugins/legacyoutput/editor_plugin_src.js | 136 +
.../tiny_mce/plugins/media/css/content.css | 6 +
htdocs-binary/tiny_mce/plugins/media/css/media.css | 16 +
.../tiny_mce/plugins/media/editor_plugin.js | 1 +
.../tiny_mce/plugins/media/editor_plugin_src.js | 414 +
htdocs-binary/tiny_mce/plugins/media/img/flash.gif | Bin 0 -> 241 bytes
.../tiny_mce/plugins/media/img/flv_player.swf | Bin 0 -> 11668 bytes
.../tiny_mce/plugins/media/img/quicktime.gif | Bin 0 -> 303 bytes
.../tiny_mce/plugins/media/img/realmedia.gif | Bin 0 -> 439 bytes
.../tiny_mce/plugins/media/img/shockwave.gif | Bin 0 -> 387 bytes
htdocs-binary/tiny_mce/plugins/media/img/trans.gif | Bin 0 -> 43 bytes
.../tiny_mce/plugins/media/img/windowsmedia.gif | Bin 0 -> 415 bytes
htdocs-binary/tiny_mce/plugins/media/js/embed.js | 73 +
htdocs-binary/tiny_mce/plugins/media/js/media.js | 630 +
.../tiny_mce/plugins/media/langs/en_dlg.js | 103 +
htdocs-binary/tiny_mce/plugins/media/media.htm | 817 ++
.../tiny_mce/plugins/nonbreaking/editor_plugin.js | 1 +
.../plugins/nonbreaking/editor_plugin_src.js | 53 +
.../tiny_mce/plugins/noneditable/editor_plugin.js | 1 +
.../plugins/noneditable/editor_plugin_src.js | 90 +
.../tiny_mce/plugins/pagebreak/css/content.css | 1 +
.../tiny_mce/plugins/pagebreak/editor_plugin.js | 1 +
.../plugins/pagebreak/editor_plugin_src.js | 77 +
.../tiny_mce/plugins/pagebreak/img/pagebreak.gif | Bin 0 -> 325 bytes
.../tiny_mce/plugins/pagebreak/img/trans.gif | Bin 0 -> 43 bytes
.../tiny_mce/plugins/paste/editor_plugin.js | 1 +
.../tiny_mce/plugins/paste/editor_plugin_src.js | 952 ++
.../tiny_mce/plugins/paste/js/pastetext.js | 36 +
.../tiny_mce/plugins/paste/js/pasteword.js | 51 +
.../tiny_mce/plugins/paste/langs/en_dlg.js | 5 +
htdocs-binary/tiny_mce/plugins/paste/pastetext.htm | 27 +
htdocs-binary/tiny_mce/plugins/paste/pasteword.htm | 21 +
.../tiny_mce/plugins/preview/editor_plugin.js | 1 +
.../tiny_mce/plugins/preview/editor_plugin_src.js | 53 +
.../tiny_mce/plugins/preview/example.html | 28 +
.../tiny_mce/plugins/preview/jscripts/embed.js | 73 +
.../tiny_mce/plugins/preview/preview.html | 17 +
.../tiny_mce/plugins/print/editor_plugin.js | 1 +
.../tiny_mce/plugins/print/editor_plugin_src.js | 34 +
.../tiny_mce/plugins/save/editor_plugin.js | 1 +
.../tiny_mce/plugins/save/editor_plugin_src.js | 101 +
.../plugins/searchreplace/css/searchreplace.css | 6 +
.../plugins/searchreplace/editor_plugin.js | 1 +
.../plugins/searchreplace/editor_plugin_src.js | 57 +
.../plugins/searchreplace/js/searchreplace.js | 138 +
.../tiny_mce/plugins/searchreplace/langs/en_dlg.js | 16 +
.../plugins/searchreplace/searchreplace.htm | 99 +
.../tiny_mce/plugins/spellchecker/css/content.css | 1 +
.../tiny_mce/plugins/spellchecker/editor_plugin.js | 1 +
.../plugins/spellchecker/editor_plugin_src.js | 417 +
.../tiny_mce/plugins/spellchecker/img/wline.gif | Bin 0 -> 46 bytes
htdocs-binary/tiny_mce/plugins/style/css/props.css | 13 +
.../tiny_mce/plugins/style/editor_plugin.js | 1 +
.../tiny_mce/plugins/style/editor_plugin_src.js | 55 +
htdocs-binary/tiny_mce/plugins/style/js/props.js | 641 +
.../tiny_mce/plugins/style/langs/en_dlg.js | 63 +
htdocs-binary/tiny_mce/plugins/style/props.htm | 723 +
.../tiny_mce/plugins/tabfocus/editor_plugin.js | 1 +
.../tiny_mce/plugins/tabfocus/editor_plugin_src.js | 112 +
htdocs-binary/tiny_mce/plugins/table/cell.htm | 178 +
htdocs-binary/tiny_mce/plugins/table/css/cell.css | 17 +
htdocs-binary/tiny_mce/plugins/table/css/row.css | 25 +
htdocs-binary/tiny_mce/plugins/table/css/table.css | 13 +
.../tiny_mce/plugins/table/editor_plugin.js | 1 +
.../tiny_mce/plugins/table/editor_plugin_src.js | 1139 ++
htdocs-binary/tiny_mce/plugins/table/js/cell.js | 286 +
.../tiny_mce/plugins/table/js/merge_cells.js | 27 +
htdocs-binary/tiny_mce/plugins/table/js/row.js | 237 +
htdocs-binary/tiny_mce/plugins/table/js/table.js | 454 +
.../tiny_mce/plugins/table/langs/en_dlg.js | 74 +
.../tiny_mce/plugins/table/merge_cells.htm | 32 +
htdocs-binary/tiny_mce/plugins/table/row.htm | 155 +
htdocs-binary/tiny_mce/plugins/table/table.htm | 187 +
htdocs-binary/tiny_mce/plugins/template/blank.htm | 12 +
.../tiny_mce/plugins/template/css/template.css | 23 +
.../tiny_mce/plugins/template/editor_plugin.js | 1 +
.../tiny_mce/plugins/template/editor_plugin_src.js | 159 +
.../tiny_mce/plugins/template/js/template.js | 106 +
.../tiny_mce/plugins/template/langs/en_dlg.js | 15 +
.../tiny_mce/plugins/template/template.htm | 31 +
.../tiny_mce/plugins/visualchars/editor_plugin.js | 1 +
.../plugins/visualchars/editor_plugin_src.js | 83 +
.../tiny_mce/plugins/wordcount/editor_plugin.js | 1 +
.../plugins/wordcount/editor_plugin_src.js | 98 +
htdocs-binary/tiny_mce/plugins/xhtmlxtras/abbr.htm | 141 +
.../tiny_mce/plugins/xhtmlxtras/acronym.htm | 141 +
.../tiny_mce/plugins/xhtmlxtras/attributes.htm | 148 +
htdocs-binary/tiny_mce/plugins/xhtmlxtras/cite.htm | 141 +
.../tiny_mce/plugins/xhtmlxtras/css/attributes.css | 11 +
.../tiny_mce/plugins/xhtmlxtras/css/popup.css | 9 +
htdocs-binary/tiny_mce/plugins/xhtmlxtras/del.htm | 161 +
.../tiny_mce/plugins/xhtmlxtras/editor_plugin.js | 1 +
.../plugins/xhtmlxtras/editor_plugin_src.js | 132 +
htdocs-binary/tiny_mce/plugins/xhtmlxtras/ins.htm | 161 +
.../tiny_mce/plugins/xhtmlxtras/js/abbr.js | 28 +
.../tiny_mce/plugins/xhtmlxtras/js/acronym.js | 28 +
.../tiny_mce/plugins/xhtmlxtras/js/attributes.js | 126 +
.../tiny_mce/plugins/xhtmlxtras/js/cite.js | 28 +
.../tiny_mce/plugins/xhtmlxtras/js/del.js | 63 +
.../plugins/xhtmlxtras/js/element_common.js | 231 +
.../tiny_mce/plugins/xhtmlxtras/js/ins.js | 62 +
.../tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js | 32 +
htdocs-binary/tiny_mce/themes/advanced/about.htm | 54 +
htdocs-binary/tiny_mce/themes/advanced/anchor.htm | 26 +
htdocs-binary/tiny_mce/themes/advanced/charmap.htm | 52 +
.../tiny_mce/themes/advanced/color_picker.htm | 73 +
.../tiny_mce/themes/advanced/editor_template.js | 1 +
.../themes/advanced/editor_template_src.js | 1229 ++
htdocs-binary/tiny_mce/themes/advanced/image.htm | 80 +
.../tiny_mce/themes/advanced/img/colorpicker.jpg | Bin 0 -> 3189 bytes
.../tiny_mce/themes/advanced/img/icons.gif | Bin 0 -> 11794 bytes
htdocs-binary/tiny_mce/themes/advanced/js/about.js | 72 +
.../tiny_mce/themes/advanced/js/anchor.js | 37 +
.../tiny_mce/themes/advanced/js/charmap.js | 335 +
.../tiny_mce/themes/advanced/js/color_picker.js | 253 +
htdocs-binary/tiny_mce/themes/advanced/js/image.js | 245 +
htdocs-binary/tiny_mce/themes/advanced/js/link.js | 156 +
.../tiny_mce/themes/advanced/js/source_editor.js | 56 +
htdocs-binary/tiny_mce/themes/advanced/langs/en.js | 62 +
.../tiny_mce/themes/advanced/langs/en_dlg.js | 51 +
htdocs-binary/tiny_mce/themes/advanced/link.htm | 58 +
.../themes/advanced/skins/default/content.css | 36 +
.../themes/advanced/skins/default/dialog.css | 117 +
.../themes/advanced/skins/default/img/buttons.png | Bin 0 -> 3274 bytes
.../themes/advanced/skins/default/img/items.gif | Bin 0 -> 70 bytes
.../advanced/skins/default/img/menu_arrow.gif | Bin 0 -> 68 bytes
.../advanced/skins/default/img/menu_check.gif | Bin 0 -> 70 bytes
.../themes/advanced/skins/default/img/progress.gif | Bin 0 -> 1787 bytes
.../themes/advanced/skins/default/img/tabs.gif | Bin 0 -> 1326 bytes
.../tiny_mce/themes/advanced/skins/default/ui.css | 213 +
.../themes/advanced/skins/o2k7/content.css | 36 +
.../tiny_mce/themes/advanced/skins/o2k7/dialog.css | 116 +
.../themes/advanced/skins/o2k7/img/button_bg.png | Bin 0 -> 5859 bytes
.../advanced/skins/o2k7/img/button_bg_black.png | Bin 0 -> 3736 bytes
.../advanced/skins/o2k7/img/button_bg_silver.png | Bin 0 -> 5358 bytes
.../tiny_mce/themes/advanced/skins/o2k7/ui.css | 215 +
.../themes/advanced/skins/o2k7/ui_black.css | 8 +
.../themes/advanced/skins/o2k7/ui_silver.css | 5 +
.../tiny_mce/themes/advanced/source_editor.htm | 25 +
.../tiny_mce/themes/simple/editor_template.js | 1 +
.../tiny_mce/themes/simple/editor_template_src.js | 85 +
htdocs-binary/tiny_mce/themes/simple/img/icons.gif | Bin 0 -> 1440 bytes
htdocs-binary/tiny_mce/themes/simple/langs/en.js | 11 +
.../themes/simple/skins/default/content.css | 25 +
.../tiny_mce/themes/simple/skins/default/ui.css | 32 +
.../tiny_mce/themes/simple/skins/o2k7/content.css | 17 +
.../themes/simple/skins/o2k7/img/button_bg.png | Bin 0 -> 5102 bytes
.../tiny_mce/themes/simple/skins/o2k7/ui.css | 35 +
htdocs-binary/tiny_mce/tiny_mce.js | 1 +
htdocs-binary/tiny_mce/tiny_mce_popup.js | 5 +
htdocs-binary/tiny_mce/tiny_mce_src.js |14222 ++++++++++++++++++++
htdocs-binary/tiny_mce/utils/editable_selects.js | 70 +
htdocs-binary/tiny_mce/utils/form_utils.js | 200 +
htdocs-binary/tiny_mce/utils/mctabs.js | 77 +
htdocs-binary/tiny_mce/utils/validate.js | 220 +
htdocs-source/AWC-cfg.txt | 20 +-
htdocs-source/Model.htm | 69 +-
htdocs-source/about.txt | 15 +
htdocs-source/{history.txt => blog.txt} | 91 +-
htdocs-source/index.txt | 92 +-
253 files changed, 37106 insertions(+), 121 deletions(-)
|
|
From: Tapio V. <aa...@us...> - 2010-11-29 15:43:05
|
Module: performous
Branch: master
Commit: 84b9126ce6094ffddd8180ab7b7d722ab12224fe
Author: Tapio Vierros <tap...@gm...>
Date: Mon Nov 29 17:42:28 2010 +0200
Fix getHomeDir() on Windows.
---
game/fs.cc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/game/fs.cc b/game/fs.cc
index 1978525..83f48d5 100644
--- a/game/fs.cc
+++ b/game/fs.cc
@@ -18,7 +18,11 @@ fs::path getHomeDir() {
static bool initialized = false;
if (!initialized) {
initialized = true;
+ #ifdef _WIN32
+ char const* home = getenv("USERPROFILE");
+ #else
char const* home = getenv("HOME");
+ #endif
if (home) dir = home;
}
return dir;
|
|
From: Peque <ms...@us...> - 2010-11-27 16:49:04
|
Module: performous Branch: new-fonts Commit: 6eeaf404515d458a61a4b8270ea34cc1d9ce9016 Author: Miguel Sánchez de León Peque <msd...@gm...> Date: Sat Nov 27 17:47:36 2010 +0100 Font fallback (needs some testing) --- themes/default/configuration_value.svg | 2 +- themes/default/instrumentmenu_comment.svg | 2 +- themes/default/instrumentmenu_option.svg | 2 +- themes/default/instrumentmenu_option_selected.svg | 2 +- themes/default/mainmenu_option.svg | 2 +- themes/default/mainmenu_option_selected.svg | 2 +- themes/default/message_text.svg | 2 +- themes/default/notebarfs.svg | 2 +- themes/default/score_rank.svg | 2 +- themes/default/score_txt.svg | 2 +- themes/default/sing_lyricscurrent.svg | 2 +- themes/default/sing_lyricshighlight.svg | 2 +- themes/default/sing_lyricsnext.svg | 2 +- themes/default/sing_pbox.svg | 2 +- themes/default/sing_popup_text.svg | 2 +- themes/default/sing_score_text.svg | 2 +- themes/default/sing_timetxt.svg | 4 ++-- themes/default/vumeter_bg.svg | 12 ++++++------ 18 files changed, 24 insertions(+), 24 deletions(-) |
|
From: Yoda-JM <yo...@us...> - 2010-11-26 13:08:12
|
Module: performous Branch: kinect Commit: 91bdeeaf09a1f6cc5882e4b423590db063960897 Author: Vincent Le Ligeour <yo...@us...> Date: Fri Nov 26 14:05:41 2010 +0100 Added some dummy Kinect to start with --- cmake/Modules/FindLibfreenect.cmake | 28 +++++++ game/CMakeLists.txt | 15 ++++ game/kinect.cc | 148 +++++++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 0 deletions(-) diff --git a/cmake/Modules/FindLibfreenect.cmake b/cmake/Modules/FindLibfreenect.cmake new file mode 100644 index 0000000..341bac8 --- /dev/null +++ b/cmake/Modules/FindLibfreenect.cmake @@ -0,0 +1,28 @@ +# - Try to find Libfreenect +# Once done, this will define +# +# Libfreenect_FOUND - system has Jpeg +# Libfreenect_INCLUDE_DIRS - the Jpeg include directories +# Libfreenect_LIBRARIES - link these to use Jpeg +# +# See documentation on how to write CMake scripts at +# http://www.cmake.org/Wiki/CMake:How_To_Find_Libraries + +include(LibFindMacros) + +libfind_pkg_check_modules(Libfreenect_PKGCONF libfreenect) + +find_path(Libfreenect_INCLUDE_DIR + NAMES libfreenect.hpp + PATHS ${Libfreenect_PKGCONF_INCLUDE_DIRS} +) + +find_library(Libfreenect_LIBRARY + NAMES freenect + PATHS ${Libfreenect_PKGCONF_LIBRARY_DIRS} +) + +set(Libfreenect_PROCESS_INCLUDES Libfreenect_INCLUDE_DIR) +set(Libfreenect_PROCESS_LIBS Libfreenect_LIBRARY) +libfind_process(Libfreenect) + diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index ccf5faf..e374d94 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -116,6 +116,21 @@ else() message(STATUS "Webcam support: Disabled (explicitly disabled)") endif() +if(NOT NO_KINECT) + find_package(OpenCV) + find_package(Libfreenect) + if(OpenCV_FOUND AND Libfreenect_FOUND) + include_directories(${OpenCV_INCLUDE_DIRS} ${Libfreenect_INCLUDE_DIRS}) + list(APPEND LIBS ${OpenCV_LIBRARIES} ${Libfreenect_LIBRARIES}) + add_definitions("-DUSE_KINEeCT") + message(STATUS "Kinect support: Enabled") + else() + message(STATUS "Kinect support: Disabled (libcv/libhighgui/libfreenect not found)") + endif() +else() + message(STATUS "Kinect support: Disabled (explicitly disabled)") +endif() + # Set default compile flags for GCC if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/game/kinect.cc b/game/kinect.cc new file mode 100644 index 0000000..a3ac786 --- /dev/null +++ b/game/kinect.cc @@ -0,0 +1,148 @@ +#include "surface.hh" + +#include <iostream> +#include <vector> +#include <boost/thread/mutex.hpp> + +#ifdef USE_KINECT +#include <libfreenect.hpp> +#include <cv.h> +#include <highgui.h> + +class MyFreenectDevice : public Freenect::FreenectDevice { + public: + MyFreenectDevice(freenect_context *_ctx, int _index) : Freenect::FreenectDevice(_ctx, _index), m_buffer_depth(FREENECT_FRAME_PIX), m_new_depth_frame(false) { + } + void RGBCallback(freenect_pixel *, uint32_t) { + //std::cout << "RGB callback" << std::endl; + }; + void DepthCallback(void *_depth, uint32_t) { + //std::cout << "Depth callback" << std::endl; + boost::mutex::scoped_lock l(m_depth_mutex); + freenect_depth *depth = static_cast<freenect_depth *>(_depth); + std::copy(depth, depth+FREENECT_FRAME_PIX, m_buffer_depth.begin()); + m_new_depth_frame = true; + } + + bool getDepth(IplImage* depth_image) { + boost::mutex::scoped_lock l(m_depth_mutex); + if(m_new_depth_frame) { + m_new_depth_frame = false; + for(unsigned int i = 0 ; i < FREENECT_FRAME_PIX ; ++i) { + if( m_buffer_depth[i] >= 0x07ff) { + depth_image->imageData[i] = 0xff; + } else { + depth_image->imageData[i] = (2048 * 256) / (2048 - m_buffer_depth[i]); + } + } + return true; + } else { + return false; + } + } + private: + std::vector<boost::uint16_t> m_buffer_depth; + boost::mutex m_depth_mutex; + bool m_new_depth_frame; +}; + +class BoundingBoxes { + public: + BoundingBoxes(boost::uint8_t _near = 0, boost::uint8_t _far = 255) : m_grey_image(NULL), m_near(_near), m_far(_far) { + m_storage = cvCreateMemStorage(0); + } + ~BoundingBoxes() { + if(m_grey_image == NULL) + cvReleaseImage(&m_grey_image); + cvReleaseMemStorage(&m_storage); + } + void process(IplImage* depth_image, std::vector<CvRect> &boxes) { + CvSeq* seq; + boxes.clear(); + cvClearMemStorage(m_storage); + if(m_grey_image == NULL) + m_grey_image = cvCreateImage(cvGetSize(depth_image), IPL_DEPTH_8U, 1); + //cvSaveImage("in.png", depth_image); + cvThreshold(depth_image, m_grey_image, m_far, 0, CV_THRESH_TOZERO_INV); + cvThreshold(m_grey_image, m_grey_image, m_near, 255, CV_THRESH_BINARY); + //cvSaveImage("out.png", m_grey_image); + cvFindContours(m_grey_image, m_storage, &seq); + for(; seq; seq = seq->h_next) { + CvRect boundbox = cvBoundingRect(seq); + if(boundbox.width >= MIN_WIDTH && boundbox.height >= MIN_HEIGHT) { + boxes.push_back(boundbox); + } + } + } + void setNear(boost::uint8_t _near) {m_near = _near;} + void setFar(boost::uint8_t _far) {m_far = _far;} + private: + CvMemStorage* m_storage; + IplImage* m_grey_image; + boost::uint8_t m_near; + boost::uint8_t m_far; + static const int MIN_WIDTH = 50; + static const int MIN_HEIGHT = 50; +}; + + +class Kinect { + public: + Kinect() : m_freenect(), m_device(m_freenect.createDevice(0)), m_boxes(90, 130), m_new_image(false) { + m_device.startDepth(); + m_depth_image = cvCreateImage(cvSize(FREENECT_FRAME_W, FREENECT_FRAME_H), IPL_DEPTH_8U, 1); + m_print_image = cvCreateImage(cvSize(FREENECT_FRAME_W, FREENECT_FRAME_H), IPL_DEPTH_8U, 3); + } + ~Kinect() { + cvReleaseImage(&m_depth_image); + cvReleaseImage(&m_print_image); + m_device.stopDepth(); + m_freenect.deleteDevice(0); + } + void process() { + std::vector<CvRect> boxes; + m_device.getDepth(m_depth_image); + cvFlip(m_depth_image, NULL, 1); + m_boxes.process(m_depth_image, boxes); + cvConvertImage(m_depth_image, m_print_image); + for(std::vector<CvRect>::const_iterator it = boxes.begin(); it != boxes.end() ; ++it) { + std::cout << "Rectangle: " << (*it).x << "," << (*it).y << " (" << (*it).width << "x" << (*it).height << ")" << std::endl; + // draw the cross + cvLine(m_print_image, cvPoint((*it).x, (*it).y), cvPoint((*it).x+(*it).width, (*it).y+(*it).height), cvScalar(0,0,255)); + cvLine(m_print_image, cvPoint((*it).x+(*it).width, (*it).y), cvPoint((*it).x, (*it).y+(*it).height), cvScalar(0,0,255)); + // draw the box + cvRectangleR(m_print_image, *it, cvScalar(255,0,0)); + //return 0; + } + m_new_image = true; + // generate drumkit events + generateEvents(); + } + void render() { + if(m_new_image) { + m_surface.load(m_print_image->width, m_print_image->height, pix::BGR, (const unsigned char*)m_print_image->imageData); + m_new_image = false; + } + m_surface.draw(); + } + private: + void generateEvents() { + } + Freenect::Freenect<MyFreenectDevice> m_freenect; + MyFreenectDevice& m_device; + BoundingBoxes m_boxes; + IplImage* m_depth_image; + IplImage* m_print_image; + bool m_new_image; + Surface m_surface; + public: + static bool enabled() { + #ifdef USE_KINECT + return true; + #else + return false; + #endif + } +}; + +#endif |
|
From: Yoda-JM <yo...@us...> - 2010-11-23 15:16:31
|
commit 4bc93fc50a5233d2b9a9f121012d820105b7a943
Merge: 84ec4684a0b09a227cb8140eb2073101b1162458 5e67c5ad2a2289febc0b6d912d4d98dc1abd80f4
Author: Vincent Le Ligeour <yo...@us...>
Date: Tue Nov 23 16:11:00 2010 +0100
Merge branch 'master' into ssxml
commit 5e67c5ad2a2289febc0b6d912d4d98dc1abd80f4
Merge: 40f61cf01229e7b229ee506017be0ce07089ae0f ca85963e75ce39e4c9a6b605378a08c682016c74
Author: Vincent Le Ligeour <yo...@us...>
Date: Tue Nov 23 16:02:23 2010 +0100
Merge remote branch 'origin/joinmenu'
commit 40f61cf01229e7b229ee506017be0ce07089ae0f
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Nov 13 01:46:54 2010 +0100
Fixed drum helper in joinmenu
commit 8dfdfe7db05bf31ceba27718129d57a188278a3d
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Nov 12 16:01:26 2010 +0100
Enhanced drumkit tom detection (now just need nice 3D object
commit d3b1d16e7ab8445d90a6d38f0b41279748514595
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Nov 11 12:06:52 2010 +0100
Added some kind of tom vs cybal detection (for the moment tom are displayed as tapped notes)
commit 80482f9fe5b816a125c083ad1c7e9eb0b6ffa0e5
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Wed Nov 3 18:58:46 2010 +0100
Missing library for supporting MIDI I/O in Fedora packages
commit 8b9ce92bc02d82ed78e72d8815f15edb2c24892a
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Wed Nov 3 17:13:41 2010 +0100
Fedora 14 is now supported for packaging
commit fdf19b9feb2024f6e4ef85eeb326925ca268086f
Author: Tapio Vierros <tap...@gm...>
Date: Mon Nov 1 21:38:13 2010 +0200
Add ImageMagick to cross-compilation script and enable building of ss_extract and friends.
commit d9d54490813cb18c70c8d3e261024813fe93b2b6
Author: Tapio Vierros <tap...@gm...>
Date: Mon Nov 1 20:07:36 2010 +0200
Added flashMessage when saving configuration.
commit c11bbf032790a10e2dbf87d514897cfb464cfffb
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 31 21:55:21 2010 +0200
Post-release version increments.
commit 704a0e00c7783a29e9258c417882071286445d75
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 31 17:49:09 2010 +0200
Bump version to 0.6.1
commit 64aa74f044e6ef3a5f0107dd3728cad6affd27fc
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 31 17:48:35 2010 +0200
Make Windows installer songdir shortcut work.
commit 3be1edfb5ba87a355f33319bcd91837da6362e26
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Oct 29 11:12:02 2010 +0200
Removed unneeded include
commit fd2d6df37b703ebb576715c8748c90d31a4c1748
Author: Tapio Vierros <tap...@gm...>
Date: Fri Oct 29 00:38:22 2010 +0300
Add forgotten device_selector.svg
commit 65c4e3a911817f9b76fa2d3b1f0a39cbce54f81c
Author: Tapio Vierros <tap...@gm...>
Date: Thu Oct 28 18:14:38 2010 +0300
Use Cachemap for join and pause menu option texts.
commit 9a007703791d23c4ce5fd74d26671f13424a0a06
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Oct 28 11:14:54 2010 +0200
Updated TODO
commit dbe148c737e63084e324d9b56e9e529ba75aa84c
Author: Tapio Vierros <tap...@gm...>
Date: Wed Oct 27 20:39:41 2010 +0300
Update ppa script.
commit 477b575fdb0acf645f7b8eed33846f38c42e5f5e
Author: Tapio Vierros <tap...@gm...>
Date: Wed Oct 27 20:27:49 2010 +0300
Use an SVG for the device selection indicator.
commit 3875fafd26248ee7babcca1c110f23191ed778f0
Author: Tapio Vierros <tap...@gm...>
Date: Wed Oct 27 18:42:32 2010 +0300
Dance arrow colors are now consistent with joinmenu icons + a tiny bugfix.
commit 34e38fcb168ef3cda6b7428ad6599d991d42dd5b
Author: Tapio Vierros <tap...@gm...>
Date: Wed Oct 27 18:29:25 2010 +0300
Add forgotten new theme files for joinmenu arrow icons.
commit 084fdf475cb1cab535c24d938a766dd02b7b093b
Author: Tapio Vierros <tap...@gm...>
Date: Wed Oct 27 18:28:24 2010 +0300
Joinmenu icons are now also visible with keyboard instruments.
commit 12622095c6ff10d7d13bbe8feb72fca3a7cec1e8
Author: Tapio Vierros <tap...@gm...>
Date: Wed Oct 27 17:59:10 2010 +0300
Arrow icon hints for instrument & dance joinmenu.
commit 2a243727590c39c5459e04ac74703dc61b5362de
Author: Tapio Vierros <tap...@gm...>
Date: Wed Oct 27 16:48:29 2010 +0300
Start button now closes the joinmenu.
commit 51bbbc002fe776e518d203f19df482e309adf1af
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Oct 27 11:38:46 2010 +0200
Moved include to the right place
commit 34be52043e50ef8696e417373843095550f6beb1
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 26 20:03:10 2010 +0300
Delete win32/setup.nsi
It is very out-dated, hard to maintain, hacky and tied to certain environment.
Use cross-from-debian/makepackage.py for a handy/robust generator.
(Though it might need tiny adjustments for use on Windows.)
commit f4c523796ae391e8078e8e8e145d20c62c3ae318
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 26 20:01:14 2010 +0300
Windows installer improvements/changes.
* Create APPDATA/songs
* Install link to it
* Install link to ConfigureSongDirectory.bat
* Don't append -win32 to installer name.
commit de62cca5f9d2553904d0df164990bdf47fe77e8a
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 26 19:20:40 2010 +0300
Use AudioDevices struct in Audio::Impl rather than direct PA calls.
commit 1251ab7ba963692a859e6529005aa37fbdb01489
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 26 19:20:15 2010 +0300
Convert PortAudio device name to UTF-8.
commit fe36c33058dc282c04cd67ee2b0ae767bbb68669
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 26 18:58:46 2010 +0300
Implement convertToUTF8 with glib instead of glibmm.
commit 94a4a40ff684814c875ef7cc1ee0b6937e48903e
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 26 18:07:58 2010 +0300
Use Cachemap for screen_intro menu option text objects.
commit 733404d37bcb21d4c0a8f5a7a472798c1f49f0cd
Author: Miguel Sánchez de León Peque <msd...@gm...>
Date: Mon Oct 25 14:24:50 2010 +0200
Spanish translation updated (100% for 0.6.0)
commit 4193c5a53392d5d6b11ad98a063c6956ca9ecbe7
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Oct 24 23:03:11 2010 +0200
Post-release version bump
commit 75295d6bfb88173b633a9991480ac5e0f037300a
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Oct 24 21:33:30 2010 +0200
Bumping version to 0.6.0.
commit 50646b66f65efb68dceb649c28126fa7fc8571de
Merge: 9714183627f0a4adb4b12342cec769b8bd27bbf7 e2e810e51177d4600b00e5ca6eb08d794c06ac5e
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Oct 24 21:29:16 2010 +0200
Merge branch 'master' of ssh://git.performous.org/gitroot/performous/performous
Removing screenshot spammer.
Conflicts:
game/main.cc
commit e2e810e51177d4600b00e5ca6eb08d794c06ac5e
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 21:34:45 2010 +0300
Screenshot spammer utility.
commit 8af8a27f6ae958232cb2f81ae4a07d7b5a99ddb5
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 20:48:52 2010 +0300
Work-around for Windows glibmm problems.
commit cfef2bba36d8eb4626cc5adb3e185d26ecfc0d9f
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun Oct 24 18:54:32 2010 +0200
Fixed score coloring
commit 9714183627f0a4adb4b12342cec769b8bd27bbf7
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Oct 24 18:46:04 2010 +0200
Profiler for main loop
commit 8ef8c73afe9de6d6b7aeb69bf566140f88d52e8f
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 19:16:09 2010 +0300
Tweak joinmenu delays.
commit c9b99dd56478ba79b3b26416aa67125ef52702bb
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Oct 24 17:19:52 2010 +0200
Proper handling of tracks with missing/broken music files.
commit eea7dc9da70636b17d9a2498dd75480cf9cb0f76
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 16:39:22 2010 +0300
Bump cross-compilation dependency library versions.
commit 9f0802dc0fd60fdff884fd139ac50c8f06846d6c
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 16:30:36 2010 +0300
Quick hack to fix per-track volume control.
commit a5f446f934b077cd108fbfc5f20dd4b0e307cee9
Author: Fredrik Klasson <sci...@gm...>
Date: Sun Oct 24 13:16:20 2010 +0200
[ ] Word de-dup. Not bothering to update wiki for this...
commit 6b8ce73a41c079f1c3ff84bbc4ce9fec4940425e
Author: Fredrik Klasson <sci...@gm...>
Date: Sun Oct 24 13:08:58 2010 +0200
[ ] Updating all .po files from sources (soon updating the overview on the wiki)
commit 7d197dec9de7b77a8bbb72b3df9186e433816efd
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 13:07:51 2010 +0300
Handle Windows drive names in backgrounds' cache path construction.
commit 1872e11e05973a097eeafa27a3418bd4a62a6572
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 12:55:34 2010 +0300
Increase suggested latency for Windows compatibility.
commit 43abd6dfe20a8d9d45c09b4fe64ab335cd49729a
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 12:50:45 2010 +0300
Fix a float error.
commit b843f79c379c3b2278442c2b2c1bbc80a9020946
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 10:54:52 2010 +0300
CPack dependencies for Ubuntu 10.04 and 10.10.
commit 33b3ba7f4a751c52554b3288f7cbb6e9e86d498e
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun Oct 24 09:35:18 2010 +0200
Fixed git ebuild and added 0.6.0 ebuild
commit 6f714bb9f1df970e56429454c7d38459f1f8e01e
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 24 01:21:33 2010 +0300
Update TODO (regarding config menu).
commit 1446553a71dd9d7a2124abe6f9bcd078b7cf38d3
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 19:21:45 2010 +0300
Fix a wrong image used with a menu item.
commit e5f84f909950df964ac1a492b018960effe17f91
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 18:11:51 2010 +0200
Further audio init/hang tuning.
commit 5be9ea201fd5cac029bec1ed50fd47e57ef24963
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 19:09:40 2010 +0300
Tweak audiokiller delays to get message in screen_audiodevices.
commit 942715a09afc515d89f86f46c25a1f938fc14fe7
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 17:31:02 2010 +0200
Fix engine deinit position in ScreenSing::exit. We really should get rid of enter/exit functions to avoid these bugs.
commit 9bb429e19e8e7f4b5680e90b91aa7ac7083a0b16
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 17:29:54 2010 +0200
Remove audiokiller from main.cc. Fix Audio/ScreenManager init order (SM needs to be destroyed before audio).
commit 92d9832b10425a7914d764fe2fd92842ad653864
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 17:27:33 2010 +0200
Add hang protection/handling in portaudio.hpp.
commit 18791fa3d379a17161ccaa8f96e4af4e6e29cc3c
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 14:51:21 2010 +0200
Update URL in Compiling.txt to point to wiki
commit c7b3fc0f93604f3a3eea98b9219e9298cfe153b2
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 18:32:05 2010 +0300
Fix neck coloring.
commit 108014f409bd149d310f0e743c3bc6d28c275c4c
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 17:32:12 2010 +0300
Fix fatal exception from vocal track chooser code.
commit 7c001d300069e27b5d9089fa69fc9e4b91d2e8ff
Author: Fredrik Klasson <sci...@gm...>
Date: Sat Oct 23 16:30:10 2010 +0200
[ ] Updating swedish translation
commit 7064185e88d4894a0a8da74eac0aefabaead4828
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Oct 23 16:17:45 2010 +0200
Fixed finilizing song not done for all vocal tracks
commit 94db4bc7142baf6acf69826fa4154249bd70cc89
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Oct 23 15:52:42 2010 +0200
Revert "Add back dummy screen_configuration.* as a work-around for ppa troubles."
This commit is not needed in new release
This reverts commit b9b699fa39d0a9ab0f999a58c4b4d2850ab42b5a.
commit d98a34e2b9a929f393e7af5af2799ed36d69b86f
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Oct 23 15:49:24 2010 +0200
Updated French translation (do not forget to add *.hh to C/C++ poedit parser)
commit c7ddd6ee7f50aa35060f62aa926c189098e33746
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Oct 23 15:39:04 2010 +0200
Updated French translation
commit d9d9de8ebc6214df6adb57fcbac9c05fa5e4e3a8
Author: Fredrik Klasson <sci...@gm...>
Date: Sat Oct 23 15:31:08 2010 +0200
[ ] Updating swedish translation
commit b6650d3ca8388b8fec2a1149b576d3ccc34a8f6d
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 16:19:24 2010 +0300
Vocals selector i18n.
commit 877276ab31e389aae6a5daa3e9fe0166ceaadc3e
Merge: 4ae18750bd0677857af24e05b8f2d68a13ded258 cd9862a98aa62cbd6aadfc1e4968253d65ab1b10
Author: Fredrik Klasson <sci...@gm...>
Date: Sat Oct 23 15:10:56 2010 +0200
Merge branch 'master' of git.performous.org:/gitroot/performous/performous
commit 4ae18750bd0677857af24e05b8f2d68a13ded258
Author: Fredrik Klasson <sci...@gm...>
Date: Sat Oct 23 15:10:07 2010 +0200
[ ] These two strings should be gettext'd too.
commit cd9862a98aa62cbd6aadfc1e4968253d65ab1b10
Author: Tapio Vierros <tap...@gm...>
Date: Sat Oct 23 15:55:22 2010 +0300
Update fi translation.
commit 543ecb238f02846da008295304358b739e7b10bc
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Oct 23 14:35:32 2010 +0200
Removed editor from gentoo's ebuild
commit a53fecb2c95e308d150a03835a23284303652809
Author: Lasse Karkkainen <tro...@tr...>
Date: Sat Oct 23 14:28:24 2010 +0200
Remove editor (didn't work and used old audio code)
commit 5a9c3644a36bc76b7cdb82402ecbc3dc8bcf10d8
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 19 21:16:18 2010 +0300
Fix a warning.
commit 9a4963b4addf3fbb91b6114daa168182da8e52a4
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 19 21:15:06 2010 +0300
Added a dummy screen_paths.
commit 5d08902686b98595ac4dfebdb7c1b5ea0fceb146
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 19 20:52:04 2010 +0300
Remove unused stuff from background SVGs.
commit 5cdba099862b53b151fbe14d4c332f172c96b18e
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 19 20:41:00 2010 +0300
Add two random backgrounds.
commit 3201b2c79c81fd27fd596b9371160f3a2640c574
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 19 19:26:57 2010 +0300
Uses SVG caching also for non-theme files.
commit e31002373fb2ed366c88bddbfb7c30c025c044e7
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 19 18:52:10 2010 +0300
Drop karmic from ppa script.
commit b9b699fa39d0a9ab0f999a58c4b4d2850ab42b5a
Author: Tapio Vierros <tap...@gm...>
Date: Tue Oct 19 17:31:33 2010 +0300
Add back dummy screen_configuration.* as a work-around for ppa troubles.
commit 052aa59e436fd5e457540432d3c384941a9e2ae3
Author: Vincent Le Ligeour <yo...@us...>
Date: Tue Oct 19 11:43:43 2010 +0200
Fixed error in previous commit (thank you gcc warning message)
commit 809fbbc4b1c2d415e66e0a907b8caf6f9feb7655
Author: Vincent Le Ligeour <yo...@us...>
Date: Tue Oct 19 08:55:46 2010 +0200
Fixed problem when going from a multiple vocal track to a single one
commit 396041e0c4cbd02b9c15178a57a14f19f92e2577
Author: Tapio Vierros <tap...@gm...>
Date: Mon Oct 18 00:37:13 2010 +0300
Reload current screen when doing fullscreen switch to counter graphics glitches.
commit 909f06a59c14cb7b2f0e8dbc3b059cab0a8e25c2
Author: Tapio Vierros <tap...@gm...>
Date: Sun Oct 17 19:35:38 2010 +0300
Vocal track changer to pause menu.
commit cb93f69bd1510831595c457e656930bb8142e2a0
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun Oct 17 12:20:29 2010 +0200
Simplified joystick axis management
commit 690959a0adff79c29d65c62abf94ab888450f709
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Oct 16 01:44:11 2010 +0200
Prepared for vocal track configuration
commit 79b00f49b92cf507ec2b4c4482d40d3f1e61042b
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Oct 16 01:21:32 2010 +0200
Created path to songlist dumping
commit d756b8e1514b656f11b657441551bebb49146da6
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Oct 8 16:01:21 2010 +0200
Enabled multiple midi vocal tracks management
commit 0db9cd04f01640248cfdc70d38debe000da28601
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Oct 8 15:12:26 2010 +0200
Changed vocal tracks visibility, fixed bug crashing when midi song has multiple vocal tracks
commit 19d943858ea45fbb994cdab33a170bee552df1f9
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Oct 8 01:13:12 2010 +0200
Added debug message on broken tracks
commit 9afa8a95af41ac092e0a5add1b1c673a97a6d408
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Oct 7 15:14:59 2010 +0200
Renamed vocals to vocal when only one track is expected in the near future
commit 826c167fc46761d14cecf606c998692ff2b9d0e5
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Oct 7 13:57:24 2010 +0200
Enhanced multiple singer midi parsing, Fixed midi parsing bug
commit f45615bca4b4910f54389989136b81afccb4e661
Author: Fredrik Klasson <sci...@gm...>
Date: Thu Oct 7 17:08:25 2010 +0200
[ ] A little more work on the japanese translation.
commit 48698d1b25ad88cb2e3c1b00679654d3c776b3b4
Author: Fredrik Klasson <sci...@gm...>
Date: Thu Oct 7 14:52:24 2010 +0200
[ ] Updating swedish translation.
commit 8d5502adb5d2e7c6f18e663a3021bed3c6c21aae
Author: Vincent Le Ligeour <yo...@us...>
Date: Mon Oct 4 21:31:41 2010 +0200
Added GH Warriors of Rock guitar mappind/detection
commit 5823228f74f89984fec6c165ae82e539178b49cb
Author: Tapio Vierros <tap...@gm...>
Date: Mon Sep 27 18:34:08 2010 +0300
Improve FI translation and update "audio/devices" XML description.
commit f86db16a756ada97b8b6d6392d9e244ec34f7875
Author: Tapio Vierros <tap...@gm...>
Date: Mon Sep 27 17:52:45 2010 +0300
Guitar join menu key hints change to alt mapping (Z,X) when in lefty-mode.
commit 93400bba989aa5998e34f089c6145c761cb6fac0
Author: Tapio Vierros <tap...@gm...>
Date: Mon Sep 27 17:47:29 2010 +0300
Add alternative fret mapping for keyboard lefty-mode.
commit 2021565e08cc63cc3e0c7ce50e2d672dd3e51d09
Author: Tapio Vierros <tap...@gm...>
Date: Mon Sep 27 17:36:12 2010 +0300
Revert "Disabled lefty-mode with keyboard guitar."
This reverts commit d00e2e3e0c5ab071f00e9b33220490d0876bda6a.
commit d00e2e3e0c5ab071f00e9b33220490d0876bda6a
Author: Tapio Vierros <tap...@gm...>
Date: Mon Sep 27 17:15:34 2010 +0300
Disabled lefty-mode with keyboard guitar.
commit f23280dd2addd290f2d3cb3c88a8979629ca50e7
Author: Tapio Vierros <tap...@gm...>
Date: Mon Sep 27 17:11:57 2010 +0300
Reverse lefty mode strum direction in menu.
commit 215f10c7bf0cb8b96c71a3d4d57462ca941c2078
Author: Fredrik Klasson <sci...@gm...>
Date: Mon Sep 27 15:18:25 2010 +0200
[ ] updating comment to reflect commiting to tree
commit b1e3694784048423d61e6cdad5e750b236e7bf73
Author: Fredrik Klasson <sci...@gm...>
Date: Mon Sep 27 15:05:28 2010 +0200
[+] Adding jap translations, these are *NOT* ready for shipping with a release. (manually exclude from official releases for now; adding to have a backup in the tree)
commit 0d98883ab8fd426691c2386d49878047f3873b55
Author: Fredrik Klasson <sci...@gm...>
Date: Mon Sep 27 15:00:59 2010 +0200
[+] Translation wiki helper and it's companion lang/TRANSLATORS file.
commit 1eef0c4a3b9e64a5908939705425812c6038a2a6
Author: Fredrik Klasson <sci...@gm...>
Date: Sun Sep 26 23:41:34 2010 +0200
[ ] Swedish translation "self-proofreading" round 1. Translations still at 98%
commit 536fea845586a58f5185f1b73b2ffdaf170cf10e
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Sep 24 21:58:56 2010 +0200
Renamed ColorRIIA class
commit eb9cea7f8d7fa84d1f1369aa0c98531a242a96e8
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Sep 24 21:52:48 2010 +0200
Used OpenGL color RIIA
commit 3af5e403c4b62b0195a7a00ed901715f2aa0e679
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Sep 24 20:34:22 2010 +0200
Prepared for RAII OpenGL Color
commit aad1ea97b878ac80178e94366abb6510b8e73fb5
Author: Fredrik Klasson <sci...@gm...>
Date: Wed Sep 22 18:59:45 2010 +0200
[ ] On closer examination, suffixing isn't required as -L/--language bypasses the filename based language guessing of xgettext.
commit 7b4af9deb4c51d74fd8c9c8e52fb38277ea34876
Author: Fredrik Klasson <sci...@gm...>
Date: Wed Sep 22 18:56:44 2010 +0200
[ ] Small typo in translation.
commit ca85963e75ce39e4c9a6b605378a08c682016c74
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Aug 21 18:11:56 2010 +0200
Removed unused pattern from theme files
|
|
From: Yoda-JM <yo...@us...> - 2010-11-23 15:07:45
|
Module: performous Branch: master Commit: 5e67c5ad2a2289febc0b6d912d4d98dc1abd80f4 Author: Vincent Le Ligeour <yo...@us...> Date: Tue Nov 23 16:02:23 2010 +0100 Merge remote branch 'origin/joinmenu' --- |
|
From: Yoda-JM <yo...@us...> - 2010-11-23 15:07:42
|
Module: performous Branch: master Commit: ca85963e75ce39e4c9a6b605378a08c682016c74 Author: Vincent Le Ligeour <yo...@us...> Date: Sat Aug 21 18:11:56 2010 +0200 Removed unused pattern from theme files --- game/main.cc | 1 - themes/default/band_cover.svg | 14 -------------- themes/default/dance_cover.svg | 32 -------------------------------- themes/default/instrument_cover.svg | 14 -------------- themes/default/instruments.svg | 16 ---------------- themes/default/no_cover.svg | 14 -------------- themes/default/no_player_image.svg | 16 ---------------- 7 files changed, 0 insertions(+), 107 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-11-21 04:13:27
|
Module: performous Branch: pitch-ng Commit: ceeff1f138f22350fa32397aac27d110c162934f Author: Lasse Karkkainen <tro...@tr...> Date: Sun Nov 21 05:13:09 2010 +0100 Major changes and a lot of tuning, now the algorithm start to look good. Switching into storing magnitude values rather than decibels in various places to allow easier calculations. --- game/notegraph.cc | 2 +- game/pitch.cc | 98 ++++++++++++++++++++++++++--------------------- game/pitch.hh | 36 ++++------------- game/screen_practice.cc | 7 ++- 4 files changed, 67 insertions(+), 76 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2010-11-15 00:11:28
|
Module: performous Branch: pitch-ng Commit: 3d335d21fd641a1ee621c66796816cd23197b2c3 Author: Lasse Karkkainen <tro...@tr...> Date: Mon Nov 15 01:05:35 2010 +0100 Hacking new pitch detection (that isn't quite usable yet). Includes visualization in screen_practice. Visualization can be paused by pressing and holding P. --- game/pitch.cc | 184 ++++++++++++++++++++++++++--------------------- game/pitch.hh | 64 ++++++++++------ game/screen_practice.cc | 50 ++++++++++++-- game/screen_practice.hh | 4 +- 4 files changed, 188 insertions(+), 114 deletions(-) |
|
From: Yoda-JM <yo...@us...> - 2010-11-13 00:47:14
|
Module: performous
Branch: master
Commit: 40f61cf01229e7b229ee506017be0ce07089ae0f
Author: Vincent Le Ligeour <yo...@us...>
Date: Sat Nov 13 01:46:54 2010 +0100
Fixed drum helper in joinmenu
---
game/instrumentgraph.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/instrumentgraph.cc b/game/instrumentgraph.cc
index d8a5580..95de035 100644
--- a/game/instrumentgraph.cc
+++ b/game/instrumentgraph.cc
@@ -151,7 +151,7 @@ void InstrumentGraph::drawMenu() {
hintfont.dimensions.left(leftx).center(y - step);
hintfont.draw("I");
}
- if (m_menu.getOptions().size()-1) { // Down
+ if (i < m_menu.getOptions().size()-1) { // Down
SvgTxtTheme& hintfont = th.getCachedOption("O");
hintfont.dimensions.left(leftx).center(y + step);
hintfont.draw("O");
|
|
From: Yoda-JM <yo...@us...> - 2010-11-12 15:01:51
|
Module: performous
Branch: master
Commit: 8dfdfe7db05bf31ceba27718129d57a188278a3d
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Nov 12 16:01:26 2010 +0100
Enhanced drumkit tom detection (now just need nice 3D object
---
game/guitargraph.cc | 59 ++++++++++++++++++++++++++++++++------------------
game/guitargraph.hh | 3 +-
2 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index bb7d25f..f7055ce 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -87,6 +87,7 @@ GuitarGraph::GuitarGraph(Audio& audio, Song const& song, bool drums, int number,
m_soloScore(),
m_solo(),
m_practHold(false),
+ m_hasTomTrack(false),
m_whammy(0)
{
// Copy all tracks of supported types (either drums or non-drums) to m_instrumentTracks
@@ -647,7 +648,7 @@ void GuitarGraph::drumHit(double time, int fret) {
// Graphical effects
m_flames[fret].push_back(AnimValue(0.0, flameSpd));
m_flames[fret].back().setTarget(1.0);
- if (fret == 0) m_drumJump.setTarget(1.0); // Do a jump for bass drum
+ if (fret == input::KICK_BUTTON) m_drumJump.setTarget(1.0); // Do a jump for bass drum
// All drums of the chord hit already?
if (m_chordIt->status == m_chordIt->polyphony) {
//m_score -= m_chordIt->score;
@@ -915,14 +916,26 @@ void GuitarGraph::draw(double time) {
if (glow > 0.5f && tEnd < 0.1f && it->hitAnim[fret].get() == 0.0)
it->hitAnim[fret].setTarget(1.0);
// Call the actual note drawing function
- if(m_drums && it->fret_tom[fret]) {
- // FIXME : new design here
- // this note should be a tom
- drawNote(fret, c, tBeg, tEnd, whammy, true, glow > 0.5f, it->hitAnim[fret].get(),
- it->releaseTimes[fret] > 0.0 ? it->releaseTimes[fret] - time : getNaN());
+ if(!m_hasTomTrack) {
+ // no tom track, normal display (only tom)
+ if(m_drums) {
+ drawNote(fret, c, tBeg, tEnd, whammy, false, glow > 0.5f, it->hitAnim[fret].get(),
+ it->releaseTimes[fret] > 0.0 ? it->releaseTimes[fret] - time : getNaN());
+ } else {
+ drawNote(fret, c, tBeg, tEnd, whammy, it->tappable, glow > 0.5f, it->hitAnim[fret].get(),
+ it->releaseTimes[fret] > 0.0 ? it->releaseTimes[fret] - time : getNaN());
+ }
} else {
- drawNote(fret, c, tBeg, tEnd, whammy, it->tappable, glow > 0.5f, it->hitAnim[fret].get(),
- it->releaseTimes[fret] > 0.0 ? it->releaseTimes[fret] - time : getNaN());
+ // here there is a tom track
+ if(!it->fret_tom[fret] && (fret == input::YELLOW_TOM_BUTTON || fret == input::BLUE_TOM_BUTTON || fret == input::GREEN_TOM_BUTTON)){
+ // here we should draw a cymbal/HiHat (yellow/blue/green pad with no tom track event)
+ drawNote(fret, c, tBeg, tEnd, whammy, false, glow > 0.5f, it->hitAnim[fret].get(),
+ it->releaseTimes[fret] > 0.0 ? it->releaseTimes[fret] - time : getNaN());
+ } else {
+ // here we should draw a tom (either red, or a yellow/blue/green pad with tom marker
+ drawNote(fret, c, tBeg, tEnd, whammy, true, glow > 0.5f, it->hitAnim[fret].get(),
+ it->releaseTimes[fret] > 0.0 ? it->releaseTimes[fret] - time : getNaN());
+ }
}
}
}
@@ -930,7 +943,7 @@ void GuitarGraph::draw(double time) {
} //< disable lighting
// Draw flames
for (int fret = 0; fret < m_pads; ++fret) { // Loop through the frets
- if (m_drums && fret == 0) { // Skip bass drum
+ if (m_drums && fret == input::KICK_BUTTON) { // Skip bass drum
m_flames[fret].clear(); continue;
}
Texture* ftex = &m_flame;
@@ -1017,7 +1030,7 @@ void GuitarGraph::draw(double time) {
/// The times passed are normalized to [past, future]
void GuitarGraph::drawNote(int fret, Color color, float tBeg, float tEnd, float whammy, bool tappable, bool hit, double hitAnim, double releaseTime) {
float x = getFretX(fret);
- if (m_drums && fret == 0) { // Bass drum? That's easy
+ if (m_drums && fret == input::KICK_BUTTON) { // Bass drum? That's easy
if (hit || hitAnim > 0) return; // Hide it if it's hit
color.a = time2a(tBeg);
{
@@ -1187,31 +1200,34 @@ void GuitarGraph::drawBar(double time, float h) {
glVertex2f(2.5f, time2y(time - h));
}
-void GuitarGraph::updateTom(unsigned int tomTrack, unsigned int fretId) {
+bool GuitarGraph::updateTom(unsigned int tomTrack, unsigned int fretId) {
// HiHat/Rack Tom 1 detection
NoteMap::const_iterator tomTrackIt = m_track_index->second->nm.find(tomTrack);
if (tomTrackIt != m_track_index->second->nm.end()) {
if(tomTrack == 110) {
- // std::cout << "HiHat/Rack Tom 1 detected" << std::endl;
+ //std::cout << "HiHat/Rack Tom 1 detected" << std::endl;
} else if(tomTrack == 111) {
- // std::cout << "Ride Cymbal/Rack Tom 2 detected" << std::endl;
+ //std::cout << "Ride Cymbal/Rack Tom 2 detected" << std::endl;
} else if(tomTrack == 112) {
- // std::cout << "Crash Cymbal/Floor Tom detected" << std::endl;
+ //std::cout << "Crash Cymbal/Floor Tom detected" << std::endl;
} else {
- // std::cout << "Unknown Tom detected" << std::endl;
+ //std::cout << "Unknown Tom detected" << std::endl;
}
for (Durations::const_iterator it = tomTrackIt->second.begin(); it != tomTrackIt->second.end(); ++it) {
- // std::cout << " ++ @" << it->begin << "->@" << it->end << std::endl;
+ //std::cout << " ++ @" << it->begin << "->@" << it->end << std::endl;
for (Chords::iterator it2 = m_chords.begin(); it2 != m_chords.end() ; ++it2) {
if(it2->begin >= it->begin && it2->begin < it->end && it2->fret[fretId]) {
- // std::cout << " FOUND !!!!" << it2->begin << std::endl;
+ //std::cout << " FOUND !!!!" << it2->begin << std::endl;
it2->fret_tom[fretId] = true;
} else if(it2->begin >= it->end) {
- // std::cout << " NO MORE !!!! (next @" << it2->begin << ")" << std::endl;
+ //std::cout << " NO MORE !!!! (next @" << it2->begin << ")" << std::endl;
break;
}
}
}
+ return true;
+ } else {
+ return false;
}
}
@@ -1271,13 +1287,14 @@ void GuitarGraph::updateChords() {
}
m_chordIt = m_chords.begin();
+ m_hasTomTrack = false;
if(m_drums) {
// HiHat/Rack Tom 1 detection
- updateTom(110, 2);
+ m_hasTomTrack = updateTom(110, input::YELLOW_TOM_BUTTON) || m_hasTomTrack;
// Ride Cymbal/Rack Tom 2 detection
- updateTom(111, 3);
+ m_hasTomTrack = updateTom(111, input::BLUE_TOM_BUTTON) || m_hasTomTrack;
// Crash Cymbal/Floor Tom detection
- updateTom(112, 4);
+ m_hasTomTrack = updateTom(112, input::GREEN_TOM_BUTTON) || m_hasTomTrack;
}
// Solos
diff --git a/game/guitargraph.hh b/game/guitargraph.hh
index 81c90e1..a1ab5cf 100644
--- a/game/guitargraph.hh
+++ b/game/guitargraph.hh
@@ -124,7 +124,7 @@ class GuitarGraph: public InstrumentGraph {
// Chords & notes
void updateChords();
- void updateTom(unsigned int tomTrack, unsigned int fretId);
+ bool updateTom(unsigned int tomTrack, unsigned int fretId); // returns true if this tom track exists
double getNotesBeginTime() const { return m_chords.front().begin; }
typedef std::vector<Chord> Chords;
Chords m_chords;
@@ -149,6 +149,7 @@ class GuitarGraph: public InstrumentGraph {
double m_soloScore; /// score during solo
bool m_solo; /// are we currently playing a solo
bool m_practHold; /// true if holding a chord during practice
+ bool m_hasTomTrack; /// true if the track has at least one tom track
double m_whammy; /// whammy value for pitch shift
};
|
|
From: Yoda-JM <yo...@us...> - 2010-11-11 11:07:17
|
Module: performous
Branch: master
Commit: d3b1d16e7ab8445d90a6d38f0b41279748514595
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Nov 11 12:06:52 2010 +0100
Added some kind of tom vs cybal detection (for the moment tom are displayed as tapped notes)
---
game/guitargraph.cc | 52 +++++++++++++++++++++++++++++++++++++++++++++++---
game/guitargraph.hh | 3 ++
2 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 538c5ed..bb7d25f 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -915,8 +915,15 @@ void GuitarGraph::draw(double time) {
if (glow > 0.5f && tEnd < 0.1f && it->hitAnim[fret].get() == 0.0)
it->hitAnim[fret].setTarget(1.0);
// Call the actual note drawing function
- drawNote(fret, c, tBeg, tEnd, whammy, it->tappable, glow > 0.5f, it->hitAnim[fret].get(),
- it->releaseTimes[fret] > 0.0 ? it->releaseTimes[fret] - time : getNaN());
+ if(m_drums && it->fret_tom[fret]) {
+ // FIXME : new design here
+ // this note should be a tom
+ drawNote(fret, c, tBeg, tEnd, whammy, true, glow > 0.5f, it->hitAnim[fret].get(),
+ it->releaseTimes[fret] > 0.0 ? it->releaseTimes[fret] - time : getNaN());
+ } else {
+ drawNote(fret, c, tBeg, tEnd, whammy, it->tappable, glow > 0.5f, it->hitAnim[fret].get(),
+ it->releaseTimes[fret] > 0.0 ? it->releaseTimes[fret] - time : getNaN());
+ }
}
}
}
@@ -1180,14 +1187,43 @@ void GuitarGraph::drawBar(double time, float h) {
glVertex2f(2.5f, time2y(time - h));
}
+void GuitarGraph::updateTom(unsigned int tomTrack, unsigned int fretId) {
+ // HiHat/Rack Tom 1 detection
+ NoteMap::const_iterator tomTrackIt = m_track_index->second->nm.find(tomTrack);
+ if (tomTrackIt != m_track_index->second->nm.end()) {
+ if(tomTrack == 110) {
+ // std::cout << "HiHat/Rack Tom 1 detected" << std::endl;
+ } else if(tomTrack == 111) {
+ // std::cout << "Ride Cymbal/Rack Tom 2 detected" << std::endl;
+ } else if(tomTrack == 112) {
+ // std::cout << "Crash Cymbal/Floor Tom detected" << std::endl;
+ } else {
+ // std::cout << "Unknown Tom detected" << std::endl;
+ }
+ for (Durations::const_iterator it = tomTrackIt->second.begin(); it != tomTrackIt->second.end(); ++it) {
+ // std::cout << " ++ @" << it->begin << "->@" << it->end << std::endl;
+ for (Chords::iterator it2 = m_chords.begin(); it2 != m_chords.end() ; ++it2) {
+ if(it2->begin >= it->begin && it2->begin < it->end && it2->fret[fretId]) {
+ // std::cout << " FOUND !!!!" << it2->begin << std::endl;
+ it2->fret_tom[fretId] = true;
+ } else if(it2->begin >= it->end) {
+ // std::cout << " NO MORE !!!! (next @" << it2->begin << ")" << std::endl;
+ break;
+ }
+ }
+ }
+ }
+}
+
/// Create the Chord structures for the current track/difficulty level
void GuitarGraph::updateChords() {
m_chords.clear(); m_solos.clear(); m_drumfills.clear();
m_scoreFactor = 0;
+ NoteMap const& nm = m_track_index->second->nm;
+
Durations::size_type pos[5] = {}, size[5] = {};
Durations const* durations[5] = {};
for (int fret = 0; fret < 5; ++fret) {
- NoteMap const& nm = m_track_index->second->nm;
int basepitch = diffv[m_level].basepitch;
NoteMap::const_iterator it = nm.find(basepitch + fret);
if (it == nm.end()) continue;
@@ -1235,8 +1271,16 @@ void GuitarGraph::updateChords() {
}
m_chordIt = m_chords.begin();
+ if(m_drums) {
+ // HiHat/Rack Tom 1 detection
+ updateTom(110, 2);
+ // Ride Cymbal/Rack Tom 2 detection
+ updateTom(111, 3);
+ // Crash Cymbal/Floor Tom detection
+ updateTom(112, 4);
+ }
+
// Solos
- NoteMap const& nm = m_track_index->second->nm;
NoteMap::const_iterator solotrack = nm.find(103); // 103 = Expert Solo - used for every difficulty
if (solotrack != nm.end()) {
for (Durations::const_iterator it = solotrack->second.begin(); it != solotrack->second.end(); ++it) {
diff --git a/game/guitargraph.hh b/game/guitargraph.hh
index a9c5e10..81c90e1 100644
--- a/game/guitargraph.hh
+++ b/game/guitargraph.hh
@@ -10,6 +10,7 @@ class Song;
struct Chord {
double begin, end;
bool fret[5];
+ bool fret_tom[5];
Duration const* dur[5];
int polyphony;
bool tappable;
@@ -19,6 +20,7 @@ struct Chord {
double releaseTimes[5];
Chord(): begin(), end(), polyphony(), tappable(), status(), score() {
std::fill(fret, fret + 5, false);
+ std::fill(fret_tom, fret_tom + 5, false);
std::fill(dur, dur + 5, static_cast<Duration const*>(NULL));
std::fill(hitAnim, hitAnim + 5, AnimValue(0.0, 1.5));
std::fill(releaseTimes, releaseTimes + 5, 0.0);
@@ -122,6 +124,7 @@ class GuitarGraph: public InstrumentGraph {
// Chords & notes
void updateChords();
+ void updateTom(unsigned int tomTrack, unsigned int fretId);
double getNotesBeginTime() const { return m_chords.front().begin; }
typedef std::vector<Chord> Chords;
Chords m_chords;
|
|
From: Tapio V. <aa...@us...> - 2010-11-08 22:24:42
|
Module: performous
Branch: opengl2
Commit: e39aa0aeb2e35ee146bbb09f4ed8af191dfb5b9f
Author: Tapio Vierros <tap...@gm...>
Date: Tue Nov 9 00:15:52 2010 +0200
Shader class refactoring.
* loadFromMemory() split into compile() and link().
* Supports linking together arbitrary number of shaders.
* Program id is now private, accessible through dereference or cast to GLuint.
---
game/glshader.cc | 67 +++++++++++++++++++++++++++--------------------------
game/glshader.hh | 27 +++++++++++++--------
2 files changed, 51 insertions(+), 43 deletions(-)
diff --git a/game/glshader.cc b/game/glshader.cc
index 69f3928..083fca5 100644
--- a/game/glshader.cc
+++ b/game/glshader.cc
@@ -3,6 +3,7 @@
#include <fstream>
#include <stdexcept>
+#include <algorithm>
namespace {
@@ -39,20 +40,19 @@ namespace {
}
}
-Shader::ShaderMap Shader::shaders;
+Shader::ShaderMap Shader::shader_progs;
-Shader::Shader(): program(0), vert_shader(), frag_shader() {}
+Shader::Shader(): program(0) {}
-Shader::Shader(const std::string& vert_path, const std::string& frag_path, bool use) {
+Shader::Shader(const std::string& vert_path, const std::string& frag_path, bool use): program(0) {
loadFromFile(vert_path, frag_path, use);
}
Shader::~Shader() {
- shaders[program] = NULL;
+ shader_progs[program] = NULL;
glDeleteProgram(program);
- glDeleteShader(vert_shader);
- glDeleteShader(frag_shader);
+ std::for_each(shader_ids.begin(), shader_ids.end(), glDeleteShader);
//std::clog << "shader/info: Shader program " << (unsigned)program << " deleted." << std::endl;
}
@@ -62,53 +62,54 @@ void Shader::loadFromFile(const std::string& vert_path, const std::string& frag_
std::string fragstr = loadFile(frag_path);
const char* vert = vertstr.c_str();
const char* frag = fragstr.c_str();
- loadFromMemory(vert, frag, use);
+ compile(vert, GL_VERTEX_SHADER);
+ compile(frag, GL_FRAGMENT_SHADER);
+ link();
+ if (use) bind();
}
-void Shader::loadFromMemory(const char* vert_source, const char* frag_source, bool use) {
+void Shader::compile(const char* source, GLenum type) {
glutil::GLErrorChecker::reset();
- vert_shader = glCreateShader(GL_VERTEX_SHADER);
- frag_shader = glCreateShader(GL_FRAGMENT_SHADER);
- glutil::GLErrorChecker shadererror("Shader::loadFromMemory - glCreateShader");
+ GLenum new_shader = glCreateShader(type);
+ glutil::GLErrorChecker shadererror("Shader::compile - glCreateShader");
- glShaderSource(vert_shader, 1, &vert_source, NULL);
- glShaderSource(frag_shader, 1, &frag_source, NULL);
- glutil::GLErrorChecker shadersourceerror("Shader::loadFromMemory - glShaderSource");
+ glShaderSource(new_shader, 1, &source, NULL);
+ glutil::GLErrorChecker shadersourceerror("Shader::compile - glShaderSource");
- glCompileShader(vert_shader);
- glGetShaderiv(vert_shader, GL_COMPILE_STATUS, &gl_response);
+ glCompileShader(new_shader);
+ glGetShaderiv(new_shader, GL_COMPILE_STATUS, &gl_response);
if (gl_response != GL_TRUE) {
- dumpInfoLog(vert_shader);
- throw std::runtime_error("Something went wrong compiling the vertex shader.");
+ dumpInfoLog(new_shader);
+ throw std::runtime_error("Something went wrong compiling the shader.");
}
- glCompileShader(frag_shader);
- glGetShaderiv(frag_shader, GL_COMPILE_STATUS, &gl_response);
- if (gl_response != GL_TRUE) {
- dumpInfoLog(frag_shader);
- throw std::runtime_error("Something went wrong compiling the fragment shader.");
- }
+ shader_ids.push_back(new_shader);
+}
+
+void Shader::link() {
glutil::GLErrorChecker::reset();
+ if (program) throw std::runtime_error("Shader already linked.");
+ // Create the program id
program = glCreateProgram();
- glutil::GLErrorChecker createprogramerror("Shader::loadFromMemory - glCreateProgram");
+ glutil::GLErrorChecker createprogramerror("Shader::link - glCreateProgram");
- glAttachShader(program, vert_shader);
- glAttachShader(program, frag_shader);
- glutil::GLErrorChecker attachshadererror("Shader::loadFromMemory - glAttachShader");
+ // Attach all compiled shaders to it
+ for (ShaderObjects::const_iterator it = shader_ids.begin(); it != shader_ids.end(); ++it)
+ glAttachShader(program, *it);
+ glutil::GLErrorChecker attachshadererror("Shader::link - glAttachShader");
+ // Link and check status
glLinkProgram(program);
glGetProgramiv(program, GL_LINK_STATUS, &gl_response);
if (gl_response != GL_TRUE) {
dumpInfoLog(program);
- throw std::runtime_error("Something went wrong linking shader program.");
+ throw std::runtime_error("Something went wrong linking the shader program.");
}
- glutil::GLErrorChecker linkerror("Shader::loadFromMemory - glLinkProgram");
-
- shaders[program] = this;
+ glutil::GLErrorChecker linkerror("Shader::link - glLinkProgram");
- if (use) bind();
+ shader_progs[program] = this;
}
diff --git a/game/glshader.hh b/game/glshader.hh
index 73e0a11..57587e9 100644
--- a/game/glshader.hh
+++ b/game/glshader.hh
@@ -2,6 +2,7 @@
#include <string>
#include <map>
+#include <vector>
#include <GL/glew.h>
#include <boost/noncopyable.hpp>
@@ -13,15 +14,14 @@ struct Shader: public boost::noncopyable {
/** Loads the shader from files. */
void loadFromFile(const std::string& vert_path, const std::string& frag_path, bool use = false);
- /** Loads the shader from memory. */
- void loadFromMemory(const char* vert_source, const char* frag_source, bool use = false);
+ /** Compiles a shader of a given type. */
+ void compile(const char* source, GLenum type);
+ /** Links all compiled shaders to a shader program. */
+ void link();
/** Binds the shader into use. */
void bind();
- /** Get uniform location. Uses caching internally. */
- GLint operator[](const std::string& uniform);
-
/** Allow setting uniforms in a chain. Shader needs to be in use.*/
Shader& setUniform(const std::string& uniform, int value) {
@@ -49,28 +49,35 @@ struct Shader: public boost::noncopyable {
glUniform4f((*this)[uniform], x, y, z, w); return *this;
}
+ /** Get uniform location. Uses caching internally. */
+ GLint operator[](const std::string& uniform);
+
// Some operators
+ GLuint operator*() { return program; }
+ operator GLuint() { return program; }
operator bool() const { return program != 0; }
bool operator==(const Shader& rhs) const { return program == rhs.program; }
bool operator!=(const Shader& rhs) const { return program != rhs.program; }
- GLuint program, vert_shader, frag_shader; ///< shader object ids
-
/** Returns pointer to the currently used shader. */
static Shader* current() {
GLint i;
glGetIntegerv(GL_CURRENT_PROGRAM, &i);
- return shaders[i];
+ return shader_progs[i];
}
private:
- int gl_response;
+ GLuint program; ///< shader program object id
+ int gl_response; ///< save last return state
+
+ typedef std::vector<GLuint> ShaderObjects;
+ ShaderObjects shader_ids;
typedef std::map<std::string, GLint> UniformMap;
UniformMap uniforms; ///< Cached uniform locations, use operator[] to access
typedef std::map<GLint, Shader*> ShaderMap;
- static ShaderMap shaders; ///< Shader objects for reverse look-up by id
+ static ShaderMap shader_progs; ///< Shader objects for reverse look-up by id
};
|
