Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vpinball configgen: pup support and 4:3 backglass ratio #11880

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

vpinball configgen: pup support and 4:3 backglass ratio #11880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...tocera/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballOptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,12 @@ def configureOptions(vpinballSettings, system):
else:
vpinballSettings.set("Standalone", "AltSound","1")

# PupTopperWindow
if system.isOptSet("vpinball_puptopper") and system.getOptBoolean("vpinball_puptopper") == False:
vpinballSettings.set("Standalone", "PUPTopperWindow", "1")
else:
vpinballSettings.set("Standalone", "PUPTopperWindow", "0")

# select which ID for sounddevices by running:
# /usr/bin/vpinball/VPinballX_GL -listsnd
if system.isOptSet("vpinball_sounddevice"):
Expand Down
188 changes: 166 additions & 22 deletions ...cera/core/batocera-configgen/configgen/configgen/generators/vpinball/vpinballWindowing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,13 @@ def configureWindowing(vpinballSettings, system, gameResolution, hasDmd):
Rscreen=16/9

# which windows to display, and where ?
flexdmd_config = getFlexDmdConfiguration(system, screens, hasDmd)
pinmame_config = getPinmameConfiguration(system, screens)
b2s_config = getB2sConfiguration(system, screens)
b2sdmd_config = getB2sdmdConfiguration(system, screens, hasDmd)
b2sgrill_config = getB2sgrillConfiguration(system, screens)
flexdmd_config = getFlexDmdConfiguration(system, screens, hasDmd)
pinmame_config = getPinmameConfiguration(system, screens)
b2s_config = getB2sConfiguration(system, screens)
b2sdmd_config = getB2sdmdConfiguration(system, screens, hasDmd)
b2sgrill_config = getB2sgrillConfiguration(system, screens)
pupbackglass_config = getPupBackglassConfiguration(system, screens)
pupfulldmd_config = getPupFulldmdConfiguration(system, screens)

# determine playField and backglass screens numbers
reverse_playfield_and_b2s = False
Expand Down Expand Up @@ -55,15 +57,24 @@ def configureWindowing(vpinballSettings, system, gameResolution, hasDmd):

# PinMame
if pinmame_config != "manual":
configurePinmame(vpinballSettings, pinmame_config, b2s_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize)

configurePinmame(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize)
# FlexDMD
if flexdmd_config != "manual":
configureFlexdmd(vpinballSettings, flexdmd_config, b2s_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize)

configureFlexdmd(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize)
# B2S and B2SDMD
if b2s_config != "manual":
configureB2s(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize)
configureB2s(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize)

# PUP
vpinballSettings.set("Standalone", "B2SPlugins", "1")
vpinballSettings.set("Standalone", "PUPCapture", "1")
vpinballSettings.set("Standalone", "PUPPlugin", "1")

if pupbackglass_config != "manual":
configurePupBackglass(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize)
if pupfulldmd_config != "manual":
configurePupFulldmd(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize)


def getFlexDmdConfiguration(system, screens, hasDmd):
val = ""
Expand Down Expand Up @@ -108,10 +119,37 @@ def getB2sConfiguration(system, screens):
val = "screen2"
else:
val = "disabled"
if len(screens) <= 1 and (val == "screen2" or val == "screen243"):
val = "disabled"
return val

def getPupBackglassConfiguration(system, screens):
val = ""
if system.isOptSet("vpinball_pupbackglass"):
val = system.config["vpinball_pupbackglass"]
if val == "":
if len(screens) > 1:
val = "screen2"
else:
val = "disabled"
if len(screens) <= 1 and val == "screen2":
val = "disabled"
return val

def getPupFulldmdConfiguration(system, screens):
val = ""
if system.isOptSet("vpinball_pupfulldmd"):
val = system.config["vpinball_pupfulldmd"]
if val == "":
if len(screens) > 1:
val = "screen2"
else:
val = "disabled"
if len(screens) <= 1 and val == "screen2":
val = "disabled"
return val


