diff options
author | hwc487 | 2012-04-19 13:01:43 -0700 |
---|---|---|
committer | hwc487 | 2012-04-19 13:01:43 -0700 |
commit | e6a20fe64574763483dc602bd759278ccf5e5e68 (patch) | |
tree | 69defe7200206f0257fe90697136fadef59d521e /js/stage/tool-handle.js | |
parent | ae7eb87564632ce7c676bd728b8ff2710ff0bb83 (diff) | |
parent | 9284c19f076dec3b47ece7dc7bcd22d74e4246c3 (diff) | |
download | ninja-e6a20fe64574763483dc602bd759278ccf5e5e68.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Conflicts:
js/lib/drawing/world.js
js/lib/geom/geom-obj.js
js/lib/rdge/materials/cloud-material.js
js/lib/rdge/materials/deform-material.js
js/lib/rdge/materials/flat-material.js
js/lib/rdge/materials/material.js
js/lib/rdge/materials/pulse-material.js
js/lib/rdge/materials/relief-tunnel-material.js
js/lib/rdge/materials/square-tunnel-material.js
js/lib/rdge/materials/star-material.js
js/lib/rdge/materials/taper-material.js
js/lib/rdge/materials/tunnel-material.js
js/lib/rdge/materials/twist-material.js
js/lib/rdge/materials/twist-vert-material.js
js/lib/rdge/materials/uber-material.js
js/lib/rdge/materials/water-material.js
js/lib/rdge/materials/z-invert-material.js
Diffstat (limited to 'js/stage/tool-handle.js')
-rwxr-xr-x | js/stage/tool-handle.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/js/stage/tool-handle.js b/js/stage/tool-handle.js index f16d8324..d353da47 100755 --- a/js/stage/tool-handle.js +++ b/js/stage/tool-handle.js | |||
@@ -235,6 +235,8 @@ exports.RotateHandle = Montage.create(ToolHandle, { | |||
235 | context.strokeStyle = this._strokeStyle; | 235 | context.strokeStyle = this._strokeStyle; |
236 | context.fillStyle = this._fillStyle; | 236 | context.fillStyle = this._fillStyle; |
237 | context.lineWidth = this._lineWidth; | 237 | context.lineWidth = this._lineWidth; |
238 | context.shadowBlur = 2; | ||
239 | context.shadowColor = "rgba(0, 0, 0, 0.8)"; | ||
238 | 240 | ||
239 | var pointOnElt = base.slice(0); | 241 | var pointOnElt = base.slice(0); |
240 | // this._origin = viewUtils.localToGlobal(pointOnElt, item); | 242 | // this._origin = viewUtils.localToGlobal(pointOnElt, item); |
@@ -400,7 +402,8 @@ exports.RotateHandle = Montage.create(ToolHandle, { | |||
400 | var context = this.application.ninja.stage.drawingContext; | 402 | var context = this.application.ninja.stage.drawingContext; |
401 | context.save(); | 403 | context.save(); |
402 | 404 | ||
403 | context.strokeStyle = this._strokeStyle; | 405 | context.strokeStyle = "rgba(0,0,0,1)"; |
406 | context.lineWidth = 2; | ||
404 | context.fillStyle = this._fillStyle; | 407 | context.fillStyle = this._fillStyle; |
405 | context.globalAlpha = 0.2; | 408 | context.globalAlpha = 0.2; |
406 | 409 | ||
@@ -574,6 +577,8 @@ exports.TranslateHandle = Montage.create(ToolHandle, { | |||
574 | context.strokeStyle = this._strokeStyle; | 577 | context.strokeStyle = this._strokeStyle; |
575 | context.fillStyle = this._fillStyle; | 578 | context.fillStyle = this._fillStyle; |
576 | context.lineWidth = this._lineWidth; | 579 | context.lineWidth = this._lineWidth; |
580 | context.shadowBlur = 2; | ||
581 | context.shadowColor = "rgba(0, 0, 0, 0.8)"; | ||
577 | 582 | ||
578 | var pointOnElt = base.slice(0); | 583 | var pointOnElt = base.slice(0); |
579 | // this._origin = viewUtils.localToGlobal(pointOnElt, item); | 584 | // this._origin = viewUtils.localToGlobal(pointOnElt, item); |