projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved some stuff
[carveJwlIkooP6JGAAIwe30JlM.git]
/
world_render.h
diff --git
a/world_render.h
b/world_render.h
index 65494a5be204ea8f6e25b6e7adfddadb3f32a4f7..9693e814dc9c0c07347fd03883f07905265bdc09 100644
(file)
--- a/
world_render.h
+++ b/
world_render.h
@@
-1,3
+1,7
@@
+/*
+ * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved
+ */
+
#ifndef WORLD_RENDER_H
#define WORLD_RENDER_H
#ifndef WORLD_RENDER_H
#define WORLD_RENDER_H
@@
-15,22
+19,18
@@
vg_tex2d tex_alphatest = { .path = "textures/alphatest.qoi",
vg_tex2d tex_graffiti = { .path = "textures/graffitibox.qoi",
.flags = VG_TEXTURE_NEAREST };
vg_tex2d tex_graffiti = { .path = "textures/graffitibox.qoi",
.flags = VG_TEXTURE_NEAREST };
-static
int
world_render_init(void)
+static
void
world_render_init(void)
{
vg_info( "Loading default world textures\n" );
{
vg_info( "Loading default world textures\n" );
- if( vg_acquire_thread_sync(1) )
+ vg_acquire_thread_sync();
{
vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours,
&tex_terrain_noise,
&tex_alphatest,
&tex_graffiti }, 4 );
{
vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours,
&tex_terrain_noise,
&tex_alphatest,
&tex_graffiti }, 4 );
-
- vg_release_thread_sync(1);
- return 1;
}
}
-
- return 0;
+ vg_release_thread_sync();
}
static void world_render_free(void*_)
}
static void world_render_free(void*_)
@@
-183,7
+183,7
@@
static void render_sky(m4x3f camera)
shader_sky_uMdl(identity_matrix);
shader_sky_uPv(full);
shader_sky_uTexGarbage(0);
shader_sky_uMdl(identity_matrix);
shader_sky_uPv(full);
shader_sky_uTexGarbage(0);
- shader_sky_uTime(
vg
_time );
+ shader_sky_uTime(
world.sky
_time );
vg_tex2d_bind( &tex_terrain_noise, 0 );
vg_tex2d_bind( &tex_terrain_noise, 0 );
@@
-202,9
+202,9
@@
static void render_world_gates( m4x4f projection, v3f playerco, m4x3f camera )
float closest = INFINITY;
int id = 0;
float closest = INFINITY;
int id = 0;
- for( int i=0; i<world
.
routes.gate_count; i++ )
+ for( int i=0; i<world
_
routes.gate_count; i++ )
{
{
- struct route_gate *rg = &world
.
routes.gates[i];
+ struct route_gate *rg = &world
_
routes.gates[i];
float dist = v3_dist2( rg->gate.co[0], camera[3] );
if( dist < closest )
float dist = v3_dist2( rg->gate.co[0], camera[3] );
if( dist < closest )
@@
-214,9
+214,9
@@
static void render_world_gates( m4x4f projection, v3f playerco, m4x3f camera )
}
}
}
}
- render_gate( &world
.
routes.gates[id].gate, playerco, camera );
+ render_gate( &world
_
routes.gates[id].gate, playerco, camera );
v3_lerp( world.render_gate_pos,
v3_lerp( world.render_gate_pos,
- world
.
routes.gates[id].gate.co[0],
+ world
_
routes.gates[id].gate.co[0],
1.0f,
world.render_gate_pos );
}
1.0f,
world.render_gate_pos );
}
@@
-232,9
+232,9
@@
static void render_world( m4x4f projection, m4x3f camera )
int closest = 0;
float min_dist = INFINITY;
int closest = 0;
float min_dist = INFINITY;
- for( int i=0; i<world
.
routes.route_count; i++ )
+ for( int i=0; i<world
_
routes.route_count; i++ )
{
{
- float dist = v3_dist2( world
.
routes.routes[i].scoreboard_transform[3],
+ float dist = v3_dist2( world
_
routes.routes[i].scoreboard_transform[3],
camera[3] );
if( dist < min_dist )
camera[3] );
if( dist < min_dist )
@@
-245,7
+245,7
@@
static void render_world( m4x4f projection, m4x3f camera )
}
sfd_render( &world.sfd.tester, projection, camera[3],
}
sfd_render( &world.sfd.tester, projection, camera[3],
- world
.
routes.routes[closest].scoreboard_transform );
+ world
_
routes.routes[closest].scoreboard_transform );
}
static void render_world_depth( m4x4f projection, m4x3f camera )
}
static void render_world_depth( m4x4f projection, m4x3f camera )