projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
respawn UI
[carveJwlIkooP6JGAAIwe30JlM.git]
/
gui.h
diff --git
a/gui.h
b/gui.h
index 5684e4c925860bed643eba6dc661aebdef40130e..8013cb014da3e099f0e8d674a9ea5a2505cba09c 100644
(file)
--- a/
gui.h
+++ b/
gui.h
@@
-90,7
+90,7
@@
void gui_draw(void)
camera_finalize( &ortho );
gui.factive = vg_lerpf( gui.factive, gui.helper_count?1.0f:0.0f,
camera_finalize( &ortho );
gui.factive = vg_lerpf( gui.factive, gui.helper_count?1.0f:0.0f,
- vg.time_delta*2.0f );
+ vg.time_
frame_
delta*2.0f );
if( gui.factive > 0.01f ){
/* draw bottom bar */
if( gui.factive > 0.01f ){
/* draw bottom bar */
@@
-104,7
+104,7
@@
void gui_draw(void)
render_fsquad1();
}
render_fsquad1();
}
- f64 loc_t = (vg.time - gui.location_time) / 5.0;
+ f64 loc_t = (vg.time
_real
- gui.location_time) / 5.0;
if( (loc_t < 1.0) && (gui.location_time != 0.0) ){
/* yep this code is a mess, i dont care anymore */
glEnable(GL_BLEND);
if( (loc_t < 1.0) && (gui.location_time != 0.0) ){
/* yep this code is a mess, i dont care anymore */
glEnable(GL_BLEND);
@@
-192,7
+192,7
@@
int gui_location_print_ccmd( int argc, const char *argv[] ){
}
if( !strcmp(gui.location,new_loc) ) return 0;
vg_strncpy( new_loc, gui.location, 64, k_strncpy_always_add_null );
}
if( !strcmp(gui.location,new_loc) ) return 0;
vg_strncpy( new_loc, gui.location, 64, k_strncpy_always_add_null );
- gui.location_time = vg.time;
+ gui.location_time = vg.time
_real
;
}
return 0;
}
}
return 0;
}