From b6dd89fce55840fadffca0248c2e2fda064befb5 Mon Sep 17 00:00:00 2001 From: John Cote Date: Mon, 28 Jun 2021 00:25:16 -0400 Subject: [PATCH] widescreen: Initial work on widescreen support --- etc/Configrc.prc | 2 +- toontown/toonbase/ToonBase.py | 2 +- toontown/toonbase/ToontownStart.py | 5 +++-- toontown/toontowngui/ToontownLoadingScreen.py | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/etc/Configrc.prc b/etc/Configrc.prc index 4a93696..dfe75e3 100644 --- a/etc/Configrc.prc +++ b/etc/Configrc.prc @@ -38,7 +38,7 @@ extractor-step-time 0.5 required-login playToken server-failover 80 443 dx-use-rangebased-fog #t -aspect-ratio 1.333333 +#aspect-ratio 1.333333 on-screen-debug-font ImpressBT.ttf temp-hpr-fix 1 vertex-buffers 0 diff --git a/toontown/toonbase/ToonBase.py b/toontown/toonbase/ToonBase.py index 6075dc3..19bea97 100644 --- a/toontown/toonbase/ToonBase.py +++ b/toontown/toonbase/ToonBase.py @@ -58,7 +58,7 @@ class ToonBase(OTPBase.OTPBase): self.wantDynamicShadows = 0 self.exitErrorCode = 0 camera.setPosHpr(0, 0, 0, 0, 0, 0) - self.camLens.setFov(ToontownGlobals.DefaultCameraFov) + self.camLens.setMinFov(ToontownGlobals.DefaultCameraFov / (4. / 3.)) self.camLens.setNearFar(ToontownGlobals.DefaultCameraNear, ToontownGlobals.DefaultCameraFar) self.musicManager.setVolume(0.65) self.setBackgroundColor(ToontownGlobals.DefaultBackgroundColor) diff --git a/toontown/toonbase/ToontownStart.py b/toontown/toonbase/ToontownStart.py index 0610d55..d08b97f 100644 --- a/toontown/toonbase/ToontownStart.py +++ b/toontown/toonbase/ToontownStart.py @@ -53,9 +53,10 @@ ConfigVariableDouble('decompressor-step-time').setValue(0.01) ConfigVariableDouble('extractor-step-time').setValue(0.01) backgroundNodePath = aspect2d.attachNewNode(backgroundNode, 0) backgroundNodePath.setPos(0.0, 0.0, 0.0) -backgroundNodePath.setScale(render2d, VBase3(1)) +backgroundNodePath.setScale(aspect2d, VBase3(1.33, 1, 1)) backgroundNodePath.find('**/fg').setBin('fixed', 20) backgroundNodePath.find('**/bg').setBin('fixed', 10) +backgroundNodePath.find('**/bg').setScale(aspect2d, VBase3(base.getAspectRatio(), 1, 1)) base.graphicsEngine.renderFrame() DirectGuiGlobals.setDefaultRolloverSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_rollover.ogg')) DirectGuiGlobals.setDefaultClickSound(base.loader.loadSfx('phase_3/audio/sfx/GUI_create_toon_fwd.ogg')) @@ -78,7 +79,7 @@ from . import ToontownLoader from direct.gui.DirectGui import * serverVersion = base.config.GetString('server-version', 'no_version_set') print('ToontownStart: serverVersion: ', serverVersion) -version = OnscreenText(serverVersion, pos=(-1.3, -0.975), scale=0.06, fg=Vec4(0, 0, 1, 0.6), align=TextNode.ALeft) +version = OnscreenText(serverVersion, parent=base.a2dBottomLeft, pos=(0.033, 0.025), scale=0.06, fg=Vec4(0, 0, 1, 0.6), align=TextNode.ALeft) loader.beginBulkLoad('init', TTLocalizer.LoaderLabel, 138, 0, TTLocalizer.TIP_NONE) from .ToonBaseGlobal import * from direct.showbase.MessengerGlobal import * diff --git a/toontown/toontowngui/ToontownLoadingScreen.py b/toontown/toontowngui/ToontownLoadingScreen.py index 2bf3e4d..5e37135 100644 --- a/toontown/toontowngui/ToontownLoadingScreen.py +++ b/toontown/toontowngui/ToontownLoadingScreen.py @@ -41,6 +41,7 @@ class ToontownLoadingScreen: self.waitBar.reparentTo(self.gui) self.title.reparentTo(self.gui) self.gui.reparentTo(aspect2dp, DGG.NO_FADE_SORT_INDEX) + self.gui.find('**/bg').setScale(aspect2dp, VBase3(base.getAspectRatio(), 1, 1)) else: self.waitBar.reparentTo(aspect2dp, DGG.NO_FADE_SORT_INDEX) self.title.reparentTo(aspect2dp, DGG.NO_FADE_SORT_INDEX)