projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more sensible world loading stuff (wip)
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_render.c
diff --git
a/world_render.c
b/world_render.c
index d59d4e1b163eb1241d280061c958b669b386e384..ba093b92d75bac2c40172d45b363ef4833624d48 100644
(file)
--- a/
world_render.c
+++ b/
world_render.c
@@
-23,7
+23,7
@@
VG_STATIC void async_world_render_init( void *payload, u32 size )
{
vg_info( "Allocate uniform buffers\n" );
for( int i=0; i<4; i++ ){
{
vg_info( "Allocate uniform buffers\n" );
for( int i=0; i<4; i++ ){
- world_instance *world = &world_static.
world
s[i];
+ world_instance *world = &world_static.
instance
s[i];
world->ubo_bind_point = i;
glGenBuffers( 1, &world->ubo_lighting );
world->ubo_bind_point = i;
glGenBuffers( 1, &world->ubo_lighting );
@@
-37,7
+37,7
@@
VG_STATIC void async_world_render_init( void *payload, u32 size )
vg_info( "Allocate frame buffers\n" );
for( int i=0; i<4; i++ ){
vg_info( "Allocate frame buffers\n" );
for( int i=0; i<4; i++ ){
- world_instance *world = &world_static.
world
s[i];
+ world_instance *world = &world_static.
instance
s[i];
struct framebuffer *fb = &world->heightmap;
fb->display_name = NULL;
struct framebuffer *fb = &world->heightmap;
fb->display_name = NULL;
@@
-538,12
+538,12
@@
VG_STATIC void render_world_gates( world_instance *world, camera *cam,
if( gate->flags & k_ent_gate_locked ) return;
if( gate->flags & k_ent_gate_nonlocal ){
if( gate->flags & k_ent_gate_locked ) return;
if( gate->flags & k_ent_gate_nonlocal ){
- if( world_
loader.
state != k_world_loader_none ){
+ if( world_
static.load_
state != k_world_loader_none ){
world->rendering_gate = NULL;
return;
}
world->rendering_gate = NULL;
return;
}
- world_instance *dest_world = &world_static.
world
s[ gate->target ];
+ world_instance *dest_world = &world_static.
instance
s[ gate->target ];
render_gate( world, dest_world, gate, cam, layer_depth );
}
else{
render_gate( world, dest_world, gate, cam, layer_depth );
}
else{