diff --git a/etc/Configrc.prc b/etc/Configrc.prc index a269857..522e1ba 100644 --- a/etc/Configrc.prc +++ b/etc/Configrc.prc @@ -1,5 +1,5 @@ # Window Settings -window-title B.Rock's TT Fixes +window-title Toontown icon-filename phase_3/models/gui/toontown.ico cursor-filename phase_3/models/gui/toonmono.cur @@ -12,9 +12,7 @@ aux-display tinydisplay depth-bits 24 audio-sfx-active #t audio-music-active #t -#aspect-ratio 1.333333 -framebuffer-hardware #t -multisamples 4 +aspect-ratio 1.333333 # Models/Resources model-path resources diff --git a/toontown/toonbase/ToonBase.py b/toontown/toonbase/ToonBase.py index fc944f3..99d29a9 100644 --- a/toontown/toonbase/ToonBase.py +++ b/toontown/toonbase/ToonBase.py @@ -55,7 +55,7 @@ class ToonBase(OTPBase.OTPBase): self.wantDynamicShadows = 0 self.exitErrorCode = 0 camera.setPosHpr(0, 0, 0, 0, 0, 0) - self.camLens.setMinFov(ToontownGlobals.DefaultCameraFov / (4. / 3.)) + self.camLens.setFov(ToontownGlobals.DefaultCameraFov) 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 36672e8..de6d608 100644 --- a/toontown/toonbase/ToontownStart.py +++ b/toontown/toonbase/ToontownStart.py @@ -63,10 +63,9 @@ 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(aspect2d, VBase3(1.33, 1, 1)) +backgroundNodePath.setScale(render2d, VBase3(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')) @@ -90,7 +89,7 @@ else: from direct.gui.DirectGui import OnscreenText serverVersion = ConfigVariableString('server-version', 'no_version_set').value print('ToontownStart: serverVersion: ', serverVersion) -version = OnscreenText(serverVersion, parent=base.a2dBottomLeft, pos=(0.033, 0.025), scale=0.06, fg=Vec4(0, 0, 1, 0.6), align=TextNode.ALeft) +version = OnscreenText(serverVersion, pos=(-1.3, -0.975), scale=0.06, fg=Vec4(0, 0, 1, 0.6), align=TextNode.ALeft) loader.beginBulkLoad('init', TTLocalizer.LoaderLabel, 138, 0, TTLocalizer.TIP_NONE) from toontown.distributed.ToontownClientRepository import ToontownClientRepository cr = ToontownClientRepository(serverVersion, launcher) diff --git a/toontown/toontowngui/ToontownLoadingScreen.py b/toontown/toontowngui/ToontownLoadingScreen.py index 6377a4a..c4de1f6 100644 --- a/toontown/toontowngui/ToontownLoadingScreen.py +++ b/toontown/toontowngui/ToontownLoadingScreen.py @@ -52,7 +52,6 @@ class ToontownLoadingScreen: self.waitBar.reparentTo(self.gui) self.title.reparentTo(self.gui) self.gui.reparentTo(hidden) - self.gui.find('**/bg').setScale(aspect2dp, VBase3(base.getAspectRatio(), 1, 1)) return (self.__expectedCount, self.__count) def abort(self):