projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
framebuffer formalitites
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index d3072785671a37955b62bcd75e10c1f13e0a5022..240e8dc1a44c77ec2b9be778e25e9d96ec688ccf 100644
(file)
--- a/
world.h
+++ b/
world.h
@@
-21,11
+21,10
@@
VG_STATIC int ray_world( v3f pos, v3f dir, ray_hit *hit );
#include "shaders/terrain.h"
#include "shaders/sky.h"
#include "shaders/terrain.h"
#include "shaders/sky.h"
-#include "shaders/planeinf.h"
#include "shaders/standard.h"
#include "shaders/vblend.h"
#include "shaders/gpos.h"
#include "shaders/standard.h"
#include "shaders/vblend.h"
#include "shaders/gpos.h"
-#include "shaders/
fs
colour.h"
+#include "shaders/
blit
colour.h"
#include "shaders/alphatest.h"
typedef struct teleport_gate teleport_gate;
#include "shaders/alphatest.h"
typedef struct teleport_gate teleport_gate;
@@
-426,9
+425,8
@@
VG_STATIC void world_init(void)
shader_terrain_register();
shader_sky_register();
shader_terrain_register();
shader_sky_register();
- shader_planeinf_register();
shader_gpos_register();
shader_gpos_register();
- shader_
fs
colour_register();
+ shader_
blit
colour_register();
shader_alphatest_register();
vg_info( "Loading world resources\n" );
shader_alphatest_register();
vg_info( "Loading world resources\n" );
@@
-436,10
+434,7
@@
VG_STATIC void world_init(void)
vg_linear_clear( vg_mem.scratch );
mdl_context *msky = mdl_load_full( vg_mem.scratch, "models/rs_skydome.mdl" );
vg_linear_clear( vg_mem.scratch );
mdl_context *msky = mdl_load_full( vg_mem.scratch, "models/rs_skydome.mdl" );
- mdl_node *nlower = mdl_node_from_name( msky, "dome_lower" ),
- *nupper = mdl_node_from_name( msky, "dome_upper" );
-
- world.dome_lower = *mdl_node_submesh( msky, nlower, 0 );
+ mdl_node *nupper = mdl_node_from_name( msky, "dome_complete" );
world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
vg_acquire_thread_sync();
world.dome_upper = *mdl_node_submesh( msky, nupper, 0 );
vg_acquire_thread_sync();