def getB2sdmdConfiguration(system, screens, hasDmd):
if system.isOptSet("vpinball_b2sdmd") and system.getOptBoolean("vpinball_b2sdmd") == False: # switchon
return False
Expand All @@ -130,7 +168,7 @@ def configurePlayfield(vpinballSettings, screens, playFieldScreen):
vpinballSettings.set("Player", "Width", str(screens[playFieldScreen]["width"]))
vpinballSettings.set("Player", "Height", str(screens[playFieldScreen]["height"]))

def configurePinmame(vpinballSettings, pinmame_config, b2s_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize):
def configurePinmame(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize):
WindowName = "PinMAMEWindow"
Rwindow = 4/1 #Usual Ratio for this window
small,medium,large=20,25,30
Expand All @@ -143,7 +181,7 @@ def configurePinmame(vpinballSettings, pinmame_config, b2s_config, screens, back
vpinballSettings.set("Standalone", WindowName, "1")

if pinmame_config == "screen2":
if b2s_config == "screen2": # share with b2s screen
if b2s_config == "screen2" or b2s_config == "screen243": # share with b2s screen
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]+(screens[backglassScreen]["width"]-dmdsize[0])//2))
vpinballSettings.set("Standalone", WindowName+"Y", str(screens[backglassScreen]["y"]))
vpinballSettings.set("Standalone", WindowName+"Width", str(dmdsize[0]))
Expand Down Expand Up @@ -200,7 +238,7 @@ def getDMDWindowSize(system, gameResolution):
return [1024, 128]
return [1024, 256] # like 128x32

