steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update game.worlds and gpu.demo.raytrace for audio.engine changes

db4
Joe Groff 2010-01-20 11:44:18 -08:00
parent 92409fd3b6
commit 87c09af8f3
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extra/game/worlds/worlds-docs.factor
View File

@ -11,8 +11,6 @@ HELP: game-attributes
{ { $snippet "use-audio-engine?" } " specifies whether the game world should manage an " { $link audio-engine } " instance. False by default." } { { $snippet "use-audio-engine?" } " specifies whether the game world should manage an " { $link audio-engine } " instance. False by default." }
{ { $snippet "audio-engine-device" } " specifies the string name of the OpenAL device the audio engine, if any, should try to open. The default value of " { $link POSTPONE: f } " attempts to open the default OpenAL device." } { { $snippet "audio-engine-device" } " specifies the string name of the OpenAL device the audio engine, if any, should try to open. The default value of " { $link POSTPONE: f } " attempts to open the default OpenAL device." }
{ { $snippet "audio-engine-voice-count" } " determines the number of independent voices the audio engine will make available. This determines how many individual audio clips can play simultaneously. This cannot exceed the OpenAL implementation's limit on supported voices." } { { $snippet "audio-engine-voice-count" } " determines the number of independent voices the audio engine will make available. This determines how many individual audio clips can play simultaneously. This cannot exceed the OpenAL implementation's limit on supported voices." }
{ { $snippet "audio-engine-buffer-size" } " determines the size in bytes of the audio buffers the audio engine will stream to the sound card." }
{ { $snippet "audio-engine-buffer-count" } " determines the number of buffers the audio engine will allocate per audio clip played." }
} ; } ;
HELP: game-world HELP: game-world

10
extra/game/worlds/worlds.factor
View File

@ -12,8 +12,6 @@ TUPLE: game-world < world
{ use-audio-engine? boolean } { use-audio-engine? boolean }
{ audio-engine-device initial: f } { audio-engine-device initial: f }
{ audio-engine-voice-count initial: 16 } { audio-engine-voice-count initial: 16 }
{ audio-engine-buffer-size initial: 8192 }
{ audio-engine-buffer-count initial: 2 }
{ tick-slice float initial: 0.0 } ; { tick-slice float initial: 0.0 } ;
GENERIC: begin-game-world ( world -- ) GENERIC: begin-game-world ( world -- )
@ -38,8 +36,6 @@ M: game-world draw*
{ {
[ audio-engine-device>> ] [ audio-engine-device>> ]
[ audio-engine-voice-count>> ] [ audio-engine-voice-count>> ]
[ audio-engine-buffer-size>> ]
[ audio-engine-buffer-count>> ]
} cleave <audio-engine> } cleave <audio-engine>
[ start-audio* ] keep ; inline [ start-audio* ] keep ; inline
@ -63,9 +59,7 @@ TUPLE: game-attributes < world-attributes
{ use-game-input? boolean initial: f } { use-game-input? boolean initial: f }
{ use-audio-engine? boolean initial: f } { use-audio-engine? boolean initial: f }
{ audio-engine-device initial: f } { audio-engine-device initial: f }
{ audio-engine-voice-count initial: 16 } { audio-engine-voice-count initial: 16 } ;
{ audio-engine-buffer-size initial: 8192 }
{ audio-engine-buffer-count initial: 2 } ;
M: game-world apply-world-attributes M: game-world apply-world-attributes
{ {
@ -74,8 +68,6 @@ M: game-world apply-world-attributes
[ use-audio-engine?>> >>use-audio-engine? ] [ use-audio-engine?>> >>use-audio-engine? ]
[ audio-engine-device>> >>audio-engine-device ] [ audio-engine-device>> >>audio-engine-device ]
[ audio-engine-voice-count>> >>audio-engine-voice-count ] [ audio-engine-voice-count>> >>audio-engine-voice-count ]
[ audio-engine-buffer-size>> >>audio-engine-buffer-size ]
[ audio-engine-buffer-count>> >>audio-engine-buffer-count ]
[ call-next-method ] [ call-next-method ]
} cleave ; } cleave ;

9
extra/gpu/demos/raytrace/raytrace.factor
View File

@ -79,13 +79,13 @@ CONSTANT: initial-spheres {
audio-engine world >>listener update-audio audio-engine world >>listener update-audio
audio-engine "vocab:gpu/demos/raytrace/mirror-ball.aiff" read-audio audio-engine "vocab:gpu/demos/raytrace/mirror-ball.aiff" read-audio
spheres first t (audio-clip) spheres first t <static-audio-clip>
audio-engine "vocab:gpu/demos/raytrace/red-ball.aiff" read-audio audio-engine "vocab:gpu/demos/raytrace/red-ball.aiff" read-audio
spheres second t (audio-clip) spheres second t <static-audio-clip>
audio-engine "vocab:gpu/demos/raytrace/green-ball.aiff" read-audio audio-engine "vocab:gpu/demos/raytrace/green-ball.aiff" read-audio
spheres third t (audio-clip) spheres third t <static-audio-clip>
audio-engine "vocab:gpu/demos/raytrace/yellow-ball.aiff" read-audio audio-engine "vocab:gpu/demos/raytrace/yellow-ball.aiff" read-audio
spheres fourth t (audio-clip) spheres fourth t <static-audio-clip>
4array play-clips ; 4array play-clips ;
@ -124,7 +124,6 @@ GAME: raytrace-game {
{ grab-input? t } { grab-input? t }
{ use-game-input? t } { use-game-input? t }
{ use-audio-engine? t } { use-audio-engine? t }
{ audio-engine-buffer-count 4 }
{ pref-dim { 1024 768 } } { pref-dim { 1024 768 } }
{ tick-interval-micros $[ 60 fps ] } { tick-interval-micros $[ 60 fps ] }
} ; } ;