From f24ee982957d64d4a7b5122d11ba67cf447b60c4 Mon Sep 17 00:00:00 2001
From: Scott Erickson <sderickson@gmail.com>
Date: Mon, 19 May 2014 22:17:01 -0700
Subject: [PATCH] More work on mark sizing.
---
app/lib/surface/Mark.coffee | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/app/lib/surface/Mark.coffee b/app/lib/surface/Mark.coffee
index b283e82a4..114fdc2eb 100644
--- a/app/lib/surface/Mark.coffee
+++ b/app/lib/surface/Mark.coffee
@@ -241,21 +241,19 @@ module.exports = class Mark extends CocoClass
oldMark.parent.addChild @mark
oldMark.parent.swapChildren oldMark, @mark
oldMark.parent.removeChild oldMark
+
+ if @markSprite?
+ @markSprite.updateScale()
return unless @name in ["selection", "target", "repair", "highlight"]
- scale = 0.5
if @sprite?.imageObject
size = @sprite.getAverageDimension()
size += 60 if @name is 'selection'
size += 60 if @name is 'repair'
size *= @sprite.scaleFactor
scale = size / {selection: 128, target: 128, repair: 320, highlight: 160}[@name]
+ scale /= 3
if @sprite?.thang.spriteName.search(/(dungeon|indoor).wall/i) isnt -1
scale *= 2
-
- if @markSprite?
- @markSprite.scaleFactor = scale
- @markSprite.updateScale()
- else
@mark.scaleX = @mark.scaleY = Math.min 1, scale
if @name in ['selection', 'target', 'repair']
@mark.scaleY *= @camera.y2x # code applies perspective