def configureFlexdmd(vpinballSettings, flexdmd_config, b2s_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize):
def configureFlexdmd(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize):
WindowName = "FlexDMDWindow"
Rwindow = 4/1 # Usual Ratio for this window
small,medium,large=20,25,30
Expand All @@ -213,8 +251,7 @@ def configureFlexdmd(vpinballSettings, flexdmd_config, b2s_config, screens, back
vpinballSettings.set("Standalone", WindowName,"1")

if flexdmd_config == "screen2":
if b2s_config == "screen2": # share with b2s screen
vpinballSettings.set("Standalone", WindowName,"1")
if b2s_config == "screen2" or b2s_config == "screen243": # share with b2s screen vpinballSettings.set("Standalone", WindowName,"1")
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]+(screens[backglassScreen]["width"]-dmdsize[0])//2))
vpinballSettings.set("Standalone", WindowName+"Y", str(screens[backglassScreen]["y"]))
vpinballSettings.set("Standalone", WindowName+"Width", str(dmdsize[0]))
Expand Down Expand Up @@ -259,7 +296,7 @@ def configureFlexdmd(vpinballSettings, flexdmd_config, b2s_config, screens, back
vpinballSettings.set("Standalone", WindowName+"Width", ConvertToPixel(gameResolution["width"], width))
vpinballSettings.set("Standalone", WindowName+"Height", ConvertToPixel(gameResolution["height"], height))

def configureB2s(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize):
def configureB2s(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize):
WindowName = "B2SBackglass"
Rwindow = 4/3 # Usual Ratio for this window
small,medium,large=20,25,30
Expand All @@ -275,16 +312,25 @@ def configureB2s(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b
vpinballSettings.set("Standalone", "B2SWindows", "1")
vpinballSettings.set("Standalone", "B2SHideGrill", "0")

if b2s_config == "screen2":
if flexdmd_config == "screen2" or pinmame_config == "screen2": # share with dmd screen
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]))
if b2s_config == "screen2" or b2s_config == "screen243":
if b2s_config == "screen2":
width = screens[backglassScreen]["width"]
xoffset = 0
if flexdmd_config == "screen2" or pinmame_config == "screen2": # share with dmd screen
if b2s_config == "screen243":
width=int((screens[backglassScreen]["height"]-dmdsize[1])*4/3)
xoffset = int((screens[backglassScreen]["width"]-width)/2)
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]+xoffset))
vpinballSettings.set("Standalone", WindowName+"Y", str(dmdsize[1]))
vpinballSettings.set("Standalone", WindowName+"Width", str(screens[backglassScreen]["width"]))
vpinballSettings.set("Standalone", WindowName+"Width", str(width))
vpinballSettings.set("Standalone", WindowName+"Height", str(screens[backglassScreen]["height"]-dmdsize[1]))
else:
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]))
if b2s_config == "screen243":
width=int((screens[backglassScreen]["height"])*4/3)
xoffset = int((screens[backglassScreen]["width"]-width)/2)
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]+xoffset))
vpinballSettings.set("Standalone", WindowName+"Y", str(screens[backglassScreen]["y"]))
vpinballSettings.set("Standalone", WindowName+"Width", str(screens[backglassScreen]["width"]))
vpinballSettings.set("Standalone", WindowName+"Width", str(width))
vpinballSettings.set("Standalone", WindowName+"Height", str(screens[backglassScreen]["height"]))
else:
if b2s_config == "topright_small":
Expand Down Expand Up @@ -333,6 +379,104 @@ def configureB2s(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b
else:
vpinballSettings.set("Standalone", "B2SHideGrill", "1")

def configurePupBackglass(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize):
WindowName = "PUPBackglassWindow"
Rwindow = 16/9 # Usual Ratio for this window
small,medium,large=25,30,35
x,y,width=0,0,medium

if pupbackglass_config=="disabled":
vpinballSettings.set("Standalone", WindowName, "0")
return

vpinballSettings.set("Standalone", WindowName, "1")

if pupbackglass_config == "screen2":
if flexdmd_config == "screen2" or pinmame_config == "screen2": # share with dmd screen
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]))
vpinballSettings.set("Standalone", WindowName+"Y", str(dmdsize[1]))
vpinballSettings.set("Standalone", WindowName+"Width", str(screens[backglassScreen]["width"]))
vpinballSettings.set("Standalone", WindowName+"Height", str(screens[backglassScreen]["height"]-dmdsize[1]))
else:
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]))
vpinballSettings.set("Standalone", WindowName+"Y", str(screens[backglassScreen]["y"]))
vpinballSettings.set("Standalone", WindowName+"Width", str(screens[backglassScreen]["width"]))
vpinballSettings.set("Standalone", WindowName+"Height", str(screens[backglassScreen]["height"]))
else:
if pupbackglass_config == "topright_small":
width = small
x = 100-width
if pupbackglass_config == "topright_medium":
width = medium
x = 100-width
if pupbackglass_config == "topright_large":
width = large
x = 100-width
if pupbackglass_config == "topleft_small":
width = small
x = 0
if pupbackglass_config == "topleft_medium":
width = medium
x = 0
if pupbackglass_config == "topleft_large":
width = large
x = 0
# apply settings
height = RelativeHeightCalculate(Rscreen, Rwindow, width)
vpinballSettings.set("Standalone",WindowName+"X", ConvertToPixel(gameResolution["width"], x))
vpinballSettings.set("Standalone",WindowName+"Y", ConvertToPixel(gameResolution["height"], y))
vpinballSettings.set("Standalone",WindowName+"Width", ConvertToPixel(gameResolution["width"], width))
vpinballSettings.set("Standalone",WindowName+"Height", ConvertToPixel(gameResolution["height"], height))

def configurePupFulldmd(vpinballSettings, flexdmd_config, pinmame_config, b2s_config, b2sdmd_config, b2sgrill_config, pupbackglass_config, pupfulldmd_config, screens, backglassScreen, Rscreen, gameResolution, dmdsize):
WindowName = "PUPFullDMDWindow"
Rwindow = 16/9 # Usual Ratio for this window
small,medium,large=25,30,35
x,y,width=0,0,medium

if pupfulldmd_config=="disabled":
vpinballSettings.set("Standalone", WindowName, "0")
return

vpinballSettings.set("Standalone", WindowName, "1")

