From a602783dd80a648eabb50ff3c4096cb013aa05f9 Mon Sep 17 00:00:00 2001
From: Loudrob <loudhuddles131@yahoo.com>
Date: Thu, 5 Mar 2015 06:59:28 -0500
Subject: [PATCH] Nametag: Improved scaling by distance.
---
toontown/nametag/Nametag3d.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/toontown/nametag/Nametag3d.py b/toontown/nametag/Nametag3d.py
index 41ee0696..a661e5ff 100644
--- a/toontown/nametag/Nametag3d.py
+++ b/toontown/nametag/Nametag3d.py
@@ -11,8 +11,8 @@ from toontown.toontowngui.Clickable3d import Clickable3d
class Nametag3d(Nametag, Clickable3d):
SCALING_MIN_DISTANCE = 1
- SCALING_MAX_DISTANCE = 50
- SCALING_FACTOR = 0.065
+ SCALING_MAX_DISTANCE = 200
+ SCALING_FACTOR = 0.085
def __init__(self):
Nametag.__init__(self)
@@ -105,13 +105,15 @@ class Nametag3d(Nametag, Clickable3d):
def tick(self, task):
distance = self.contents.getPos(base.cam).length()
+ extraScale = 1.0
if distance < self.SCALING_MIN_DISTANCE:
distance = self.SCALING_MIN_DISTANCE
elif distance > self.SCALING_MAX_DISTANCE:
+ extraScale = 1.4
distance = self.SCALING_MAX_DISTANCE
if distance != self.distance:
- self.contents.setScale(math.sqrt(distance) * self.SCALING_FACTOR)
+ self.contents.setScale(math.sqrt(distance) * self.SCALING_FACTOR * extraScale)
self.distance = distance
self.updateClickRegion()