projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better water
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 73b42a4c2bbaf45de4a41f5295bf7789f4e5e028..af0507fafc0db0f33b0a4f33e6ba0a10d6b3f9f3 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-23,10
+23,10
@@
static struct gworld
v3f tutorial;
v3f tutorial;
- teleport_gate gates[
16
];
+ teleport_gate gates[
64
];
u32 gate_count;
u32 gate_count;
- rigidbody temp_rbs[
32
];
+ rigidbody temp_rbs[
128
];
u32 rb_count;
bh_tree bhcubes;
u32 rb_count;
bh_tree bhcubes;
@@
-48,6
+48,8
@@
static void render_world( m4x4f projection, m4x3f camera )
scene_bind( &world.foliage );
scene_draw( &world.foliage );
glEnable(GL_CULL_FACE);
scene_bind( &world.foliage );
scene_draw( &world.foliage );
glEnable(GL_CULL_FACE);
+
+ vg_line_boxf( world.geo.bbx, 0xff00ff00 );
}
static void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
}
static void ray_world_get_tri( ray_hit *hit, v3f tri[3] )
@@
-90,6
+92,10
@@
static void world_load(void)
scene_copy_slice( &world.geo, &world.sm_terrain );
scene_copy_slice( &world.geo, &world.sm_terrain );
+ vg_info( "BBX: %.3f %.3f %.3f -> %.3f %.3f %.3f\n",
+ world.geo.bbx[0][0], world.geo.bbx[0][1], world.geo.bbx[0][2],
+ world.geo.bbx[1][0], world.geo.bbx[1][1], world.geo.bbx[1][2] );
+
/*
* TODO: Parametric marker import
*/
/*
* TODO: Parametric marker import
*/
@@
-139,6
+145,8
@@
static void world_load(void)
water_init();
water_set_surface( &surf, sm->pivot[1] );
water_init();
water_set_surface( &surf, sm->pivot[1] );
+ vg_info( "%.3f\n", sm->pivot[1] );
+
break;
}
}
break;
}
}
@@
-195,6
+203,7
@@
static void world_load(void)
{
v3f pos;
v3_mul( volume, (v3f){ vg_randf(), 1000.0f, vg_randf() }, pos );
{
v3f pos;
v3_mul( volume, (v3f){ vg_randf(), 1000.0f, vg_randf() }, pos );
+ pos[1] = 1000.0f;
v3_add( pos, world.geo.bbx[0], pos );
ray_hit hit;
v3_add( pos, world.geo.bbx[0], pos );
ray_hit hit;