projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add glider&orphan data to replay
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_render.h
diff --git
a/world_render.h
b/world_render.h
index 402ca60082f94cc69c7436b82b7e8600a590f896..ecbd3d22ec093a78cb68dfb128df537b2a3f3340 100644
(file)
--- a/
world_render.h
+++ b/
world_render.h
@@
-12,6
+12,7
@@
#include "shaders/scene_standard.h"
#include "shaders/scene_standard_alphatest.h"
#include "shaders/scene_standard.h"
#include "shaders/scene_standard_alphatest.h"
+#include "shaders/scene_foliage.h"
#include "shaders/scene_override.h"
#include "shaders/scene_cubemapped.h"
#include "shaders/scene_vertex_blend.h"
#include "shaders/scene_override.h"
#include "shaders/scene_cubemapped.h"
#include "shaders/scene_vertex_blend.h"
@@
-50,12
+51,12
@@
struct world_render{
u32 timer_text_count;
struct text_particle{
u32 timer_text_count;
struct text_particle{
- r
b_object obj
;
+ r
igidbody rb
;
m4x3f mlocal;
ent_glyph *glyph;
v4f colour;
m4x3f mlocal;
ent_glyph *glyph;
v4f colour;
-
m4x3f mdl;
m4x3f mdl;
+ f32 radius;
}
text_particles[6*4];
u32 text_particle_count;
}
text_particles[6*4];
u32 text_particle_count;
@@
-84,7
+85,7
@@
static void render_world_override( world_instance *world,
world_instance *lighting_source,
m4x3f mmdl,
camera *cam,
world_instance *lighting_source,
m4x3f mmdl,
camera *cam,
- ent_spawn *dest_spawn,
f32 iso_amt
);
+ ent_spawn *dest_spawn,
v4f map_info
);
#define WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( WORLD, SHADER ) \
world_link_lighting_ub( WORLD, _shader_##SHADER.id ); \
#define WORLD_BIND_LIGHT_BUFFERS_UB0_TEX234( WORLD, SHADER ) \
world_link_lighting_ub( WORLD, _shader_##SHADER.id ); \