projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
some niceer ui stuff
[carveJwlIkooP6JGAAIwe30JlM.git]
/
skaterift.c
diff --git
a/skaterift.c
b/skaterift.c
index a575fc5486ca422850f9d77f7a1239454e2436cc..b18ede47466dd8116e1e567524746f23af763823 100644
(file)
--- a/
skaterift.c
+++ b/
skaterift.c
@@
-14,7
+14,10
@@
#if 1
#define SR_NETWORKED
#if 1
#define SR_NETWORKED
-//#define VG_DEVWINDOW
+
+#ifndef VG_RELEASE
+ #define VG_DEVWINDOW
+#endif
/*
* system headers
/*
* system headers
@@
-454,7
+457,7
@@
VG_STATIC void skaterift_composite_maincamera(void){
vg_smoothstepf(global_skateshop.factive), &skaterift.cam );
if( skaterift.activity == k_skaterift_replay ){
vg_smoothstepf(global_skateshop.factive), &skaterift.cam );
if( skaterift.activity == k_skaterift_replay ){
-
replay_get_camera( &skaterift.replay,
&skaterift.cam );
+
skaterift_get_replay_camera(
&skaterift.cam );
}
skaterift.cam.nearz = 0.1f;
}
skaterift.cam.nearz = 0.1f;
@@
-477,12
+480,13
@@
VG_STATIC void skaterift_composite_maincamera(void){
}
VG_STATIC void render_main_game(void){
}
VG_STATIC void render_main_game(void){
- player__animate( &localplayer );
if( skaterift.activity == k_skaterift_replay ){
player__animate_from_replay( &localplayer, &skaterift.replay );
}
if( skaterift.activity == k_skaterift_replay ){
player__animate_from_replay( &localplayer, &skaterift.replay );
}
- else
+ else{
+ player__animate( &localplayer );
skaterift_record_frame( &skaterift.replay, 0 );
skaterift_record_frame( &skaterift.replay, 0 );
+ }
player__pre_render( &localplayer );
skaterift_composite_maincamera();
player__pre_render( &localplayer );
skaterift_composite_maincamera();
@@
-505,8
+509,6
@@
VG_STATIC void render_main_game(void){
it up with the oblique rendering inside the
portals */
it up with the oblique rendering inside the
portals */
- world_render_challenges( localplayer.viewable_world );
-
/* continue with variable rate */
render_scene_gate_subview();
/* continue with variable rate */
render_scene_gate_subview();