projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a mess but stable
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_entity.c
diff --git
a/world_entity.c
b/world_entity.c
index d525572f1e7dd548b791ef50ad472bf998fd3b21..e75cb29cebfdb2c09519b33e1c212c35845ffb95 100644
(file)
--- a/
world_entity.c
+++ b/
world_entity.c
@@
-14,6
+14,7
@@
#include "ent_glider.h"
#include "ent_region.h"
#include "ent_npc.h"
#include "ent_glider.h"
#include "ent_region.h"
#include "ent_npc.h"
+#include "ent_camera.h"
#include "input.h"
#include "player_walk.h"
#include "input.h"
#include "player_walk.h"
@@
-85,17
+86,14
@@
void world_entity_clear_focus(void)
void world_entity_focus_camera( world_instance *world, u32 uid )
{
void world_entity_focus_camera( world_instance *world, u32 uid )
{
- if( mdl_entity_id_type( uid ) == k_ent_camera ){
+ if( mdl_entity_id_type( uid ) == k_ent_camera )
+ {
u32 index = mdl_entity_id_id( uid );
ent_camera *cam = mdl_arritm( &world->ent_camera, index );
u32 index = mdl_entity_id_id( uid );
ent_camera *cam = mdl_arritm( &world->ent_camera, index );
-
- v3f dir = {0.0f,-1.0f,0.0f};
- mdl_transform_vector( &cam->transform, dir, dir );
- v3_angles( dir, world_static.focus_cam.angles );
- v3_copy( cam->transform.co, world_static.focus_cam.pos );
- world_static.focus_cam.fov = cam->fov;
+ ent_camera_unpack( cam, &world_static.focus_cam );
}
}
- else {
+ else
+ {
vg_camera_copy( &localplayer.cam, &world_static.focus_cam );
/* TODO ? */
vg_camera_copy( &localplayer.cam, &world_static.focus_cam );
/* TODO ? */
@@
-148,7
+146,7
@@
void world_entity_focus_render(void)
{
world_instance *world = world_current_instance();
if( skaterift.activity != k_skaterift_ent_focus ){
{
world_instance *world = world_current_instance();
if( skaterift.activity != k_skaterift_ent_focus ){
- skateshop_render_nonfocused( world, &
skaterift
.cam );
+ skateshop_render_nonfocused( world, &
g_render
.cam );
return;
}
return;
}
@@
-767,7
+765,7
@@
void world_entity_start( world_instance *world, vg_msg *sav )
const char *alias = mdl_pstr( &world->meta, challenge->pstr_alias );
u32 result;
const char *alias = mdl_pstr( &world->meta, challenge->pstr_alias );
u32 result;
- vg_msg_getkvintg( sav, alias, k_vg_msg_u32, &result );
+ vg_msg_getkvintg( sav, alias, k_vg_msg_u32, &result
, NULL
);
if( result ){
ent_call call;
if( result ){
ent_call call;
@@
-788,11
+786,12
@@
void world_entity_start( world_instance *world, vg_msg *sav )
mdl_pstr(&world->meta,route->pstr_name) ) ){
u32 flags;
mdl_pstr(&world->meta,route->pstr_name) ) ){
u32 flags;
- vg_msg_getkvintg( &route_info, "flags", k_vg_msg_u32, &flags );
+ vg_msg_getkvintg( &route_info, "flags", k_vg_msg_u32,
+ &flags, NULL );
route->flags |= flags;
vg_msg_getkvintg( &route_info, "best_laptime", k_vg_msg_f64,
route->flags |= flags;
vg_msg_getkvintg( &route_info, "best_laptime", k_vg_msg_f64,
- &route->best_laptime );
+ &route->best_laptime
, NULL
);
f32 sections[ route->checkpoints_count ];
vg_msg_cmd cmd;
f32 sections[ route->checkpoints_count ];
vg_msg_cmd cmd;