Revert "ported over opentts widescreen support"
This reverts commit 9498a1f861.
This commit is contained in:
parent
63d6036a7e
commit
5cb37eb6ab
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
Loading…
Reference in New Issue