From: hgn Date: Sat, 10 Jun 2023 10:46:17 +0000 (+0100) Subject: yed X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;h=2b7784846e2f2ee57ba336a2aa040adb2d0ca461;p=carveJwlIkooP6JGAAIwe30JlM.git yed --- diff --git a/.gitignore b/.gitignore index ae6d327..a0a220f 100755 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.log *.old *.bin +*.swp # soft links steamworks_sdk diff --git a/shaders.sh b/shaders.sh deleted file mode 100755 index e7a6f61..0000000 --- a/shaders.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# Copyright (C) 2021-2022 Mt.ZERO Software, Harry Godden - All Rights Reserved -# -# Shader header generator script which wraps vg's tool -# Stores a list of shaders to build into -> .h files -# - -target_shaders="" -shader(){ - target_shaders="$target_shaders $1 $2 $3" -} - -# uses scene -shader scene_standard scene.vs scene_standard.fs -shader scene_standard_alphatest scene.vs scene_standard_alphatest.fs -shader scene_vertex_blend scene.vs scene_vertex_blend.fs -shader scene_terrain scene.vs scene_terrain.fs -shader scene_route scene.vs scene_route.fs -shader scene_depth scene.vs scene_depth.fs - -# model shaders -shader model_sky model.vs model_sky.fs -shader model_water model.vs model_water.fs -shader model_water_fast model.vs model_water_fast.fs -shader model_menu model.vs model_menu.fs -shader model_character_view model_skinned.vs model_character_view.fs -shader model_gate model_gate.vs model_gate.fs -shader model_gatelq model_gate.vs model_gate_lq.fs - -# fullscreen -shader blit blit.vs blit.fs -shader fscolour blit.vs colour.fs - -#shader planeinf standard.vs planeinf.fs -#shader scoretext scoretext.vs vblend.fs -# Special - -shader routeui routeui.vs routeui.fs - -cd shaders -../bin/linux/tools/shader $target_shaders -cd .. diff --git a/skaterift.c b/skaterift.c index 5400e76..fe1c5bc 100644 --- a/skaterift.c +++ b/skaterift.c @@ -14,7 +14,7 @@ #if 1 #define SR_NETWORKED -//#define VG_DEVWINDOW +#define VG_DEVWINDOW /* * system headers @@ -197,6 +197,7 @@ VG_STATIC void vg_load(void) menu_link(); temp_update_playermodel(); + //vg_mem_log( vg_mem.rtmemory, 0, "Root" ); vg_async_call( async_skaterift_complete, NULL, 0 ); } diff --git a/skaterift_imgui_dev.c b/skaterift_imgui_dev.c deleted file mode 100644 index b27489b..0000000 --- a/skaterift_imgui_dev.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * ============================================================================= - * - * Copyright . . . -----, ,----- ,---. .---. - * 2021-2023 |\ /| | / | | | | /| - * | \ / | +-- / +----- +---' | / | - * | \ / | | / | | \ | / | - * | \/ | | / | | \ | / | - * ' ' '--' [] '----- '----- ' ' '---' SOFTWARE - * - * ============================================================================= - */ - -#define SR_NETWORKED -#define VG_DEVWINDOW -#include "common.h" -#include "conf.h" -#include "steam.h" -#include "render.h" -#include "audio.h" -#include "world.h" -#include "font.h" -#include "player.h" -#include "entity.c" -#include "workshop.c" - -static int skaterift_loaded = 0; - -int main( int argc, char *argv[] ) -{ - vg_mem.use_libc_malloc = 0; - vg_set_mem_quota( 160*1024*1024 ); - vg_enter( argc, argv, "Voyager Game Engine" ); - return 0; -} - -VG_STATIC void vg_launch_opt(void) -{ -} - -VG_STATIC void vg_preload(void) -{ -vg_info(" Copyright . . . -----, ,----- ,---. .---. \n" ); -vg_info(" 2021-2023 |\\ /| | / | | | | /| \n" ); -vg_info(" | \\ / | +-- / +----- +---' | / | \n" ); -vg_info(" | \\ / | | / | | \\ | / | \n" ); -vg_info(" | \\/ | | / | | \\ | / | \n" ); -vg_info(" ' ' '--' [] '----- '----- ' ' '---' " - "SOFTWARE\n" ); - - steam_init(); - vg_loader_step( NULL, steam_end ); -} - -VG_STATIC void skaterift_load_post( void *data, u32 len ) -{ - skaterift_loaded = 1; -} - -VG_STATIC void vg_load(void) -{ - vg_bake_shaders(); - vg_async_call( skaterift_load_post, NULL, 0 ); -} - -VG_STATIC void vg_update(void) -{ - steam_update(); -} - -VG_STATIC void vg_update_fixed(void) -{ -} - -VG_STATIC void vg_update_post(void) -{ -} - -VG_STATIC void vg_framebuffer_resize( int w, int h ) -{ - render_fb_resize(); -} - -VG_STATIC void vg_render(void) -{ - glBindFramebuffer( GL_FRAMEBUFFER, 0 ); - - glViewport( 0,0, vg.window_x, vg.window_y ); - glDisable( GL_DEPTH_TEST ); - - glClearColor( 0.0f, 0.2f, 0.7f, 0.0f ); - glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT ); - - /* Other shite */ - glDisable( GL_BLEND ); - glDisable( GL_DEPTH_TEST ); - vg_lines_drawall(); -} - -VG_STATIC void vg_gui(void) -{ - if( !skaterift_loaded ) return; - - ui_rect null; - ui_rect screen = { 0, 0, vg.window_x, vg.window_y }; - ui_rect window = { 0, 0, 1000, 700 }; - ui_rect_center( screen, window ); - vg_ui.wants_mouse = 1; - - ui_fill( window, ui_colour( k_ui_bg+1 ) ); - ui_outline( window, 1, ui_colour( k_ui_bg+7 ) ); - - ui_rect title, panel; - ui_split( window, k_ui_axis_h, 28, 0, title, panel ); - ui_fill( title, ui_colour( k_ui_bg+7 ) ); - ui_text( title, "Workshop tool", 1, k_ui_align_middle_center, - ui_colourcont(k_ui_bg+7) ); - - ui_rect quit_button; - ui_split( title, k_ui_axis_v, title[2]-title[3], 2, title, quit_button ); - - ui_dev_colourview(); -} diff --git a/web/frag/.main.html.swp b/web/frag/.main.html.swp deleted file mode 100644 index 2993c1a..0000000 Binary files a/web/frag/.main.html.swp and /dev/null differ diff --git a/workshop.c b/workshop.c index 6f71579..7f00820 100644 --- a/workshop.c +++ b/workshop.c @@ -1562,34 +1562,4 @@ VG_STATIC void async_workshop_get_installed_files( void *data, u32 len ) *info->len = j; } -#if 0 -VG_STATIC void vg_strsan_ascii( char *buf, u32 len ) -{ - for( u32 i=0; i 126 ){ - buf[i] = '?'; - } - } - buf[len-1] = '\0'; -} - -#define VG_STRSAN_ASCII( X ) vg_strsan_ascii( X, vg_list_size(X) ) - -VG_STATIC void workshop_load_metadata( const char *path, - struct workshop_file_info *info ) -{ - FILE *fp = fopen( path, "rb" ); - - if( fp ){ - if( fread( info, sizeof( struct workshop_file_info ), 1, fp ) ){ - VG_STRSAN_ASCII( info->author_name ); - VG_STRSAN_ASCII( info->title ); - } - fclose( fp ); - } -} -#endif - #endif /* WORKSHOP_C */