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...> - 2009-10-09 08:12:07
|
Module: performous
Branch: master
Commit: c365f18726ac1bcafe8cbd791dea4b73cafd6169
Author: Lasse Karkkainen <tro...@tr...>
Date: Fri Oct 9 11:10:57 2009 +0300
Building with -fvisibility=hidden now to allow better source-level compatibility with Windows.
---
game/CMakeLists.txt | 4 ++--
libs/libda/CMakeLists.txt | 5 +++++
libs/libda/src/CMakeLists.txt | 5 +++++
libs/libda/src/audio.cpp | 5 +++--
libs/plugin++/CMakeLists.txt | 5 +++++
libs/plugin++/include/plugin++/dllhelper.hpp | 20 ++++++++++++++++++++
libs/plugin++/include/plugin++/plugin.hpp | 3 ++-
7 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index 7f078f6..035021d 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -23,9 +23,9 @@ endforeach(lib)
# Set default compile flags for GCC
if(CMAKE_COMPILER_IS_GNUCXX)
- message(STATUS "GCC detected, enabling warnings")
+ message(STATUS "GCC detected, adding compile flags")
# -pedantic cannot be used because ffmpeg headers are b0rked
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++98 -Wall -Wextra")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++98 -Wall -Wextra -fvisibility=hidden")
# Needed for ffmpeg.cc to compile cleanly on OSX (it's a (unsigned long) long story)
add_definitions("-D__STDC_CONSTANT_MACROS")
endif(CMAKE_COMPILER_IS_GNUCXX)
diff --git a/libs/libda/CMakeLists.txt b/libs/libda/CMakeLists.txt
index d279a05..350aaa6 100644
--- a/libs/libda/CMakeLists.txt
+++ b/libs/libda/CMakeLists.txt
@@ -9,6 +9,11 @@ include_directories(../plugin++/include)
FILE(GLOB HEADER_FILES "include/libda/*")
install(FILES ${HEADER_FILES} DESTINATION include/libda)
+if(CMAKE_COMPILER_IS_GNUCXX)
+ message(STATUS "GCC detected, adding compile flags")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++98 -Wall -Wextra -fvisibility=hidden -fvisibility-inlines-hidden")
+endif(CMAKE_COMPILER_IS_GNUCXX)
+
add_subdirectory(src)
add_subdirectory(plugins)
diff --git a/libs/libda/src/CMakeLists.txt b/libs/libda/src/CMakeLists.txt
index cab06e2..fc6ea31 100644
--- a/libs/libda/src/CMakeLists.txt
+++ b/libs/libda/src/CMakeLists.txt
@@ -4,6 +4,11 @@ set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTITHREAD ON)
find_package(Boost 1.34 REQUIRED COMPONENTS thread filesystem)
+if(CMAKE_COMPILER_IS_GNUCXX)
+ message(STATUS "GCC detected, adding compile flags")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -std=c++98 -pedantic -Wall -Wextra -fvisibility=hidden")
+endif(CMAKE_COMPILER_IS_GNUCXX)
+
include_directories(${Boost_INCLUDE_DIRS})
add_library(da audio.cpp)
target_link_libraries(da plugin++ ${Boost_LIBRARIES})
diff --git a/libs/libda/src/audio.cpp b/libs/libda/src/audio.cpp
index bfff922..4f29b39 100644
--- a/libs/libda/src/audio.cpp
+++ b/libs/libda/src/audio.cpp
@@ -1,11 +1,12 @@
#include <libda/audio_dev.hpp>
+#include <plugin++/dllhelper.hpp>
#include <plugin++/loader.hpp>
#include <ostream>
#include <limits>
namespace da {
- const std::size_t settings::low = std::numeric_limits<std::size_t>::min();
- const std::size_t settings::high = std::numeric_limits<std::size_t>::max();
+ DLL_PUBLIC const std::size_t settings::low = std::numeric_limits<std::size_t>::min();
+ DLL_PUBLIC const std::size_t settings::high = std::numeric_limits<std::size_t>::max();
class init_impl {
plugin::loader m_loader;
diff --git a/libs/plugin++/CMakeLists.txt b/libs/plugin++/CMakeLists.txt
index 10cc329..f2837f2 100644
--- a/libs/plugin++/CMakeLists.txt
+++ b/libs/plugin++/CMakeLists.txt
@@ -3,6 +3,11 @@ cmake_minimum_required(VERSION 2.4)
include_directories(include)
+if(CMAKE_COMPILER_IS_GNUCXX)
+ message(STATUS "GCC detected, adding compile flags")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98 -pedantic -Wall -Wextra -fvisibility=hidden -fvisibility-inlines-hidden")
+endif(CMAKE_COMPILER_IS_GNUCXX)
+
if (WIN32)
add_library(plugin++ STATIC src/dll-windows.cpp)
else (WIN32)
diff --git a/libs/plugin++/include/plugin++/dllhelper.hpp b/libs/plugin++/include/plugin++/dllhelper.hpp
new file mode 100644
index 0000000..bcb5593
--- /dev/null
+++ b/libs/plugin++/include/plugin++/dllhelper.hpp
@@ -0,0 +1,20 @@
+#undef DLL_PUBLIC
+
+#if defined _WIN32 || defined __CYGWIN__
+
+#ifdef BUILDING_DLL
+#define DLL_PUBLIC __declspec(dllexport)
+#else
+#define DLL_PUBLIC __declspec(dllimport)
+#endif
+
+#else
+
+#if __GNUC__ >= 4
+#define DLL_PUBLIC __attribute__ ((visibility("default")))
+#else
+#define DLL_PUBLIC
+#endif
+
+#endif
+
diff --git a/libs/plugin++/include/plugin++/plugin.hpp b/libs/plugin++/include/plugin++/plugin.hpp
index d079ef8..32be7ee 100644
--- a/libs/plugin++/include/plugin++/plugin.hpp
+++ b/libs/plugin++/include/plugin++/plugin.hpp
@@ -11,6 +11,7 @@
#ifndef PLUGIN_HPP_INCLUDED
#define PLUGIN_HPP_INCLUDED
+#include "dllhelper.hpp"
#include <map>
#include <stdexcept>
#include <string>
@@ -48,7 +49,7 @@ namespace plugin {
// being a static member variable of this class to ensure that it gets
// initialized when it is used the first time. If it were static member,
// the initialization (on program startup) might occur too late.
- static map_t& map() {
+ DLL_PUBLIC static map_t& map() {
static map_t m;
return m;
}
|
|
From: Yoda-JM <yo...@us...> - 2009-10-02 08:31:42
|
Module: performous
Branch: master
Commit: 7d312083fa83ebddb730ca6e82a208c7568f5422
Author: Vincent Le Ligeour <v.l...@am...>
Date: Fri Oct 2 10:31:22 2009 +0200
Fixed midi lyrics parsing
---
game/midifile.cc | 39 +++++++++++++++++++++++++--------------
1 files changed, 25 insertions(+), 14 deletions(-)
diff --git a/game/midifile.cc b/game/midifile.cc
index a1f4a0b..7f5c74b 100644
--- a/game/midifile.cc
+++ b/game/midifile.cc
@@ -261,27 +261,38 @@ void MidiFileParser::process_midi_event(Track& track, uint8_t t, uint8_t arg1, u
#if MIDI_DEBUG_LEVEL > 3
cout_midi_event(t, arg1, arg2, miditime);
#endif
+
std::vector<Note>& pitch(track.notes[arg1]);
+ // common track management
if (t == 8 || (t == 9 && arg2 == 0)) {
- // Note off event or note on with velocity 0 => note ends
if (pitch.empty() || pitch.back().end != 0) {
-#if MIDI_DEBUG_LEVEL > 0
- std::cout << "WARNING: Note end event with no corresponding beginning:" << std::endl;
- cout_midi_event(t, arg1, arg2, miditime);
-#endif
+ // Note end event with no corresponding beginning
} else {
pitch.back().end = miditime;
- if (track.name == "PART VOCALS" && !m_lyric.empty()) {
- if (track.lyrics.empty()) throw std::logic_error("Lyrics empty in MidiFileParser::process_midi_event");
- track.lyrics.back().end = miditime;
- m_lyric.clear();
- }
}
- } else if (t == 9) {
+ } else {
pitch.push_back(Note(miditime));
- if (track.name == "PART VOCALS") {
- if (arg1 > 100) track.lyrics.push_back(LyricNote("", arg1, miditime, miditime));
- else if (!m_lyric.empty()) track.lyrics.push_back(LyricNote(m_lyric, arg1, miditime));
+ }
+ // special management for lyrics
+ if (track.name == "PART VOCALS") {
+ if (t == 8 || (t == 9 && arg2 == 0)) {
+ // end of note (note off or note on with zero velocity)
+ if( !m_lyric.empty() ) {
+ // here we should update the last note lyric with the current m_lyric
+ track.lyrics.back().lyric = m_lyric;
+ // here we should update the last note end time with the miditime
+ track.lyrics.back().end = miditime;
+ } else {
+ if( track.lyrics.back().lyric.empty() ) {
+ // bad notes, removing it
+ track.lyrics.pop_back();
+ }
+ }
+ m_lyric.clear();
+ } else {
+ // beginning of note then
+ // here we should add a lyric with the start time at miditime
+ track.lyrics.push_back(LyricNote("", arg1, miditime, miditime));
}
}
}
|
|
From: Yoda-JM <yo...@us...> - 2009-09-25 13:58:30
|
Module: performous
Branch: master
Commit: 6c8f3d4f5f0c2edcfe2805581eabffc1d4b6fa85
Author: Vincent Le Ligeour <yo...@us...>
Date: Fri Sep 25 15:58:01 2009 +0200
Added some Windows build stuff
---
cmake/Modules/FindBoost.cmake | 6 +++---
cmake/Modules/FindGLEW.cmake | 2 +-
cmake/Modules/FindJpeg.cmake | 28 ++++++++++++++++++++++++++++
cmake/Modules/FindOpenGL.cmake | 4 ++--
cmake/Modules/FindPThread.cmake | 21 +++++++++++++++++++++
cmake/Modules/FindPng.cmake | 28 ++++++++++++++++++++++++++++
cmake/Modules/FindSDL.cmake | 2 +-
cmake/Modules/FindTiff.cmake | 28 ++++++++++++++++++++++++++++
cmake/Modules/FindZ.cmake | 28 ++++++++++++++++++++++++++++
tools/cover_conv.cpp | 3 +++
10 files changed, 143 insertions(+), 7 deletions(-)
diff --git a/cmake/Modules/FindBoost.cmake b/cmake/Modules/FindBoost.cmake
index 9cda27d..bf38344 100644
--- a/cmake/Modules/FindBoost.cmake
+++ b/cmake/Modules/FindBoost.cmake
@@ -76,7 +76,7 @@
# MESSAGE(STATUS "Finding Boost libraries.... ")
-SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" "1.36.0" "1.36" "1.34.1" "1.34.0" "1.34" "1.33.1" "1.33.0" "1.33")
+SET( _boost_TEST_VERSIONS ${Boost_ADDITIONAL_VERSIONS} "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37" "1.36.0" "1.36" "1.34.1" "1.34.0" "1.34" "1.33.1" "1.33.0" "1.33")
############################################
#
@@ -284,7 +284,7 @@ ELSE (_boost_IN_CACHE)
SET (_boost_COMPILER "-vc90")
ENDIF(MSVC90)
IF (MINGW)
- SET (_boost_COMPILER "-mgw")
+ SET (_boost_COMPILER "-mgw44")
ENDIF(MINGW)
IF (CYGWIN)
SET (_boost_COMPILER "-gcc")
@@ -317,7 +317,7 @@ ELSE (_boost_IN_CACHE)
SET( _boost_STATIC_TAG "")
IF (WIN32)
- SET (_boost_ABI_TAG "g")
+ SET (_boost_ABI_TAG "")
SET( _boost_STATIC_TAG "-s")
ENDIF(WIN32)
SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")
diff --git a/cmake/Modules/FindGLEW.cmake b/cmake/Modules/FindGLEW.cmake
index badee76..7fb93a1 100644
--- a/cmake/Modules/FindGLEW.cmake
+++ b/cmake/Modules/FindGLEW.cmake
@@ -19,7 +19,7 @@ find_path(GLEW_INCLUDE_DIR
)
find_library(GLEW_LIBRARY
- NAMES GLEW
+ NAMES GLEW GLEW32
PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindJpeg.cmake b/cmake/Modules/FindJpeg.cmake
new file mode 100644
index 0000000..c5cc9b6
--- /dev/null
+++ b/cmake/Modules/FindJpeg.cmake
@@ -0,0 +1,28 @@
+# - Try to find Jpeg
+# Once done, this will define
+#
+# Jpeg_FOUND - system has Jpeg
+# Jpeg_INCLUDE_DIRS - the Jpeg include directories
+# Jpeg_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(Jpeg_PKGCONF jpeg)
+
+find_path(Jpeg_INCLUDE_DIR
+ NAMES jconfig.h
+ PATHS ${Jpeg_PKGCONF_INCLUDE_DIRS}
+)
+
+find_library(Jpeg_LIBRARY
+ NAMES jpeg
+ PATHS ${Jpeg_PKGCONF_LIBRARY_DIRS}
+)
+
+set(Jpeg_PROCESS_INCLUDES Jpeg_INCLUDE_DIR)
+set(Jpeg_PROCESS_LIBS Jpeg_LIBRARY)
+libfind_process(Jpeg)
+
diff --git a/cmake/Modules/FindOpenGL.cmake b/cmake/Modules/FindOpenGL.cmake
index b660117..c37c380 100644
--- a/cmake/Modules/FindOpenGL.cmake
+++ b/cmake/Modules/FindOpenGL.cmake
@@ -20,12 +20,12 @@ find_path(OpenGL_INCLUDE_DIR
)
find_library(OpenGL_GL_LIBRARY
- NAMES GL
+ NAMES GL OpenGL32
PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
)
find_library(OpenGL_GLU_LIBRARY
- NAMES GLU
+ NAMES GLU GLU32
PATHS ${OpenGL_PKGCONF_LIBRARY_DIRS}
)
diff --git a/cmake/Modules/FindPThread.cmake b/cmake/Modules/FindPThread.cmake
new file mode 100644
index 0000000..a404e28
--- /dev/null
+++ b/cmake/Modules/FindPThread.cmake
@@ -0,0 +1,21 @@
+# - Try to find PThread
+# Once done, this will define
+#
+# PThread_FOUND - system has PThread
+# PThread_LIBRARIES - link these to use PThread
+#
+# 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(Png_PKGCONF PThread)
+
+find_library(PThread_LIBRARY
+ NAMES pthreadGC2
+ PATHS ${PThread_PKGCONF_LIBRARY_DIRS}
+)
+
+set(PThread_PROCESS_LIBS PThread_LIBRARY)
+libfind_process(PThread)
+
diff --git a/cmake/Modules/FindPng.cmake b/cmake/Modules/FindPng.cmake
new file mode 100644
index 0000000..0f52098
--- /dev/null
+++ b/cmake/Modules/FindPng.cmake
@@ -0,0 +1,28 @@
+# - Try to find Png
+# Once done, this will define
+#
+# Png_FOUND - system has Png
+# Png_INCLUDE_DIRS - the Png include directories
+# Png_LIBRARIES - link these to use Png
+#
+# 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(Png_PKGCONF Png)
+
+find_path(Png_INCLUDE_DIR
+ NAMES pngconf.h
+ PATHS ${Png_PKGCONF_INCLUDE_DIRS}
+)
+
+find_library(Png_LIBRARY
+ NAMES png12
+ PATHS ${Png_PKGCONF_LIBRARY_DIRS}
+)
+
+set(Png_PROCESS_INCLUDES Png_INCLUDE_DIR)
+set(Png_PROCESS_LIBS Png_LIBRARY)
+libfind_process(Png)
+
diff --git a/cmake/Modules/FindSDL.cmake b/cmake/Modules/FindSDL.cmake
index e89c44a..2d4e557 100644
--- a/cmake/Modules/FindSDL.cmake
+++ b/cmake/Modules/FindSDL.cmake
@@ -39,7 +39,7 @@ if(NOT "${SDL_SDL_LIBRARY}" MATCHES "framework")
if (SDL_SDLmain_LIBRARY)
set(SDL_PROCESS_LIBS ${SDL_PROCESS_LIBS} SDL_SDLmain_LIBRARY)
endif (SDL_SDLmain_LIBRARY)
- set(SDL_PROCESS_LIBS SDL_SDL_LIBRARY)
+ set(SDL_PROCESS_LIBS ${SDL_PROCESS_LIBS} SDL_SDL_LIBRARY)
endif(NOT "${SDL_SDL_LIBRARY}" MATCHES "framework")
set(SDL_PROCESS_INCLUDES SDL_INCLUDE_DIR)
diff --git a/cmake/Modules/FindTiff.cmake b/cmake/Modules/FindTiff.cmake
new file mode 100644
index 0000000..dcc7988
--- /dev/null
+++ b/cmake/Modules/FindTiff.cmake
@@ -0,0 +1,28 @@
+# - Try to find Tiff
+# Once done, this will define
+#
+# Tiff_FOUND - system has Tiff
+# Tiff_INCLUDE_DIRS - the Tiff include directories
+# Tiff_LIBRARIES - link these to use Tiff
+#
+# 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(Tiff_PKGCONF tiff)
+
+find_path(Tiff_INCLUDE_DIR
+ NAMES tiffconf.h
+ PATHS ${Tiff_PKGCONF_INCLUDE_DIRS}
+)
+
+find_library(Tiff_LIBRARY
+ NAMES libtiff
+ PATHS ${Tiff_PKGCONF_LIBRARY_DIRS}
+)
+
+set(Tiff_PROCESS_INCLUDES Tiff_INCLUDE_DIR)
+set(Tiff_PROCESS_LIBS Tiff_LIBRARY)
+libfind_process(Tiff)
+
diff --git a/cmake/Modules/FindZ.cmake b/cmake/Modules/FindZ.cmake
new file mode 100644
index 0000000..63db9d6
--- /dev/null
+++ b/cmake/Modules/FindZ.cmake
@@ -0,0 +1,28 @@
+# - Try to find Z
+# Once done, this will define
+#
+# Z_FOUND - system has Z
+# Z_INCLUDE_DIRS - the Z include directories
+# Z_LIBRARIES - link these to use Z
+#
+# 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(Z_PKGCONF Z)
+
+find_path(Z_INCLUDE_DIR
+ NAMES zconf.h
+ PATHS ${Z_PKGCONF_INCLUDE_DIRS}
+)
+
+find_library(Z_LIBRARY
+ NAMES z
+ PATHS ${Z_PKGCONF_LIBRARY_DIRS}
+)
+
+set(Z_PROCESS_INCLUDES Z_INCLUDE_DIR)
+set(Z_PROCESS_LIBS Z_LIBRARY)
+libfind_process(Z)
+
diff --git a/tools/cover_conv.cpp b/tools/cover_conv.cpp
index 81a5699..d0bacf2 100644
--- a/tools/cover_conv.cpp
+++ b/tools/cover_conv.cpp
@@ -1,5 +1,8 @@
#include <boost/lexical_cast.hpp>
#include <iostream>
+#ifdef __WIN32__
+# include <windows.h>
+#endif
#include "ss_cover.hh"
|
|
From: Yoda-JM <yo...@us...> - 2009-09-23 15:17:43
|
Module: performous
Branch: master
Commit: 597899b036a8d442cabeb3fd5e81a5346be23273
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 17:14:18 2009 +0200
Made editor not build by default, Fixed Magick library detection
---
cmake/Modules/FindMagick.cmake | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cmake/Modules/FindMagick.cmake b/cmake/Modules/FindMagick.cmake
index 9ebd457..089c7d2 100644
--- a/cmake/Modules/FindMagick.cmake
+++ b/cmake/Modules/FindMagick.cmake
@@ -21,17 +21,18 @@ find_library(Magick_LIBRARY
NAMES Magick MagickCore
PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
)
+set(Magick_PROCESS_LIBS Magick_LIBRARY)
if(MINGW)
find_library(MagickWand_LIBRARY
NAMES MagickWand
PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
)
+ set(Magick_PROCESS_LIBS ${Magick_PROCESS_LIBS} MagickWand_LIBRARY)
endif(MINGW)
# Set the include dir variables and the libraries and let libfind_process do the rest.
# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
set(Magick_PROCESS_INCLUDES Magick_INCLUDE_DIR)
-set(Magick_PROCESS_LIBS Magick_LIBRARY MagickWand_LIBRARY)
libfind_process(Magick)
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-09-23 15:10:15
|
Module: performous Branch: master Commit: 8b39e386b81c148656b01080c2924fbd8b33a320 Author: Lasse Karkkainen <tro...@tr...> Date: Wed Sep 23 18:09:11 2009 +0300 Make the editor optional and default to not building it. --- CMakeLists.txt | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 290f236..6ff8338 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,9 +29,14 @@ add_subdirectory(libs) add_subdirectory(themes) add_subdirectory(data) add_subdirectory(game) -add_subdirectory(editor) add_subdirectory(docs) +option(ENABLE_EDITOR "Enable experimental song editor (doesn't work)" OFF) + +if (ENABLE_EDITOR) + add_subdirectory(editor) +endif (ENABLE_EDITOR) + option(ENABLE_TOOLS "Enable extra tools (e.g. Singstar ripper)" ON) if (ENABLE_TOOLS) |
|
From: Yoda-JM <yo...@us...> - 2009-09-23 14:58:08
|
Module: performous
Branch: master
Commit: f8d0d4033bcb1c935009dfcce2ce42041f7a906a
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 14:33:57 2009 +0200
Fixed missing include file (Xaldyz fix)
---
editor/main.cc | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/editor/main.cc b/editor/main.cc
index 04d4ef6..f5970f6 100644
--- a/editor/main.cc
+++ b/editor/main.cc
@@ -3,6 +3,8 @@
#include "notes.hh"
//#include <boost/math/special_functions/fpclassify.hpp>
+#include <cmath>
+
int main(int argc, char **argv) {
if (argc < 2)
@@ -20,7 +22,7 @@ int main(int argc, char **argv) {
// wait for ffmpeg to be ready
// TODO: fix this it is probably not enough
- while(isinf(mpeg.duration()) ) ;
+ while(std::isinf(mpeg.duration()) ) ;
// this should majorate the song duration
int64_t duration = (mpeg.duration() + 0.5) * 48000 * 2;
|
|
From: Yoda-JM <yo...@us...> - 2009-09-23 14:11:06
|
Module: performous
Branch: master
Commit: cac4168e9cc148c0805fdc81b650b75ce211181c
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 16:10:51 2009 +0200
Fixed the latest fix ... again :)
---
cmake/Modules/FindMagick.cmake | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/cmake/Modules/FindMagick.cmake b/cmake/Modules/FindMagick.cmake
index f2a32c3..9ebd457 100644
--- a/cmake/Modules/FindMagick.cmake
+++ b/cmake/Modules/FindMagick.cmake
@@ -17,14 +17,14 @@ find_path(Magick_INCLUDE_DIR
)
# Finally the library itself
+find_library(Magick_LIBRARY
+ NAMES Magick MagickCore
+ PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
+)
+
if(MINGW)
- find_library(Magick_LIBRARY
- NAMES Magick MagickCore MagickWand
- PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
- )
-else(MINGW)
- find_library(Magick_LIBRARY
- NAMES Magick MagickCore
+ find_library(MagickWand_LIBRARY
+ NAMES MagickWand
PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
)
endif(MINGW)
@@ -32,6 +32,6 @@ endif(MINGW)
# Set the include dir variables and the libraries and let libfind_process do the rest.
# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
set(Magick_PROCESS_INCLUDES Magick_INCLUDE_DIR)
-set(Magick_PROCESS_LIBS Magick_LIBRARY)
+set(Magick_PROCESS_LIBS Magick_LIBRARY MagickWand_LIBRARY)
libfind_process(Magick)
|
|
From: Yoda-JM <yo...@us...> - 2009-09-23 13:52:20
|
Module: performous
Branch: master
Commit: 6f4bf3cb1ad53dabe24b7a31917f621966e93e4c
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 15:52:05 2009 +0200
Tried to fix the Windows detection of MagickWand
---
cmake/Modules/FindMagick.cmake | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/cmake/Modules/FindMagick.cmake b/cmake/Modules/FindMagick.cmake
index d53e020..f2a32c3 100644
--- a/cmake/Modules/FindMagick.cmake
+++ b/cmake/Modules/FindMagick.cmake
@@ -17,10 +17,17 @@ find_path(Magick_INCLUDE_DIR
)
# Finally the library itself
-find_library(Magick_LIBRARY
- NAMES Magick MagickCore
- PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
-)
+if(MINGW)
+ find_library(Magick_LIBRARY
+ NAMES Magick MagickCore MagickWand
+ PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
+ )
+else(MINGW)
+ find_library(Magick_LIBRARY
+ NAMES Magick MagickCore
+ PATHS ${Magick_PKGCONF_LIBRARY_DIRS}
+ )
+endif(MINGW)
# Set the include dir variables and the libraries and let libfind_process do the rest.
# NOTE: Singular variables for this library, plural for libraries this this lib depends on.
|
|
From: Yoda-JM <yo...@us...> - 2009-09-23 13:37:36
|
Module: performous
Branch: master
Commit: df9422b6f16dd39839cecb75436e12ada57e041c
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 15:37:22 2009 +0200
Fixed the fix of the fix
---
cmake/Modules/FindSDL.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cmake/Modules/FindSDL.cmake b/cmake/Modules/FindSDL.cmake
index 41b9787..e89c44a 100644
--- a/cmake/Modules/FindSDL.cmake
+++ b/cmake/Modules/FindSDL.cmake
@@ -29,7 +29,7 @@ find_library(SDL_SDL_LIBRARY
# Process others than OSX with native SDL normally
if(NOT "${SDL_SDL_LIBRARY}" MATCHES "framework")
if(MINGW)
- set(MINGW32_LIBRARY mingw)
+ set(MINGW32_LIBRARY mingw32)
set(SDL_PROCESS_LIBS ${SDL_PROCESS_LIBS} MINGW32_LIBRARY)
endif(MINGW)
find_library(SDL_SDLmain_LIBRARY
|
|
From: Yoda-JM <yo...@us...> - 2009-09-23 13:36:52
|
Module: performous
Branch: master
Commit: 18d180d859afd68c610a11483c52c892039f7b0a
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 15:36:37 2009 +0200
Fixed the fix
---
cmake/Modules/FindSDL.cmake | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/cmake/Modules/FindSDL.cmake b/cmake/Modules/FindSDL.cmake
index 58eb776..41b9787 100644
--- a/cmake/Modules/FindSDL.cmake
+++ b/cmake/Modules/FindSDL.cmake
@@ -29,6 +29,7 @@ find_library(SDL_SDL_LIBRARY
# Process others than OSX with native SDL normally
if(NOT "${SDL_SDL_LIBRARY}" MATCHES "framework")
if(MINGW)
+ set(MINGW32_LIBRARY mingw)
set(SDL_PROCESS_LIBS ${SDL_PROCESS_LIBS} MINGW32_LIBRARY)
endif(MINGW)
find_library(SDL_SDLmain_LIBRARY
|
|
From: Yoda-JM <yo...@us...> - 2009-09-23 13:33:58
|
Module: performous
Branch: master
Commit: a1177a8de73ab69419099ff80958397a7a9e072b
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 15:33:29 2009 +0200
Fixed SDL Windows build (Xaldyz fix)
---
cmake/Modules/FindSDL.cmake | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cmake/Modules/FindSDL.cmake b/cmake/Modules/FindSDL.cmake
index 9959790..58eb776 100644
--- a/cmake/Modules/FindSDL.cmake
+++ b/cmake/Modules/FindSDL.cmake
@@ -28,7 +28,9 @@ find_library(SDL_SDL_LIBRARY
# Process others than OSX with native SDL normally
if(NOT "${SDL_SDL_LIBRARY}" MATCHES "framework")
- set(SDL_PROCESS_LIBS SDL_SDL_LIBRARY)
+ if(MINGW)
+ set(SDL_PROCESS_LIBS ${SDL_PROCESS_LIBS} MINGW32_LIBRARY)
+ endif(MINGW)
find_library(SDL_SDLmain_LIBRARY
NAMES libSDLmain.a SDLmain
HINTS ${SDL_PKGCONF_LIBRARY_DIRS}
@@ -36,6 +38,7 @@ if(NOT "${SDL_SDL_LIBRARY}" MATCHES "framework")
if (SDL_SDLmain_LIBRARY)
set(SDL_PROCESS_LIBS ${SDL_PROCESS_LIBS} SDL_SDLmain_LIBRARY)
endif (SDL_SDLmain_LIBRARY)
+ set(SDL_PROCESS_LIBS SDL_SDL_LIBRARY)
endif(NOT "${SDL_SDL_LIBRARY}" MATCHES "framework")
set(SDL_PROCESS_INCLUDES SDL_INCLUDE_DIR)
|
|
From: Yoda-JM <yo...@us...> - 2009-09-23 09:39:41
|
Module: performous
Branch: master
Commit: 3d0c4fca71e4667566555e537aecdff62a63cf32
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 11:39:28 2009 +0200
Fixed missing include file (Xaldyz fix)
---
game/guitargraph.cc | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 66f3a61..4a48dc5 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -5,6 +5,8 @@
#include <cmath>
#include <cstdlib>
+#include <boost/lexical_cast.hpp>
+
namespace {
struct Diff { std::string name; int basepitch; } diffv[] = {
{ "Supaeasy", 0x3C },
|
|
From: Yoda-JM <yo...@us...> - 2009-09-23 09:13:30
|
Module: performous
Branch: master
Commit: 097ee2dab88bbd5a0fc936e756f3875925fd7ad5
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 11:13:14 2009 +0200
Fixed Windows compilation (Xaldyz fix)
---
libs/libda/plugins/CMakeLists.txt | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libs/libda/plugins/CMakeLists.txt b/libs/libda/plugins/CMakeLists.txt
index d4b9fbe..fb21655 100644
--- a/libs/libda/plugins/CMakeLists.txt
+++ b/libs/libda/plugins/CMakeLists.txt
@@ -157,9 +157,9 @@ if(PLUGIN_PORTAUDIO)
add_library(da_audio_dev_pa${Portaudio_VERSION} MODULE audio_dev_pa${Portaudio_VERSION}.cpp)
target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} ${Portaudio_LIBRARIES})
install(TARGETS da_audio_dev_pa${Portaudio_VERSION} DESTINATION ${LIBDA_PLUGIN_DIR})
- if(APPLE)
+ if(APPLE OR WIN32)
target_link_libraries(da_audio_dev_pa${Portaudio_VERSION} da)
- endif(APPLE)
+ endif(APPLE OR WIN32)
endif(PLUGIN_PORTAUDIO)
if(PLUGIN_PULSE)
|
|
From: Yoda-JM <yo...@us...> - 2009-09-23 09:00:15
|
Module: performous
Branch: master
Commit: 4a93349c6e8e51de4152c1368bc94c88289a91ce
Author: Vincent Le Ligeour <yo...@us...>
Date: Wed Sep 23 09:58:04 2009 +0200
Fixed missing header reported by Xaldyz
---
editor/main.cc | 2 ++
game/layout_singer.hh | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/editor/main.cc b/editor/main.cc
index c7156f9..04d4ef6 100644
--- a/editor/main.cc
+++ b/editor/main.cc
@@ -29,7 +29,9 @@ int main(int argc, char **argv) {
int64_t position = 0;
std::vector<da::sample_t> sample(1500*2);
da::pcm_data data(&sample[0], 1500, 2, 48000);
+ usleep(500000);
while( mpeg.audioQueue(data, position) ) {
+ usleep(500000);
std::cout << i << ": " << position << " " << double(position) / double(48000*2)<< std::endl;
analyzer.input(data.begin(0), data.end(0));
diff --git a/game/layout_singer.hh b/game/layout_singer.hh
index 32c6931..e91aba2 100644
--- a/game/layout_singer.hh
+++ b/game/layout_singer.hh
@@ -4,6 +4,8 @@
#include "opengl_text.hh"
#include "notegraph.hh"
+#include <deque>
+
/// handles songlyrics
class LyricRow {
public:
|
|
From: Yoda-JM <yo...@us...> - 2009-09-17 09:05:24
|
Module: performous
Branch: master
Commit: cfbe99c107d834ed31b27d4f4af741bd4da0c8b9
Author: Vincent Le Ligeour <yo...@us...>
Date: Thu Sep 17 11:05:07 2009 +0200
Fixed editor segfault
---
editor/main.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/editor/main.cc b/editor/main.cc
index 7ce6e18..c7156f9 100644
--- a/editor/main.cc
+++ b/editor/main.cc
@@ -27,8 +27,8 @@ int main(int argc, char **argv) {
unsigned int i = 0;
int64_t position = 0;
- da::sample_t *sample = new da::sample_t(2);
- da::pcm_data data(sample, 1500, 2, 48000);
+ std::vector<da::sample_t> sample(1500*2);
+ da::pcm_data data(&sample[0], 1500, 2, 48000);
while( mpeg.audioQueue(data, position) ) {
std::cout << i << ": " << position << " " << double(position) / double(48000*2)<< std::endl;
|
|
From: Yoda-JM <yo...@us...> - 2009-09-14 15:13:58
|
Module: web Branch: master Commit: 73b1e11c719b3fb11044557ddfedc7b43c463b4d Author: Vincent Le Ligeour <yo...@us...> Date: Mon Sep 14 17:13:42 2009 +0200 Updated performous forum URL --- htdocs-source/AWC-cfg.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/htdocs-source/AWC-cfg.txt b/htdocs-source/AWC-cfg.txt index bffcd2b..0809a6c 100644 --- a/htdocs-source/AWC-cfg.txt +++ b/htdocs-source/AWC-cfg.txt @@ -10,7 +10,7 @@ +commands Keys +develop Hacking % Project links: -.http://sourceforge.net/forum/forum.php?forum_id=871563 Forum +.http://sourceforge.net/projects/performous/forums/forum/871563 Forum .http://sourceforge.net/projects/performous/ SF.net .http://www.ohloh.net/projects/performous Ohloh.net .http://cia.vc/stats/project/performous CIA.vc |
|
From: Yoda-JM <yo...@us...> - 2009-09-07 13:02:02
|
Module: performous Branch: master Commit: c018b2686413663a63842b65188a0bc89941c9f8 Author: Vincent Le Ligeour <yo...@us...> Date: Mon Sep 7 15:01:37 2009 +0200 Cleaned some more includes --- game/audio.cc | 4 ---- game/configuration.cc | 2 +- game/guitargraph.cc | 2 ++ game/highscore.cc | 4 ++-- game/joystick.cc | 30 ------------------------------ game/layout_singer.cc | 1 + game/main.cc | 8 +++++--- game/notegraph.cc | 1 + game/notes.cc | 4 +--- game/opengl_text.cc | 3 ++- game/pitch.cc | 6 ++---- game/progressbar.cc | 2 +- game/screen_configuration.cc | 1 + game/screen_highscore.cc | 3 ++- game/screen_intro.cc | 3 ++- game/screen_players.cc | 2 +- game/screen_practice.cc | 1 - game/screen_sing.cc | 10 ++++++---- game/screen_songs.cc | 2 +- game/screenmanager.cc | 1 + game/song.cc | 1 - game/song.hh | 1 + game/songparser-txt.cc | 2 ++ game/songs.cc | 8 ++++---- game/surface.cc | 7 +++---- game/theme.cc | 3 --- game/video.cc | 4 +++- 27 files changed, 45 insertions(+), 71 deletions(-) |
|
From: Yoda-JM <yo...@us...> - 2009-09-06 21:39:47
|
Module: performous Branch: master Commit: 2e602027bef398eafdb160608c312bdf120cb3db Author: Vincent Le Ligeour <yo...@us...> Date: Sun Sep 6 23:39:23 2009 +0200 Removed one more include --- game/songs.cc | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/game/songs.cc b/game/songs.cc index a6c3bfe..3914aa7 100644 --- a/game/songs.cc +++ b/game/songs.cc @@ -2,13 +2,11 @@ #include "configuration.hh" #include "fs.hh" -#include "screen.hh" #include <boost/bind.hpp> #include <boost/format.hpp> #include <boost/lexical_cast.hpp> #include <boost/regex.hpp> #include <libxml++/libxml++.h> -// #include <tr1/random> #include <cstdlib> #include <algorithm> #include <fstream> |
|
From: Yoda-JM <yo...@us...> - 2009-09-06 21:39:39
|
Module: performous Branch: master Commit: 56e41355fe512c48d3599aec42c91c6319028622 Author: Vincent Le Ligeour <yo...@us...> Date: Sun Sep 6 23:36:24 2009 +0200 Cleaned up headers --- game/audio.hh | 8 +++----- game/color.cc | 1 + game/color.hh | 5 ----- game/configuration.cc | 5 ++++- game/configuration.hh | 7 ------- game/dialog.hh | 7 +------ game/engine.hh | 9 +-------- game/ffmpeg.hh | 4 ---- game/guitargraph.cc | 2 ++ game/guitargraph.hh | 8 +++++--- game/highscore.hh | 2 -- game/joystick.hh | 8 +++++++- game/layout_singer.cc | 8 ++++++++ game/layout_singer.hh | 3 ++- game/main.cc | 2 ++ game/midifile.hh | 1 - game/notegraph.cc | 2 ++ game/notegraph.hh | 4 ++-- game/opengl_text.hh | 5 ----- game/pitch.hh | 10 ++-------- game/player.hh | 4 +--- game/players.cc | 1 + game/players.hh | 2 +- game/record.hh | 2 ++ game/screen.hh | 7 ------- game/screen_configuration.cc | 1 + game/screen_configuration.hh | 4 +--- game/screen_highscore.cc | 4 ++++ game/screen_highscore.hh | 2 +- game/screen_intro.cc | 2 ++ game/screen_intro.hh | 8 +++----- game/screen_players.cc | 4 ++++ game/screen_players.hh | 4 ++-- game/screen_practice.cc | 2 ++ game/screen_practice.hh | 9 ++++----- game/screen_sing.cc | 1 + game/screen_sing.hh | 5 ++++- game/screen_songs.cc | 2 ++ game/screen_songs.hh | 10 ++-------- game/singleton.hh | 4 ---- game/song.cc | 2 ++ game/song.hh | 1 + game/songparser-ini.cc | 1 + game/songparser-txt.cc | 3 +++ game/songparser.hh | 3 --- game/songs.cc | 1 + game/songs.hh | 2 +- game/surface.cc | 3 +++ game/surface.hh | 3 --- game/unicode.hh | 2 ++ game/video_driver.cc | 2 +- game/video_driver.hh | 4 ---- game/xtime.hh | 5 ----- libs/libda/include/libda/mixer.hpp | 3 ++- 54 files changed, 97 insertions(+), 117 deletions(-) |
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-09-06 15:44:04
|
Module: performous
Branch: master
Commit: bb052406b738d0a71ec52d31d82358fcce1eeb78
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Sep 6 18:42:46 2009 +0300
Fix compiling editor on older versions of Boost (not a proper fix though).
---
editor/main.cc | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/editor/main.cc b/editor/main.cc
index 2d5cc84..7ce6e18 100644
--- a/editor/main.cc
+++ b/editor/main.cc
@@ -1,7 +1,7 @@
#include "pitch.hh"
#include "ffmpeg.hh"
#include "notes.hh"
-#include <boost/math/special_functions/fpclassify.hpp>
+//#include <boost/math/special_functions/fpclassify.hpp>
int main(int argc, char **argv) {
@@ -20,7 +20,7 @@ int main(int argc, char **argv) {
// wait for ffmpeg to be ready
// TODO: fix this it is probably not enough
- while( boost::math::isinf(mpeg.duration()) ) ;
+ while(isinf(mpeg.duration()) ) ;
// this should majorate the song duration
int64_t duration = (mpeg.duration() + 0.5) * 48000 * 2;
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-09-06 15:44:00
|
Module: performous
Branch: master
Commit: 10cbeefe11764ee337b73212b93707ccd7f899f1
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Sep 6 18:41:45 2009 +0300
Proper mixer destruction order/cleanup, should avoid segfaults on exit.
---
game/audio.hh | 2 +-
libs/libda/include/libda/mixer.hpp | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/game/audio.hh b/game/audio.hh
index e7ed18e..6accaa4 100644
--- a/game/audio.hh
+++ b/game/audio.hh
@@ -105,8 +105,8 @@ class Audio {
Notes const* volatile m_notes;
da::settings m_rs;
da::volume m_volume;
+ std::string m_volumeSetting;
da::mixer m_mixer;
std::map<std::string,boost::shared_ptr<Stream> > m_streams;
- std::string m_volumeSetting;
};
diff --git a/libs/libda/include/libda/mixer.hpp b/libs/libda/include/libda/mixer.hpp
index 20915ce..a44946f 100644
--- a/libs/libda/include/libda/mixer.hpp
+++ b/libs/libda/include/libda/mixer.hpp
@@ -175,8 +175,13 @@ namespace da {
mutex_stream(callback_t const& stream): m_stream(stream) {}
bool operator()(pcm_data& data) {
scoped_lock l(*this);
+ if (!m_stream) return false;
return m_stream(data);
}
+ void clear() {
+ scoped_lock l(*this);
+ m_stream.clear();
+ }
private:
callback_t m_stream;
mutable boost::recursive_mutex m_mutex;
@@ -211,6 +216,12 @@ namespace da {
public:
mixer(): m_mutex(boost::ref(m_select)) { init(); }
mixer(settings& s): m_mutex(boost::ref(m_select)) { init(); start(s); }
+ ~mixer() {
+ // Make sure that all processing has stopped before exiting
+ scoped_lock l(m_mutex);
+ m_mutex.clear();
+ m_playback.reset();
+ }
void start(settings& s) { m_settings = s; start(); s = m_settings; }
void start() {
stop();
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-09-06 15:43:58
|
Module: performous
Branch: master
Commit: 66ab8eb454411c95eccdaf26b12ab4b71923f428
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Sep 6 18:14:21 2009 +0300
Modified guitar neck angle etc. as requested by semi-pro GH players at Assembly.
---
game/guitargraph.cc | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index fe5ab38..8f63d1c 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -10,9 +10,10 @@ namespace {
};
const size_t diffsz = sizeof(diffv) / sizeof(*diffv);
- const float past = -0.3f;
- const float future = 3.0f;
- const float timescale = 60.0f;
+ const float g_angle = 80.0f;
+ const float past = -0.2f;
+ const float future = 1.8f;
+ const float timescale = 25.0f;
const float texCoordStep = -0.5f; // Two beat lines per neck texture => 0.5 tex units per beat
// Note: t is difference from playback time so it must be in range [past, future]
float time2y(float t) { return -timescale * (t - past) / (future - past); }
@@ -322,7 +323,7 @@ void GuitarGraph::draw(double time) {
glTranslatef(frac * 2.0 * offsetX, 0.0f, 0.0f);
glutil::PushMatrixMode pmb(GL_MODELVIEW);
glTranslatef((1.0 - frac) * offsetX, dimensions.y2(), 0.0f);
- glRotatef(85.0f, 1.0f, 0.0f, 0.0f);
+ glRotatef(g_angle, 1.0f, 0.0f, 0.0f);
{ float s = dimensions.w() / 5.0f; glScalef(s, s, s); }
// Draw the neck
{
|
|
From: Lasse Kärkkäi. <tr...@us...> - 2009-09-06 15:43:58
|
Module: performous
Branch: master
Commit: 1f7c735b23509d8d2358f5085aa49c65f647ed66
Author: Lasse Karkkainen <tro...@tr...>
Date: Sun Sep 6 18:16:05 2009 +0300
Modify editor executable name to avoid massively b0rking UNIX systems when installed.
---
editor/CMakeLists.txt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt
index acd5b71..65e7065 100644
--- a/editor/CMakeLists.txt
+++ b/editor/CMakeLists.txt
@@ -30,11 +30,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions("-D__STDC_CONSTANT_MACROS")
endif(CMAKE_COMPILER_IS_GNUCXX)
-add_executable(editor ${SOURCES} ${SDL_SOURCES})
-target_link_libraries(editor da ${LIBS})
+add_executable(performous-editor ${SOURCES} ${SDL_SOURCES})
+target_link_libraries(performous-editor da ${LIBS})
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.hh" "${CMAKE_CURRENT_BINARY_DIR}/config.hh" @ONLY)
include_directories("${CMAKE_CURRENT_BINARY_DIR}")
-install(TARGETS editor DESTINATION bin)
+install(TARGETS performous-editor DESTINATION bin)
|
|
From: Yoda-JM <yo...@us...> - 2009-09-06 14:19:34
|
Module: performous
Branch: master
Commit: 4b292149663c9688f7b95605d466228c1d53674d
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun Sep 6 16:19:18 2009 +0200
Removed MacOSX error (should be tested)
---
game/guitargraph.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index c906bed..fe5ab38 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -18,7 +18,7 @@ namespace {
float time2y(float t) { return -timescale * (t - past) / (future - past); }
float time2a(float t) {
float a = clamp(1.0 - t / future); // Note: we want 1.0 alpha already at zero t.
- return std::pow(a, 0.8); // Nicer curve
+ return std::pow(a, 0.8f); // Nicer curve
}
float y2a(float y) { return time2a(past - y / timescale * (future - past)); }
const double maxTolerance = 0.15;
|
|
From: Yoda-JM <yo...@us...> - 2009-09-06 11:57:56
|
Module: performous
Branch: master
Commit: 0f4fe7a9e4145440332bd48c527514f5a7b1e437
Author: Vincent Le Ligeour <yo...@us...>
Date: Sun Sep 6 13:57:28 2009 +0200
Fixed track assignment
---
game/guitargraph.cc | 1 +
game/screen_sing.cc | 22 ++++++++++++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index f45ee92..c906bed 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -79,6 +79,7 @@ GuitarGraph::GuitarGraph(Audio& audio, Song const& song, std::string track):
else if (index == "bass") m_necks.insert(index, new Texture("bassneck.svg"));
else m_necks.insert(index, new Texture("guitarneck.svg"));
}
+ if( m_track_index.empty() ) throw std::runtime_error("Could not find track \"" + track + "\"");
for (int i = 0; i < 6; ++i) m_hit[i].setRate(5.0);
for (int i = 0; i < 5; ++i) m_holds[i] = 0;
if (m_track_map.empty()) throw std::runtime_error("No track");
diff --git a/game/screen_sing.cc b/game/screen_sing.cc
index eed1cd9..affbd58 100644
--- a/game/screen_sing.cc
+++ b/game/screen_sing.cc
@@ -36,15 +36,25 @@ void ScreenSing::enter() {
if( !m_song->track_map.empty() ) {
// Here we load alternatively guitar/bass tracks until no guitar controler is available
// then we load all the drums tracks until no drum controler is available (and place them in second position)
- std::string track = "guitar";
+ bool no_guitar = false;
+ bool no_bass = false;
while (1) {
try {
Instruments::iterator it = m_instruments.end();
- if (track == "drums" && m_instruments.size() > 1) it = m_instruments.begin() + 1; // Drums go after the first guitar
- m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, track));
- } catch (std::runtime_error&) { if (track=="drums") break; track = "drums";}
- if( track == "guitar" ) track = "bass";
- if( track == "bass" ) track = "guitar";
+ m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "guitar"));
+ } catch (std::runtime_error&) {no_guitar = true;}
+ try {
+ Instruments::iterator it = m_instruments.end();
+ m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "bass"));
+ } catch (std::runtime_error&) {no_bass = true;}
+ if( no_guitar && no_bass ) break;
+ }
+ while(1) {
+ try {
+ Instruments::iterator it = m_instruments.end();
+ if (m_instruments.size() > 1) it = m_instruments.begin() + 1; // Drums go after the first guitar
+ m_instruments.insert(it, new GuitarGraph(m_audio, *m_song, "drums"));
+ } catch (std::runtime_error&) { break; }
}
}
m_audio.playMusic(m_song->music, false, 0.0, m_instruments.empty() ? -1.0 : -8.0); // Startup delay for instruments is longer than for singing only
|
