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...> - 2011-01-02 02:16:38
|
Module: performous
Branch: opengl2
Commit: c0a2346959c8656655f3ed4d1526de80d8fbd306
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Dec 23 15:40:51 2010 +0100
Removed padding on height since padding on width seems enough
---
game/ffmpeg.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
index 58c4f0b..30739c6 100644
--- a/game/ffmpeg.cc
+++ b/game/ffmpeg.cc
@@ -102,7 +102,7 @@ void FFmpeg::open() {
// Setup software scaling context for YUV to RGB conversion
if (videoStream != -1 && decodeVideo) {
width = (pVideoCodecCtx->width+15)&~15;
- height = (pVideoCodecCtx->height+15)&~15;
+ height = pVideoCodecCtx->height;
img_convert_ctx = sws_getContext(
pVideoCodecCtx->width, pVideoCodecCtx->height, pVideoCodecCtx->pix_fmt,
width, height, PIX_FMT_RGB24,
@@ -243,7 +243,7 @@ void FFmpeg::decodeNextFrame() {
if (frameFinished) {
// Convert into RGB and scale the data
int w = (pVideoCodecCtx->width+15)&~15;
- int h = (pVideoCodecCtx->height+15)&~15;
+ int h = pVideoCodecCtx->height;
std::vector<uint8_t> buffer(w * h * 3);
{
uint8_t* data = &buffer[0];
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:16:35
|
Module: performous
Branch: opengl2
Commit: 26f91bfcc062c1f7d2bda2370468523b7f1c7cfd
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Dec 23 15:20:27 2010 +0100
Scaled nicely non-nicely aligned videos (could maybe lead to small aspect ratio errors
---
game/ffmpeg.cc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
index 5c136f3..58c4f0b 100644
--- a/game/ffmpeg.cc
+++ b/game/ffmpeg.cc
@@ -101,10 +101,10 @@ void FFmpeg::open() {
}
// Setup software scaling context for YUV to RGB conversion
if (videoStream != -1 && decodeVideo) {
- width = pVideoCodecCtx->width;
- height = pVideoCodecCtx->height;
+ width = (pVideoCodecCtx->width+15)&~15;
+ height = (pVideoCodecCtx->height+15)&~15;
img_convert_ctx = sws_getContext(
- width, height, pVideoCodecCtx->pix_fmt,
+ pVideoCodecCtx->width, pVideoCodecCtx->height, pVideoCodecCtx->pix_fmt,
width, height, PIX_FMT_RGB24,
SWS_POINT, NULL, NULL, NULL);
}
@@ -242,8 +242,8 @@ void FFmpeg::decodeNextFrame() {
packetData += decodeSize;
if (frameFinished) {
// Convert into RGB and scale the data
- int w = pVideoCodecCtx->width;
- int h = pVideoCodecCtx->height;
+ int w = (pVideoCodecCtx->width+15)&~15;
+ int h = (pVideoCodecCtx->height+15)&~15;
std::vector<uint8_t> buffer(w * h * 3);
{
uint8_t* data = &buffer[0];
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:16:33
|
Module: performous Branch: opengl2 Commit: 16e03f3cdc3cd3b517893a8ea29cd9aa36b1b49d Author: Tapio Vierros <tap...@gm...> Date: Thu Dec 16 23:56:12 2010 +0200 Added a script to fetch ppa download stats from Launchpad. --- tools/ppa/ppastats.py | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/tools/ppa/ppastats.py b/tools/ppa/ppastats.py new file mode 100755 index 0000000..bef3db5 --- /dev/null +++ b/tools/ppa/ppastats.py @@ -0,0 +1,26 @@ +#!/usr/bin/python +# Prints download stats from Launchpad PPA. + +from launchpadlib.launchpad import Launchpad + +PPAOWNER = "performous-team" # PPA owner +PPA = "ppa" # PPA name + +cachedir = "~/.cache/launchpadlib/" +apiurl = 'https://api.edge.launchpad.net/devel/ubuntu/' + +lp_ = Launchpad.login_anonymously('ppastats', 'edge', cachedir, version='devel') +owner = lp_.people[PPAOWNER] +archive = owner.getPPAByName(name=PPA) + +def printDLCount(distarch): + for i in archive.getPublishedBinaries(status='Published',distro_arch_series=apiurl+distarch): + # Uncomment last part of next line to get daily stats + print i.binary_package_name + "\t" + i.binary_package_version + "\t" + str(i.getDownloadCount()) #+ "\t" + str(i.getDailyDownloadTotals()) + +print "Package\tVersion\tDownloads" #"\tDaily DLs" +print +printDLCount("maverick/i386") +printDLCount("maverick/amd64") +printDLCount("lucid/i386") +printDLCount("lucid/amd64") |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:16:30
|
Module: performous Branch: opengl2 Commit: 1cbf9fdab33615c5589d0b0f74f968bd3b3638bf Author: Marcin Wanczyk <dj_...@po...> Date: Wed Dec 8 22:23:29 2010 +0100 Added a Thrustmaster dancepad Signed-off-by: Marcin Wanczyk <dj_...@po...> --- data/controllers.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/data/controllers.xml b/data/controllers.xml index 513fcdf..c78cda8 100644 --- a/data/controllers.xml +++ b/data/controllers.xml @@ -208,4 +208,20 @@ <button id="9" value="start" /> </mapping> </controller> + <controller type="dancepad" name="DANCEPAD_THRUST"> + <description>Thrustmaster dancepad</description> + <regexp match="DDR2SET DDR2SET" /> + <mapping> + <button id="0" value="down" /> + <button id="1" value="right" /> + <button id="2" value="up-right" /> + <button id="3" value="left" /> + <button id="4" value="up" /> + <button id="5" value="up-left" /> + <button id="6" value="down-left" /> + <button id="7" value="down-right" /> + <button id="8" value="start" /> + <button id="9" value="select" /> + </mapping> + </controller> </controllers> |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:16:27
|
Module: performous Branch: opengl2 Commit: c7a1ab41ab36473e2ac115a95a57c8226f5f5ab5 Author: Marcin Wanczyk <dj_...@po...> Date: Wed Dec 8 22:17:21 2010 +0100 Polish localization in 87% Signed-off-by: Marcin Wanczyk <dj_...@po...> --- lang/pl.po | 815 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 815 insertions(+), 0 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:16:24
|
Module: performous Branch: opengl2 Commit: 759bd4997ce76c9956bbdc9f1aa0b412a8e3c1fa Author: TatankaT <tim...@us...> Date: Tue Dec 7 22:41:49 2010 +0100 Dutch translation updated --- lang/nl.po | 300 +++++++++++++++++++++++++++++++----------------------------- 1 files changed, 154 insertions(+), 146 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:16:20
|
Module: performous Branch: opengl2 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...> - 2011-01-02 02:16:18
|
Module: performous Branch: opengl2 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...> - 2011-01-02 02:16:15
|
Module: performous
Branch: opengl2
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: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:16:10
|
Module: performous Branch: opengl2 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...> - 2011-01-02 02:16:08
|
Module: performous Branch: opengl2 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...> - 2011-01-02 02:16:05
|
Module: performous Branch: opengl2 Commit: 5e67c5ad2a2289febc0b6d912d4d98dc1abd80f4 Author: Vincent Le Ligeour <yo...@us...> Date: Tue Nov 23 16:02:23 2010 +0100 Merge remote branch 'origin/joinmenu' --- |
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:16:02
|
Module: performous
Branch: opengl2
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: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:15:59
|
Module: performous
Branch: opengl2
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: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:15:56
|
Module: performous
Branch: opengl2
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: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:15:53
|
Module: performous
Branch: opengl2
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
---
cmake/performous-packaging.cmake | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index da39d4e..18f65e3 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -99,10 +99,10 @@ if(UNIX)
endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
# Set the dependencies based on the distro version
if("${LSB_DISTRIB}" MATCHES "Fedora14")
- set(CPACK_RPM_PACKAGE_REQUIRES "gettext, gtk2, cairo, librsvg2, libsigc++20, glibmm24, libxml++, ImageMagick-c++, boost, SDL, glew, ffmpeg, pulseaudio-libs, portaudio, opencv")
+ set(CPACK_RPM_PACKAGE_REQUIRES "gettext, gtk2, cairo, librsvg2, libsigc++20, glibmm24, libxml++, ImageMagick-c++, boost, SDL, glew, ffmpeg, pulseaudio-libs, portaudio, opencv, portmidi")
endif("${LSB_DISTRIB}" MATCHES "Fedora14")
if("${LSB_DISTRIB}" MATCHES "Fedora13")
- set(CPACK_RPM_PACKAGE_REQUIRES "gettext, gtk2, cairo, librsvg2, libsigc++20, glibmm24, libxml++, ImageMagick-c++, boost, SDL, glew, ffmpeg, pulseaudio-libs, portaudio, opencv")
+ set(CPACK_RPM_PACKAGE_REQUIRES "gettext, gtk2, cairo, librsvg2, libsigc++20, glibmm24, libxml++, ImageMagick-c++, boost, SDL, glew, ffmpeg, pulseaudio-libs, portaudio, opencv, portmidi")
endif("${LSB_DISTRIB}" MATCHES "Fedora13")
if(NOT CPACK_RPM_PACKAGE_REQUIRES)
message("WARNING: ${LSB_DISTRIB} is not supported.\nPlease set deps in cmake/performous-packaging.cmake before packaging.")
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:15:51
|
Module: performous
Branch: opengl2
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
---
cmake/performous-packaging.cmake | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/cmake/performous-packaging.cmake b/cmake/performous-packaging.cmake
index 5d5f8dc..da39d4e 100644
--- a/cmake/performous-packaging.cmake
+++ b/cmake/performous-packaging.cmake
@@ -98,6 +98,9 @@ if(UNIX)
set(CPACK_PACKAGE_ARCHITECTURE amd64)
endif("${CPACK_PACKAGE_ARCHITECTURE}" MATCHES "x86_64")
# Set the dependencies based on the distro version
+ if("${LSB_DISTRIB}" MATCHES "Fedora14")
+ set(CPACK_RPM_PACKAGE_REQUIRES "gettext, gtk2, cairo, librsvg2, libsigc++20, glibmm24, libxml++, ImageMagick-c++, boost, SDL, glew, ffmpeg, pulseaudio-libs, portaudio, opencv")
+ endif("${LSB_DISTRIB}" MATCHES "Fedora14")
if("${LSB_DISTRIB}" MATCHES "Fedora13")
set(CPACK_RPM_PACKAGE_REQUIRES "gettext, gtk2, cairo, librsvg2, libsigc++20, glibmm24, libxml++, ImageMagick-c++, boost, SDL, glew, ffmpeg, pulseaudio-libs, portaudio, opencv")
endif("${LSB_DISTRIB}" MATCHES "Fedora13")
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2011-01-02 02:15:48
|
Module: performous Branch: opengl2 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: Tapio V. <aa...@us...> - 2010-12-28 21:59:10
|
Module: performous Branch: master Commit: ae7b8bcf299c85123630812e9b33f46d52fab52f Author: Tapio Vierros <tap...@gm...> Date: Tue Dec 28 23:58:20 2010 +0200 Update fi translation. --- lang/fi.po | 720 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 366 insertions(+), 354 deletions(-) |
|
From: Tapio V. <aa...@us...> - 2010-12-28 21:25:39
|
Module: performous Branch: master Commit: a18d3356ee3211134f50007375306542e643443a Author: Tapio Vierros <tap...@gm...> Date: Tue Dec 28 23:20:44 2010 +0200 Updates to ppa script. * Use 0.6.1 package as base * Get base package with wget instead of apt-get * Remove old hacks needed with 0.5.1 base package version * HACK: debian/patches deleted due to errors - Effect: probably no icon in launcher * Fixed control.patch fuzzyness * Colored status messages --- tools/ppa/control.patch | 2 +- tools/ppa/ppa.sh | 108 +++++++++++++++++++++++++++-------------------- 2 files changed, 63 insertions(+), 47 deletions(-) diff --git a/tools/ppa/control.patch b/tools/ppa/control.patch index 643442a..1de35d8 100644 --- a/tools/ppa/control.patch +++ b/tools/ppa/control.patch @@ -1,6 +1,6 @@ --- debian/control +++ debian/control @@ -7,2 +7,3 @@ - cmake (>= 2.6), pkg-config, quilt, help2man, + cmake (>= 2.6), pkg-config, quilt, help2man, gettext, + libportmidi-dev, libcv-dev, libhighgui-dev, libgl1-mesa-dev, libsdl1.2-dev, libcairo2-dev, librsvg2-dev, diff --git a/tools/ppa/ppa.sh b/tools/ppa/ppa.sh index 8f49476..34a01ba 100755 --- a/tools/ppa/ppa.sh +++ b/tools/ppa/ppa.sh @@ -17,7 +17,10 @@ export DEBEMAIL="`gpg --list-keys | grep uid | sed 's/ *(.*)//; s/>.*//; s/.*[:< # Config PKG="performous" VERSIONCOMMON="0.6.1-99+git"`date '+%Y%m%d'`"~ppa1" -SUITES="lucid maverick" +BASEPKGVERSION="0.6.1" # base version of the base package +BASEPKGADD="-1" # additional version suffix of the base package +BASEURL="http://archive.ubuntu.com/ubuntu/pool/universe/p/performous" +SUITES="lucid maverick natty" GITURL="git://git.performous.org/gitroot/performous/performous" DESTINATIONPPA="ppa:performous-team/ppa" @@ -25,11 +28,18 @@ TEMPDIR=`mktemp -dt $PKG-ppa.XXXXXXXXXX` SOURCEDIR="$TEMPDIR/git" PPAPATCHDIR="`pwd`" + # Print a status message + status() + { + echo -e "\e[0;31m"$@"\e[0m" + } + # Copy the new files for source package CopyNewFiles() { COPYCMD="cp -r" $COPYCMD "$1/CMakeLists.txt" "$2" + $COPYCMD "$1/README.txt" "$2" $COPYCMD "$1/cmake" "$2" $COPYCMD "$1/data" "$2" $COPYCMD "$1/docs" "$2" @@ -37,69 +47,75 @@ PPAPATCHDIR="`pwd`" $COPYCMD "$1/lang" "$2" $COPYCMD "$1/themes" "$2" $COPYCMD "$1/tools" "$2" - rm -rf "$2"/libs # Old libs dir not used anymore - rm -rf "$2/editor" # Editor removed } cd "$TEMPDIR" +status "Tempdir: `pwd`" # Figure out the version of the "old" official package -version=`apt-cache showsrc $PKG | sed -n 's/^Version: \(.*\)/\1/p' | head -n 1` -echo "Working on $PKG $version" +status "Working on $PKG ${BASEPKGVERSION}${BASEPKGADD}" -mkdir -p $PKG-$version -cd $PKG-$version +mkdir -p $PKG-$BASEPKGVERSION +cd $PKG-$BASEPKGVERSION # Download the "old" source package we use as a base -apt-get --download-only source $PKG +wget $BASEURL/${PKG}_${BASEPKGVERSION}${BASEPKGADD}.dsc +wget $BASEURL/${PKG}_${BASEPKGVERSION}.orig.tar.bz2 +wget $BASEURL/${PKG}_${BASEPKGVERSION}${BASEPKGADD}.debian.tar.bz2 # Download fresh version from git -echo "Fetch from git..." +status "Fetch from git..." git clone "$GITURL" "$SOURCEDIR" # Get some info from git for changelog -pushd . -cd "$SOURCEDIR" -# 10 chars from the HEAD commit hash -headcommit=`git log | head -n 1 | cut --delimiter=" " -f 2 | cut -c 1-10` -popd +( + cd "$SOURCEDIR" + # 10 chars from the HEAD commit hash + headcommit=`git log | head -n 1 | cut --delimiter=" " -f 2 | cut -c 1-10` +) # Loop suites +status "Do each suite..." for suite in $SUITES ; do newversion="${VERSIONCOMMON}~${suite}" rm -rf $suite; mkdir $suite - cd $suite - ln ../${PKG}_* . - dpkg-source -x ${PKG}_${version}.dsc extracted - cd extracted - # Copy new files - echo "Copy new files..." - CopyNewFiles "$SOURCEDIR" . - # Apply patches - echo "Apply some patches..." - cp "$PPAPATCHDIR/"*.patch . - patch -p0 < *.patch - rm *.patch - - # Hack hack - echo "// Dummy" > game/screen_configuration.hh - echo "// Dummy" > game/screen_configuration.cc - - # Do changelog - # Dch complains about unknown suites - yes '' | dch -b -v $newversion -D $suite "Upload development version from Git $headcommit to Ubuntu PPA for $suite." - if [ -f debian/source/format -a ! -f debian/patches/series ] ; then - rm debian/source/format - fi - # Build package - #dpkg-buildpackage -sa -S # Full .orig.gz - dpkg-buildpackage -sd -S # Only .diff.gz - cd .. - # Upload to PPA - dput $DESTINATIONPPA ${PKG}_${newversion}_source.changes - cd .. + ( + cd $suite + status "Extracting source for $suite..." + ln ../${PKG}_* . + dpkg-source -x ${PKG}_${BASEPKGVERSION}${BASEPKGADD}.dsc extracted + ( + cd extracted + + # Copy new files + status "Copy new files..." + CopyNewFiles "$SOURCEDIR" . + + # Apply patches + status "Apply some patches..." + cp "$PPAPATCHDIR/"*.patch . + for p in *.patch; do + patch -p0 < "$p" + done + rm *.patch + + # Hack hack + #TODO: Get rid of these + status "Apply some hacks..." + rm -rf debian/patches # Delete troublesome patch + + # Do changelog + # Dch complains about unknown suites + yes '' | dch -b -v $newversion -D $suite "Upload development version from Git $headcommit to Ubuntu PPA for $suite." + + # Build package + #dpkg-buildpackage -sa -S # Full .orig.gz + dpkg-buildpackage -sd -S # Only .diff.gz + ) + # Upload to PPA + dput $DESTINATIONPPA ${PKG}_${newversion}_source.changes + ) done -cd .. -echo "Files were kept in $TEMPDIR" +status "Files were kept in $TEMPDIR" |
|
From: Yoda-JM <yo...@us...> - 2010-12-23 14:48:43
|
Module: performous
Branch: master
Commit: 0dad329f57dfa20a5ca67b3c49b41249030b7707
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Dec 23 15:48:29 2010 +0100
Removed AR problem when decoding video with non-padded width
---
game/ffmpeg.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
index 30739c6..7e1d129 100644
--- a/game/ffmpeg.cc
+++ b/game/ffmpeg.cc
@@ -101,7 +101,7 @@ void FFmpeg::open() {
}
// Setup software scaling context for YUV to RGB conversion
if (videoStream != -1 && decodeVideo) {
- width = (pVideoCodecCtx->width+15)&~15;
+ width = pVideoCodecCtx->width;
height = pVideoCodecCtx->height;
img_convert_ctx = sws_getContext(
pVideoCodecCtx->width, pVideoCodecCtx->height, pVideoCodecCtx->pix_fmt,
|
|
From: Yoda-JM <yo...@us...> - 2010-12-23 14:41:08
|
Module: performous
Branch: master
Commit: c0a2346959c8656655f3ed4d1526de80d8fbd306
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Dec 23 15:40:51 2010 +0100
Removed padding on height since padding on width seems enough
---
game/ffmpeg.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
index 58c4f0b..30739c6 100644
--- a/game/ffmpeg.cc
+++ b/game/ffmpeg.cc
@@ -102,7 +102,7 @@ void FFmpeg::open() {
// Setup software scaling context for YUV to RGB conversion
if (videoStream != -1 && decodeVideo) {
width = (pVideoCodecCtx->width+15)&~15;
- height = (pVideoCodecCtx->height+15)&~15;
+ height = pVideoCodecCtx->height;
img_convert_ctx = sws_getContext(
pVideoCodecCtx->width, pVideoCodecCtx->height, pVideoCodecCtx->pix_fmt,
width, height, PIX_FMT_RGB24,
@@ -243,7 +243,7 @@ void FFmpeg::decodeNextFrame() {
if (frameFinished) {
// Convert into RGB and scale the data
int w = (pVideoCodecCtx->width+15)&~15;
- int h = (pVideoCodecCtx->height+15)&~15;
+ int h = pVideoCodecCtx->height;
std::vector<uint8_t> buffer(w * h * 3);
{
uint8_t* data = &buffer[0];
|
|
From: Yoda-JM <yo...@us...> - 2010-12-23 14:20:48
|
Module: performous
Branch: master
Commit: 26f91bfcc062c1f7d2bda2370468523b7f1c7cfd
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Dec 23 15:20:27 2010 +0100
Scaled nicely non-nicely aligned videos (could maybe lead to small aspect ratio errors
---
game/ffmpeg.cc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
index 5c136f3..58c4f0b 100644
--- a/game/ffmpeg.cc
+++ b/game/ffmpeg.cc
@@ -101,10 +101,10 @@ void FFmpeg::open() {
}
// Setup software scaling context for YUV to RGB conversion
if (videoStream != -1 && decodeVideo) {
- width = pVideoCodecCtx->width;
- height = pVideoCodecCtx->height;
+ width = (pVideoCodecCtx->width+15)&~15;
+ height = (pVideoCodecCtx->height+15)&~15;
img_convert_ctx = sws_getContext(
- width, height, pVideoCodecCtx->pix_fmt,
+ pVideoCodecCtx->width, pVideoCodecCtx->height, pVideoCodecCtx->pix_fmt,
width, height, PIX_FMT_RGB24,
SWS_POINT, NULL, NULL, NULL);
}
@@ -242,8 +242,8 @@ void FFmpeg::decodeNextFrame() {
packetData += decodeSize;
if (frameFinished) {
// Convert into RGB and scale the data
- int w = pVideoCodecCtx->width;
- int h = pVideoCodecCtx->height;
+ int w = (pVideoCodecCtx->width+15)&~15;
+ int h = (pVideoCodecCtx->height+15)&~15;
std::vector<uint8_t> buffer(w * h * 3);
{
uint8_t* data = &buffer[0];
|
|
From: Tapio V. <aa...@us...> - 2010-12-16 21:57:06
|
Module: performous Branch: master Commit: 16e03f3cdc3cd3b517893a8ea29cd9aa36b1b49d Author: Tapio Vierros <tap...@gm...> Date: Thu Dec 16 23:56:12 2010 +0200 Added a script to fetch ppa download stats from Launchpad. --- tools/ppa/ppastats.py | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/tools/ppa/ppastats.py b/tools/ppa/ppastats.py new file mode 100755 index 0000000..bef3db5 --- /dev/null +++ b/tools/ppa/ppastats.py @@ -0,0 +1,26 @@ +#!/usr/bin/python +# Prints download stats from Launchpad PPA. + +from launchpadlib.launchpad import Launchpad + +PPAOWNER = "performous-team" # PPA owner +PPA = "ppa" # PPA name + +cachedir = "~/.cache/launchpadlib/" +apiurl = 'https://api.edge.launchpad.net/devel/ubuntu/' + +lp_ = Launchpad.login_anonymously('ppastats', 'edge', cachedir, version='devel') +owner = lp_.people[PPAOWNER] +archive = owner.getPPAByName(name=PPA) + +def printDLCount(distarch): + for i in archive.getPublishedBinaries(status='Published',distro_arch_series=apiurl+distarch): + # Uncomment last part of next line to get daily stats + print i.binary_package_name + "\t" + i.binary_package_version + "\t" + str(i.getDownloadCount()) #+ "\t" + str(i.getDailyDownloadTotals()) + +print "Package\tVersion\tDownloads" #"\tDaily DLs" +print +printDLCount("maverick/i386") +printDLCount("maverick/amd64") +printDLCount("lucid/i386") +printDLCount("lucid/amd64") |
|
From: Yoda-JM <yo...@us...> - 2010-12-13 13:34:37
|
Module: performous
Branch: kinect
Commit: 418990b0207c6c5baeaa12bd5bee0b43f85336b8
Author: Vincent Le Ligeour <yo...@us...>
Date: Mon Dec 13 14:34:18 2010 +0100
Fixed compilation errors
---
game/kinect.cc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/game/kinect.cc b/game/kinect.cc
index cbc03ec..9554280 100644
--- a/game/kinect.cc
+++ b/game/kinect.cc
@@ -20,7 +20,7 @@ class MyFreenectDevice : public Freenect::FreenectDevice {
boost::mutex::scoped_lock l(m_mutex_depth);
m_depth_has_changed = true;
}
- bool getDepth(std::vector<boost::uint8_t> &_buffer) {
+ bool getDepth(std::vector<boost::uint16_t> &_buffer) {
if(m_depth_has_changed) {
// update buffer
boost::mutex::scoped_lock l(m_mutex_depth);
@@ -45,10 +45,10 @@ class MyFreenectDevice : public Freenect::FreenectDevice {
private:
boost::mutex m_mutex_depth;
boost::mutex m_mutex_video;
- std::vector<boost::uint16_t> m_buffer_depth;
- std::vector<boost::uint8_t> m_buffer_video;
volatile bool m_video_has_changed;
volatile bool m_depth_has_changed;
+ std::vector<boost::uint16_t> m_buffer_depth;
+ std::vector<boost::uint8_t> m_buffer_video;
};
// Screen positions:
@@ -92,7 +92,7 @@ class Kinect::Impl {
while (!m_quit) {
if (m_running) {
static std::vector<boost::uint16_t> m_buffer_depth;
- if(m_device.getVideo(m_buffer_depth)) {
+ if(m_device.getDepth(m_buffer_depth)) {
// compute stuff here
}
}
|
