X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_render.h;h=ecbd3d22ec093a78cb68dfb128df537b2a3f3340;hb=859178c6d4b2a9b9a95f8b01b113f589ce0f197f;hp=52b291376d155b6ffb27afe8c2cde1fc0921dc44;hpb=d13f2700b1773551307685cc7c34c804ccd6d664;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_render.h b/world_render.h index 52b2913..ecbd3d2 100644 --- a/world_render.h +++ b/world_render.h @@ -1,268 +1,99 @@ -#ifndef WORLD_RENDER_H -#define WORLD_RENDER_H - -#include "world.h" - -vg_tex2d tex_terrain_colours = { .path = "textures/gradients.qoi", - .flags = VG_TEXTURE_CLAMP|VG_TEXTURE_NEAREST }; - -vg_tex2d tex_terrain_noise = { .path = "textures/garbage.qoi", - .flags = VG_TEXTURE_NEAREST }; - -vg_tex2d tex_alphatest = { .path = "textures/alphatest.qoi", - .flags = VG_TEXTURE_NEAREST }; - -vg_tex2d tex_graffiti = { .path = "textures/graffitibox.qoi", - .flags = VG_TEXTURE_NEAREST }; - -static void world_render_init(void) -{ - vg_info( "Loading default world textures\n" ); - - vg_acquire_thread_sync(); - { - vg_tex2d_init( (vg_tex2d *[]){ &tex_terrain_colours, - &tex_terrain_noise, - &tex_alphatest, - &tex_graffiti }, 4 ); - } - vg_release_thread_sync(); -} - -static void world_render_free(void*_) -{ - vg_tex2d_free( (vg_tex2d *[]){ &tex_terrain_colours, - &tex_terrain_noise, - &tex_alphatest, - &tex_graffiti }, 4 ); -} - - - -static void render_world_depth( m4x4f projection, m4x3f camera ); - - - - /* - * Rendering + * Copyright (C) 2021-2023 Mt.ZERO Software, Harry Godden - All Rights Reserved */ -static void bind_terrain_textures(void) -{ - vg_tex2d_bind( &tex_terrain_noise, 0 ); - vg_tex2d_bind( &tex_terrain_colours, 1 ); -} - -static void render_world_vb( m4x4f projection, v3f camera ) -{ - m4x3f identity_matrix; - m4x3_identity( identity_matrix ); - - shader_vblend_use(); - shader_vblend_uTexGarbage(0); - shader_vblend_uTexGradients(1); - shader_link_standard_ub( _shader_vblend.id, 2 ); - bind_terrain_textures(); - - shader_vblend_uPv( projection ); - shader_vblend_uMdl( identity_matrix ); - shader_vblend_uCamera( camera ); +#ifndef WORLD_RENDER_H +#define WORLD_RENDER_H - scene_bind( &world.geo ); - mdl_draw_submesh( &world.sm_geo_vb ); +#define WORLD_CUBEMAP_RES 32 - mesh_bind( &world.cars ); +#include "camera.h" +#include "world.h" -#if 0 - for( int i=0; igate.co[0], camera[3] ); - - if( dist < closest ) - { - closest = dist; - id = i; - } + water; + + v3f render_gate_pos; + struct timer_text{ + char text[8]; + m4x3f transform; + ent_gate *gate; + ent_route *route; } - - render_gate( &world.routes.gates[id].gate, playerco, camera ); - v3_lerp( world.render_gate_pos, - world.routes.gates[id].gate.co[0], - 1.0f, - world.render_gate_pos ); -} - -static void render_world( m4x4f projection, m4x3f camera ) -{ - render_sky( camera ); - render_world_routes( projection, camera[3] ); - render_world_vb( projection, camera[3] ); - render_world_alphatest( projection, camera[3] ); - render_terrain( projection, camera[3] ); - - int closest = 0; - float min_dist = INFINITY; - - for( int i=0; i