Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
peach-cgt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4eb0196
)
player 2 sees table mirrored vertically
author
Jason Woofenden
<jason@jasonwoof.com>
Thu, 27 Oct 2011 21:19:15 +0000
(17:19 -0400)
committer
Jason Woofenden
<jason@jasonwoof.com>
Thu, 27 Oct 2011 21:20:23 +0000
(17:20 -0400)
client.coffee
patch
|
blob
|
history
diff --git
a/client.coffee
b/client.coffee
index
177f3b4
..
7f22674
100644
(file)
--- a/
client.coffee
+++ b/
client.coffee
@@
-1,5
+1,6
@@
# globals
$table = null
# globals
$table = null
+table_height = 0
state = null
server_url = null
state = null
server_url = null
@@
-23,11
+24,18
@@
unless Array::shuffle?
new_button = (text) -> $ $ "<div class=\"button\">#{text}</div>"
new_button = (text) -> $ $ "<div class=\"button\">#{text}</div>"
+# transform coordinates from client-side coords to server-side coords (or back)
+# this makes it so p2 view everything upside down (mirrored), but still sends coords rightside up
+transform_coords = (coords) ->
+ ret = {left: coords.left, top: coords.top}
+ if state.agent is 'p2'
+ ret.top = table_height - ret.top
+ return ret
+
instantiate_card = (card) ->
text = card.text
instantiate_card = (card) ->
text = card.text
- x = card.x
- y = card.y
- view = $ $ "<div class=\"card\" style=\"left: #{x}px; top: #{y}px\"><span class=\"cardtext\">#{text}</span></div>"
+ view_coords = transform_coords {left: card.x, top: card.y}
+ view = $ $ "<div class=\"card\" style=\"left: #{view_coords.left}px; top: #{view_coords.top}px\"><span class=\"cardtext\">#{text}</span></div>"
button_box = $ $ '<div/>'
flip_button = new_button "flip over"
mark_button = new_button "mark"
button_box = $ $ '<div/>'
flip_button = new_button "flip over"
mark_button = new_button "mark"
@@
-45,7
+53,7
@@
instantiate_card = (card) ->
$table.append view
view.draggable stack: '.card'
view.bind 'dragstop', (event, ui) ->
$table.append view
view.draggable stack: '.card'
view.bind 'dragstop', (event, ui) ->
- p = view.position()
+ p = transform_coords view.position()
state.move state.agent, card.number, p.left, p.top
card.view = view
state.move state.agent, card.number, p.left, p.top
card.view = view
@@
-115,7
+123,8
@@
init = ->
if agent is me
tell_server ['move', agent, card, x, y]
else
if agent is me
tell_server ['move', agent, card, x, y]
else
- state.cards[card].view.animate { left: "#{x}px", top: "#{y}px"}, 800
+ coords = transform_coords {left: x, top: y}
+ state.cards[card].view.animate { left: "#{coords.left}px", top: "#{coords.top}px"}, 800
state.on 'mark', (agent, card, state) ->
@cards[card].view.toggleClass 'marked', state
if agent is me
state.on 'mark', (agent, card, state) ->
@cards[card].view.toggleClass 'marked', state
if agent is me
@@
-140,4
+149,5
@@
init = ->
$ ->
$table = $ '#table'
$ ->
$table = $ '#table'
+ table_height = $table.height() - 148 # FIXME auto-detect card height
init()
init()