if pupfulldmd_config == "screen2":
if flexdmd_config == "screen2" or pinmame_config == "screen2": # share with dmd screen
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]))
vpinballSettings.set("Standalone", WindowName+"Y", str(dmdsize[1]))
vpinballSettings.set("Standalone", WindowName+"Width", str(screens[backglassScreen]["width"]))
vpinballSettings.set("Standalone", WindowName+"Height", str(screens[backglassScreen]["height"]-dmdsize[1]))
else:
vpinballSettings.set("Standalone", WindowName+"X", str(screens[backglassScreen]["x"]))
vpinballSettings.set("Standalone", WindowName+"Y", str(screens[backglassScreen]["y"]))
vpinballSettings.set("Standalone", WindowName+"Width", str(screens[backglassScreen]["width"]))
vpinballSettings.set("Standalone", WindowName+"Height", str(screens[backglassScreen]["height"]))
else:
if pupfulldmd_config == "topright_small":
width = small
x = 100-width
if pupfulldmd_config == "topright_medium":
width = medium
x = 100-width
if pupfulldmd_config == "topright_large":
width = large
x = 100-width
if pupfulldmd_config == "topleft_small":
width = small
x = 0
if pupfulldmd_config == "topleft_medium":
width = medium
x = 0
if pupfulldmd_config == "topleft_large":
width = large
x = 0
# apply settings
height = RelativeHeightCalculate(Rscreen, Rwindow, width)
vpinballSettings.set("Standalone",WindowName+"X", ConvertToPixel(gameResolution["width"], x))
vpinballSettings.set("Standalone",WindowName+"Y", ConvertToPixel(gameResolution["height"], y))
vpinballSettings.set("Standalone",WindowName+"Width", ConvertToPixel(gameResolution["width"], width))
vpinballSettings.set("Standalone",WindowName+"Height", ConvertToPixel(gameResolution["height"], height))

# Extra_windows (pinmamedmd, flexdmd, b2s,b2sdmd)
# VideogetCurrentResolution to convert from percentage to pixel value
# necessary trick because people can plug their 1080p laptop on a 4k TV
Expand Down
34 changes: 34 additions & 0 deletions package/batocera/emulationstation/batocera-es-system/es_features.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12464,6 +12464,7 @@ vpinball:
"Top-Left Position, Medium": "topleft_medium"
"Top-Left Position, Large": "topleft_large"
"On screen 2 if available": "screen2"
"On screen 2 with ratio 4:3 if available": "screen243"
"Disabled": "disabled"
"Manual": "manual"
vpinball_b2sdmd:
Expand All @@ -12485,6 +12486,39 @@ vpinball:
"128x32": "128x32"
"192x64": "192x64"
"256x64": "256x64"
vpinball_pupbackglass:
group: WINDOWS POSITIONS
prompt: PUP BACKGLASS
description: Improved Backglass displaying some extra videos. By default, settings come from the VPinballX.ini configuration file.
choices:
"Top-Right Position, Small": "topright_small"
"Top-Right Position, Medium": "topright_medium"
"Top-Right Position, Large": "topright_large"
"Top-Left Position, Small": "topleft_small"
"Top-Left Position, Medium": "topleft_medium"
"Top-Left Position, Large": "topleft_large"
"On screen 2 if available": "screen2"
"Disabled": "disabled"
"Manual": "manual"
vpinball_pupfulldmd:
group: WINDOWS POSITIONS
prompt: PUP FULLDMD
description: The Pup FullDMD displays scoring and instructions with advanced effects like video files and animations on some recent or original tables without a rom. By default, settings come from the VPinballX.ini configuration file.
choices:
"Top-Right Position, Small": "topright_small"
"Top-Right Position, Medium": "topright_medium"
"Top-Right Position, Large": "topright_large"
"Top-Left Position, Small": "topleft_small"
"Top-Left Position, Medium": "topleft_medium"
"Top-Left Position, Large": "topleft_large"
"On screen 2 if available": "screen2"
"Disabled": "disabled"
"Manual": "manual"
vpinball_puptopper:
group: WINDOWS POSITIONS
prompt: HIDE SEPARATE PUP TOPPER
description: Small display on the top of the backglass. Position and size settings come from the VPinballX.ini.
preset: switchon
vpinball_inverseplayfieldandb2s:
group: WINDOWS POSITIONS
prompt: INVERSE PLAYFIELD AND B2S
Expand Down