Changeset 253Tweet

Timestamp:

Jan 21, 2011, 1:05:06 AM (12 years ago)

Author:

sam

Message:

Add preliminary support for sound samples. Implement click.

Location:

trunk

Files:

• configure.ac (modified) (4 diffs)
• monsterz/board.cpp (modified) (4 diffs)
• monsterz/monsterz.cpp (modified) (2 diffs)
• monsterz/monsterz.h (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/audio.cpp (added)
• src/audio.h (added)
• src/core.h (modified) (1 diff)
• src/sample.cpp (modified) (4 diffs)
• src/sampler.cpp (modified) (1 diff)
• win32/deushax.vcxproj (modified) (2 diffs)
• win32/monsterz.vcxproj (modified) (2 diffs)

trunk/configure.ac

@@ -49 +49 @@
 
 # Use SDL?
-ac_cv_my_have_sdl="no"
+ac_cv_my_have_sdl="yes"
 save_CPPFLAGS="${CPPFLAGS}"
 AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
@@ -56 +56 @@
 fi
 AC_CHECK_HEADERS(SDL_image.h,
- [ac_cv_my_have_sdl="yes"],
- [ac_cv_my_have_sdl="no"])
+ [:],[ac_cv_my_have_sdl="no"])
+AC_CHECK_HEADERS(SDL_mixer.h,
+ [:],[ac_cv_my_have_sdl="no"])
 CPPFLAGS="${save_CPPFLAGS}"
 if test "${ac_cv_my_have_sdl}" != "no"; then
@@ -64 +65 @@
 AM_CONDITIONAL(USE_SDL, test "${ac_cv_my_have_sdl}" = "yes")
 
-if test "${ac_cv_my_have_sdl}" = "no" -a "${ac_cv_my_have_imlib2}" = "no"; then
-  AC_MSG_ERROR([[cannot find SDL_Image or GTK+, please install one of them]])
+if test "${ac_cv_my_have_sdl}" = "no"; then
+  AC_MSG_ERROR([[One of SDL, SDL_Image or SDL_Mixer not found]])
 fi
 
@@ -89 +90 @@
 # How to use the Lol Engine inside this tree
 LOL_CFLAGS="-I \$(top_srcdir)/src `pkg-config --cflags sdl gl SDL_image`"
-LOL_LIBS="`pkg-config --libs sdl gl SDL_image`"
+LOL_LIBS="`pkg-config --libs sdl gl SDL_image` -lSDL_mixer"
 
 if test "${enable_release}" = "yes"; then

trunk/monsterz/board.cpp

@@ -33 +33 @@
     Game *game;
     int screen, board, tiles;
+    int click;
     Piece *pieces[8][8];
     Piece *grabbed;
@@ -62 +63 @@
     data->board = Tiler::Register(PNG_BOARD, 384, 384, 1.0f);
     data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
+    data->click = Sampler::Register(WAV_CLICK);
 
     for (int j = 0; j < 8; j++)
@@ -101 +103 @@
                 if (data->pieces[x / 48][y / 48]->Grab(Int2(0, 0)))
                 {
+                    Sampler::PlaySample(data->click);
                     data->grabbed = data->pieces[x / 48][y / 48];
                     data->src_cell = Int2(x / 48, y / 48);
@@ -189 +192 @@
     Tiler::Deregister(data->screen);
     Tiler::Deregister(data->tiles);
+    Sampler::Deregister(data->click);
     delete data;
 }

trunk/monsterz/monsterz.cpp

@@ -33 +33 @@
 {
     /* Initialise SDL */
-    if (SDL_Init(SDL_INIT_VIDEO) < 0)
+    if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0)
     {
         fprintf(stderr, "Cannot initialise SDL: %s\n", SDL_GetError());
@@ -54 +54 @@
     /* Initialise OpenGL */
     Video::Setup(video->w, video->h);
+    Audio::Setup(2);
 
     /* Create a game */

trunk/monsterz/monsterz.h

@@ -13 +13 @@
 static char const * const PNG_TILES = "monsterz/tiles.png";
 
+static char const * const WAV_CLICK = "monsterz/click.wav";
+

trunk/src/Makefile.am

@@ -3 +3 @@
 
 liblol_a_SOURCES = \
-    core.h matrix.h tiler.cpp tiler.h dict.cpp dict.h \
+    core.h matrix.h tiler.cpp tiler.h dict.cpp dict.h audio.cpp audio.h \
     scene.cpp scene.h font.cpp font.h layer.cpp layer.h map.cpp map.h \
     entity.cpp entity.h ticker.cpp ticker.h tileset.cpp tileset.h \

trunk/src/core.h

@@ -23 +23 @@
 // Static classes
 #include "video.h"
+#include "audio.h"
 #include "scene.h"
 #include "input.h"

trunk/src/sample.cpp

@@ -16 +16 @@
 #include <cmath>
 
-#include <SDL.h>
+#include <SDL_mixer.h>
 
 #include "core.h"
@@ -30 +30 @@
 private:
     char *name;
+    Mix_Chunk *chunk;
 };
 
@@ -40 +41 @@
     data = new SampleData();
     data->name = strdup(path);
+    data->chunk = Mix_LoadWAV(path);
 }
 
 Sample::~Sample()
 {
+    Mix_FreeChunk(data->chunk);
     free(data->name);
     delete data;
@@ -60 +63 @@
 void Sample::Play()
 {
+    Mix_PlayChannel(-1, data->chunk, 0);
 }
 

trunk/src/sampler.cpp

@@ -54 +54 @@
 void Sampler::PlaySample(int id)
 {
-    Sample *sample = (Sample *)data->samples.GetEntity(id);
+    Sample *sample = (Sample *)data->samples.GetEntity(id - 1);
     sample->Play();
 }

trunk/win32/deushax.vcxproj

@@ -14 +14 @@
     <ClInclude Include="..\deushax\debugsprite.h" />
     <ClInclude Include="..\deushax\game.h" />
+    <ClInclude Include="..\src\audio.h" />
     <ClInclude Include="..\src\bitfield.h" />
     <ClInclude Include="..\src\core.h" />
@@ -44 +45 @@
     <ClCompile Include="..\deushax\deushax.cpp" />
     <ClCompile Include="..\deushax\game.cpp" />
+    <ClCompile Include="..\src\audio.cpp" />
     <ClCompile Include="..\src\debugfps.cpp" />
     <ClCompile Include="..\src\debugrecord.cpp" />

trunk/win32/monsterz.vcxproj

@@ -15 +15 @@
     <ClInclude Include="..\monsterz\game.h" />
     <ClInclude Include="..\monsterz\piece.h" />
+    <ClInclude Include="..\src\audio.h" />
     <ClInclude Include="..\src\bitfield.h" />
     <ClInclude Include="..\src\core.h" />
@@ -46 +47 @@
     <ClCompile Include="..\monsterz\monsterz.cpp" />
     <ClCompile Include="..\monsterz\piece.cpp" />
+    <ClCompile Include="..\src\audio.cpp" />
     <ClCompile Include="..\src\debugfps.cpp" />
     <ClCompile Include="..\src\debugrecord.cpp" />