Commit Graph

120 Commits (89b495c6671f7651d20085d482f9dc8c335ebe7b)

Author SHA1 Message Date
Didier 'OdyX' Raboud 591ba30a00 Include the OpenAL headers using the "al.h" form, as recommended by its CMake finder script 2013-10-24 21:12:52 +02:00
Piotr Dziwinski 12313fecf5 Fixed some memory issues
* invalid pointer, uninitialized buffer
2013-05-27 20:59:50 +02:00
Piotr Dziwinski 950a3474d5 Refactored sound code
* fixed formatting and naming to be uniform with rest of code
 * moved default implementation of CSound to cpp module
2013-05-27 10:19:16 +02:00
Piotr Dziwinski 8765d58b02 Fixed code formatting
* moved braces to new lines
 * fixed some function/variable names
 * fixed whitespace issues
2013-05-27 10:19:16 +02:00
erihel 3c442d17dc Fix for issue #202 with 3D sound disabled 2013-05-03 21:12:39 +02:00
krzys-h 166a6b4403 Improved music cache 2013-05-02 16:37:11 +02:00
krzys-h c1db140ad3 Updated Main Mnu music
For now only code - we need to wait for PiXeL to give us new music :)
2013-05-02 10:44:07 +02:00
krzys-h 9e1870f6bd Removed some warnings
+ fix for previous commit
2013-05-01 13:19:10 +02:00
krzys-h 293376b82d Removed sound081.wav
It wasn't used in Colobot and caused errors because we removed it from data package.
2013-05-01 12:47:06 +02:00
krzys-h f419293207 Minor refactoring 2013-05-01 12:12:32 +02:00
krzys-h c2932f4ee3 Added new Intro music (by PiXeL) 2013-04-29 15:33:28 +02:00
erihel 88478990b9 * Fix a problem with CleanUp function trying to clean up music cache twice 2013-04-26 14:15:11 +02:00
krzys-h 90c691ab0f Small fix to music cache 2013-04-20 09:33:54 +02:00
krzys-h cdba398d29 Added music files cache 2013-04-13 16:34:52 +02:00
krzys-h ebffda717b Implemented AudioChange (partially)
There is some issues due to #173
Issue #172
2013-04-13 11:44:16 +02:00
erihel 8a0383c9f0 * More work on sound 2013-04-12 01:46:30 +02:00
erihel 82fdc2ba23 * Fixed problem with 2D sound mode 2013-04-11 23:16:32 +02:00
erihel 99d386b61a * Fixed problem with MuteAll and some sounds not playing after muting other sounds (like game menu sound) 2013-04-09 13:20:31 +02:00
erihel 846e7b6578 * Adjusted pan computing function from original game (2D sound should work correctly)
* Set max sound distance to 110.0f to match original colobot (for issue #123)
2013-04-08 01:42:12 +02:00
erihel 7513bc5864 * Set distance model to fix issue #123 2013-04-07 16:26:15 +02:00
erihel f4b1cabbde * Sound are too quiet in 3D mode, for now added support for 2D sound option in menu. In 2D mode sounds are normal (Issue #123) 2013-04-07 13:35:39 +02:00
erihel b7b5f002a6 * Removed warning while compiling brain.cpp
* Fix for issue #130
* Fix for issue #128 with wrong sound pitch
2013-03-30 16:03:25 +01:00
erihel 9f5bef030d * Adjusted sound volume to game settings
* Added fabs to remove logs about pitch having negative values
2013-03-14 23:03:03 +01:00
Piotr Dziwinski b361d27d33 Removed unnecessary print 2013-02-28 20:29:16 +01:00
erihel 3a594dc3a8 * Changed AdjustFrequency formula
* Changed SetVolume to match orginal game formula
2013-02-24 18:04:38 +01:00
Piotr Dziwiński 001d37b257 CInstanceManager refactoring
* removed classes managed by CInstanceManager
   except for CObject, CPyro, CBrain and CPhysics
   because of dependencies
 * refactored instance searching to use existing singleton instances of
   CApplication, CEngine and CRobotMain and calling their getter
   functions
2013-02-17 12:11:56 +01:00
erihel 9f75a29e88 * Fixed sound pitch causing segfault
* Sound support should now compile fine with MXE
* Added cache for 3 music files to speedup loading
* Updated howto
2013-01-16 01:45:38 +01:00
erihel 58f35e44ae * Removed alut
* Using libsndfile to load sounds and music
* Added support for playing music files
2013-01-14 22:55:16 +01:00
erihel 983373f150 * Fixed pitch calculation (sound in cut scenes will work as well as robot tracks sound)
* Fixed applying effects to sounds
* Changed volume to range 0.0-1.0 except for values in UI
2013-01-09 23:19:10 +01:00
erihel fff9d235e4 * Fixed problem with freeing buffers while conneted to a source resulting with "Unable to unload buffer message"
* Fixed posible segfault while trying to play sound after not loading file properly
2013-01-04 21:44:16 +01:00
erihel c9ca8f2b62 * Fixed segault when could not set sound pitch (bad logger call)
* All 81 audio files should be loaded instead of 69 high quality
* Changed volume ajustment formula to proper one
2012-12-28 21:19:50 +01:00
erihel c793d2d4c6 * Changed Ret to Get methods in sound module
* Added video settings to profile
* Resolution change is now posibble but restart is required
2012-12-25 21:36:50 +01:00
erihel 1fa5f7a96f * Changed log level in sound module
* Fixed warnings in sound module
* Fixed problem with map loading when locale with different number separator
2012-12-25 17:46:48 +01:00
erihel f0e76ad446 sound fix 2012-12-20 21:57:57 +01:00
erihel a6ff654ae3 removing plugins for gold version (for mxe cross compiling) 2012-12-20 20:59:11 +01:00
Didier Raboud 7e9ef0c042 Put common CXX flags in common variables
CMAKE_CXX_FLAGS is taken into account in all builds; build-type-specific
flags are appended to it.
2012-12-19 16:55:00 +01:00
Didier Raboud 3c976c040b Don't enforce CMake build type on users.
Only set CMAKE_BUILD_TYPE to Debug when no value is provided.
2012-12-19 16:52:17 +01:00
Piotr Dziwinski 72ce040054 Merge branch 'master' into dev 2012-12-15 20:23:58 +01:00
Didier Raboud 9b127fc0a3 Add FindLTDL cmake module
As mentionned in FindLTDL.cmake, this is code that is hereby relicensed
under GPLv3.

closes #68
2012-12-14 15:50:11 +01:00
Piotr Dziwinski f6e27099b2 Doxygen/comment fixes and some #include refactoring 2012-10-17 21:55:45 +02:00
Piotr Dziwinski e9660c47c6 Merge branch 'dev' into dev-graphics 2012-09-29 12:19:00 +02:00
Piotr Dziwinski a394c9efec Updated docs and some Doxygen fixes 2012-09-27 20:43:20 +02:00
Zaba999 cc9a507054 Profile rewritten to boost. Read/write to ini should work.
Load/Save should work.
2012-09-27 00:30:47 +02:00
Zaba999 f6638a173e Work in progress on opening files, and listing dirs
Fixed includes
profile changed from SimpleIni to boost::ptree -> not finished yet
2012-09-26 22:57:43 +02:00
erihel 15ff1d512b * Fixed audio problems
* Added colobot.ini to CApp in Create function
* Fixes to plugin manager
* Fixed CProfile segfault
2012-09-22 00:11:16 +02:00
Piotr Dziwinski e896b83bcf Whitespace fix 2012-09-20 20:38:14 +02:00
Piotr Dziwinski af9af56bb0 Successful compilation & running
- temporarily mocked CSoundInterface and CPluginInterface
- added CRobotMain to application
- successfully compiles & runs, but doesn't display correctly at the
  moment
2012-09-15 22:19:32 +02:00
Piotr Dziwinski 8ad15c0ef7 CMainDialog rewrite
- rewritten CMainDialog and updated CRobotMain
2012-09-15 21:47:19 +02:00
erihel 62b545128f * Final changes to plugin interface
* Added doxygen comments to plugin manager and plugin loader
2012-08-12 18:37:11 +02:00
erihel f01296690e Merge branch 'dev-opengl' into dev 2012-08-12 17:09:11 +02:00
erihel 5e271e550d * New CPluginManager class for managing plugins based on colobot.ini
* Moved sound plugin into sound dir
* Minor changes in logger and profile
2012-08-12 15:00:37 +02:00
Piotr Dziwinski 1996507fd3 Documentation update
- updated Doxyfile
- added/changed file, dir and namespace descriptions
- fixed some errors in doxygen tags
2012-08-11 18:39:16 +02:00
erihel f1d1cdceee Changes after merge 2012-08-09 21:21:14 +02:00
erihel 611680a72e Merge branch 'dev' of https://github.com/adiblol/colobot into dev
Conflicts:
	src/sound/sound.h
2012-08-09 20:20:47 +02:00
Piotr Dziwinski 851300d61d Whitespace fix 2012-07-27 18:44:43 +02:00
Piotr Dziwinski ab8e55a651 Merge branch 'dev' into dev-opengl
Pulled changes & resolved conflicts
2012-07-27 18:09:50 +02:00
Piotr Dziwinski 6b846aa629 Compile fixes
Fixed some compiling issues
2012-07-26 00:18:02 +02:00
erihel d56db5f4e4 * Chaned plugin interface
* Added plugin class for plugin loading
* Added plugin loading test
2012-07-19 19:19:21 +02:00
Piotr Dziwinski af3057df7e Merged changes from dev
Resolved conflicts & added fixes.
2012-07-04 19:56:22 +02:00
Piotr Dziwinski 092e4ae75e Enabled logging & minor fixes
- added logger to main()
- removed reference to Snd namespace and renamed back to sound.h
- fixed minor issues
2012-07-04 19:20:22 +02:00
erihel 4a839d8734 * Added CLogger class for loggin info to console or file
* Added CSoundInterface
* Added basic plugin interface
2012-07-04 18:04:34 +02:00
Piotr Dziwinski ebed57aa22 Whitespace and language change
- changed tabs to spaces and DOS line endings to Unix
  (except in CBot and metafile)
- changed language to English
- fixed #include <d3d.h> in d3dengine.h
2012-06-26 22:23:05 +02:00
Piotr Dziwinski b08a63790c SDL project
- added (very basic) SDL template in CApplication and CEngine
- split project into two targets: colobot_old (dependent on DirectX and WinAPI)
  and colobot_new (dependent on SDL and OpenGL)
- moved sound.h/cpp to old/ and created new template in Snd namespace
- added platform-independent dialog boxes in app/system.h/cpp
2012-06-25 19:59:17 +02:00
Piotr Dziwinski 8bb223e679 Templates for new implementation
- added template of classes/structs for new implementation
- changed #include paths
- updated README files
2012-06-22 16:31:55 +02:00
Piotr Dziwinski 9f784e81f8 Switched to new implementation of the rest of math module
- changed structs from D3DVECTOR to Math::Vector
  and from D3DMATRIX to Math::Matrix
- changed functions to new Math namespace functions
- moved mainmovie module from graphics to object
- added Get and Set to Math::Matrix
2012-06-19 20:11:47 +02:00
Piotr Dziwinski b735913deb FPOINT -> Math::Point & other math functions
- changed FPOINT to Math::Point and some functions
  from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
2012-06-13 22:48:35 +02:00
Piotr Dziwinski a8665d2042 Changed #defined constants to consts; typedef struct -> struct 2012-06-11 17:28:27 +02:00
Piotr Dziwinski 697fbdabf1 BOOL -> bool; additional fixes in constructors/destructors 2012-06-10 15:28:12 +02:00
Piotr Dziwinski 680af17819 Fixed include paths and CMakeLists.txt
Additionally, changed #ifndef to #pragma once everywhere
2012-06-10 00:18:08 +02:00
Piotr Dziwinski 449cc186d5 Source files split into modules 2012-04-28 17:53:17 +02:00