Emulation/Gopher2600
1
0
Fork 0
mirror of https://github.com/JetSetIlly/Gopher2600.git synced 2024-05-20 05:40:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

gui/crt package is now gui/display

Browse source 
colour preferences are now independent of CRT preferences
This commit is contained in:
JetSetIlly 2024-05-05 10:27:11 +01:00
parent 4cc32c4294
commit c827d70c5b
15 changed files with 304 additions and 172 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
gui/display/colour.go Normal file
View file

@ -0,0 +1,98 @@
// This file is part of Gopher2600.
//
// Gopher2600 is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Gopher2600 is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Gopher2600. If not, see <https://www.gnu.org/licenses/>.
package display
import (
"github.com/jetsetilly/gopher2600/prefs"
"github.com/jetsetilly/gopher2600/resources"
)
type Colour struct {
dsk *prefs.Disk
Brightness prefs.Float
Contrast prefs.Float
Saturation prefs.Float
Hue prefs.Float
}
func (p *Colour) String() string {
return p.dsk.String()
}
const (
brightness = 1.0
contrast = 1.0
saturation = 1.0
hue = 0.0
)
func newColour() (*Colour, error) {
p := &Colour{}
p.SetDefaults()
pth, err := resources.JoinPath(prefs.DefaultPrefsFile)
if err != nil {
return nil, err
}
p.dsk, err = prefs.NewDisk(pth)
if err != nil {
return nil, err
}
err = p.dsk.Add("display.color.brightness", &p.Brightness)
if err != nil {
return nil, err
}
err = p.dsk.Add("display.color.contrast", &p.Contrast)
if err != nil {
return nil, err
}
err = p.dsk.Add("display.color.saturation", &p.Saturation)
if err != nil {
return nil, err
}
err = p.dsk.Add("display.color.hue", &p.Hue)
if err != nil {
return nil, err
}
err = p.dsk.Load(true)
if err != nil {
return nil, err
}
return p, nil
}
// SetDefaults reverts all colour values to default
func (p *Colour) SetDefaults() {
p.Brightness.Set(brightness)
p.Contrast.Set(contrast)
p.Saturation.Set(saturation)
p.Hue.Set(hue)
}
// Load colour values from disk
func (p *Colour) Load() error {
return p.dsk.Load(false)
}
// Save current colour values to disk
func (p *Colour) Save() error {
return p.dsk.Save()
}

52
gui/crt/preferences.go → gui/display/crt.go
View file

