projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move texture compiler to native code
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_gen.c
diff --git
a/world_gen.c
b/world_gen.c
index 1bbc2ca21a7f52a6219e1cef80fdd36bad20480a..bc9b2222dc7dda30952b9fca25eb60e6fbccf0cf 100644
(file)
--- a/
world_gen.c
+++ b/
world_gen.c
@@
-4,10
+4,6
@@
* World generation/population. Different to regular loading, since it needs to
* create geometry, apply procedural stuff and save that image to files etc.
*/
* World generation/population. Different to regular loading, since it needs to
* create geometry, apply procedural stuff and save that image to files etc.
*/
-
-#ifndef WORLD_GEN_C
-#define WORLD_GEN_C
-
#include "world.h"
#include "world_gen.h"
#include "world_load.h"
#include "world.h"
#include "world_gen.h"
#include "world_load.h"
@@
-210,7
+206,8
@@
void world_unpack_submesh_dynamic( world_instance *world,
/*
* Create the main meshes for the world
*/
/*
* Create the main meshes for the world
*/
-static void world_gen_generate_meshes( world_instance *world ){
+void world_gen_generate_meshes( world_instance *world )
+{
/*
* Compile meshes into the world scenes
*/
/*
* Compile meshes into the world scenes
*/
@@
-399,7
+396,8
@@
static void async_upload_light_indices( void *payload, u32 size ){
/*
* Computes light indices for world
*/
/*
* Computes light indices for world
*/
-static void world_gen_compute_light_indices( world_instance *world ){
+void world_gen_compute_light_indices( world_instance *world )
+{
/* light cubes */
v3f cubes_min, cubes_max;
v3_muls( world->scene_geo.bbx[0], 1.0f/k_world_light_cube_size, cubes_min );
/* light cubes */
v3f cubes_min, cubes_max;
v3_muls( world->scene_geo.bbx[0], 1.0f/k_world_light_cube_size, cubes_min );
@@
-559,7
+557,8
@@
static void world_gen_compute_light_indices( world_instance *world ){
/*
* Rendering pass needed to complete the world
*/
/*
* Rendering pass needed to complete the world
*/
-static void async_world_postprocess( void *payload, u32 _size ){
+void async_world_postprocess( void *payload, u32 _size )
+{
/* create scene lighting buffer */
world_instance *world = payload;
/* create scene lighting buffer */
world_instance *world = payload;
@@
-625,7
+624,7
@@
static void async_world_postprocess( void *payload, u32 _size ){
/*
* Rendering the depth map
*/
/*
* Rendering the depth map
*/
- camera ortho;
+
vg_
camera ortho;
v3f extent;
v3_sub( world->scene_geo.bbx[1], world->scene_geo.bbx[0], extent );
v3f extent;
v3_sub( world->scene_geo.bbx[1], world->scene_geo.bbx[0], extent );
@@
-644,8
+643,8
@@
static void async_world_postprocess( void *payload, u32 _size ){
ortho.mtx.p[3][1] = (ft + fb) * -tb;
ortho.mtx.p[3][3] = 1.0f;
m4x3_identity( ortho.transform );
ortho.mtx.p[3][1] = (ft + fb) * -tb;
ortho.mtx.p[3][3] = 1.0f;
m4x3_identity( ortho.transform );
- camera_update_view( &ortho );
- camera_finalize( &ortho );
+
vg_
camera_update_view( &ortho );
+
vg_
camera_finalize( &ortho );
glDisable(GL_DEPTH_TEST);
glDisable(GL_BLEND);
glDisable(GL_DEPTH_TEST);
glDisable(GL_BLEND);
@@
-713,7
+712,8
@@
static void async_world_postprocess( void *payload, u32 _size ){
}
/* Loads textures from the pack file */
}
/* Loads textures from the pack file */
-static void world_gen_load_surfaces( world_instance *world ){
+void world_gen_load_surfaces( world_instance *world )
+{
vg_info( "Loading textures\n" );
world->texture_count = 0;
vg_info( "Loading textures\n" );
world->texture_count = 0;
@@
-755,5
+755,3
@@
static void world_gen_load_surfaces( world_instance *world ){
surf->flags = 0;
}
}
surf->flags = 0;
}
}
-
-#endif /* WORLD_GEN_C */