Menu
▾
▴
ultrastar-ng-cvs — CVS commits list
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
(84) |
Mar
(29) |
Apr
(57) |
May
(78) |
Jun
(26) |
Jul
(11) |
Aug
(39) |
Sep
(51) |
Oct
(131) |
Nov
(51) |
Dec
(18) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(23) |
Feb
(47) |
Mar
(72) |
Apr
(56) |
May
(49) |
Jun
(37) |
Jul
(28) |
Aug
(49) |
Sep
(105) |
Oct
(151) |
Nov
(224) |
Dec
(103) |
| 2009 |
Jan
(13) |
Feb
(16) |
Mar
(31) |
Apr
(4) |
May
(5) |
Jun
(26) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
1
|
2
(3) |
|
3
|
4
(1) |
5
(2) |
6
(2) |
7
(1) |
8
(4) |
9
|
|
10
(4) |
11
(1) |
12
|
13
|
14
|
15
(5) |
16
|
|
17
|
18
|
19
|
20
|
21
|
22
|
23
|
|
24
|
25
|
26
(3) |
27
|
28
|
29
|
30
|
|
From: Yoda-JM <yo...@us...> - 2007-06-26 20:23:54
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv4095/src Modified Files: main.cpp Log Message: Fixed typo Index: main.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/main.cpp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** main.cpp 26 Jun 2007 20:22:24 -0000 1.37 --- main.cpp 26 Jun 2007 20:23:46 -0000 1.38 *************** *** 73,77 **** fprintf(stdout," -t, --theme set theme (theme name or absolute path to the\n"); fprintf(stdout," theme)\n"); ! fprintf(stdout," -c, --capture-device sound capture device (none to disable)\n"); fprintf(stdout," -f, --fullscreen enable fullscreen video output\n"); fprintf(stdout," -d, --difficulty set difficulty level\n"); --- 73,77 ---- fprintf(stdout," -t, --theme set theme (theme name or absolute path to the\n"); fprintf(stdout," theme)\n"); ! fprintf(stdout," -c, --capture-device set sound capture device (none to disable)\n"); fprintf(stdout," -f, --fullscreen enable fullscreen video output\n"); fprintf(stdout," -d, --difficulty set difficulty level\n"); |
|
From: Yoda-JM <yo...@us...> - 2007-06-26 20:22:40
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv3371/src Modified Files: main.cpp Log Message: Changed capture device flag Index: main.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/main.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -C2 -d -r1.36 -r1.37 *** main.cpp 4 Jun 2007 22:30:20 -0000 1.36 --- main.cpp 26 Jun 2007 20:22:24 -0000 1.37 *************** *** 73,77 **** fprintf(stdout," -t, --theme set theme (theme name or absolute path to the\n"); fprintf(stdout," theme)\n"); ! fprintf(stdout," -c, --no-capture disable sound capture thread\n"); fprintf(stdout," -f, --fullscreen enable fullscreen video output\n"); fprintf(stdout," -d, --difficulty set difficulty level\n"); --- 73,77 ---- fprintf(stdout," -t, --theme set theme (theme name or absolute path to the\n"); fprintf(stdout," theme)\n"); ! fprintf(stdout," -c, --capture-device sound capture device (none to disable)\n"); fprintf(stdout," -f, --fullscreen enable fullscreen video output\n"); fprintf(stdout," -d, --difficulty set difficulty level\n"); *************** *** 86,89 **** --- 86,90 ---- char * songs_directory = NULL; char * theme_name = NULL; + char * capture_device = "default"; CScreen * screen = NULL; int ch = 0; *************** *** 98,102 **** {"theme",required_argument,NULL,'t'}, {"help",no_argument,NULL,'h'}, ! {"no-capture",no_argument,NULL,'c'}, {"version",no_argument,NULL,'v'}, {"difficulty",required_argument,NULL,'d'}, --- 99,103 ---- {"theme",required_argument,NULL,'t'}, {"help",no_argument,NULL,'h'}, ! {"capture-device",required_argument,NULL,'c'}, {"version",no_argument,NULL,'v'}, {"difficulty",required_argument,NULL,'d'}, *************** *** 105,109 **** }; ! while ((ch = getopt_long(argc, argv, "t:W:H:hcfd:v", long_options, NULL)) != -1) { switch(ch) { case 't': --- 106,110 ---- }; ! while ((ch = getopt_long(argc, argv, "t:W:H:hc:fd:v", long_options, NULL)) != -1) { switch(ch) { case 't': *************** *** 120,124 **** break; case 'c': ! capture=false; break; case 'f': --- 121,128 ---- break; case 'c': ! if(!strncmp("none",optarg,5)) ! capture=false; ! else ! capture_device=optarg; break; case 'f': *************** *** 160,164 **** screenManager->setSDLScreen(screenSDL); screenManager->setAudio( new CAudio() ); ! screenManager->setRecord( new CRecord() ); screenManager->setVideoDriver( videoDriver ); screenManager->setDifficulty( difficulty ); --- 164,168 ---- screenManager->setSDLScreen(screenSDL); screenManager->setAudio( new CAudio() ); ! screenManager->setRecord( new CRecord(capture_device) ); screenManager->setVideoDriver( videoDriver ); screenManager->setDifficulty( difficulty ); |
|
From: Yoda-JM <yo...@us...> - 2007-06-26 18:31:32
|
Update of /cvsroot/ultrastar-ng/htdocs/pages In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22612/pages Modified Files: download.php Log Message: Adde Frugalware package Index: download.php =================================================================== RCS file: /cvsroot/ultrastar-ng/htdocs/pages/download.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** download.php 7 Jun 2007 12:21:40 -0000 1.11 --- download.php 26 Jun 2007 18:31:05 -0000 1.12 *************** *** 20,23 **** --- 20,26 ---- <p>Package is available in Ubuntu Gutsy (repo universe) (unstable) (<a href="http://packages.ubuntu.com/gutsy/games/ultrastar-ng">package page</a>).</p> + <h3>Frugalware</h3> + <p>Package is available in Frugalware (current) (<a href="http://www.frugalware.org/packages/23239">package page</a>).</p> + <h3>Arch Linux</h3> <p>UltraStar-NG has been added to AUR (ArchLinux User-community Repository). Package can be found <a href="http://aur.archlinux.org/packages.php?do_Details=1&ID=8313">here</a> (outdated). |
|
From: Yoda-JM <yo...@us...> - 2007-06-15 21:38:46
|
Update of /cvsroot/ultrastar-ng/htdocs/pages In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25298/pages Modified Files: screenshots.php Log Message: Added configuration screenshot Index: screenshots.php =================================================================== RCS file: /cvsroot/ultrastar-ng/htdocs/pages/screenshots.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** screenshots.php 15 May 2007 10:10:49 -0000 1.7 --- screenshots.php 15 Jun 2007 21:38:42 -0000 1.8 *************** *** 34,35 **** --- 34,41 ---- <a href="imgs/screenshots/sing_0.1.3-cvs.png">Sing screen</a> </p> + + <h2>Version 0.1.4-CVS</h2> + + <p> + <a href="imgs/screenshots/configuration_0.1.4-cvs.png">Configuration screen</a> + </p> |
|
From: Yoda-JM <yo...@us...> - 2007-06-15 21:38:46
|
Update of /cvsroot/ultrastar-ng/htdocs/imgs/screenshots In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv25298/imgs/screenshots Added Files: configuration_0.1.4-cvs.png Log Message: Added configuration screenshot --- NEW FILE: configuration_0.1.4-cvs.png --- (This appears to be a binary file; contents omitted.) |
|
From: Yoda-JM <yo...@us...> - 2007-06-15 21:33:16
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/include In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22845/include Modified Files: theme.h screen_configuration.h Log Message: Used theme Added configuration theme Index: theme.h =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/include/theme.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** theme.h 20 May 2007 19:52:13 -0000 1.12 --- theme.h 15 Jun 2007 21:33:11 -0000 1.13 *************** *** 114,116 **** --- 114,127 ---- }; + class CThemeConfiguration { + public: + CThemeConfiguration(); + ~CThemeConfiguration(); + CairoSVG *bg; + TThemeTxt item; + TThemeTxt value; + CTheme *theme; + private: + }; + #endif Index: screen_configuration.h =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/include/screen_configuration.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** screen_configuration.h 5 Jun 2007 11:31:04 -0000 1.3 --- screen_configuration.h 15 Jun 2007 21:33:11 -0000 1.4 *************** *** 7,10 **** --- 7,11 ---- #include <cairosvg.h> #include <configuration.h> + #include <theme.h> class CScreenConfiguration : public CScreen { *************** *** 17,20 **** --- 18,23 ---- void draw(void); private: + CThemeConfiguration *theme; + unsigned int bg_texture; std::vector <CConfiguration *> configuration; unsigned int selected; |
|
From: Yoda-JM <yo...@us...> - 2007-06-15 21:33:16
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22845/src Modified Files: theme.cpp screen_configuration.cpp Log Message: Used theme Added configuration theme Index: screen_configuration.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/screen_configuration.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** screen_configuration.cpp 5 Jun 2007 11:31:09 -0000 1.3 --- screen_configuration.cpp 15 Jun 2007 21:33:10 -0000 1.4 *************** *** 6,9 **** --- 6,10 ---- configuration.push_back(new CConfigurationFullscreen()); configuration.push_back(new CConfigurationDifficulty()); + configuration.push_back(new CConfigurationAudioVolume()); selected=0; } *************** *** 17,24 **** --- 18,29 ---- void CScreenConfiguration::enter( void ) { + CScreenManager * sm = CScreenManager::getSingletonPtr(); + theme = new CThemeConfiguration(); + bg_texture = sm->getVideoDriver()->initSurface(theme->bg->getSDLSurface()); } void CScreenConfiguration::exit( void ) { + delete theme; } *************** *** 36,42 **** CScreenManager::getSingletonPtr()->activateScreen("Intro"); } else if( keypressed == SDLK_LEFT ) { ! configuration[selected]->setPrevious(); } else if( keypressed == SDLK_RIGHT ) { ! configuration[selected]->setNext(); } else if( keypressed == SDLK_UP ) { if( selected > 0 ) --- 41,49 ---- CScreenManager::getSingletonPtr()->activateScreen("Intro"); } else if( keypressed == SDLK_LEFT ) { ! if( !configuration[selected]->isFirst() ) ! configuration[selected]->setPrevious(); } else if( keypressed == SDLK_RIGHT ) { ! if( !configuration[selected]->isLast() ) ! configuration[selected]->setNext(); } else if( keypressed == SDLK_UP ) { if( selected > 0 ) *************** *** 51,53 **** --- 58,79 ---- void CScreenConfiguration::draw( void ) { + CScreenManager * sm = CScreenManager::getSingletonPtr(); + theme->theme->clear(); + cairo_text_extents_t extents; + + // Draw the "Order by" text + { + theme->item.text = configuration[selected]->getDescription(); + extents = theme->theme->GetTextExtents(theme->item); + theme->item.x = (theme->item.svg_width - extents.width)/2; + theme->theme->PrintText(&theme->item); + + theme->value.text = configuration[selected]->getValue(); + extents = theme->theme->GetTextExtents(theme->value); + theme->value.x = (theme->value.svg_width - extents.width)/2; + theme->theme->PrintText(&theme->value); + } + + sm->getVideoDriver()->drawSurface(bg_texture); + sm->getVideoDriver()->drawSurface(theme->theme->getCurrent()); } Index: theme.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/theme.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** theme.cpp 10 Jun 2007 13:16:33 -0000 1.21 --- theme.cpp 15 Jun 2007 21:33:10 -0000 1.22 *************** *** 458,459 **** --- 458,480 ---- delete theme; } + + CThemeConfiguration::CThemeConfiguration() { + char * theme_path = new char[1024]; + CScreenManager * sm = CScreenManager::getSingletonPtr(); + + sm->getThemePathFile(theme_path,"configuration_bg.svg"); + bg = new CairoSVG(theme_path, sm->getWidth(), sm->getHeight()); + + theme = new CTheme(sm->getWidth(), sm->getHeight()); + sm->getThemePathFile(theme_path,"configuration_item.svg"); + theme->ParseSVGForText(theme_path, &item); + + sm->getThemePathFile(theme_path,"configuration_value.svg"); + theme->ParseSVGForText(theme_path, &value); + + delete[] theme_path; + } + CThemeConfiguration::~CThemeConfiguration() { + delete bg; + delete theme; + } |
|
From: Yoda-JM <yo...@us...> - 2007-06-15 21:31:27
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/themes In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv22004/themes Modified Files: Makefile.am Log Message: Added configuration screen theme Index: Makefile.am =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/themes/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 20 May 2007 19:52:13 -0000 1.6 --- Makefile.am 15 Jun 2007 21:31:11 -0000 1.7 *************** *** 19,23 **** default/practice_txt.svg \ default/practice_note.svg \ ! default/practice_sharp.svg themeslimadir = @THEMES_DIR@/lima --- 19,26 ---- default/practice_txt.svg \ default/practice_note.svg \ ! default/practice_sharp.svg \ ! default/configuration_bg.svg \ ! default/configuration_item.svg \ ! default/configuration_value.svg themeslimadir = @THEMES_DIR@/lima *************** *** 45,49 **** lima/score_rank.svg \ lima/score_level.svg \ ! lima/score_txt.svg EXTRA_DIST = $(themesdef_DATA) $(themeslima_DATA) --- 48,55 ---- lima/score_rank.svg \ lima/score_level.svg \ ! lima/score_txt.svg \ ! lima/configuration_bg.svg \ ! lima/configuration_item.svg \ ! lima/configuration_value.svg EXTRA_DIST = $(themesdef_DATA) $(themeslima_DATA) |
|
From: Yoda-JM <yo...@us...> - 2007-06-11 19:26:00
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27010/src Modified Files: audio.cpp Log Message: Added volume control with gstreamer Index: audio.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/audio.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** audio.cpp 8 Jun 2007 20:33:52 -0000 1.26 --- audio.cpp 11 Jun 2007 19:25:49 -0000 1.27 *************** *** 60,64 **** #endif #ifdef USE_GSTREAMER_AUDIO ! return 100; #endif } --- 60,66 ---- #endif #ifdef USE_GSTREAMER_AUDIO ! gdouble vol; ! g_object_get (music, "volume", &vol, NULL); ! return (unsigned int)(vol*100); #endif } *************** *** 70,74 **** #endif #ifdef USE_GSTREAMER_AUDIO ! _volume = _volume; #endif } --- 72,77 ---- #endif #ifdef USE_GSTREAMER_AUDIO ! gdouble vol = _volume/100.; ! g_object_set (music, "volume", vol, NULL); #endif } |
|
From: Yoda-JM <yo...@us...> - 2007-06-10 13:27:27
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24397/src Modified Files: songs.cpp Log Message: Modularized the image loading Index: songs.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/songs.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** songs.cpp 8 Jun 2007 17:20:04 -0000 1.45 --- songs.cpp 10 Jun 2007 13:27:23 -0000 1.46 *************** *** 146,149 **** --- 146,150 ---- background = NULL; backgroundSurf = NULL; + coverSurf = NULL; video = NULL; noteMin = 256; *************** *** 254,257 **** --- 255,330 ---- } + void CSongs::loadCover( unsigned int i) + { + if( songs[i]->coverSurf == NULL ) { + CSong * song = songs[i]; + char buff[1024]; + snprintf(buff,1024,"%s/%s",song->path,song->cover); + SDL_RWops *rwop = NULL; + rwop = SDL_RWFromFile(buff, "rb"); + SDL_Surface* coverSurface = NULL; + if(strstr(song->cover, ".png")) + coverSurface = IMG_LoadPNG_RW(rwop); + else if(strstr(song->cover, ".jpg")) + coverSurface = IMG_LoadJPG_RW(rwop); + if( rwop != NULL ) + SDL_RWclose(rwop); + + if( coverSurface == NULL ) + song->coverSurf = surface_nocover; + else { + // Here we want to have cover of 256x256 in 800x600 and scale it if the resolution is different + int w = CScreenManager::getSingletonPtr()->getWidth()*256/800; + int h = CScreenManager::getSingletonPtr()->getHeight()*256/600; + song->coverSurf = zoomSurface(coverSurface,(double) w/coverSurface->w,(double) h/coverSurface->h,1); + SDL_FreeSurface(coverSurface); + } + } + } + + void CSongs::loadBackground( unsigned int i) + { + if( songs[i]->backgroundSurf == NULL && songs[i]->background != NULL ) { + CSong * song = songs[i]; + char buff[1024]; + snprintf(buff,1024,"%s/%s",song->path,song->background); + SDL_RWops *rwop = NULL; + rwop = SDL_RWFromFile(buff, "rb"); + SDL_Surface* backgroundSurface = NULL; + if(strstr(song->background, ".png")) + backgroundSurface = IMG_LoadPNG_RW(rwop); + else if(strstr(song->background, ".jpg")) + backgroundSurface = IMG_LoadJPG_RW(rwop); + if( rwop != NULL ) + SDL_RWclose(rwop); + + if( backgroundSurface == NULL ) + song->backgroundSurf = NULL; + else { + // Here we want to have cover of 256x256 in 800x600 and scale it if the resolution is different + int w = CScreenManager::getSingletonPtr()->getWidth(); + int h = CScreenManager::getSingletonPtr()->getHeight(); + song->backgroundSurf = zoomSurface(backgroundSurface,(double) w/backgroundSurface->w,(double) h/backgroundSurface->h,1); + SDL_FreeSurface(backgroundSurface); + } + } + } + + void CSongs::unloadCover( unsigned int i) + { + if( songs[i]->coverSurf != NULL && songs[i]->coverSurf != surface_nocover ) { + SDL_FreeSurface(songs[i]->coverSurf); + } + songs[i]->coverSurf = NULL; + } + + void CSongs::unloadBackground( unsigned int i) + { + if( songs[i]->backgroundSurf != NULL ) { + SDL_FreeSurface(songs[i]->backgroundSurf); + } + songs[i]->backgroundSurf = NULL; + } + CSongs::CSongs() { *************** *** 324,379 **** tmp->cover = cover; } - - snprintf(buff,1024,"%s/%s/%s",songs_dir,dirEntry->d_name,tmp->cover); - SDL_RWops *rwop = NULL; - rwop = SDL_RWFromFile(buff, "rb"); - SDL_Surface * coverSurface = NULL; - if(strstr(tmp->cover, ".png")) - coverSurface = IMG_LoadPNG_RW(rwop); - else if(strstr(tmp->cover, ".jpg")) - coverSurface = IMG_LoadJPG_RW(rwop); - if( rwop != NULL ) - SDL_RWclose(rwop); - - if( coverSurface == NULL ) - tmp->coverSurf = surface_nocover; - else { - // Here we want to have cover of 256x256 in 800x600 and scale it if the resolution is different - int w = CScreenManager::getSingletonPtr()->getWidth()*256/800; - int h = CScreenManager::getSingletonPtr()->getHeight()*256/600; - tmp->coverSurf = zoomSurface(coverSurface,(double) w/coverSurface->w,(double) h/coverSurface->h,1); - SDL_FreeSurface(coverSurface); - } - - - if (tmp->background) { - SDL_Surface * backgroundSurface = NULL; - - if(strstr(tmp->background, ".png")) { - rwop = NULL; - snprintf(buff,1024,"%s/%s/%s",songs_dir,dirEntry->d_name,tmp->background); - rwop = SDL_RWFromFile(buff, "rb"); - backgroundSurface = IMG_LoadPNG_RW(rwop); - if( rwop != NULL ) - SDL_RWclose(rwop); - } else if(strstr(tmp->background, ".jpg")) { - rwop = NULL; - snprintf(buff,1024,"%s/%s/%s",songs_dir,dirEntry->d_name,tmp->background); - rwop = SDL_RWFromFile(buff, "rb"); - backgroundSurface = IMG_LoadJPG_RW(rwop); - if( rwop != NULL ) - SDL_RWclose(rwop); - } - - - if( backgroundSurface == NULL ) - tmp->backgroundSurf = NULL; - else { - int w = CScreenManager::getSingletonPtr()->getWidth(); - int h = CScreenManager::getSingletonPtr()->getHeight(); - tmp->backgroundSurf = zoomSurface(backgroundSurface,(double)w/backgroundSurface->w,(double)h/backgroundSurface->h,1); - SDL_FreeSurface(backgroundSurface); - } - } tmp->parseFile(); --- 397,400 ---- *************** *** 383,386 **** --- 404,412 ---- } closedir(dir); + + for(unsigned int i = 0; i < songs.size(); i++) { + loadCover(i); + loadBackground(i); + } } *************** *** 402,409 **** delete songs[i]->notes[j]; } ! if( surface_nocover != songs[i]->coverSurf ) ! SDL_FreeSurface(songs[i]->coverSurf); ! if( songs[i]->backgroundSurf ) ! SDL_FreeSurface(songs[i]->backgroundSurf); delete songs[i]; } --- 428,433 ---- delete songs[i]->notes[j]; } ! unloadCover(i); ! unloadBackground(i); delete songs[i]; } |
|
From: Yoda-JM <yo...@us...> - 2007-06-10 13:27:27
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/include In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv24397/include Modified Files: songs.h Log Message: Modularized the image loading Index: songs.h =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/include/songs.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** songs.h 30 Apr 2007 17:56:35 -0000 1.12 --- songs.h 10 Jun 2007 13:27:23 -0000 1.13 *************** *** 83,86 **** --- 83,90 ---- void sortByArtist( void ); int getOrder( void ) {return order;}; + void loadCover( unsigned int i); + void loadBackground( unsigned int i); + void unloadCover( unsigned int i); + void unloadBackground( unsigned int i); private: std::vector <CSong*> songs; |
|
From: Yoda-JM <yo...@us...> - 2007-06-10 13:16:37
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv20164/src Modified Files: theme.cpp Log Message: Should fixe a mem leak Index: theme.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/theme.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** theme.cpp 10 Jun 2007 11:53:47 -0000 1.20 --- theme.cpp 10 Jun 2007 13:16:33 -0000 1.21 *************** *** 100,105 **** extents.y_advance = rec.height; - pango_font_description_free (desc); g_object_unref (layout); g_object_unref (ctx); --- 100,105 ---- extents.y_advance = rec.height; g_object_unref (layout); + pango_font_description_free (desc); g_object_unref (ctx); |
|
From: Yoda-JM <yo...@us...> - 2007-06-10 11:54:29
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19784/src Modified Files: cairosvg.cpp theme.cpp Log Message: Fixed some possible memleaks Index: cairosvg.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/cairosvg.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** cairosvg.cpp 7 Apr 2007 12:59:27 -0000 1.9 --- cairosvg.cpp 10 Jun 2007 11:53:47 -0000 1.10 *************** *** 19,22 **** --- 19,26 ---- rsvg_init(); svgHandle = rsvg_handle_new_from_file(filename,&pError); + if( pError != NULL ) { + fprintf (stderr, "CairoSVG::CairoSVG: %s\n", pError->message); + g_error_free(pError); + } rsvg_handle_get_dimensions (svgHandle, &svgDimension); width = svgDimension.width; Index: theme.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/theme.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** theme.cpp 8 Jun 2007 17:49:41 -0000 1.19 --- theme.cpp 10 Jun 2007 11:53:47 -0000 1.20 *************** *** 88,91 **** --- 88,92 ---- PangoLayout *layout = pango_layout_new(ctx); PangoRectangle rec; + pango_layout_set_text (layout, text.text, -1); pango_font_description_set_family(desc, text.fontfamily); *************** *** 93,97 **** pango_font_description_set_absolute_size (desc,text.fontsize * PANGO_SCALE); pango_layout_set_font_description (layout, desc); - pango_font_description_free (desc); pango_layout_get_pixel_extents (layout,NULL,&rec); extents.width = rec.width; --- 94,97 ---- *************** *** 99,102 **** --- 99,104 ---- extents.x_advance = rec.width; extents.y_advance = rec.height; + + pango_font_description_free (desc); g_object_unref (layout); g_object_unref (ctx); *************** *** 173,177 **** xmlFree(string); } else if (!strcasecmp((char *) attr->name, "style")) { ! string = strtok((char *) xmlGetProp(cur_node, attr->name), ";"); while (string != NULL) { if (!strncasecmp(string, "font-size:", 10)) { --- 175,180 ---- xmlFree(string); } else if (!strcasecmp((char *) attr->name, "style")) { ! char * orig = (char *) xmlGetProp(cur_node, attr->name); ! string = strtok(orig, ";"); while (string != NULL) { if (!strncasecmp(string, "font-size:", 10)) { *************** *** 207,211 **** string = strtok(NULL, ";"); } ! xmlFree(string); } --- 210,214 ---- string = strtok(NULL, ";"); } ! xmlFree(orig); } |
|
From: Yoda-JM <yo...@us...> - 2007-06-08 20:33:55
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27996/src Modified Files: audio.cpp configuration.cpp Log Message: Added volume control Index: audio.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/audio.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** audio.cpp 16 Apr 2007 21:19:51 -0000 1.25 --- audio.cpp 8 Jun 2007 20:33:52 -0000 1.26 *************** *** 54,57 **** --- 54,77 ---- } + unsigned int CAudio::getVolume() + { + #ifdef USE_LIBXINE_AUDIO + return xine_get_param( stream, XINE_PARAM_AUDIO_VOLUME ); + #endif + #ifdef USE_GSTREAMER_AUDIO + return 100; + #endif + } + + void CAudio::setVolume( unsigned int _volume ) + { + #ifdef USE_LIBXINE_AUDIO + xine_set_param( stream, XINE_PARAM_AUDIO_VOLUME, _volume ); + #endif + #ifdef USE_GSTREAMER_AUDIO + _volume = _volume; + #endif + } + void CAudio::playMusic( char * filename ) { Index: configuration.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/configuration.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configuration.cpp 5 Jun 2007 11:31:09 -0000 1.4 --- configuration.cpp 8 Jun 2007 20:33:52 -0000 1.5 *************** *** 96,97 **** --- 96,137 ---- sm->setDifficulty(difficulty); } + + /****************************************************************************/ + + CConfigurationAudioVolume::CConfigurationAudioVolume() + { + CScreenManager * sm = CScreenManager::getSingletonPtr(); + audioVolume = sm->getAudio()->getVolume(); + description="Audio Volume"; + } + CConfigurationAudioVolume::~CConfigurationAudioVolume() + { + } + bool CConfigurationAudioVolume::isLast() + { + return (audioVolume>=100); + } + bool CConfigurationAudioVolume::isFirst() + { + return (audioVolume<=0); + } + void CConfigurationAudioVolume::setNext() + { + audioVolume++; + apply(); + } + void CConfigurationAudioVolume::setPrevious() + { + audioVolume--; + apply(); + } + char * CConfigurationAudioVolume::getValue() + { + sprintf(value,"%d%%",audioVolume); + return value; + } + void CConfigurationAudioVolume::apply() + { + CScreenManager * sm = CScreenManager::getSingletonPtr(); + sm->getAudio()->setVolume(audioVolume); + } |
|
From: Yoda-JM <yo...@us...> - 2007-06-08 20:33:55
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/include In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27996/include Modified Files: audio.h configuration.h Log Message: Added volume control Index: configuration.h =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/include/configuration.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configuration.h 5 Jun 2007 11:31:04 -0000 1.2 --- configuration.h 8 Jun 2007 20:33:52 -0000 1.3 *************** *** 47,49 **** --- 47,63 ---- }; + class CConfigurationAudioVolume : public CConfiguration { + public: + CConfigurationAudioVolume(); + ~CConfigurationAudioVolume(); + bool isLast(); + bool isFirst(); + void setNext(); + void setPrevious(); + char * getValue(); + protected: + void apply(); + unsigned int audioVolume; + char value[32]; + }; #endif Index: audio.h =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/include/audio.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** audio.h 14 Apr 2007 07:51:55 -0000 1.12 --- audio.h 8 Jun 2007 20:33:52 -0000 1.13 *************** *** 68,73 **** --- 68,76 ---- */ int getPosition( void ); + unsigned int getVolume( void ); + void setVolume( unsigned int _volume ); private: int length; + unsigned int audioVolume; #ifdef USE_LIBXINE_AUDIO xine_t *xine; |
|
From: Yoda-JM <yo...@us...> - 2007-06-08 17:49:50
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv27088/src Modified Files: theme.cpp Log Message: Updated to pango Index: theme.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/theme.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** theme.cpp 20 May 2007 19:52:13 -0000 1.18 --- theme.cpp 8 Jun 2007 17:49:41 -0000 1.19 *************** *** 20,32 **** } cairo_surface_t *CTheme::PrintText(TThemeTxt *text) { cairo_save(dc); cairo_scale(dc, width/text->svg_width, height/text->svg_height); ! cairo_select_font_face(dc, text->fontfamily, text->fontstyle, text->fontweight); ! cairo_set_font_size(dc, text->fontsize); ! cairo_move_to(dc, text->x, text->y); ! cairo_text_extents(dc, text->text, &(text->extents)); ! cairo_move_to(dc, text->x - (text->extents.width - text->extents.width/text->scale)/2, text->y - (text->extents.height - text->extents.height/text->scale)/2); ! cairo_set_font_size(dc, text->fontsize * text->scale); ! cairo_text_path(dc, text->text); if (text->fill_col.r != -1 && text->fill_col.g != -1 && text->fill_col.b != -1) { cairo_set_source_rgba(dc, text->fill_col.r, text->fill_col.g, text->fill_col.b, text->fill_col.a); --- 20,46 ---- } cairo_surface_t *CTheme::PrintText(TThemeTxt *text) { + PangoFontDescription *desc = pango_font_description_new(); + PangoLayout *layout = pango_cairo_create_layout(dc); + PangoRectangle rec; + cairo_save(dc); + cairo_scale(dc, width/text->svg_width, height/text->svg_height); ! pango_font_description_set_family(desc, text->fontfamily); ! pango_font_description_set_style (desc,PANGO_STYLE_NORMAL); ! pango_font_description_set_absolute_size (desc,text->fontsize * PANGO_SCALE); ! pango_layout_set_font_description (layout, desc); ! pango_layout_set_text (layout, text->text, -1); ! pango_layout_get_pixel_extents (layout,NULL,&rec); ! text->extents.width = rec.width; ! text->extents.height = rec.height; ! text->extents.x_advance = rec.width; ! text->extents.y_advance = rec.height; ! pango_font_description_set_absolute_size (desc,text->fontsize * text->scale * PANGO_SCALE); ! pango_layout_set_font_description (layout, desc); ! pango_cairo_update_layout (dc, layout); ! cairo_move_to(dc,text->x - (rec.width-rec.width/text->scale)/2,text->y-text->fontsize * text->scale); ! pango_cairo_show_layout (dc, layout); ! pango_cairo_layout_path(dc,layout); if (text->fill_col.r != -1 && text->fill_col.g != -1 && text->fill_col.b != -1) { cairo_set_source_rgba(dc, text->fill_col.r, text->fill_col.g, text->fill_col.b, text->fill_col.a); *************** *** 41,45 **** cairo_stroke(dc); } ! cairo_restore(dc); return surface; } --- 55,62 ---- cairo_stroke(dc); } ! cairo_restore(dc); ! ! g_object_unref(layout); ! pango_font_description_free(desc); return surface; } *************** *** 65,72 **** cairo_text_extents_t CTheme::GetTextExtents(TThemeTxt text) { cairo_text_extents_t extents; ! cairo_select_font_face(dc, text.fontfamily, text.fontstyle, text.fontweight); ! cairo_set_font_size(dc, text.fontsize); ! cairo_move_to(dc, text.x, text.y); ! cairo_text_extents(dc, text.text, &extents); return extents; } --- 82,105 ---- cairo_text_extents_t CTheme::GetTextExtents(TThemeTxt text) { cairo_text_extents_t extents; ! ! PangoContext* ctx=NULL; ! ctx = pango_cairo_font_map_create_context ((PangoCairoFontMap*)pango_cairo_font_map_get_default()); ! PangoFontDescription *desc = pango_font_description_new(); ! PangoLayout *layout = pango_layout_new(ctx); ! PangoRectangle rec; ! pango_layout_set_text (layout, text.text, -1); ! pango_font_description_set_family(desc, text.fontfamily); ! pango_font_description_set_style (desc,PANGO_STYLE_NORMAL); ! pango_font_description_set_absolute_size (desc,text.fontsize * PANGO_SCALE); ! pango_layout_set_font_description (layout, desc); ! pango_font_description_free (desc); ! pango_layout_get_pixel_extents (layout,NULL,&rec); ! extents.width = rec.width; ! extents.height = rec.height; ! extents.x_advance = rec.width; ! extents.y_advance = rec.height; ! g_object_unref (layout); ! g_object_unref (ctx); ! return extents; } |
|
From: Yoda-JM <yo...@us...> - 2007-06-08 17:20:14
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14996/src Modified Files: songs.cpp Log Message: Fixed unclosed file descriptors Index: songs.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/songs.cpp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** songs.cpp 30 Apr 2007 17:56:35 -0000 1.44 --- songs.cpp 8 Jun 2007 17:20:04 -0000 1.45 *************** *** 266,270 **** char * theme_path = new char[1024]; CScreenManager::getSingletonPtr()->getThemePathFile(theme_path,"no_cover.png"); ! SDL_RWops *rwop_nocover = SDL_RWFromFile(theme_path, "rb"); delete[] theme_path; --- 266,271 ---- char * theme_path = new char[1024]; CScreenManager::getSingletonPtr()->getThemePathFile(theme_path,"no_cover.png"); ! SDL_RWops *rwop_nocover = NULL; ! rwop_nocover = SDL_RWFromFile(theme_path, "rb"); delete[] theme_path; *************** *** 277,281 **** surface_nocover = zoomSurface(surface_nocover_tmp,(double)w/surface_nocover_tmp->w,(double)h/surface_nocover_tmp->h,1); SDL_FreeSurface(surface_nocover_tmp); ! SDL_FreeRW(rwop_nocover); } --- 278,283 ---- surface_nocover = zoomSurface(surface_nocover_tmp,(double)w/surface_nocover_tmp->w,(double)h/surface_nocover_tmp->h,1); SDL_FreeSurface(surface_nocover_tmp); ! if( rwop_nocover != NULL ) ! SDL_RWclose(rwop_nocover); } *************** *** 324,343 **** snprintf(buff,1024,"%s/%s/%s",songs_dir,dirEntry->d_name,tmp->cover); ! SDL_RWops *rwop = SDL_RWFromFile(buff, "rb"); SDL_Surface * coverSurface = NULL; if(strstr(tmp->cover, ".png")) ! coverSurface = IMG_LoadPNG_RW(rwop); else if(strstr(tmp->cover, ".jpg")) ! coverSurface = IMG_LoadJPG_RW(rwop); ! SDL_FreeRW(rwop); if( coverSurface == NULL ) ! tmp->coverSurf = surface_nocover; else { ! // Here we want to have cover of 256x256 in 800x600 and scale it if the resolution is different ! int w = CScreenManager::getSingletonPtr()->getWidth()*256/800; ! int h = CScreenManager::getSingletonPtr()->getHeight()*256/600; ! tmp->coverSurf = zoomSurface(coverSurface,(double) w/coverSurface->w,(double) h/coverSurface->h,1); ! SDL_FreeSurface(coverSurface); } --- 326,347 ---- snprintf(buff,1024,"%s/%s/%s",songs_dir,dirEntry->d_name,tmp->cover); ! SDL_RWops *rwop = NULL; ! rwop = SDL_RWFromFile(buff, "rb"); SDL_Surface * coverSurface = NULL; if(strstr(tmp->cover, ".png")) ! coverSurface = IMG_LoadPNG_RW(rwop); else if(strstr(tmp->cover, ".jpg")) ! coverSurface = IMG_LoadJPG_RW(rwop); ! if( rwop != NULL ) ! SDL_RWclose(rwop); if( coverSurface == NULL ) ! tmp->coverSurf = surface_nocover; else { ! // Here we want to have cover of 256x256 in 800x600 and scale it if the resolution is different ! int w = CScreenManager::getSingletonPtr()->getWidth()*256/800; ! int h = CScreenManager::getSingletonPtr()->getHeight()*256/600; ! tmp->coverSurf = zoomSurface(coverSurface,(double) w/coverSurface->w,(double) h/coverSurface->h,1); ! SDL_FreeSurface(coverSurface); } *************** *** 347,359 **** if(strstr(tmp->background, ".png")) { snprintf(buff,1024,"%s/%s/%s",songs_dir,dirEntry->d_name,tmp->background); rwop = SDL_RWFromFile(buff, "rb"); backgroundSurface = IMG_LoadPNG_RW(rwop); ! SDL_FreeRW(rwop); } else if(strstr(tmp->background, ".jpg")) { snprintf(buff,1024,"%s/%s/%s",songs_dir,dirEntry->d_name,tmp->background); rwop = SDL_RWFromFile(buff, "rb"); backgroundSurface = IMG_LoadJPG_RW(rwop); ! SDL_FreeRW(rwop); } --- 351,367 ---- if(strstr(tmp->background, ".png")) { + rwop = NULL; snprintf(buff,1024,"%s/%s/%s",songs_dir,dirEntry->d_name,tmp->background); rwop = SDL_RWFromFile(buff, "rb"); backgroundSurface = IMG_LoadPNG_RW(rwop); ! if( rwop != NULL ) ! SDL_RWclose(rwop); } else if(strstr(tmp->background, ".jpg")) { + rwop = NULL; snprintf(buff,1024,"%s/%s/%s",songs_dir,dirEntry->d_name,tmp->background); rwop = SDL_RWFromFile(buff, "rb"); backgroundSurface = IMG_LoadJPG_RW(rwop); ! if( rwop != NULL ) ! SDL_RWclose(rwop); } |
|
From: Yoda-JM <yo...@us...> - 2007-06-07 12:21:47
|
Update of /cvsroot/ultrastar-ng/htdocs/pages In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv14035/pages Modified Files: download.php home.php Log Message: Updated Index: home.php =================================================================== RCS file: /cvsroot/ultrastar-ng/htdocs/pages/home.php,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** home.php 20 Jan 2007 01:24:34 -0000 1.1.1.1 --- home.php 7 Jun 2007 12:21:40 -0000 1.2 *************** *** 1 **** --- 1,3 ---- <h1>UltraStar-ng : The free Linux karaoke game</h1> + <h2>News</h2> + <p>Comming soon here, more news</p> Index: download.php =================================================================== RCS file: /cvsroot/ultrastar-ng/htdocs/pages/download.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** download.php 15 May 2007 09:59:00 -0000 1.10 --- download.php 7 Jun 2007 12:21:40 -0000 1.11 *************** *** 3,7 **** <h2>Archives (tar.gz)</h2> ! <p>Latest version : <a href="http://prdownloads.sourceforge.net/ultrastar-ng/UltraStar-ng-0.1.3.tar.gz">UltraStar-ng-0.1.3.tar.gz</a></p> <h2>Linux Distributions</h2> --- 3,7 ---- <h2>Archives (tar.gz)</h2> ! <p>Latest version : <a href="http://prdownloads.sourceforge.net/ultrastar-ng/UltraStar-ng-0.1.4.tar.gz">UltraStar-ng-0.1.4.tar.gz</a></p> <h2>Linux Distributions</h2> *************** *** 14,21 **** <h3>Debian</h3> ! <p>UltraStar-NG is available on Debian SID, apt-get install ultrastar-ng-xine or ultrastar-ng-gstreamer to install it</p> ! <p>Michael Geiger also provides a Debian 4.0 Etch and an Ubuntu 6.10 Edgy Eft source. To know how to add them to your Debian, please visit <a href="http://geigers-site.de/index.php?n=8&i=44">this site</a>. </p> <h3>Arch Linux</h3> <p>UltraStar-NG has been added to AUR (ArchLinux User-community Repository). Package can be found <a href="http://aur.archlinux.org/packages.php?do_Details=1&ID=8313">here</a> (outdated). --- 14,23 ---- <h3>Debian</h3> ! <p>Michael Geiger provides a Debian 4.0 Etch and an Ubuntu 6.10 Edgy Eft source. To know how to add them to your Debian, please visit <a href="http://geigers-site.de/index.php?n=8&i=44">this site</a>. UltraStar-NG is also available in Debian SID (unstable) (<a href="http://packages.debian.org/unstable/games/ultrastar-ng">package page</a>), apt-get install ultrastar-ng-xine or ultrastar-ng-gstreamer to install it. </p> + <h3>Ubuntu</h3> + <p>Package is available in Ubuntu Gutsy (repo universe) (unstable) (<a href="http://packages.ubuntu.com/gutsy/games/ultrastar-ng">package page</a>).</p> + <h3>Arch Linux</h3> <p>UltraStar-NG has been added to AUR (ArchLinux User-community Repository). Package can be found <a href="http://aur.archlinux.org/packages.php?do_Details=1&ID=8313">here</a> (outdated). |
|
From: Yoda-JM <yo...@us...> - 2007-06-06 16:34:10
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31372 Modified Files: configure.in Log Message: Added pangocairo libs/header Index: configure.in =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/configure.in,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** configure.in 19 May 2007 09:46:20 -0000 1.30 --- configure.in 6 Jun 2007 16:33:54 -0000 1.31 *************** *** 103,106 **** --- 103,109 ---- AC_MSG_ERROR(This game connot be build without alsa)) + PKG_CHECK_MODULES(pangocairo, pangocairo , , + AC_MSG_ERROR(This game connot be build without pango for cairo)) + PKG_CHECK_MODULES(librsvg, librsvg-2.0 , [librsvg_detected=yes] , [librsvg_detected=no]) PKG_CHECK_MODULES(cairosvg, cairo-svg , [cairosvg_detected=yes] , [cairosvg_detected=no]) *************** *** 197,200 **** --- 200,214 ---- AC_SUBST(ALSA_LIBS) + # Do things for alsa + PANGOCAIRO_FLAGS=`pkg-config --cflags pangocairo` + PANGOCAIRO_LIBS=`pkg-config --libs pangocairo` + ac_includes_default=$(cat <<USNG_EOF + $ac_includes_default + /* pango cairo headers */ + #include <pango/pangocairo.h> + USNG_EOF) + AC_SUBST(PANGOCAIRO_FLAGS) + AC_SUBST(PANGOCAIRO_LIBS) + # Do things for video case $video_layer in |
|
From: Yoda-JM <yo...@us...> - 2007-06-06 16:34:09
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31372/src Modified Files: Makefile.am Log Message: Added pangocairo libs/header Index: Makefile.am =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** Makefile.am 31 May 2007 21:23:54 -0000 1.13 --- Makefile.am 6 Jun 2007 16:33:55 -0000 1.14 *************** *** 24,29 **** INCLUDES = -I../include \ @CAIRO_FLAGS@ @XML_FLAGS@ @SDL_FLAGS@ @FFT_FLAGS@ @ALSA_FLAGS@ \ ! @VIDEO_FLAGS@ @SVG_FLAGS@ @AUDIO_FLAGS@ \ -DTHEMES_DIR="\"@THEMES_DIR@\"" -DDATA_DIR="\"@DATA_DIR@\"" LDADD = @CAIRO_LIBS@ @XML_LIBS@ @SDL_LIBS@ @FFT_LIBS@ @ALSA_LIBS@ \ ! @VIDEO_LIBS@ @SVG_LIBS@ @AUDIO_LIBS@ @GL_LIBS@ --- 24,29 ---- INCLUDES = -I../include \ @CAIRO_FLAGS@ @XML_FLAGS@ @SDL_FLAGS@ @FFT_FLAGS@ @ALSA_FLAGS@ \ ! @VIDEO_FLAGS@ @SVG_FLAGS@ @AUDIO_FLAGS@ @PANGOCAIRO_FLAGS@\ -DTHEMES_DIR="\"@THEMES_DIR@\"" -DDATA_DIR="\"@DATA_DIR@\"" LDADD = @CAIRO_LIBS@ @XML_LIBS@ @SDL_LIBS@ @FFT_LIBS@ @ALSA_LIBS@ \ ! @VIDEO_LIBS@ @SVG_LIBS@ @AUDIO_LIBS@ @GL_LIBS@ @PANGOCAIRO_LIBS@ |
|
From: Yoda-JM <yo...@us...> - 2007-06-05 11:31:24
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/include In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23419/include Modified Files: configuration.h screen_configuration.h Log Message: Added difficulty configuration Index: configuration.h =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/include/configuration.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configuration.h 31 May 2007 21:23:54 -0000 1.1 --- configuration.h 5 Jun 2007 11:31:04 -0000 1.2 *************** *** 33,35 **** --- 33,49 ---- }; + class CConfigurationDifficulty : public CConfiguration { + public: + CConfigurationDifficulty(); + ~CConfigurationDifficulty(); + bool isLast(); + bool isFirst(); + void setNext(); + void setPrevious(); + char * getValue(); + protected: + void apply(); + unsigned int difficulty; + }; + #endif Index: screen_configuration.h =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/include/screen_configuration.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** screen_configuration.h 2 Jun 2007 10:17:11 -0000 1.2 --- screen_configuration.h 5 Jun 2007 11:31:04 -0000 1.3 *************** *** 18,22 **** private: std::vector <CConfiguration *> configuration; ! int selected; }; --- 18,22 ---- private: std::vector <CConfiguration *> configuration; ! unsigned int selected; }; |
|
From: Yoda-JM <yo...@us...> - 2007-06-05 11:31:24
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23419/src Modified Files: configuration.cpp screen_configuration.cpp Log Message: Added difficulty configuration Index: screen_configuration.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/screen_configuration.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** screen_configuration.cpp 2 Jun 2007 10:17:11 -0000 1.2 --- screen_configuration.cpp 5 Jun 2007 11:31:09 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- screenName = name; configuration.push_back(new CConfigurationFullscreen()); + configuration.push_back(new CConfigurationDifficulty()); selected=0; } Index: configuration.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/configuration.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configuration.cpp 2 Jun 2007 12:05:22 -0000 1.3 --- configuration.cpp 5 Jun 2007 11:31:09 -0000 1.4 *************** *** 4,8 **** CConfigurationFullscreen::CConfigurationFullscreen() { ! fullscreen=false; description="Fullscreen mode"; } --- 4,9 ---- CConfigurationFullscreen::CConfigurationFullscreen() { ! CScreenManager * sm = CScreenManager::getSingletonPtr(); ! fullscreen = sm->getFullscreenStatus(); description="Fullscreen mode"; } *************** *** 43,44 **** --- 44,97 ---- } } + + /****************************************************************************/ + + CConfigurationDifficulty::CConfigurationDifficulty() + { + CScreenManager * sm = CScreenManager::getSingletonPtr(); + difficulty = sm->getDifficulty(); + description="Difficulty"; + } + CConfigurationDifficulty::~CConfigurationDifficulty() + { + } + bool CConfigurationDifficulty::isLast() + { + return (difficulty>=2); + } + bool CConfigurationDifficulty::isFirst() + { + return (difficulty<=0); + } + void CConfigurationDifficulty::setNext() + { + difficulty++; + apply(); + } + void CConfigurationDifficulty::setPrevious() + { + difficulty--; + apply(); + } + char * CConfigurationDifficulty::getValue() + { + switch(difficulty) { + case 0: + return "Easy"; + break; + case 1: + return "Medium"; + break; + case 2: + return "Hard"; + break; + default: + return "Error"; + break; + } + } + void CConfigurationDifficulty::apply() + { + CScreenManager * sm = CScreenManager::getSingletonPtr(); + sm->setDifficulty(difficulty); + } |
|
From: Yoda-JM <yo...@us...> - 2007-06-04 22:30:33
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv5313/src Modified Files: main.cpp Log Message: Fixed bug when fullscreen is set by command line (this is not the bug referenced in the debian bug tracker) Index: main.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/main.cpp,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** main.cpp 2 Jun 2007 10:17:11 -0000 1.35 --- main.cpp 4 Jun 2007 22:30:20 -0000 1.36 *************** *** 90,93 **** --- 90,94 ---- SDL_Thread *thread = NULL; unsigned int difficulty= 2; + bool fullscreen = false; static struct option long_options[] = *************** *** 122,126 **** break; case 'f': ! screenManager->setFullscreenStatus(true); break; case 'd': --- 123,127 ---- break; case 'f': ! fullscreen=true; break; case 'd': *************** *** 152,155 **** --- 153,158 ---- else screenManager = new CScreenManager( width, height , songs_directory ); + + screenManager->setFullscreenStatus(fullscreen); init(); |
|
From: Yoda-JM <yo...@us...> - 2007-06-02 12:05:26
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv9478/src Modified Files: configuration.cpp Log Message: Added description Index: configuration.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/configuration.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configuration.cpp 2 Jun 2007 10:17:11 -0000 1.2 --- configuration.cpp 2 Jun 2007 12:05:22 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- { fullscreen=false; + description="Fullscreen mode"; } CConfigurationFullscreen::~CConfigurationFullscreen() |
|
From: Yoda-JM <yo...@us...> - 2007-06-02 10:17:22
|
Update of /cvsroot/ultrastar-ng/UltraStar-ng/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv32036/src Modified Files: configuration.cpp main.cpp screen_configuration.cpp screenmanager.cpp Log Message: Started to have something that work Index: screen_configuration.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/screen_configuration.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** screen_configuration.cpp 31 May 2007 21:23:54 -0000 1.1 --- screen_configuration.cpp 2 Jun 2007 10:17:11 -0000 1.2 *************** *** 5,8 **** --- 5,9 ---- screenName = name; configuration.push_back(new CConfigurationFullscreen()); + selected=0; } *************** *** 33,36 **** --- 34,47 ---- if( keypressed == SDLK_ESCAPE ) { CScreenManager::getSingletonPtr()->activateScreen("Intro"); + } else if( keypressed == SDLK_LEFT ) { + configuration[selected]->setPrevious(); + } else if( keypressed == SDLK_RIGHT ) { + configuration[selected]->setNext(); + } else if( keypressed == SDLK_UP ) { + if( selected > 0 ) + selected--; + } else if( keypressed == SDLK_DOWN ) { + if( selected < configuration.size() - 1 ) + selected++; } } Index: configuration.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/configuration.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configuration.cpp 31 May 2007 21:23:54 -0000 1.1 --- configuration.cpp 2 Jun 2007 10:17:11 -0000 1.2 *************** *** 36,38 **** --- 36,43 ---- void CConfigurationFullscreen::apply() { + CScreenManager * sm = CScreenManager::getSingletonPtr(); + if( sm->getFullscreenStatus() != fullscreen ) { + SDL_WM_ToggleFullScreen(sm->getSDLScreen()); + sm->setFullscreenStatus(fullscreen); + } } Index: screenmanager.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/screenmanager.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** screenmanager.cpp 1 May 2007 09:11:32 -0000 1.7 --- screenmanager.cpp 2 Jun 2007 10:17:11 -0000 1.8 *************** *** 11,14 **** --- 11,15 ---- currentScreen = NULL; songId = 0; + fullscreen=false; width = _width; height = _height; Index: main.cpp =================================================================== RCS file: /cvsroot/ultrastar-ng/UltraStar-ng/src/main.cpp,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** main.cpp 31 May 2007 21:23:54 -0000 1.34 --- main.cpp 2 Jun 2007 10:17:11 -0000 1.35 *************** *** 11,15 **** unsigned int width=800; unsigned int height=600; - unsigned int fullscreen=0; SDL_Event event; --- 11,14 ---- *************** *** 33,36 **** --- 32,36 ---- if( keypressed == SDLK_f && modifier&KMOD_ALT ) { SDL_WM_ToggleFullScreen(screenSDL); + screenManager->setFullscreenStatus(!screenManager->getFullscreenStatus()); break; } *************** *** 49,53 **** SDL_WM_SetCaption(PACKAGE" - "VERSION, "WM_DEFAULT"); ! screenSDL = videoDriver->init( width, height, fullscreen ); SDL_ShowCursor(SDL_DISABLE); --- 49,53 ---- SDL_WM_SetCaption(PACKAGE" - "VERSION, "WM_DEFAULT"); ! screenSDL = videoDriver->init( width, height, screenManager->getFullscreenStatus() ); SDL_ShowCursor(SDL_DISABLE); *************** *** 122,126 **** break; case 'f': ! fullscreen = 1; break; case 'd': --- 122,126 ---- break; case 'f': ! screenManager->setFullscreenStatus(true); break; case 'd': *************** *** 148,153 **** videoDriver = new CVideoDriver(); - init(); - if( theme_name != NULL ) screenManager = new CScreenManager( width, height , songs_directory , theme_name ); --- 148,151 ---- *************** *** 155,158 **** --- 153,158 ---- screenManager = new CScreenManager( width, height , songs_directory ); + init(); + screenManager->setSDLScreen(screenSDL); screenManager->setAudio( new CAudio() ); |
