projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revision 2
[carveJwlIkooP6JGAAIwe30JlM.git]
/
ent_miniworld.c
diff --git
a/ent_miniworld.c
b/ent_miniworld.c
index 46def88bf700f90eeacef359585da43d8762997d..4f22df8d7bc30065c79874c5657ad6de213ca626 100644
(file)
--- a/
ent_miniworld.c
+++ b/
ent_miniworld.c
@@
-5,7
+5,10
@@
#include "gui.h"
#include "menu.h"
#include "gui.h"
#include "menu.h"
-static void ent_miniworld_call( world_instance *world, ent_call *call ){
+struct global_miniworld global_miniworld;
+
+void ent_miniworld_call( world_instance *world, ent_call *call )
+{
ent_miniworld *miniworld = mdl_arritm( &world->ent_miniworld,
mdl_entity_id_id(call->id) );
ent_miniworld *miniworld = mdl_arritm( &world->ent_miniworld,
mdl_entity_id_id(call->id) );
@@
-36,7
+39,9
@@
static void ent_miniworld_call( world_instance *world, ent_call *call ){
}
}
}
}
-static void miniworld_icon( camera *cam, enum gui_icon icon, v3f pos, f32 size){
+static void miniworld_icon( vg_camera *cam, enum gui_icon icon,
+ v3f pos, f32 size)
+{
m4x3f mmdl;
v3_copy( cam->transform[2], mmdl[2] );
mmdl[2][1] = 0.0f;
m4x3f mmdl;
v3_copy( cam->transform[2], mmdl[2] );
mmdl[2][1] = 0.0f;
@@
-58,7
+63,8
@@
static void miniworld_icon( camera *cam, enum gui_icon icon, v3f pos, f32 size){
mdl_draw_submesh( sm );
}
mdl_draw_submesh( sm );
}
-static void ent_miniworld_render( world_instance *host_world, camera *cam ){
+void ent_miniworld_render( world_instance *host_world, vg_camera *cam )
+{
if( host_world != &world_static.instances[k_world_purpose_hub] )
return;
if( host_world != &world_static.instances[k_world_purpose_hub] )
return;
@@
-138,7
+144,8
@@
static void ent_miniworld_render( world_instance *host_world, camera *cam ){
}
}
}
}
-static void ent_miniworld_preupdate(void){
+void ent_miniworld_preupdate(void)
+{
world_instance *hub = world_current_instance(),
*dest = &world_static.instances[k_world_purpose_client];
world_instance *hub = world_current_instance(),
*dest = &world_static.instances[k_world_purpose_client];
@@
-177,7
+184,8
@@
static void ent_miniworld_preupdate(void){
}
}
}
}
-static void ent_miniworld_goback(void){
+void ent_miniworld_goback(void)
+{
audio_lock();
audio_oneshot( &audio_ui[2], 1.0f, 0.0f );
audio_unlock();
audio_lock();
audio_oneshot( &audio_ui[2], 1.0f, 0.0f );
audio_unlock();
@@
-186,6
+194,6
@@
static void ent_miniworld_goback(void){
global_miniworld.t = 1.0f;
global_miniworld.cam = skaterift.cam;
global_miniworld.t = 1.0f;
global_miniworld.cam = skaterift.cam;
- m4x3_transform_camera( global_miniworld.mmdl, &global_miniworld.cam );
+
vg_
m4x3_transform_camera( global_miniworld.mmdl, &global_miniworld.cam );
world_switch_instance(0);
}
world_switch_instance(0);
}