Deus_nsf balanced texture filtering

installer/GUI/InstallerWindow.py

@@ -239,18 +239,18 @@ def GlobalFixes(self, pad):
  self.globalsettings['dxvk'] = DummyCheckbox()
 
  self.globalsettings['deus_nsf_d3d10_lighting'] = BooleanVar(master=self.frame, value=False)
- self.deus_nsf_d3d10_lighting = Checkbutton(self.frame, text="Deus_nsf tweaked D3D10 vivid lighting", variable=self.globalsettings['deus_nsf_d3d10_lighting'])
+ self.deus_nsf_d3d10_lighting = Checkbutton(self.frame, text="Deus_nsf D3D10 vivid lighting", variable=self.globalsettings['deus_nsf_d3d10_lighting'])
  Hovertip(self.deus_nsf_d3d10_lighting, "Tweaked D3D10 shaders for more vivid lighting.\nMay require more powerful hardware.")
  self.setgrid(self.deus_nsf_d3d10_lighting, True, column=1,row=self.row, sticky='SW', padx=pad, pady=pad)
  self.FixColors(self.deus_nsf_d3d10_lighting)
  self.row+=1
 
- self.globalsettings['deus_nsf_d3d10_retro_textures'] = BooleanVar(master=self.frame, value=False)
- self.deus_nsf_d3d10_retro_textures = Checkbutton(self.frame, text="Deus_nsf tweaked D3D10 retro texture filtering", variable=self.globalsettings['deus_nsf_d3d10_retro_textures'])
- Hovertip(self.deus_nsf_d3d10_retro_textures, "Tweaked D3D10 shaders for retro texture filtering.\nMay require more powerful hardware.")
- self.setgrid(self.deus_nsf_d3d10_retro_textures, True, column=1,row=self.row, sticky='SW', padx=pad, pady=pad)
- self.FixColors(self.deus_nsf_d3d10_retro_textures)
- self.row+=1
+ self.globalsettings['d3d10_textures'] = self.Radios('Which EXE to use for vanilla:', 'Smooth', pad, pad, advanced=True,
+  options=OrderedDict(
+  Retro={ 'text': "Deus_nsf D3D10 retro texture filtering", 'hover': "Tweaked D3D10 shaders for retro texture filtering.\nMay require more powerful hardware." },
+  Balanced={ 'text': "Deus_nsf D3D10 semi-retro texture filtering", 'hover': "Tweaked D3D10 shaders for semi-retro texture filtering.\nMay require more powerful hardware." },
+  Smooth={ 'text': "D3D10 normal smooth texture filtering", 'hover': "Typical D3D10 shaders for texture filtering." },
+ ))
 
  self.globalsettings['ogl2'] = BooleanVar(master=self.frame, value=self.ogl2_default)
  self.ogl2 = Checkbutton(self.frame, text="Updated OpenGL 2.0 Renderer", variable=self.globalsettings['ogl2'])

installer/Install/Install.py

@@ -83,7 +83,7 @@ def Install(exe:Path, flavors:dict, globalsettings:dict) -> dict:
  EngineDllFix(system)
 
  CopyDXVK(system, globalsettings['dxvk'])
- CopyD3DRenderers(system, globalsettings['deus_nsf_d3d10_lighting'], globalsettings['deus_nsf_d3d10_retro_textures'])
+ CopyD3DRenderers(system, globalsettings['deus_nsf_d3d10_lighting'], globalsettings['d3d10_textures'])
  InstallOGL2(system, globalsettings['ogl2'])
 
  debug("Install returning", flavors)
@@ -220,7 +220,7 @@ def VanillaFixConfigs(system, exename, kentie, globalsettings:dict, sourceINI: P
  changes['DeusEx.DXRFlags'] = {}
  changes['DeusEx.DXRFlags'].update({'gamemode': '4'})
 
- if globalsettings['deus_nsf_d3d10_lighting'] or globalsettings['deus_nsf_d3d10_retro_textures']:
+ if globalsettings['deus_nsf_d3d10_lighting'] or globalsettings['d3d10_textures'] != 'Smooth':
  # keep D3D10 because obviously they wanted it
  changes['Engine.Engine'] = {'GameRenderDevice': 'D3D10Drv.D3D10RenderDevice'}
  elif IsWindows() and not globalsettings['dxvk']:

installer/Install/__init__.py

@@ -330,7 +330,7 @@ def EngineDllFix(p:Path) -> bool:
 
 
 
-def CopyD3DRenderers(system:Path, deus_nsf_lighting:bool, deus_nsf_retro_textures:bool):
+def CopyD3DRenderers(system:Path, deus_nsf_lighting:bool, d3d10_textures:str):
  source = GetSourcePath()
  thirdparty = source / '3rdParty'
  info('CopyD3DRenderers from', thirdparty, ' to ', system)
@@ -343,7 +343,7 @@ def CopyD3DRenderers(system:Path, deus_nsf_lighting:bool, deus_nsf_retro_texture
  CopyTo(thirdparty/'d3d10drv.dll', system/'d3d10drv.dll', True)
  CopyTo(thirdparty/'D3D10Drv.int', system/'D3D10Drv.int', True)
 
- if deus_nsf_lighting or deus_nsf_retro_textures:
+ if deus_nsf_lighting or d3d10_textures != 'Smooth':
  deus_nsf = system / 'd3d10drv'
  Copyd3d10drv(thirdparty / 'd3d10drv_deus_nsf', system / 'd3d10drv')
  Copyd3d10drv(thirdparty / 'd3d10drv', system / 'd3d10drv_kentie')
@@ -352,9 +352,11 @@ def CopyD3DRenderers(system:Path, deus_nsf_lighting:bool, deus_nsf_retro_texture
  Copyd3d10drv(thirdparty / 'd3d10drv_deus_nsf', system / 'd3d10drv_deus_nsf')
  Copyd3d10drv(thirdparty / 'd3d10drv', system / 'd3d10drv')
 
- if deus_nsf_retro_textures:
+ if d3d10_textures=='Retro':
  CopyTo(deus_nsf/'unrealpool_retro_textures.fxh', deus_nsf/'unrealpool.fxh')
- else:
+ elif d3d10_textures=='Balanced':
+ CopyTo(deus_nsf/'unrealpool_balanced_textures.fxh', deus_nsf/'unrealpool.fxh')
+ elif d3d10_textures=='Smooth':
  CopyTo(deus_nsf/'unrealpool_smooth_textures.fxh', deus_nsf/'unrealpool.fxh')