X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=main.c;h=ba6f384ca48debf596103cdfce8fc4c24c3866f0;hb=ecc4dfbfb3adf91d2dfc03ba0ec9a821fcc2390c;hp=def609d6c915b063db19fba3a135ea68c810261f;hpb=dfee9022b3513fddec36f7ea70867ee5961a44da;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/main.c b/main.c
index def609d..ba6f384 100644
--- a/main.c
+++ b/main.c
@@ -1,3 +1,7 @@
+/*
+ * Copyright (C) Mount0 Software, Harry Godden - All Rights Reserved
+ */
+
 #include "common.h"
 
 /* Resources */
@@ -17,6 +21,7 @@ static int sv_debugcam = 0;
 #include "road.h"
 #include "scene.h"
 #include "ik.h"
+#include "audio.h"
 #include "terrain.h"
 #include "character.h"
 #include "ragdoll.h"
@@ -35,14 +40,24 @@ void vg_register(void)
 {
    shader_blit_register();
    shader_standard_register();
+   shader_vblend_register();
    shader_unlit_register();
 
-   terrain_register();
+   world_register();
    character_register();
    water_register();
    gate_register();
 }
 
+static void init_other(void)
+{
+   render_init();
+   gate_init();
+   world_init();
+   character_init();
+   audio_init();
+}
+
 vg_tex2d *texture_list[] =
 {
    &tex_norwey,
@@ -119,11 +134,8 @@ void vg_start(void)
 	});
 
    vg_tex2d_init( texture_list, vg_list_size( texture_list ) );
-
-   render_init();
-   gate_init();
-   terrain_init();
-   character_init();
+   
+   init_other();
 
    character_load( &player.mdl, "ch_default" );
    character_init_ragdoll( &player.mdl );
@@ -167,10 +179,10 @@ void vg_render(void)
    m4x4f world_4x4;
    m4x3_expand( player.camera_inverse, world_4x4 );
 
-   gpipeline.fov = freecam? 60.0f: 120.0f; /* 120 */
+   gpipeline.fov = freecam? 60.0f: 135.0f; /* 120 */
    m4x4_projection( vg_pv, gpipeline.fov, 
          (float)vg_window_x / (float)vg_window_y, 
-         0.025f, 1000.0f );
+         0.1f, 2100.0f );
 
    m4x4_mul( vg_pv, world_4x4, vg_pv );