projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
poll functions
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world.h
diff --git
a/world.h
b/world.h
index 8ae85fcf2e4e689d56a11c9be6575bde243e2a12..e158e184e4b9f89193d0552842c75fde21e2082a 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;
@@
-401,10
+400,10
@@
VG_STATIC int world_change_world( int argc, const char *argv[] )
VG_STATIC void world_init(void)
{
VG_STATIC void world_init(void)
{
- vg_
convar_push( (struct vg_con
var){
+ vg_
var_push( (struct vg_
var){
.name = "water_enable",
.data = &world.water.enabled,
.name = "water_enable",
.data = &world.water.enabled,
- .data_type = k_
con
var_dtype_i32,
+ .data_type = k_var_dtype_i32,
.opt_i32 = { .min=0, .max=1, .clamp=1 },
.persistent = 0
});
.opt_i32 = { .min=0, .max=1, .clamp=1 },
.persistent = 0
});
@@
-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" );