From 3dfcdca415c38a8380635f38078c01a5583ac126 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 19 May 2004 22:16:38 +0000 Subject: [PATCH] add -gl_trilinear OGL command-line option (d1x r1.27) --- ChangeLog | 3 +++ arch/ogl/gr.c | 7 ++++++- main/inferno.c | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d15e917f..bfc1e0e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-05-19 Matthew Mueller + * arch/ogl/gr.c, main/inferno.c: add -gl_trilinear OGL + command-line option (d1x r1.27) + * main/inferno.c: restore inferno.c initialization of screen_compatible and use_double_buffer to 'normal' values, broken long long ago in one of the high res menu patches (d1x r1.30) diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index 7470b1d2..2094c20e 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -1,4 +1,4 @@ -/* $Id: gr.c,v 1.19 2004-05-19 03:47:03 btb Exp $ */ +/* $Id: gr.c,v 1.20 2004-05-19 22:16:12 btb Exp $ */ /* * * OGL video functions. - Added 9/15/99 Matthew Mueller @@ -394,6 +394,11 @@ int gr_init() GL_texmagfilt=GL_LINEAR; GL_texminfilt=GL_LINEAR_MIPMAP_NEAREST; } + if ((glt=FindArg("-gl_trilinear"))) + { + GL_texmagfilt = GL_LINEAR; + GL_texminfilt = GL_LINEAR_MIPMAP_LINEAR; + } if ((t=FindArg("-gl_simple"))){ if (t>=glt){//allow overriding of earlier args glt=t; diff --git a/main/inferno.c b/main/inferno.c index c9d41a32..d53fcbad 100644 --- a/main/inferno.c +++ b/main/inferno.c @@ -1,4 +1,4 @@ -/* $Id: inferno.c,v 1.73 2004-05-19 21:47:50 btb Exp $ */ +/* $Id: inferno.c,v 1.74 2004-05-19 22:16:38 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1028,7 +1028,8 @@ void print_commandline_help() #ifdef OGL printf( " -gl_texmagfilt %s\n","set GL_TEXTURE_MAG_FILTER (see readme.d1x)"); printf( " -gl_texminfilt %s\n","set GL_TEXTURE_MIN_FILTER (see readme.d1x)"); - printf( " -gl_mipmap %s\n","set gl texture filters to \"standard\" options for mipmapping"); + printf(" -gl_mipmap %s\n", "set gl texture filters to \"standard\" (bilinear) mipmapping"); + printf(" -gl_trilinear %s\n", "set gl texture filters to trilinear mipmapping"); printf( " -gl_simple %s\n","set gl texture filters to gl_nearest for \"original\" look. (default)"); printf( " -gl_alttexmerge %s\n","use new texmerge, usually uses less ram (default)"); printf( " -gl_stdtexmerge %s\n","use old texmerge, uses more ram, but _might_ be a bit faster"); -- 2.39.2