@ -13,14 +13,14 @@
// You should have received a copy of the GNU General Public License
// along with Gopher2600. If not, see <https://www.gnu.org/licenses/>.
package crt
package display
import (
"github.com/jetsetilly/gopher2600/prefs"
"github.com/jetsetilly/gopher2600/resources"
)
type Preferences struct {
type CRT struct {
dsk *prefs.Disk
Enabled prefs.Bool
@ -53,11 +53,6 @@ type Preferences struct {
Sharpness prefs.Float
BlackLevel prefs.Float
Brightness prefs.Float
Contrast prefs.Float
Saturation prefs.Float
Hue prefs.Float
PixelPerfectFade prefs.Float
VSyncRecovery prefs.Int
@ -66,7 +61,7 @@ type Preferences struct {
IntegerScaling prefs.Bool
}
func (p *Preferences) String() string {
func (p *CRT) String() string {
return p.dsk.String()
}
@ -101,20 +96,14 @@ const (
sharpness = 0.55
blackLevel = 0.045
brightness = 1.0
contrast = 1.0
saturation = 1.0
hue = 0.0
pixelPerfectFade = 0.4
vsyncRecovery = 10
vsyncSensitivity = 2
integerScaling = false
)
// NewPreferences is the preferred method of initialisation for the Preferences type.
func NewPreferences() (*Preferences, error) {
p := &Preferences{}
func newCRT() (*CRT, error) {
p := &CRT{}
p.SetDefaults()
pth, err := resources.JoinPath(prefs.DefaultPrefsFile)
@ -235,22 +224,6 @@ func NewPreferences() (*Preferences, error) {
if err != nil {
return nil, err
}
err = p.dsk.Add("crt.brightness", &p.Brightness)
if err != nil {
return nil, err
}
err = p.dsk.Add("crt.contrast", &p.Contrast)
if err != nil {
return nil, err
}
err = p.dsk.Add("crt.saturation", &p.Saturation)
if err != nil {
return nil, err
}
err = p.dsk.Add("crt.hue", &p.Hue)
if err != nil {
return nil, err
}
err = p.dsk.Add("crt.pixelPerfectFade", &p.PixelPerfectFade)
if err != nil {
return nil, err
@ -277,7 +250,7 @@ func NewPreferences() (*Preferences, error) {
}
// SetDefaults revers all CRT settings to default values.
func (p *Preferences) SetDefaults() {
func (p *CRT) SetDefaults() {
p.Enabled.Set(enabled)
p.Curve.Set(curve)
p.RoundedCorners.Set(roundedCorners)
@ -306,23 +279,18 @@ func (p *Preferences) SetDefaults() {
p.Sharpness.Set(sharpness)
p.BlackLevel.Set(blackLevel)
p.Brightness.Set(brightness)
p.Contrast.Set(contrast)
p.Saturation.Set(saturation)
p.Hue.Set(hue)
p.PixelPerfectFade.Set(pixelPerfectFade)
p.VSyncRecovery.Set(vsyncRecovery)
p.VSyncSensitivity.Set(vsyncSensitivity)
p.IntegerScaling.Set(integerScaling)
}
// Load disassembly preferences and apply to the current disassembly.
func (p *Preferences) Load() error {
// Load CRT values from disk.
func (p *CRT) Load() error {
return p.dsk.Load(false)
}
// Save current disassembly preferences to disk.
func (p *Preferences) Save() error {
// Save current CRT values to disk.
func (p *CRT) Save() error {
return p.dsk.Save()
}

7
gui/crt/doc.go → gui/display/doc.go
View file

@ -13,6 +13,7 @@
// You should have received a copy of the GNU General Public License
// along with Gopher2600. If not, see <https://www.gnu.org/licenses/>.
// Package CRT contains non-gui-specific and non-VCS-specific information. The
// CRT package is conceptually different to the television package.
package crt
// Package display specifies the preference values for the displaying of a TV
// image by a GUI. The types in this package are intended to be agnostic of
// which GUI system is being used.
package display

36
gui/display/preferences.go Normal file
View file

@ -0,0 +1,36 @@
// This file is part of Gopher2600.
//
// Gopher2600 is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Gopher2600 is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Gopher2600. If not, see <https://www.gnu.org/licenses/>.
package display
type Preferences struct {
Colour *Colour
CRT *CRT
}
// NewPreferences is the preferred method of initialisation for the Preferences type.
func NewPreferences() (*Preferences, error) {
var p Preferences
var err error
p.CRT, err = newCRT()
if err != nil {
return nil, err
}
p.Colour, err = newColour()
if err != nil {
return nil, err
}
return &p, nil
}

68
gui/sdlimgui/gl32_crtseq.go
View file

@ -18,7 +18,7 @@
package sdlimgui
import (
"github.com/jetsetilly/gopher2600/gui/crt"
"github.com/jetsetilly/gopher2600/gui/display"
"github.com/jetsetilly/gopher2600/gui/sdlimgui/framebuffer"
"github.com/jetsetilly/gopher2600/hardware/television/specification"
)
@ -61,41 +61,41 @@ type crtSeqPrefs struct {
Hue float64
}
func newCrtSeqPrefs(prefs *crt.Preferences) crtSeqPrefs {
func newCrtSeqPrefs(prefs *display.Preferences) crtSeqPrefs {
return crtSeqPrefs{
Enabled: prefs.Enabled.Get().(bool),
PixelPerfectFade: prefs.PixelPerfectFade.Get().(float64),
Curve: prefs.Curve.Get().(bool),
RoundedCorners: prefs.RoundedCorners.Get().(bool),
Bevel: prefs.Bevel.Get().(bool),
Shine: prefs.Shine.Get().(bool),
Mask: prefs.Mask.Get().(bool),
Scanlines: prefs.Scanlines.Get().(bool),
Interference: prefs.Interference.Get().(bool),
Flicker: prefs.Flicker.Get().(bool),
Fringing: prefs.Fringing.Get().(bool),
Ghosting: prefs.Ghosting.Get().(bool),
Phosphor: prefs.Phosphor.Get().(bool),
CurveAmount: prefs.CurveAmount.Get().(float64),
RoundedCornersAmount: prefs.RoundedCornersAmount.Get().(float64),
BevelSize: prefs.BevelSize.Get().(float64),
MaskIntensity: prefs.MaskIntensity.Get().(float64),
MaskFine: prefs.MaskFine.Get().(float64),
ScanlinesIntensity: prefs.ScanlinesIntensity.Get().(float64),
ScanlinesFine: prefs.ScanlinesFine.Get().(float64),
InterferenceLevel: prefs.InterferenceLevel.Get().(float64),
FlickerLevel: prefs.FlickerLevel.Get().(float64),
FringingAmount: prefs.FringingAmount.Get().(float64),
GhostingAmount: prefs.GhostingAmount.Get().(float64),
PhosphorLatency: prefs.PhosphorLatency.Get().(float64),
PhosphorBloom: prefs.PhosphorBloom.Get().(float64),
Sharpness: prefs.Sharpness.Get().(float64),
BlackLevel: prefs.BlackLevel.Get().(float64),
Enabled: prefs.CRT.Enabled.Get().(bool),
PixelPerfectFade: prefs.CRT.PixelPerfectFade.Get().(float64),
Curve: prefs.CRT.Curve.Get().(bool),
RoundedCorners: prefs.CRT.RoundedCorners.Get().(bool),
Bevel: prefs.CRT.Bevel.Get().(bool),
Shine: prefs.CRT.Shine.Get().(bool),
Mask: prefs.CRT.Mask.Get().(bool),
Scanlines: prefs.CRT.Scanlines.Get().(bool),
Interference: prefs.CRT.Interference.Get().(bool),
Flicker: prefs.CRT.Flicker.Get().(bool),
Fringing: prefs.CRT.Fringing.Get().(bool),
Ghosting: prefs.CRT.Ghosting.Get().(bool),
Phosphor: prefs.CRT.Phosphor.Get().(bool),
CurveAmount: prefs.CRT.CurveAmount.Get().(float64),
RoundedCornersAmount: prefs.CRT.RoundedCornersAmount.Get().(float64),
BevelSize: prefs.CRT.BevelSize.Get().(float64),
MaskIntensity: prefs.CRT.MaskIntensity.Get().(float64),
MaskFine: prefs.CRT.MaskFine.Get().(float64),
ScanlinesIntensity: prefs.CRT.ScanlinesIntensity.Get().(float64),
ScanlinesFine: prefs.CRT.ScanlinesFine.Get().(float64),
InterferenceLevel: prefs.CRT.InterferenceLevel.Get().(float64),
FlickerLevel: prefs.CRT.FlickerLevel.Get().(float64),
FringingAmount: prefs.CRT.FringingAmount.Get().(float64),
GhostingAmount: prefs.CRT.GhostingAmount.Get().(float64),
PhosphorLatency: prefs.CRT.PhosphorLatency.Get().(float64),
PhosphorBloom: prefs.CRT.PhosphorBloom.Get().(float64),
Sharpness: prefs.CRT.Sharpness.Get().(float64),
BlackLevel: prefs.CRT.BlackLevel.Get().(float64),
Brightness: prefs.Brightness.Get().(float64),
Contrast: prefs.Contrast.Get().(float64),
Saturation: prefs.Saturation.Get().(float64),
Hue: prefs.Hue.Get().(float64),
Brightness: prefs.Colour.Brightness.Get().(float64),
Contrast: prefs.Colour.Contrast.Get().(float64),
Saturation: prefs.Colour.Saturation.Get().(float64),
Hue: prefs.Colour.Hue.Get().(float64),
}
}

4
gui/sdlimgui/gl32_dbgscr.go
View file

@ -202,7 +202,7 @@ func (sh *dbgScrShader) setAttributes(env shaderEnvironment) {
// something for the future.
env.srcTextureID = sh.img.wm.dbgScr.displayTexture.getID()
prefs := newCrtSeqPrefs(sh.img.crtPrefs)
prefs := newCrtSeqPrefs(sh.img.displayPrefs)
prefs.Enabled = true
prefs.Bevel = false
@ -219,7 +219,7 @@ func (sh *dbgScrShader) setAttributes(env shaderEnvironment) {
// note that we specify integer scaling for the non-CRT preview image,
// this is so that the overlay is aligned properly with the TV image
prefs := newCrtSeqPrefs(sh.img.crtPrefs)
prefs := newCrtSeqPrefs(sh.img.displayPrefs)
prefs.Enabled = false
env.srcTextureID = sh.crt.process(env, true, sh.img.wm.dbgScr.numScanlines, specification.ClksVisible, 0, sh.img.wm.dbgScr, prefs, specification.NormalRotation, false)

2
gui/sdlimgui/gl32_playscr.go
View file

@ -70,5 +70,5 @@ func (sh *playscrShader) setAttributes(env shaderEnvironment) {
sh.screenshot.process(env, sh.img.playScr)
sh.crt.process(env, false, sh.img.playScr.visibleScanlines, specification.ClksVisible, screenroll, sh.img.playScr, newCrtSeqPrefs(sh.img.crtPrefs), sh.img.screen.rotation.Load().(specification.Rotation), false)
sh.crt.process(env, false, sh.img.playScr.visibleScanlines, specification.ClksVisible, screenroll, sh.img.playScr, newCrtSeqPrefs(sh.img.displayPrefs), sh.img.screen.rotation.Load().(specification.Rotation), false)
}

6
gui/sdlimgui/gl32_screenshot.go
View file

@ -101,7 +101,7 @@ func (sh *gl32Screenshot) start(mode screenshotMode, finish chan screenshotResul
sh.mode = mode
// description of screenshot to be returned to caller over finish channel
if sh.img.crtPrefs.Enabled.Get().(bool) {
if sh.img.displayPrefs.CRT.Enabled.Get().(bool) {
sh.description = fmt.Sprintf("crt_%s", sh.mode)
} else {
sh.description = fmt.Sprintf("pix_%s", sh.mode)
@ -161,7 +161,7 @@ func (sh *gl32Screenshot) process(env shaderEnvironment, scalingImage textureSpe
}
func (sh *gl32Screenshot) crtProcess(env shaderEnvironment, scalingImage textureSpec) {
prefs := newCrtSeqPrefs(sh.img.crtPrefs)
prefs := newCrtSeqPrefs(sh.img.displayPrefs)
if sh.mode == modeMotion {
switch sh.frames {
@ -335,7 +335,7 @@ func (sh *gl32Screenshot) compositeFinalise(env shaderEnvironment, composite *im
env.srcTextureID = sh.compositeBuffer.Texture(0)
// pass composite image through CRT shaders
textureID := sh.crt.process(env, true, sh.img.playScr.visibleScanlines, specification.ClksVisible, 0, sh, newCrtSeqPrefs(sh.img.crtPrefs), sh.img.screen.rotation.Load().(specification.Rotation), true)
textureID := sh.crt.process(env, true, sh.img.playScr.visibleScanlines, specification.ClksVisible, 0, sh, newCrtSeqPrefs(sh.img.displayPrefs), sh.img.screen.rotation.Load().(specification.Rotation), true)
gl.BindTexture(gl.TEXTURE_2D, textureID)

2
gui/sdlimgui/playscr.go
View file

@ -143,7 +143,7 @@ func (win *playScr) setScaling() {
}
// limit scaling to whole integers
if win.img.crtPrefs == nil || win.img.crtPrefs.IntegerScaling.Get().(bool) {
if win.img.displayPrefs == nil || win.img.displayPrefs.CRT.IntegerScaling.Get().(bool) {
scaling = float32(int(scaling))
}

4
gui/sdlimgui/screen.go
View file

@ -433,8 +433,8 @@ func (scr *screen) NewFrame(frameInfo television.FrameInfo) error {
// set VSYNC recover value if number of vsync scanlines is insufficient. we
// only do this is TV is stable
if frameInfo.Stable && frameInfo.VSyncScanlines < scr.img.crtPrefs.VSyncSensitivity.Get().(int) {
scr.crit.vsyncRecover = scr.img.crtPrefs.VSyncRecovery.Get().(int)
if frameInfo.Stable && frameInfo.VSyncScanlines < scr.img.displayPrefs.CRT.VSyncSensitivity.Get().(int) {
scr.crit.vsyncRecover = scr.img.displayPrefs.CRT.VSyncRecovery.Get().(int)
} else if scr.crit.vsyncRecover >= 0 {
scr.crit.vsyncRecover--
}

12
gui/sdlimgui/sdlimgui.go
View file

@ -23,7 +23,7 @@ import (
"github.com/jetsetilly/gopher2600/debugger"
"github.com/jetsetilly/gopher2600/debugger/govern"
"github.com/jetsetilly/gopher2600/debugger/terminal"
"github.com/jetsetilly/gopher2600/gui/crt"
"github.com/jetsetilly/gopher2600/gui/display"
"github.com/jetsetilly/gopher2600/gui/sdlaudio"
"github.com/jetsetilly/gopher2600/gui/sdlimgui/caching"
"github.com/jetsetilly/gopher2600/logger"
@ -121,8 +121,8 @@ type SdlImgui struct {
// gui specific preferences. crt preferences are handled separately. all
// other preferences are handled by the emulation
prefs *preferences
crtPrefs *crt.Preferences
prefs *preferences
displayPrefs *display.Preferences
// modal window
modal modal
@ -216,14 +216,14 @@ func NewSdlImgui(dbg *debugger.Debugger) (*SdlImgui, error) {
}
img.dbg.VCS().TV.AddRealtimeAudioMixer(img.audio)
// initialise crt preferences
img.crtPrefs, err = crt.NewPreferences()
// initialise display preferences
img.displayPrefs, err = display.NewPreferences()
if err != nil {
return nil, fmt.Errorf("sdlimgui: %w", err)
}
// set scaling when IntegerScaling prefs value is changed
img.crtPrefs.IntegerScaling.SetHookPost(func(v prefs.Value) error {
img.displayPrefs.CRT.IntegerScaling.SetHookPost(func(v prefs.Value) error {
select {
case img.postRenderFunctions <- func() {
img.screen.crit.section.Lock()

24
gui/sdlimgui/win_prefs.go
View file

@ -100,16 +100,18 @@ func (win *winPrefs) draw() {
imgui.EndTabItem()
}
if imgui.BeginTabItem("TV") {
win.drawTV()
if imgui.BeginTabItem("Colour") {
win.drawColour()
imgui.EndTabItem()
setDef = win.img.displayPrefs.Colour
setDefLabel = "Colour"
}
if win.img.rnd.supportsCRT() {
if imgui.BeginTabItem("CRT") {
win.drawCRT()
imgui.EndTabItem()
setDef = win.img.crtPrefs
setDef = win.img.displayPrefs.CRT
setDefLabel = "CRT"
}
}
@ -714,9 +716,13 @@ func (win *winPrefs) drawDiskButtons() {
if err != nil {
logger.Logf(logger.Allow, "sdlimgui", "could not save (imgui debugger) preferences: %v", err)
}
err = win.img.crtPrefs.Save()
err = win.img.displayPrefs.CRT.Save()
if err != nil {
logger.Logf(logger.Allow, "sdlimgui", "could not save (crt) preferences: %v", err)
logger.Logf(logger.Allow, "sdlimgui", "could not save (display/crt) preferences: %v", err)
}
err = win.img.displayPrefs.Colour.Save()
if err != nil {
logger.Logf(logger.Allow, "sdlimgui", "could not save (display/colour) preferences: %v", err)
}
err = win.img.audio.Prefs.Save()
if err != nil {
@ -762,9 +768,13 @@ func (win *winPrefs) drawDiskButtons() {
if err != nil {
logger.Logf(logger.Allow, "sdlimgui", "could not restore (imgui debugger) preferences: %v", err)
}
err = win.img.crtPrefs.Load()
err = win.img.displayPrefs.CRT.Load()
if err != nil {
logger.Logf(logger.Allow, "sdlimgui", "could not restore (crt) preferences: %v", err)
logger.Logf(logger.Allow, "sdlimgui", "could not restore (display/crt) preferences: %v", err)
}
err = win.img.displayPrefs.Colour.Load()
if err != nil {
logger.Logf(logger.Allow, "sdlimgui", "could not restore (display/colour) preferences: %v", err)
}
err = win.img.audio.Prefs.Load()
if err != nil {

33
gui/sdlimgui/win_prefs_tv.go → gui/sdlimgui/win_prefs_colour.go
View file

@ -22,9 +22,12 @@ import (
"github.com/jetsetilly/gopher2600/gui/fonts"
)
func (win *winPrefs) drawTV() {
func (win *winPrefs) drawColour() {
imgui.Spacing()
imgui.PushItemWidth(400)
defer imgui.PopItemWidth()
win.drawBrightness()
imgui.Spacing()
win.drawContrast()
@ -35,51 +38,63 @@ func (win *winPrefs) drawTV() {
}
func (win *winPrefs) drawBrightness() {
imgui.BeginGroup()
defer imgui.EndGroup()
imgui.Text(fmt.Sprintf("%c Brightness", fonts.TVBrightness))
f := float32(win.img.crtPrefs.Brightness.Get().(float64))
f := float32(win.img.displayPrefs.Colour.Brightness.Get().(float64))
minv := float32(0.1)
maxv := float32(1.90)
label := fmt.Sprintf("%.0f", 100*(f-minv)/(maxv-minv))
if imgui.SliderFloatV("##brightness", &f, minv, maxv, label, imgui.SliderFlagsNone) {
win.img.crtPrefs.Brightness.Set(f)
win.img.displayPrefs.Colour.Brightness.Set(f)
}
}
func (win *winPrefs) drawContrast() {
imgui.BeginGroup()
defer imgui.EndGroup()
imgui.Text(fmt.Sprintf("%c Contrast", fonts.TVContrast))
f := float32(win.img.crtPrefs.Contrast.Get().(float64))
f := float32(win.img.displayPrefs.Colour.Contrast.Get().(float64))
minv := float32(0.1)
maxv := float32(1.90)
label := fmt.Sprintf("%.0f", 100*(f-minv)/(maxv-minv))
if imgui.SliderFloatV("##contrast", &f, minv, maxv, label, imgui.SliderFlagsNone) {
win.img.crtPrefs.Contrast.Set(f)
win.img.displayPrefs.Colour.Contrast.Set(f)
}
}
func (win *winPrefs) drawSaturation() {
imgui.BeginGroup()
defer imgui.EndGroup()
imgui.Text(fmt.Sprintf("%c Saturation", fonts.TVSaturation))
f := float32(win.img.crtPrefs.Saturation.Get().(float64))
f := float32(win.img.displayPrefs.Colour.Saturation.Get().(float64))
minv := float32(0.1)
maxv := float32(1.90)
label := fmt.Sprintf("%.0f", 100*(f-minv)/(maxv-minv))
if imgui.SliderFloatV("##saturation", &f, minv, maxv, label, imgui.SliderFlagsNone) {
win.img.crtPrefs.Saturation.Set(f)
win.img.displayPrefs.Colour.Saturation.Set(f)
}
}
func (win *winPrefs) drawHue() {
imgui.BeginGroup()
defer imgui.EndGroup()
imgui.Text(fmt.Sprintf("%c Hue", fonts.TVHue))
f := float32(win.img.crtPrefs.Hue.Get().(float64))
f := float32(win.img.displayPrefs.Colour.Hue.Get().(float64))
minv := float32(-0.99)
maxv := float32(0.99)
@ -88,6 +103,6 @@ func (win *winPrefs) drawHue() {
label := fmt.Sprintf("%.0f\u00b0", (f+minv+maxv)/(aminv+amaxv)*360)
if imgui.SliderFloatV("##hue", &f, minv, maxv, label, imgui.SliderFlagsNone) {
win.img.crtPrefs.Hue.Set(f)
win.img.displayPrefs.Colour.Hue.Set(f)
}
}

124
gui/sdlimgui/win_prefs_crt.go
View file

@ -42,7 +42,7 @@ func (win *winPrefs) drawCRT() {
imgui.Separator()
imgui.Spacing()
if imgui.BeginTableV("crtPrefs", 3, imgui.TableFlagsBordersInnerV, imgui.Vec2{}, 1.0) {
if imgui.BeginTableV("displayPrefs.CRT", 3, imgui.TableFlagsBordersInnerV, imgui.Vec2{}, 1.0) {
imgui.TableSetupColumnV("0", imgui.TableColumnFlagsWidthFixed, 200, 0)
imgui.TableSetupColumnV("1", imgui.TableColumnFlagsWidthFixed, 200, 1)
imgui.TableSetupColumnV("2", imgui.TableColumnFlagsWidthFixed, 200, 2)
@ -97,12 +97,12 @@ func (win *winPrefs) drawCRT() {
}
func (win *winPrefs) drawCurve() {
b := win.img.crtPrefs.Curve.Get().(bool)
b := win.img.displayPrefs.CRT.Curve.Get().(bool)
if imgui.Checkbox("Curve##curve", &b) {
win.img.crtPrefs.Curve.Set(b)
win.img.displayPrefs.CRT.Curve.Set(b)
}
f := float32(win.img.crtPrefs.CurveAmount.Get().(float64))
f := float32(win.img.displayPrefs.CRT.CurveAmount.Get().(float64))
var label string
@ -115,17 +115,17 @@ func (win *winPrefs) drawCurve() {
}
if imgui.SliderFloatV("##curveamount", &f, 1.0, 0.0, label, 1.0) {
win.img.crtPrefs.CurveAmount.Set(f)
win.img.displayPrefs.CRT.CurveAmount.Set(f)
}
}
func (win *winPrefs) drawMask() {
b := win.img.crtPrefs.Mask.Get().(bool)
b := win.img.displayPrefs.CRT.Mask.Get().(bool)
if imgui.Checkbox("Shadow Mask##mask", &b) {
win.img.crtPrefs.Mask.Set(b)
win.img.displayPrefs.CRT.Mask.Set(b)
}
f := float32(win.img.crtPrefs.MaskIntensity.Get().(float64))
f := float32(win.img.displayPrefs.CRT.MaskIntensity.Get().(float64))
var label string
@ -140,10 +140,10 @@ func (win *winPrefs) drawMask() {
}
if imgui.SliderFloatV("##maskintensity", &f, 0.025, 0.125, label, 1.0) {
win.img.crtPrefs.MaskIntensity.Set(f)
win.img.displayPrefs.CRT.MaskIntensity.Set(f)
}
fine := float32(win.img.crtPrefs.MaskFine.Get().(float64))
fine := float32(win.img.displayPrefs.CRT.MaskFine.Get().(float64))
if fine >= 3.0 {
label = "very fine"
@ -156,17 +156,17 @@ func (win *winPrefs) drawMask() {
}
if imgui.SliderFloatV("##maskfine", &fine, 1.5, 3.5, label, 1.0) {
win.img.crtPrefs.MaskFine.Set(fine)
win.img.displayPrefs.CRT.MaskFine.Set(fine)
}
}
func (win *winPrefs) drawScanlines() {
b := win.img.crtPrefs.Scanlines.Get().(bool)
b := win.img.displayPrefs.CRT.Scanlines.Get().(bool)
if imgui.Checkbox("Scanlines##scanlines", &b) {
win.img.crtPrefs.Scanlines.Set(b)
win.img.displayPrefs.CRT.Scanlines.Set(b)
}
f := float32(win.img.crtPrefs.ScanlinesIntensity.Get().(float64))
f := float32(win.img.displayPrefs.CRT.ScanlinesIntensity.Get().(float64))
var label string
@ -181,10 +181,10 @@ func (win *winPrefs) drawScanlines() {
}
if imgui.SliderFloatV("##scanlinesintensity", &f, 0.025, 0.125, label, 1.0) {
win.img.crtPrefs.ScanlinesIntensity.Set(f)
win.img.displayPrefs.CRT.ScanlinesIntensity.Set(f)
}
fine := float32(win.img.crtPrefs.ScanlinesFine.Get().(float64))
fine := float32(win.img.displayPrefs.CRT.ScanlinesFine.Get().(float64))
if fine > 2.25 {
label = "very fine"
@ -197,17 +197,17 @@ func (win *winPrefs) drawScanlines() {
}
if imgui.SliderFloatV("##scanlinesfine", &fine, 1.5, 2.5, label, 1.0) {
win.img.crtPrefs.ScanlinesFine.Set(fine)
win.img.displayPrefs.CRT.ScanlinesFine.Set(fine)
}
}
func (win *winPrefs) drawInterference() {
b := win.img.crtPrefs.Interference.Get().(bool)
b := win.img.displayPrefs.CRT.Interference.Get().(bool)
if imgui.Checkbox("Interference##interference", &b) {
win.img.crtPrefs.Interference.Set(b)
win.img.displayPrefs.CRT.Interference.Set(b)
}
f := float32(win.img.crtPrefs.InterferenceLevel.Get().(float64))
f := float32(win.img.displayPrefs.CRT.InterferenceLevel.Get().(float64))
var label string
@ -222,17 +222,17 @@ func (win *winPrefs) drawInterference() {
}
if imgui.SliderFloatV("##interferencelevel", &f, 0.1, 0.2, label, 1.0) {
win.img.crtPrefs.InterferenceLevel.Set(f)
win.img.displayPrefs.CRT.InterferenceLevel.Set(f)
}
}
func (win *winPrefs) drawFlicker() {
b := win.img.crtPrefs.Flicker.Get().(bool)
b := win.img.displayPrefs.CRT.Flicker.Get().(bool)
if imgui.Checkbox("Flicker##flicker", &b) {
win.img.crtPrefs.Flicker.Set(b)
win.img.displayPrefs.CRT.Flicker.Set(b)
}
f := float32(win.img.crtPrefs.FlickerLevel.Get().(float64))
f := float32(win.img.displayPrefs.CRT.FlickerLevel.Get().(float64))
var label string
@ -247,17 +247,17 @@ func (win *winPrefs) drawFlicker() {
}
if imgui.SliderFloatV("##flickerlevel", &f, 0.01, 0.06, label, 1.0) {
win.img.crtPrefs.FlickerLevel.Set(f)
win.img.displayPrefs.CRT.FlickerLevel.Set(f)
}
}
func (win *winPrefs) drawFringing() {
b := win.img.crtPrefs.Fringing.Get().(bool)
b := win.img.displayPrefs.CRT.Fringing.Get().(bool)
if imgui.Checkbox("Colour Fringing##fringing", &b) {
win.img.crtPrefs.Fringing.Set(b)
win.img.displayPrefs.CRT.Fringing.Set(b)
}
f := float32(win.img.crtPrefs.FringingAmount.Get().(float64))
f := float32(win.img.displayPrefs.CRT.FringingAmount.Get().(float64))
var label string
@ -272,17 +272,17 @@ func (win *winPrefs) drawFringing() {
}
if imgui.SliderFloatV("##fringingamount", &f, 0.0, 0.6, label, 1.0) {
win.img.crtPrefs.FringingAmount.Set(f)
win.img.displayPrefs.CRT.FringingAmount.Set(f)
}
}
func (win *winPrefs) drawGhosting() {
b := win.img.crtPrefs.Ghosting.Get().(bool)
b := win.img.displayPrefs.CRT.Ghosting.Get().(bool)
if imgui.Checkbox("Ghosting##ghosting", &b) {
win.img.crtPrefs.Ghosting.Set(b)
win.img.displayPrefs.CRT.Ghosting.Set(b)
}
f := float32(win.img.crtPrefs.GhostingAmount.Get().(float64))
f := float32(win.img.displayPrefs.CRT.GhostingAmount.Get().(float64))
var label string
@ -297,20 +297,20 @@ func (win *winPrefs) drawGhosting() {
}
if imgui.SliderFloatV("##ghostingamount", &f, 0.0, 4.5, label, 1.0) {
win.img.crtPrefs.GhostingAmount.Set(f)
win.img.displayPrefs.CRT.GhostingAmount.Set(f)
}
}
func (win *winPrefs) drawPhosphor() {
b := win.img.crtPrefs.Phosphor.Get().(bool)
b := win.img.displayPrefs.CRT.Phosphor.Get().(bool)
if imgui.Checkbox("Phosphor##phosphor", &b) {
win.img.crtPrefs.Phosphor.Set(b)
win.img.displayPrefs.CRT.Phosphor.Set(b)
}
var label string
// latency
f := float32(win.img.crtPrefs.PhosphorLatency.Get().(float64))
f := float32(win.img.displayPrefs.CRT.PhosphorLatency.Get().(float64))
if f > 0.7 {
label = "very slow"
@ -323,11 +323,11 @@ func (win *winPrefs) drawPhosphor() {
}
if imgui.SliderFloatV("##phosphorlatency", &f, 0.9, 0.1, label, 1.0) {
win.img.crtPrefs.PhosphorLatency.Set(f)
win.img.displayPrefs.CRT.PhosphorLatency.Set(f)
}
// bloom
g := float32(win.img.crtPrefs.PhosphorBloom.Get().(float64))
g := float32(win.img.displayPrefs.CRT.PhosphorBloom.Get().(float64))
if g > 1.70 {
label = "very high bloom"
@ -340,12 +340,12 @@ func (win *winPrefs) drawPhosphor() {
}
if imgui.SliderFloatV("##phosphorbloom", &g, 0.20, 2.20, label, 1.0) {
win.img.crtPrefs.PhosphorBloom.Set(g)
win.img.displayPrefs.CRT.PhosphorBloom.Set(g)
}
}
func (win *winPrefs) drawSharpness() {
f := float32(win.img.crtPrefs.Sharpness.Get().(float64))
f := float32(win.img.displayPrefs.CRT.Sharpness.Get().(float64))
var label string
@ -360,14 +360,14 @@ func (win *winPrefs) drawSharpness() {
}
if imgui.SliderFloatV("##sharpness", &f, 0.1, 1.1, label, 1.0) {
win.img.crtPrefs.Sharpness.Set(f)
win.img.displayPrefs.CRT.Sharpness.Set(f)
}
}
func (win *winPrefs) drawBlackLevel() {
imgui.Text("Black Level")
f := float32(win.img.crtPrefs.BlackLevel.Get().(float64))
f := float32(win.img.displayPrefs.CRT.BlackLevel.Get().(float64))
var label string
@ -380,17 +380,17 @@ func (win *winPrefs) drawBlackLevel() {
}
if imgui.SliderFloatV("##blacklevel", &f, 0.00, 0.20, label, 1.0) {
win.img.crtPrefs.BlackLevel.Set(f)
win.img.displayPrefs.CRT.BlackLevel.Set(f)
}
}
func (win *winPrefs) drawRoundedCorners() {
b := win.img.crtPrefs.RoundedCorners.Get().(bool)
b := win.img.displayPrefs.CRT.RoundedCorners.Get().(bool)
if imgui.Checkbox("Rounded Corners##roundedcorners", &b) {
win.img.crtPrefs.RoundedCorners.Set(b)
win.img.displayPrefs.CRT.RoundedCorners.Set(b)
}
f := float32(win.img.crtPrefs.RoundedCornersAmount.Get().(float64))
f := float32(win.img.displayPrefs.CRT.RoundedCornersAmount.Get().(float64))
var label string
@ -405,17 +405,17 @@ func (win *winPrefs) drawRoundedCorners() {
}
if imgui.SliderFloatV("##roundedcornersamount", &f, 0.02, 0.09, label, 1.0) {
win.img.crtPrefs.RoundedCornersAmount.Set(f)
win.img.displayPrefs.CRT.RoundedCornersAmount.Set(f)
}
}
func (win *winPrefs) drawBevel() {
b := win.img.crtPrefs.Bevel.Get().(bool)
b := win.img.displayPrefs.CRT.Bevel.Get().(bool)
if imgui.Checkbox("Bevel##bevel", &b) {
win.img.crtPrefs.Bevel.Set(b)
win.img.displayPrefs.CRT.Bevel.Set(b)
}
f := float32(win.img.crtPrefs.BevelSize.Get().(float64))
f := float32(win.img.displayPrefs.CRT.BevelSize.Get().(float64))
var label string
@ -430,24 +430,24 @@ func (win *winPrefs) drawBevel() {
}
if imgui.SliderFloatV("##bevelSize", &f, 0.005, 0.025, label, 1.0) {
win.img.crtPrefs.BevelSize.Set(f)
win.img.displayPrefs.CRT.BevelSize.Set(f)
}
}
func (win *winPrefs) drawShine() {
b := win.img.crtPrefs.Shine.Get().(bool)
b := win.img.displayPrefs.CRT.Shine.Get().(bool)
if imgui.Checkbox("Shine##shine", &b) {
win.img.crtPrefs.Shine.Set(b)
win.img.displayPrefs.CRT.Shine.Set(b)
}
}
func (win *winPrefs) drawPixelPerfect() bool {
b := !win.img.crtPrefs.Enabled.Get().(bool)
b := !win.img.displayPrefs.CRT.Enabled.Get().(bool)
if imgui.Checkbox("Pixel Perfect##pixelpefect", &b) {
win.img.crtPrefs.Enabled.Set(!b)
win.img.displayPrefs.CRT.Enabled.Set(!b)
}
if win.img.crtPrefs.Enabled.Get().(bool) {
if win.img.displayPrefs.CRT.Enabled.Get().(bool) {
imgui.PushItemFlag(imgui.ItemFlagsDisabled, true)
imgui.PushStyleVarFloat(imgui.StyleVarAlpha, disabledAlpha)
defer imgui.PopStyleVar()
@ -456,7 +456,7 @@ func (win *winPrefs) drawPixelPerfect() bool {
imgui.SameLineV(0, 25)
f := float32(win.img.crtPrefs.PixelPerfectFade.Get().(float64))
f := float32(win.img.displayPrefs.CRT.PixelPerfectFade.Get().(float64))
var label string
if f > 0.7 {
@ -471,7 +471,7 @@ func (win *winPrefs) drawPixelPerfect() bool {
imgui.PushItemWidth(imguiRemainingWinWidth() * 0.75)
if imgui.SliderFloatV("##pixelperfectfade", &f, 0.0, 0.9, label, 1.0) {
win.img.crtPrefs.PixelPerfectFade.Set(f)
win.img.displayPrefs.CRT.PixelPerfectFade.Set(f)
}
imgui.PopItemWidth()
@ -484,7 +484,7 @@ available when 'Pixel Perfect' mode is disabled.`)
func (win *winPrefs) drawVSYNC() {
imguiLabel("Recovery")
recovery := int32(win.img.crtPrefs.VSyncRecovery.Get().(int))
recovery := int32(win.img.displayPrefs.CRT.VSyncRecovery.Get().(int))
var label string
if recovery == 0 {
label = "sync immediately"
@ -493,7 +493,7 @@ func (win *winPrefs) drawVSYNC() {
}
if imgui.SliderIntV("##vsyncRecovery", &recovery, 0, 20, label, 1.0) {
win.img.crtPrefs.VSyncRecovery.Set(recovery)
win.img.displayPrefs.CRT.VSyncRecovery.Set(recovery)
}
win.img.imguiTooltipSimple(`The number of frames required for
the TV to recover after desynchronisation`)
@ -501,7 +501,7 @@ the TV to recover after desynchronisation`)
imgui.SameLineV(0, 15)
imguiLabel("Sensitivity")
sensitivity := int32(win.img.crtPrefs.VSyncSensitivity.Get().(int))
sensitivity := int32(win.img.displayPrefs.CRT.VSyncSensitivity.Get().(int))
if sensitivity == 1 {
label = fmt.Sprintf("%d scanline", sensitivity)
} else {
@ -509,7 +509,7 @@ the TV to recover after desynchronisation`)
}
if imgui.SliderIntV("##vsyncSensitivity", &sensitivity, 0, 4, label, 1.0) {
win.img.crtPrefs.VSyncSensitivity.Set(sensitivity)
win.img.displayPrefs.CRT.VSyncSensitivity.Set(sensitivity)
}
win.img.imguiTooltipSimple(`The number of scanlines that VSYNC

4
prefs/defunct.go
View file

@ -68,6 +68,10 @@ var defunct = []string{
"crt.syncSensitivity",
"sdlimgui.playmode.coprocDevNotification",
"sdlimgui.playmode.fpsOverlay",
"crt.brightness",
"crt.contrast",
"crt.hue",
"crt.saturation",
}
// returns true if string is in list of defunct values.