projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
deactivate challenge on max dist
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift.c
diff --git
a/skaterift.c
b/skaterift.c
index 3188fd9adee822628b7291a4d84788a5db364f39..9b90548c3f64a28f4e62949ce5c83f77b7d240cd 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-13,7
+13,7
@@
#if 1
#if 1
-#define SR_NETWORKED
+
//
#define SR_NETWORKED
#ifndef VG_RELEASE
#define VG_DEVWINDOW
#ifndef VG_RELEASE
#define VG_DEVWINDOW
@@
-143,15
+143,17
@@
static void skaterift_restore_state(void){
};
skaterift_world_load_thread( &args );
};
skaterift_world_load_thread( &args );
- world_s
tatic.active_instance = vg_msg_seekkvu32( &world, "index", 0
);
+ world_s
et_active_instance( vg_msg_seekkvu32( &world, "index", 0 )
);
world_static.active_trigger_volume_count = 0;
localplayer.viewable_world = world_current_instance();
world_static.active_trigger_volume_count = 0;
localplayer.viewable_world = world_current_instance();
+ }
+
+ vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
+ v3f pos;
+ vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
- vg_msg_cmd position = vg_msg_seekkv( &world, "position", 0 );
- v3f pos;
- vg_msg_convert_num( &position, k_vg_msg_float|k_vg_msg_32b, 3, pos );
+ if( v3_length2(pos) > 1.0f )
player__setpos( &localplayer, pos );
player__setpos( &localplayer, pos );
- }
}
}
}
}
@@
-297,7
+299,7
@@
VG_STATIC void vg_pre_update(void){
vg.time_rate = vg_smoothstepf( skaterift.time_rate );
player__pre_update( &localplayer );
vg.time_rate = vg_smoothstepf( skaterift.time_rate );
player__pre_update( &localplayer );
-
global_skateshop
_preupdate();
+
world_entity_focus
_preupdate();
skaterift_replay_pre_update();
world_update( world_current_instance(), localplayer.rb.co );
skaterift_replay_pre_update();
world_update( world_current_instance(), localplayer.rb.co );
@@
-467,8
+469,8
@@
VG_STATIC void render_scene_gate_subview(void){
}
VG_STATIC void skaterift_composite_maincamera(void){
}
VG_STATIC void skaterift_composite_maincamera(void){
- camera_lerp( &localplayer.cam, &
global_skateshop.cam,
- vg_smoothstepf(
global_skateshop.factive
), &skaterift.cam );
+ camera_lerp( &localplayer.cam, &
world_static.focus_cam,
+ vg_smoothstepf(
world_static.focus_strength
), &skaterift.cam );
if( skaterift.activity == k_skaterift_replay ){
skaterift_get_replay_camera( &skaterift.cam );
if( skaterift.activity == k_skaterift_replay ){
skaterift_get_replay_camera( &skaterift.cam );