projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
turbo chaos
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_audio.c
diff --git
a/world_audio.c
b/world_audio.c
index ee1aeca7d7587db621b3d829fca5543bcbbb2ce9..1e902fad724f3581941a999b25d35dc159cb376e 100644
(file)
--- a/
world_audio.c
+++ b/
world_audio.c
@@
-6,14
+6,14
@@
/* finds any active playing in world and fades them out, we can only do this
* while unloading */
/* finds any active playing in world and fades them out, we can only do this
* while unloading */
-
VG_STATIC
void world_fadeout_audio( world_instance *world )
+
static
void world_fadeout_audio( world_instance *world )
{
if( world->status != k_world_status_unloading ){
vg_fatal_error( "World status must be set to 'unloading', to fadeout"
" audio.\n" );
}
{
if( world->status != k_world_status_unloading ){
vg_fatal_error( "World status must be set to 'unloading', to fadeout"
" audio.\n" );
}
- u8 world_id = (world - world_static.
world
s) + 1;
+ u8 world_id = (world - world_static.
instance
s) + 1;
audio_lock();
for( u32 i=0; i<AUDIO_CHANNELS; i++ ){
audio_lock();
for( u32 i=0; i<AUDIO_CHANNELS; i++ ){
@@
-29,7
+29,7
@@
VG_STATIC void world_fadeout_audio( world_instance *world )
/*
* Trace out a random point, near the player to try and determine water areas
*/
/*
* Trace out a random point, near the player to try and determine water areas
*/
-VG_STATIC
+static
enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output)
{
v3f chance = { (vg_randf64()-0.5f) * 30.0f,
enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output)
{
v3f chance = { (vg_randf64()-0.5f) * 30.0f,
@@
-44,7
+44,8
@@
enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output)
world_instance *world = world_current_instance();
world_instance *world = world_current_instance();
- if( ray_world( world, pos, (v3f){0.0f,-1.0f,0.0f}, &contact ) ){
+ if( ray_world( world, pos, (v3f){0.0f,-1.0f,0.0f}, &contact,
+ k_material_flag_ghosts ) ){
struct world_surface *mat = ray_hit_surface( world, &contact );
if( mat->info.surface_prop == k_surface_prop_grass){
struct world_surface *mat = ray_hit_surface( world, &contact );
if( mat->info.surface_prop == k_surface_prop_grass){
@@
-68,7
+69,7
@@
enum audio_sprite_type world_audio_sample_sprite_random(v3f origin, v3f output)
return k_audio_sprite_type_none;
}
return k_audio_sprite_type_none;
}
-
VG_STATIC
void world_audio_sample_distances( v3f co, int *index, float *value )
+
static
void world_audio_sample_distances( v3f co, int *index, float *value )
{
float inr3 = 0.57735027,
inr2 = 0.70710678118;
{
float inr3 = 0.57735027,
inr2 = 0.70710678118;
@@
-104,7
+105,8
@@
VG_STATIC void world_audio_sample_distances( v3f co, int *index, float *value )
float dist = 200.0f;
for( int i=0; i<10; i++ ){
float dist = 200.0f;
for( int i=0; i<10; i++ ){
- if( ray_world( world_current_instance(), rc, rd, &ray ) ){
+ if( ray_world( world_current_instance(), rc, rd, &ray,
+ k_material_flag_ghosts ) ){
dist = (float)i*5.0f + ray.dist;
break;
}
dist = (float)i*5.0f + ray.dist;
break;
}
@@
-127,7
+129,7
@@
VG_STATIC void world_audio_sample_distances( v3f co, int *index, float *value )
v3f p1;
v3_muladds( ro, sample_directions[i], distances[i], p1 );
vg_line( ro, p1, colour );
v3f p1;
v3_muladds( ro, sample_directions[i], distances[i], p1 );
vg_line( ro, p1, colour );
- vg_line_p
t3
( p1, 0.1f, colour );
+ vg_line_p
oint
( p1, 0.1f, colour );
}
}
}
}
}
}