X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=world_render.h;h=846e2d83f7f53694147231ca09a02b2246a3caaf;hb=5fa590f62aa7e62a8b6b07e10556c2ecc54cdca6;hp=5da3556275f6c1aba1ca4d68c93b5116eae8cd42;hpb=a98ce96041b248580c0447bf87d4c6106483cade;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/world_render.h b/world_render.h index 5da3556..846e2d8 100644 --- a/world_render.h +++ b/world_render.h @@ -1,272 +1,101 @@ /* - * Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved + * Copyright (C) 2021-2024 Mt.ZERO Software, Harry Godden - All Rights Reserved */ -#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 ); - - +#pragma once +#define WORLD_CUBEMAP_RES 32 -/* - * Rendering - */ - -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 ) +#include "vg/vg_camera.h" +#include "world.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_terrain.h" +#include "shaders/scene_fxglow.h" +#include "shaders/scene_depth.h" +#include "shaders/scene_position.h" +#include "shaders/scene_font.h" +#include "shaders/model_sky.h" +#include "shaders/model_sky_space.h" + +static const float k_world_light_cube_size = 8.0f; + +struct world_render { - 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(); + GLuint tex_terrain_noise; - shader_vblend_uPv( projection ); - shader_vblend_uMdl( identity_matrix ); - shader_vblend_uCamera( camera ); + /* rendering */ + glmesh skydome; - scene_bind( &world.geo ); - mdl_draw_submesh( &world.sm_geo_vb ); + double sky_time, sky_rate, sky_target_rate; - mesh_bind( &world.cars ); - -#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