Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad:[9086] armagetronad/trunk/armagetronad
|
From: <baz...@us...> - 2009-02-28 23:17:17
|
Revision: 9086
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9086&view=rev
Author: bazaarmagetron
Date: 2009-02-28 23:17:07 +0000 (Sat, 28 Feb 2009)
Log Message:
-----------
Manuel Moos: Merged Luke-Jr's zone cleanup branch.
Modified Paths:
--------------
armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp
armagetronad/trunk/armagetronad/src/engine/eGameObject.h
armagetronad/trunk/armagetronad/src/tools/tPolynomial.cpp
armagetronad/trunk/armagetronad/src/tools/tPolynomial.h
armagetronad/trunk/armagetronad/src/tron/gGame.cpp
armagetronad/trunk/armagetronad/src/tron/gParser.cpp
armagetronad/trunk/armagetronad/src/tron/gParser.h
armagetronad/trunk/armagetronad/src/tron/zone/zEffectGroup.cpp
armagetronad/trunk/armagetronad/src/tron/zone/zEffector.cpp
armagetronad/trunk/armagetronad/src/tron/zone/zEffector.h
armagetronad/trunk/armagetronad/src/tron/zone/zFortress.cpp
armagetronad/trunk/armagetronad/src/tron/zone/zMisc.h
armagetronad/trunk/armagetronad/src/tron/zone/zSelector.cpp
armagetronad/trunk/armagetronad/src/tron/zone/zShape.cpp
armagetronad/trunk/armagetronad/src/tron/zone/zShape.h
armagetronad/trunk/armagetronad/src/tron/zone/zTimedZone.cpp
armagetronad/trunk/armagetronad/src/tron/zone/zZone.cpp
armagetronad/trunk/armagetronad/src/tron/zone/zZone.h
Removed Paths:
-------------
armagetronad/trunk/armagetronad/src/tron/zone/shapeCircle.h
Property Changed:
----------------
armagetronad/trunk/armagetronad/
Property changes on: armagetronad/trunk/armagetronad
___________________________________________________________________
Modified: bzr:revision-info
- timestamp: 2009-02-28 20:14:47.447999954 +0100
committer: Manuel Moos <z-...@us...>
properties:
branch-nick: armagetronad
+ timestamp: 2009-02-28 22:04:11.640000105 +0100
committer: Manuel Moos <z-...@us...>
properties:
branch-nick: armagetronad
Modified: bzr:ancestry:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs
- svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394
svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715
voodoo-20080418152302-ig27bh2y1fbkwp6b
z-...@us...-20090105231059-64ezj2pllnvlf5s6
svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754
z-...@us...-20090106232555-c0rb04zb284g544v
z-...@us...-20090106235948-tei6dwt5b5ac0s6j
z-...@us...-20090107093029-m0zav0ckcpf5b8b7
lee...@gm...-20090107170845-jnex0i7u41wb3ovq
da...@da...-20090108021335-ep7dny6f7hrl380e
lee...@gm...-20090109021549-p0ce8in8453gexow
z-...@us...-20090112094132-31xbu83j367i7qck
z-...@us...-20090112102021-296xw0o0kas9uloi
z-...@us...-20090112103632-yroyhl5crs8uad38
ma...@mo...-20090112112802-yk5fp7eetdy8ef48
ma...@mo...-20090112115717-sd79x6ml6zk0noom
z-...@us...-20090113073533-hmwz45y2gj2ptcpk
z-...@us...-20090124222719-p3fjoaua9erewjgf
z-...@us...-20090126151939-p4hg3740ce23qlmx
z-...@us...-20090118233742-2moj2gn6mqjtixbx
lee...@gm...-20090119003538-68wuas2ov54qrsgp
z-...@us...-20090127083429-v73fl8hifom6fv53
z-...@us...-20090202121501-gaa4p2bxdp2zrvr3
z-...@us...-20090217081716-0hw7dox1wi418jy0
luk...@da...-20090227094815-rqlqco4svxc53t60
+ svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8394
svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8715
voodoo-20080418152302-ig27bh2y1fbkwp6b
z-...@us...-20090105231059-64ezj2pllnvlf5s6
svn-v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs:7d95bf1e-0414-0410-9756-b78462a59f44:armagetronad%2Ftrunk%2Farmagetronad:8754
z-...@us...-20090106232555-c0rb04zb284g544v
z-...@us...-20090106235948-tei6dwt5b5ac0s6j
z-...@us...-20090107093029-m0zav0ckcpf5b8b7
lee...@gm...-20090107170845-jnex0i7u41wb3ovq
da...@da...-20090108021335-ep7dny6f7hrl380e
lee...@gm...-20090109021549-p0ce8in8453gexow
z-...@us...-20090112094132-31xbu83j367i7qck
z-...@us...-20090112102021-296xw0o0kas9uloi
z-...@us...-20090112103632-yroyhl5crs8uad38
ma...@mo...-20090112112802-yk5fp7eetdy8ef48
ma...@mo...-20090112115717-sd79x6ml6zk0noom
z-...@us...-20090113073533-hmwz45y2gj2ptcpk
z-...@us...-20090124222719-p3fjoaua9erewjgf
z-...@us...-20090126151939-p4hg3740ce23qlmx
z-...@us...-20090118233742-2moj2gn6mqjtixbx
lee...@gm...-20090119003538-68wuas2ov54qrsgp
z-...@us...-20090127083429-v73fl8hifom6fv53
z-...@us...-20090202121501-gaa4p2bxdp2zrvr3
z-...@us...-20090217081716-0hw7dox1wi418jy0
luk...@da...-20090227094815-rqlqco4svxc53t60
luk...@da...-20090227183814-rcrifwbe2o8qzibo
Modified: bzr:revision-id:v3-list-QlpoOTFBWSZTWZvbKhsAAAdRgAAQABK6798QIABURMgAAaeoNT1TxT1DQbKaeobXKiyAmlWT7Y5MkdJOtXDtB7w7DOGFBHiOBxaUIu7HQyyQSvxdyRThQkJvbKhs
- 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr
626 z-...@us...-20080214170110-rhfpd874zuogr3cm
627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b
657 z-...@us...-20080301093905-0jwh1zg9srukp8fn
678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a
679 z-...@us...-20080324202056-eybvkm0gjomywbcq
680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd
681 epsy-20080327213346-setzm7umdzzuk2dm
683 wrt...@us...-20080402122117-54nak33inuca02o9
684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd
685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn
686 ep...@fr...-20080418200503-q16s8az3yewn4x7a
687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3
688 wrt...@us...-20080419185850-ksm1feadrrhqigjb
689 wrt...@us...-20080423170738-zb8v72r0asm7cp52
691 ep...@fr...-20080427145818-212ave5ohdhth4ph
692 epsy46-20080428164518-07b9wsj90rf82c3y
693 epsy46-20080429194430-hq3fd6i1mnz1vrnz
694 ep...@fr...-20080518131839-uik8hj18c55boh3m
696 z-...@us...-20080618212520-e6ov1rb9b9edwt30
697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf
698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl
699 da...@da...-20080824021014-8aacq5gfp7ktxlxz
700 da...@da...-20080824055426-l5dwhb216uteu7ca
701 da...@da...-20080824172432-lvagd99j28hq8uc1
702 da...@da...-20080824225545-ply97boo9jkqtysn
704 ep...@fr...-20081027173216-nh6d92edtwe35j2g
705 ep...@fr...-20081027203505-42bpegw0fyywzyou
706 ep...@fr...-20081027204727-jcx89jukht9ay72r
707 ep...@fr...-20081028180734-62o6e90rf020xzv8
708 ep...@fr...-20081028224044-f3myemuy87v52ilp
709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq
710 ep...@fr...-20081114212232-i1q12n375bdpl0sp
712 z-...@us...-20081211141049-wbjceadupsfss5ib
713 da...@da...-20081216223143-1hso83uxyagaubg8
716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7
717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl
718 lee...@gm...-20081220085502-gpad43pu99t1e6po
719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb
720 lee...@gm...-20081220094339-k3zb139qp87r4b2w
721 lee...@gm...-20081220100858-uap7k5s22tbipzkt
722 lee...@gm...-20081220111203-rhp5p15agx73xi1k
723 lee...@gm...-20081220112757-mjp2yffddjy5s74e
724 lee...@gm...-20081220114653-k2dqt4wiizipbwas
725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6
726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw
734 lee...@gm...-20081230173103-fmzio9fanap2rybf
735 lee...@gm...-20081230174204-cppkz4sumguhysa9
736 lee...@gm...-20081230174738-mecjttlpyp1i859c
737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3
738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr
739 lee...@gm...-20081231202038-odzabc3wmlqzvskt
740 lee...@gm...-20081231203835-nn2kezh1el82dn1q
741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz
743 da...@da...-20090103170253-cdtppjz8nzwhngst
744 da...@da...-20090103183413-r1852m22og3lh2uc
745 lee...@gm...-20090103212852-mvsergjd4ao1la77
746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8
748 da...@da...-20090105115751-x3y9oui4xvt43crj
749 da...@da...-20090105131244-nljbq3qp4hp7lg07
750 da...@da...-20090105192648-inoxhljmqqe3dgw7
751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0
752 da...@da...-20090106194428-nwwwyljr8wn3pwq1
753 da...@da...-20090106194753-82zu5xfqfzbnk9k9
754 da...@da...-20090106202104-5z9836ych2di2jlo
755 da...@da...-20090106234335-aolp3kr0gasjmbri
756 da...@da...-20090106234811-p3el5s40j0upvyql
757 da...@da...-20090107021107-5kbemotp1sco4ncp
758 da...@da...-20090107051447-8ncvyikf3aadgz3a
759 da...@da...-20090107071255-jhqi9p9212levb60
760 z-...@us...-20090107105902-l6x07af4hr2py066
761 z-...@us...-20090107111842-2o0fqp72oxz55jri
762 z-...@us...-20090107113141-mo1g3b0jgzhyj001
763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e
764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1
770 z-...@us...-20090111232523-lnab7ymhxk94pdh1
771 z-...@us...-20090111232619-ukmmx5gfarcoiipi
772 z-...@us...-20090111233014-dazt93cibmg56v3i
774 z-...@us...-20090112103858-psygqhxdmdaer8iz
775 z-...@us...-20090112104018-jik2mqnc14fg5bdk
776 z-...@us...-20090112104123-hvkx0sxhs9wz706b
777 z-...@us...-20090112114514-v1u04w5v83ai75lz
778 z-...@us...-20090112115926-ltqy35euxny3n7zc
779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5
780 lee...@gm...-20090112194338-2zfak9nrxm961yh5
781 lee...@gm...-20090112194729-dlonazcnq20npwqk
782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j
783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf
784 lee...@gm...-20090112214315-r8akrgn38um8llfc
785 z-...@us...-20090115005714-uscid6wcwnjqzcht
787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym
788 z-...@us...-20090116160116-47he0b9dhkvzfo8e
789 z-...@us...-20090116160130-yu0foyldpp0w651o
794 z-...@us...-20090119152329-7zjbhlxicmzrs3st
795 z-...@us...-20090119152406-eh33pwel5c1ev3tn
796 z-...@us...-20090124222920-5j301djumy6o30js
797 lee...@gm...-20090125161331-yk5t26dos9w7vqh3
798 lee...@gm...-20090125161412-uqkzofyzrzbw5fku
799 z-...@us...-20090125215052-nlr7n742el563xdo
801 z-...@us...-20090126114408-qusodq3le7x4cxmu
802 z-...@us...-20090126114433-hel0im4ncfqun48y
805 z-...@us...-20090126205856-miq23b488w0ybg08
806 z-...@us...-20090126213956-zvazq7x917mgwgcx
807 z-...@us...-20090127091358-zyxrvmeiem90y980
808 z-...@us...-20090127091531-1nu13tf1ylwyfeu2
809 z-...@us...-20090127091641-9ejvsyc3pnqwcquk
811 z-...@us...-20090127214457-3xlqb0gqbff5fzrp
812 z-...@us...-20090127215738-ef3azdi8gyejpmod
814 z-...@us...-20090128112925-ae2c03271u9dfxhw
815 z-...@us...-20090128120342-mbnkieilhllj4p4i
816 z-...@us...-20090128120737-3ln3obsj4d6tqn2a
818 lee...@gm...-20090131032714-zj324yiwx4wni02q
819 ep...@fr...-20090125161823-9dd0qka61mwcz3c1
820 ep...@fr...-20090131143119-vb7l6bbps0mq4nz0
821 wrt...@us...-20090131191353-72oxaevmd0c43bcd
822 wrt...@us...-20090131192158-su1i1fq7a22l8m4t
823 wrt...@us...-20090131202016-24mecfpuyglq88bm
824 lee...@gm...-20090201001131-102ieca1w2tgx88j
825 lee...@gm...-20090201001411-lgn4q6qa50huba5h
826 lee...@gm...-20090201005238-sbzpnl8po5nz4p0p
827 lee...@gm...-20090201005537-esbp0iuxn2wq9ngh
830 z-...@us...-20090202133840-7iwg1phjzr3uzssl
831 lee...@gm...-20090202152533-iya7luyiiaimmann
832 ep...@fr...-20090202212943-20822j01vxylgi1c
833 lee...@gm...-20090207183547-3l0rhwd4b1cb6ksi
837 lee...@gm...-20090212204958-7qcxyvg6gg25zjaj
841 z-...@us...-20090217081732-6jpvxz8o92sti37z
842 z-...@us...-20090217100425-q62s7uu2j4h9keq4
843 z-...@us...-20090217223904-w2fk3zhgjs0s0t55
844 z-...@us...-20090217224702-zs3dd362cll5szp7
845 z-...@us...-20090219175237-ynhe2ijn23bj3824
846 z-...@us...-20090221110006-fgbl1dk4q41b7x1f
848 z-...@us...-20090223100007-f7epfrh7lfmpv5t9
849 z-...@us...-20090224115230-pgv2rxw6412ndwcx
850 z-...@us...-20090224121247-g8ycdgh9m2dn6yth
854 wrt...@us...-20090227072038-tpfjivi0uhpgrl1a
856 z-...@us...-20090227114018-torvxxmcdpf66wwu
857 z-...@us...-20090227114224-sp0ihfus7xw2fcfv
858 z-...@us...-20090227122808-o2h53nb648qvcwb3
859 z-...@us...-20090227122836-k2jjl684gaico2p1
860 z-...@us...-20090227123920-flur7p6h2g24a0hm
861 z-...@us...-20090227143152-4nay9c5k5zzmdrr3
862 lee...@gm...-20090227182603-mo7djpl31xkh38bv
863 z-...@us...-20090227201048-rin598t8m9fctjf7
864 z-...@us...-20090227201140-fnx5r434n3urmz3i
865 z-...@us...-20090227204211-qwwrnbjkx3knmbko
866 z-...@us...-20090227204603-w8nle3nyd4r5ldng
867 z-...@us...-20090227205040-xqmbjcv8nxwt9t9z
868 z-...@us...-20090227205731-2m1v554bbt2qhxes
869 z-...@us...-20090227210145-bij5hlj5x82u461d
870 z-...@us...-20090227212539-wmt09xs5wb72jal9
871 z-...@us...-20090228191447-a5kgcgxger1uktqn
+ 613 z-...@us...-20080211141509-cwbrb6hmtz9313jr
626 z-...@us...-20080214170110-rhfpd874zuogr3cm
627 z-...@us...-20080214170244-1gstsfe9yzyvrx9b
657 z-...@us...-20080301093905-0jwh1zg9srukp8fn
678 wrt...@us...-20080320130546-cr72y7d9q5a8nk7a
679 z-...@us...-20080324202056-eybvkm0gjomywbcq
680 z-...@us...-20080326104303-kpkkrwiw1fioi0rd
681 epsy-20080327213346-setzm7umdzzuk2dm
683 wrt...@us...-20080402122117-54nak33inuca02o9
684 wrt...@us...-20080402122804-2xhc8bgyrjsa09cd
685 wrt...@us...-20080418093840-cxtpql4xw2vsbmyn
686 ep...@fr...-20080418200503-q16s8az3yewn4x7a
687 ep...@fr...-20080419004917-bq4vguy9vpbkmlo3
688 wrt...@us...-20080419185850-ksm1feadrrhqigjb
689 wrt...@us...-20080423170738-zb8v72r0asm7cp52
691 ep...@fr...-20080427145818-212ave5ohdhth4ph
692 epsy46-20080428164518-07b9wsj90rf82c3y
693 epsy46-20080429194430-hq3fd6i1mnz1vrnz
694 ep...@fr...-20080518131839-uik8hj18c55boh3m
696 z-...@us...-20080618212520-e6ov1rb9b9edwt30
697 wrt...@us...-20080708142300-tu6f7ag7ak0yhdrf
698 wrt...@us...-20080727173310-pv1vq0wj01yfwgfl
699 da...@da...-20080824021014-8aacq5gfp7ktxlxz
700 da...@da...-20080824055426-l5dwhb216uteu7ca
701 da...@da...-20080824172432-lvagd99j28hq8uc1
702 da...@da...-20080824225545-ply97boo9jkqtysn
704 ep...@fr...-20081027173216-nh6d92edtwe35j2g
705 ep...@fr...-20081027203505-42bpegw0fyywzyou
706 ep...@fr...-20081027204727-jcx89jukht9ay72r
707 ep...@fr...-20081028180734-62o6e90rf020xzv8
708 ep...@fr...-20081028224044-f3myemuy87v52ilp
709 ep...@fr...-20081110193848-iksu9rmzzi7jb0qq
710 ep...@fr...-20081114212232-i1q12n375bdpl0sp
712 z-...@us...-20081211141049-wbjceadupsfss5ib
713 da...@da...-20081216223143-1hso83uxyagaubg8
716 lee...@gm...-20081220084635-zv6bpm9rar9yufy7
717 lee...@gm...-20081220085046-6rwe6cqmdlffs4rl
718 lee...@gm...-20081220085502-gpad43pu99t1e6po
719 lee...@gm...-20081220092821-q7uj4w92j6a3a7eb
720 lee...@gm...-20081220094339-k3zb139qp87r4b2w
721 lee...@gm...-20081220100858-uap7k5s22tbipzkt
722 lee...@gm...-20081220111203-rhp5p15agx73xi1k
723 lee...@gm...-20081220112757-mjp2yffddjy5s74e
724 lee...@gm...-20081220114653-k2dqt4wiizipbwas
725 lee...@gm...-20081221181637-6d0tfx7sx7syxfb6
726 lee...@gm...-20081221182603-9bkelm9x7aclb0bw
734 lee...@gm...-20081230173103-fmzio9fanap2rybf
735 lee...@gm...-20081230174204-cppkz4sumguhysa9
736 lee...@gm...-20081230174738-mecjttlpyp1i859c
737 lee...@gm...-20081230174816-qmtp2a3q8m52jsn3
738 lee...@gm...-20081230194247-q6oyx6cqfz03b2lr
739 lee...@gm...-20081231202038-odzabc3wmlqzvskt
740 lee...@gm...-20081231203835-nn2kezh1el82dn1q
741 lee...@gm...-20090101022727-myjxnrvqe5e4l1wz
743 da...@da...-20090103170253-cdtppjz8nzwhngst
744 da...@da...-20090103183413-r1852m22og3lh2uc
745 lee...@gm...-20090103212852-mvsergjd4ao1la77
746 da...@da...-20090103231550-6zn9qzo6gpj9kwu8
748 da...@da...-20090105115751-x3y9oui4xvt43crj
749 da...@da...-20090105131244-nljbq3qp4hp7lg07
750 da...@da...-20090105192648-inoxhljmqqe3dgw7
751 da...@da...-20090105192806-vhrs9hj8nr4lrdp0
752 da...@da...-20090106194428-nwwwyljr8wn3pwq1
753 da...@da...-20090106194753-82zu5xfqfzbnk9k9
754 da...@da...-20090106202104-5z9836ych2di2jlo
755 da...@da...-20090106234335-aolp3kr0gasjmbri
756 da...@da...-20090106234811-p3el5s40j0upvyql
757 da...@da...-20090107021107-5kbemotp1sco4ncp
758 da...@da...-20090107051447-8ncvyikf3aadgz3a
759 da...@da...-20090107071255-jhqi9p9212levb60
760 z-...@us...-20090107105902-l6x07af4hr2py066
761 z-...@us...-20090107111842-2o0fqp72oxz55jri
762 z-...@us...-20090107113141-mo1g3b0jgzhyj001
763 z-...@us...-20090107113517-dsyf4f6jroj6dr9e
764 z-...@us...-20090107114151-9n5m6mvsq9nh33p1
770 z-...@us...-20090111232523-lnab7ymhxk94pdh1
771 z-...@us...-20090111232619-ukmmx5gfarcoiipi
772 z-...@us...-20090111233014-dazt93cibmg56v3i
774 z-...@us...-20090112103858-psygqhxdmdaer8iz
775 z-...@us...-20090112104018-jik2mqnc14fg5bdk
776 z-...@us...-20090112104123-hvkx0sxhs9wz706b
777 z-...@us...-20090112114514-v1u04w5v83ai75lz
778 z-...@us...-20090112115926-ltqy35euxny3n7zc
779 lee...@gm...-20090112192634-vs5qzckrwxphs3k5
780 lee...@gm...-20090112194338-2zfak9nrxm961yh5
781 lee...@gm...-20090112194729-dlonazcnq20npwqk
782 lee...@gm...-20090112211701-prgmu1fh3p33tz1j
783 lee...@gm...-20090112212513-ojbb1zz98kk1mmzf
784 lee...@gm...-20090112214315-r8akrgn38um8llfc
785 z-...@us...-20090115005714-uscid6wcwnjqzcht
787 z-...@us...-20090116155610-s9rvqacdyl4uu2ym
788 z-...@us...-20090116160116-47he0b9dhkvzfo8e
789 z-...@us...-20090116160130-yu0foyldpp0w651o
794 z-...@us...-20090119152329-7zjbhlxicmzrs3st
795 z-...@us...-20090119152406-eh33pwel5c1ev3tn
796 z-...@us...-20090124222920-5j301djumy6o30js
797 lee...@gm...-20090125161331-yk5t26dos9w7vqh3
798 lee...@gm...-20090125161412-uqkzofyzrzbw5fku
799 z-...@us...-20090125215052-nlr7n742el563xdo
801 z-...@us...-20090126114408-qusodq3le7x4cxmu
802 z-...@us...-20090126114433-hel0im4ncfqun48y
805 z-...@us...-20090126205856-miq23b488w0ybg08
806 z-...@us...-20090126213956-zvazq7x917mgwgcx
807 z-...@us...-20090127091358-zyxrvmeiem90y980
808 z-...@us...-20090127091531-1nu13tf1ylwyfeu2
809 z-...@us...-20090127091641-9ejvsyc3pnqwcquk
811 z-...@us...-20090127214457-3xlqb0gqbff5fzrp
812 z-...@us...-20090127215738-ef3azdi8gyejpmod
814 z-...@us...-20090128112925-ae2c03271u9dfxhw
815 z-...@us...-20090128120342-mbnkieilhllj4p4i
816 z-...@us...-20090128120737-3ln3obsj4d6tqn2a
818 lee...@gm...-20090131032714-zj324yiwx4wni02q
819 ep...@fr...-20090125161823-9dd0qka61mwcz3c1
820 ep...@fr...-20090131143119-vb7l6bbps0mq4nz0
821 wrt...@us...-20090131191353-72oxaevmd0c43bcd
822 wrt...@us...-20090131192158-su1i1fq7a22l8m4t
823 wrt...@us...-20090131202016-24mecfpuyglq88bm
824 lee...@gm...-20090201001131-102ieca1w2tgx88j
825 lee...@gm...-20090201001411-lgn4q6qa50huba5h
826 lee...@gm...-20090201005238-sbzpnl8po5nz4p0p
827 lee...@gm...-20090201005537-esbp0iuxn2wq9ngh
830 z-...@us...-20090202133840-7iwg1phjzr3uzssl
831 lee...@gm...-20090202152533-iya7luyiiaimmann
832 ep...@fr...-20090202212943-20822j01vxylgi1c
833 lee...@gm...-20090207183547-3l0rhwd4b1cb6ksi
837 lee...@gm...-20090212204958-7qcxyvg6gg25zjaj
841 z-...@us...-20090217081732-6jpvxz8o92sti37z
842 z-...@us...-20090217100425-q62s7uu2j4h9keq4
843 z-...@us...-20090217223904-w2fk3zhgjs0s0t55
844 z-...@us...-20090217224702-zs3dd362cll5szp7
845 z-...@us...-20090219175237-ynhe2ijn23bj3824
846 z-...@us...-20090221110006-fgbl1dk4q41b7x1f
848 z-...@us...-20090223100007-f7epfrh7lfmpv5t9
849 z-...@us...-20090224115230-pgv2rxw6412ndwcx
850 z-...@us...-20090224121247-g8ycdgh9m2dn6yth
854 wrt...@us...-20090227072038-tpfjivi0uhpgrl1a
856 z-...@us...-20090227114018-torvxxmcdpf66wwu
857 z-...@us...-20090227114224-sp0ihfus7xw2fcfv
858 z-...@us...-20090227122808-o2h53nb648qvcwb3
859 z-...@us...-20090227122836-k2jjl684gaico2p1
860 z-...@us...-20090227123920-flur7p6h2g24a0hm
861 z-...@us...-20090227143152-4nay9c5k5zzmdrr3
862 lee...@gm...-20090227182603-mo7djpl31xkh38bv
863 z-...@us...-20090227201048-rin598t8m9fctjf7
864 z-...@us...-20090227201140-fnx5r434n3urmz3i
865 z-...@us...-20090227204211-qwwrnbjkx3knmbko
866 z-...@us...-20090227204603-w8nle3nyd4r5ldng
867 z-...@us...-20090227205040-xqmbjcv8nxwt9t9z
868 z-...@us...-20090227205731-2m1v554bbt2qhxes
869 z-...@us...-20090227210145-bij5hlj5x82u461d
870 z-...@us...-20090227212539-wmt09xs5wb72jal9
871 z-...@us...-20090228191447-a5kgcgxger1uktqn
872 z-...@us...-20090228210411-oxward6ey0qja0v9
Modified: armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/engine/eGameObject.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -638,7 +638,15 @@
void eGameObject::OnRoundBegin(){}
void eGameObject::OnRoundEnd(){}
+void eGameObject::OnBirth(){}
+void eGameObject::EnsureBorn() {
+ if (_born)
+ return;
+ _born = true;
+ OnBirth();
+}
+
void eGameObject::Kill(){}
// draws it to the screen using OpenGL
@@ -703,6 +711,8 @@
tJUST_CONTROLLED_PTR< eGameObject > keep( c ); // keep object alive
+ c->EnsureBorn();
+
REAL maxstep=.2;
// don't do a thing if the timestep is too small
Modified: armagetronad/trunk/armagetronad/src/engine/eGameObject.h
===================================================================
--- armagetronad/trunk/armagetronad/src/engine/eGameObject.h 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/engine/eGameObject.h 2009-02-28 23:17:07 UTC (rev 9086)
@@ -57,6 +57,9 @@
// small wrapper of TimestepThis doing preparation and cleanup work
static void TimestepThisWrapper(eGrid * grid, REAL currentTime, eGameObject *t, REAL minTimestep);
+ //! called immediately after the object is created, either right after round beginning or mid-game creation
+ virtual void OnBirth();
+
protected:
// does a timestep and all interactions for this gameobject,
// divided in many small steps
@@ -89,6 +92,8 @@
tJUST_CONTROLLED_PTR<eFace> currentFace; // the eFace pos it is currently
tCHECKED_PTR(eGrid) grid; // the game grid we are on
+ bool _born;
+
// entry and deletion in the list of all eGameObjects
public:
//! tells game objects what the maximum lag caused by lazy simulation of timesteps is
@@ -164,6 +169,9 @@
//! called when the round ends
virtual void OnRoundEnd();
+ //! call to ensure the object is "born"
+ void EnsureBorn();
+
//! destroys the gameobject (in the game)
virtual void Kill();
Modified: armagetronad/trunk/armagetronad/src/tools/tPolynomial.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tPolynomial.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tools/tPolynomial.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -74,6 +74,14 @@
// Empty
}
+tPolynomial::tPolynomial(const tFunction &tf, REAL refValue) //!< constructor
+ : referenceVarValue(refValue),
+ coefs(2)
+{
+ coefs[0] = tf.offset_;
+ coefs[1] = tf.slope_;
+}
+
tPolynomial::tPolynomial(const tFunction &tf) //!< constructor
: referenceVarValue(0.0),
coefs(2)
Modified: armagetronad/trunk/armagetronad/src/tools/tPolynomial.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tools/tPolynomial.h 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tools/tPolynomial.h 2009-02-28 23:17:07 UTC (rev 9086)
@@ -54,6 +54,7 @@
tPolynomial(REAL value); //!< constructor for constant polynomial
tPolynomial(tArray<REAL> const & newCoefs); //!< constructor
tPolynomial(const tPolynomial &tf); //!< constructor
+ tPolynomial(const tFunction &tf, REAL refValue); //!< constructor
tPolynomial(const tFunction &tf); //!< constructor
tPolynomial(std::string str); //!< constructor
Modified: armagetronad/trunk/armagetronad/src/tron/gGame.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/gGame.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -2728,6 +2728,7 @@
if ( e )
{
e->OnRoundBegin();
+ e->EnsureBorn();
}
}
}
Modified: armagetronad/trunk/armagetronad/src/tron/gParser.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gParser.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/gParser.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -933,7 +933,9 @@
// Get the label of the effector to be used
string effectorAttribute( myxmlGetProp(cur, "effect"));
- effector = zEffectorPtr(zEffectorManager::Create(effectorAttribute, tXmlParser::node(cur)));
+ effector = zEffectorPtr(zEffectorManager::Create(effectorAttribute));
+ effector->applyContext(state);
+ effector->readXML(tXmlParser::node(cur));
return effector;
}
@@ -2013,20 +2015,35 @@
bool
gParser::State_t::exists(std::string const & var)
+const
{
return _varstack.front().find(var) != _varstack.front().end();
}
bool
gParser::State_t::isset(std::string const & var)
+const
{
- return exists(var) && !_varstack.front()[var]->empty();
+ if (!exists(var))
+ return false;
+ my_map_t vars = _varstack.front();
+ my_map_t::const_iterator i;
+ if ((i = vars.find(var)) == vars.end())
+ return false;
+ if (i->second->empty())
+ return false;
+ return true;
}
boost::any
gParser::State_t::getAny(std::string const & var)
+const
{
- return *(_varstack.front()[var]);
+ my_map_t vars = _varstack.front();
+ my_map_t::const_iterator i;
+ if ((i = vars.find(var)) == vars.end())
+ return boost::any();
+ return *(i->second);
}
void
Modified: armagetronad/trunk/armagetronad/src/tron/gParser.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/gParser.h 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/gParser.h 2009-02-28 23:17:07 UTC (rev 9086)
@@ -32,13 +32,13 @@
public:
gParserState();
- bool exists(std::string const & var);
- bool isset(std::string const & var);
- template<typename T> bool istype(std::string const & var) {
+ bool exists(std::string const & var) const;
+ bool isset(std::string const & var) const;
+ template<typename T> bool istype(std::string const & var) const {
if (!isset(var))
return false;
try {
- boost::any_cast<T>(*(_varstack.front()[var]));
+ boost::any_cast<T>(getAny(var));
return true;
}
catch (const boost::bad_any_cast &)
@@ -46,8 +46,8 @@
return false;
}
}
- boost::any getAny(std::string const & var);
- template<typename T> T get(std::string const & var) {
+ boost::any getAny(std::string const & var) const;
+ template<typename T> T get(std::string const & var) const {
return boost::any_cast<T>(getAny(var));
}
void setAny(std::string const & var, boost::any val);
Deleted: armagetronad/trunk/armagetronad/src/tron/zone/shapeCircle.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/shapeCircle.h 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/shapeCircle.h 2009-02-28 23:17:07 UTC (rev 9086)
@@ -1,34 +0,0 @@
-typedef boost::shared_ptr<shape> ShapePtr;
-
-class shape {
- virtual ~shape();
-};
-
-class shapeCircle : public shape {
- tValue::Base() x;
- tValue::Base() y;
- tValue::Base() radius;
-
-public :
- shapeCircle(tValue::Base() _x, tValue::Base() _y, tValue::Base() _radius): x(_x), y(_y), radius(_radius) { };
-
-};
-
-class shapeTriangle : public shape {
- tValue::Base() x1;
- tValue::Base() y1;
- tValue::Base() x2;
- tValue::Base() y2;
- tValue::Base() x3;
- tValue::Base() y3;
-
-public:
- shapeSquare(tValue::Base() _x1, tValue::Base() _y1,
- tValue::Base() _x2, tValue::Base() _y2,
- tValue::Base() _x3, tValue::Base() _y3,
- ):
- x1(_x1), y1(_y1),
- x2(_x2), y2(_y2),
- x3(_x3), y3(_y3)
- {};
-};
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zEffectGroup.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zEffectGroup.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zEffectGroup.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -29,8 +29,6 @@
zEffectGroup::zEffectGroup(gVectorExtra< nNetObjectID > const owners, gVectorExtra< nNetObjectID > const teamOwners):
validators(),
- // monitorInfluences(),
- // zoneInfluences(),
d_owners(owners),
d_teamOwners(teamOwners),
d_calculatedTargets()
@@ -38,8 +36,6 @@
zEffectGroup::zEffectGroup(zEffectGroup const &other) :
validators(other.validators),
- // monitorInfluences(other.monitorInfluences),
- // zoneInfluences(other.zoneInfluences),
d_owners(other.d_owners),
d_teamOwners(other.d_teamOwners),
d_calculatedTargets(other.d_calculatedTargets)
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zEffector.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zEffector.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zEffector.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -86,6 +86,9 @@
*/
}
+void zEffector::applyContext(gParserState const &) {
+}
+
void
zEffector::readXML(tXmlParser::node const & node)
{
@@ -293,17 +296,9 @@
static zEffectorRegistration regSpawnPlayer("spawnplayer", "", zEffectorSpawnPlayer::create);
-void
-zEffectorSpawnPlayer::readXML(tXmlParser::node const & node)
-{
- // FIXME: Unique issue, we just care about context, not the node itself
- // FIXME: Someday, this will need to be checked for the right arena/grid
-
- gParser*parser = dynamic_cast<gParser*>(node.ownerDocument());
- assert(parser);
-
- setGrid(parser->contextGrid(node));
- setArena(parser->contextArena(node));
+void zEffectorSpawnPlayer::applyContext(gParserState const & state) {
+ setGrid( state.get<eGrid*>("grid") );
+ setArena( state.get<gArena*>("arena") );
}
void zEffectorSpawnPlayer::effect(gVectorExtra<ePlayerNetID *> &d_calculatedTargets)
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zEffector.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zEffector.h 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zEffector.h 2009-02-28 23:17:07 UTC (rev 9086)
@@ -41,6 +41,8 @@
#include "tFunction.h"
#include "tXmlParser.h"
+class gParserState;
+
class zEffector
{
public:
@@ -54,6 +56,7 @@
void apply(gVectorExtra<ePlayerNetID *> &d_calculatedTargets);
virtual void effect(gVectorExtra<ePlayerNetID *> &d_calculatedTargets) { };
+ virtual void applyContext(gParserState const &);
virtual void readXML(tXmlParser::node const &);
void setCount(int _count) {count = _count;};
@@ -245,7 +248,7 @@
virtual zEffectorSpawnPlayer *copy(void) const { return new zEffectorSpawnPlayer(*this); };
virtual ~zEffectorSpawnPlayer() {};
- void readXML(tXmlParser::node const &);
+ void applyContext(gParserState const &);
void setGrid(eGrid *_grid) {grid = _grid;};
void setArena(gArena *_arena) {arena = _arena;};
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zFortress.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zFortress.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zFortress.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -341,7 +341,10 @@
{
int kills = int( sg_onConquestKillRatio * team->NumPlayers() );
kills = kills > sg_onConquestKillMin ? kills : sg_onConquestKillMin;
- eCoord pos = GetPosition();
+ tCoord pos;
+ if (shape)
+ pos = shape->Position();
+ // FIXME: What should we use for origin if there is no shape?
while ( kills > 0 )
{
@@ -395,7 +398,14 @@
{
if ( team )
{
- sg_basezoneConqueredWriter << ePlayerNetID::FilterName(team->Name()) << GetPosition().x << GetPosition().y;
+ if (shape)
+ {
+ tCoord p = shape->Position();
+
+ sg_basezoneConqueredWriter << ePlayerNetID::FilterName(team->Name()) << p.x << p.y;
+ }
+ else
+ sg_basezoneConqueredWriter << ePlayerNetID::FilterName(team->Name());
sg_basezoneConqueredWriter.write();
}
if (shape)
@@ -554,7 +564,10 @@
const tList<eGameObject>& gameObjects = Grid()->GameObjects();
gCycle * closest = NULL;
REAL closestDistance = 0;
- eCoord pos = GetPosition();
+ tCoord pos;
+ if (shape)
+ pos = shape->Position();
+ // FIXME: What should we use for origin if there is no shape?
for (int i=gameObjects.Len()-1;i>=0;i--)
{
gCycle *other=dynamic_cast<gCycle *>(gameObjects(i));
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zMisc.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zMisc.h 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zMisc.h 2009-02-28 23:17:07 UTC (rev 9086)
@@ -33,13 +33,4 @@
return false;
}
-/*
- * HACK
- * This is a very bad solution that hopefully will find a better design
- *
- * Basis for the "other" data that might be passed to an effect group
- * ATM: only the value from the monitor is passed
- * We use an auto_ptr so we can control if there is a value or not
-*/
-typedef boost::shared_ptr<REAL> miscDataPtr;
#endif
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zSelector.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zSelector.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zSelector.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -839,29 +839,6 @@
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
//
// Count the number of other alive players in the same team as thePlayer, ie: excluding thePlayer
//
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zShape.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zShape.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zShape.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -1,3 +1,4 @@
+#include "eSoundMixer.h"
#include "rScreen.h"
#include "zShape.h"
#include "gCycle.h"
@@ -167,6 +168,13 @@
setScale( state.get<tFunction>("scale") );
}
+void
+zShape::OnBirth() {
+ eSoundMixer* mixer = eSoundMixer::GetMixer();
+ mixer->PushButton(ZONE_SPAWN, Position());
+}
+
+
REAL zShape::calcDistanceNear(tCoord & p) {
return (findPointNear(p) - p).Norm();
}
@@ -240,6 +248,10 @@
);
}
+REAL zShape::GetCurrentScale() const {
+ return scale_.Evaluate(lasttime_ - referencetime_);
+}
+
REAL zShape::GetEffectiveBottom() const {
if (bottom_.Len())
return bottom_.evaluate(lastTime);
@@ -252,6 +264,12 @@
return sz_zoneHeight;
}
+tCoord zShape::GetRotation() const {
+ REAL currAngle = rotation2.evaluate(lasttime_);
+ tCoord rot( cos(currAngle), sin(currAngle) );
+ return rot;
+}
+
REAL zShape::GetRotationSpeed() {
return getRotation2().evaluateRate(1, lasttime_);
}
@@ -394,8 +412,7 @@
if ( color_.a_ <= 0 )
return;
- REAL currAngle = rotation2.evaluate(lasttime_);
- eCoord rot( cos(currAngle), sin(currAngle) );
+ tCoord rot = GetRotation();
GLfloat m[4][4]={{rot.x,rot.y,0,0},
{-rot.y,rot.x,0,0},
@@ -482,8 +499,7 @@
if ( color_.a_ <= 0 )
return;
- REAL currAngle = rotation2.evaluate(lasttime_);
- eCoord rot( cos(currAngle), sin(currAngle) );
+ tCoord rot = GetRotation();
GLfloat m[4][4]={{rot.x,rot.y,0,0},
{-rot.y,rot.x,0,0},
@@ -624,8 +640,7 @@
REAL x_ = (*iter).first.Evaluate(lasttime_ - referencetime_);
REAL y_ = (*iter).second.Evaluate(lasttime_ - referencetime_);
tCoord centerPos = tCoord(posx_.Evaluate(lasttime_ - referencetime_), posy_.Evaluate(lasttime_ - referencetime_));
- // tCoord rotation = tCoord( cosf(rotation_.Evaluate(lasttime_ - referencetime_)), sinf(rotation_.Evaluate(lasttime_ - referencetime_)) );
- tCoord rotation = tCoord( cosf(rotation2.evaluate(lasttime_)), sinf(rotation2.evaluate(lasttime_)) );
+ tCoord rotation = GetRotation();
currentScale = scale_.Evaluate(lasttime_ - referencetime_);
tCoord previous = tCoord(x_, y_).Turn( rotation )*currentScale + centerPos;
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zShape.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zShape.h 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zShape.h 2009-02-28 23:17:07 UTC (rev 9086)
@@ -68,6 +68,7 @@
tFunction getPosX() {return posx_;};
tFunction getPosY() {return posy_;};
tPolynomial getRotation2() { return rotation2; };
+ REAL GetCurrentScale() const;
tFunction getScale() {return scale_;};
rColor getColor() {return color_;};
@@ -75,6 +76,7 @@
REAL GetEffectiveHeight() const;
//! shortcut rotation functions
+ tCoord GetRotation() const;
REAL GetRotationSpeed();
void SetRotationSpeed(REAL r);
REAL GetRotationAcceleration();
@@ -88,6 +90,10 @@
virtual void setGrowth(REAL growth); //!< similar to old zones v1 setExpansionSpeed, but generic
virtual void collapse(REAL speed); //!< set growth such that collapse happens in a timeframe
+private:
+ //! called immediately after the object is created, either right after round beginning or mid-game creation
+ virtual void OnBirth();
+
public: // DEPRECATED -- DO NOT USE
void __deprecated render(const eCamera*cam) { Render(cam); }
void __deprecated render2d(tCoord&scale) { Render2D(scale); }
@@ -104,8 +110,6 @@
tPolynomial seglength_; //!< Length of each segment making up the zone
rColor color_;
- eCoord Position() { return eCoord(posx_(lastTime - referencetime_), posy_(lastTime - referencetime_) ); };
-
void setCreatedTime(REAL time);
REAL createdtime_; // The in-game time when this shape was first instantiated
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zTimedZone.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zTimedZone.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zTimedZone.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -70,14 +70,5 @@
zone->setShape( shape );
- /* TODO FIXME
- // initialize radius and expansion speed
- static_cast<eGameObject*>(ret)->Timestep( se_GameTime() );
- ret->SetReferenceTime();
- ret->SetRadius( sg_initialSize );
- ret->SetExpansionSpeed( sg_expansionSpeed );
- ret->SetRotationSpeed( .3f );
- */
-
return zone;
}
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zZone.cpp
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zZone.cpp 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zZone.cpp 2009-02-28 23:17:07 UTC (rev 9086)
@@ -39,7 +39,6 @@
#include "nConfig.h"
#include "tString.h"
#include "rScreen.h"
-#include "eSoundMixer.h"
#include "tPolynomial.h"
@@ -61,9 +60,6 @@
std::deque<zZone *> sz_Zones;
-// number of segments to render a zone with
-static const int sg_segments = 11;
-
// *******************************************************************************
// *
// * EvaluateFunctionNow
@@ -115,7 +111,6 @@
effectGroupOutside(),
playersInside(),
playersOutside(),
- oldFortressAutomaticAssignmentBehavior_(false),
name_()
{
// store creation time
@@ -125,11 +120,6 @@
this->AddToList();
sz_Zones.push_back(this);
-
- // initialize position functions
- // SetPosition( pos );
- eSoundMixer* mixer = eSoundMixer::GetMixer();
- mixer->PushButton(ZONE_SPAWN, pos);
}
static nVersionFeature sz_ShapedZones(20);
@@ -149,25 +139,16 @@
//rotation_(1,0),
playersInside(),
playersOutside(),
- oldFortressAutomaticAssignmentBehavior_(false),
name_()
{
// read creation time
createTime_ = sync.create_time();
referenceTime_ = lastTime = createTime_;
- // initialize color to white, ReadSync will fill in the true value if available
- // color_.r_ = color_.g_ = color_.b_ = 1.0f;
-
// add to game grid
this->AddToList();
sz_Zones.push_back(this);
-
- // initialize position functions
- // SetPosition( pos );
- eSoundMixer* mixer = eSoundMixer::GetMixer();
- mixer->PushButton(ZONE_SPAWN, pos);
}
// *******************************************************************************
@@ -319,31 +300,6 @@
bool zZone::Timestep( REAL time )
{
- /*
- if(!emulateOldZoneShape) {
- shape->TimeStep( time );
- }
- else { // Old representation of zone
- // rotate
- REAL speed = GetRotationSpeed();
- REAL angle = ( time - lastTime ) * speed;
- // angle /= ( 1 + 2 * 3.14159 * angle/sg_segments );
- rotation_ = rotation_.Turn( cos( angle ), sin( angle ) );
-
- // move to new position
- REAL dt = time - referenceTime_;
- Move( eCoord( posx_( dt ), posy_( dt ) ), lastTime, time );
-
-
- // kill this zone if it shrunk down to zero scale
- if ( GetExpansionSpeed() < 0 && GetScale() <= 0 )
- {
- OnVanish();
- return true;
- }
- }
- // update time
- */
lastTime = time;
return false;
@@ -519,25 +475,7 @@
return zone_init;
}
-/*
-// *******************************************************************************
-// *
-// * Scale
-// *
-// *******************************************************************************
-//!
-//! @return
-//!
-// *******************************************************************************
-REAL zZone::Scale( void ) const
-{
- // return GetScale();
- return shape->getScale();
-}
-*/
-
-
// *******************************************************************************
// *
// * GetPosition
@@ -571,8 +509,7 @@
zZone const & zZone::GetPosition( eCoord & position ) const
{
if(0 != shape) {
- position.x = EvaluateFunctionNow( shape->getPosX() );
- position.y = EvaluateFunctionNow( shape->getPosY() );
+ position = shape->Position();
}
return *this;
}
@@ -589,15 +526,11 @@
REAL zZone::GetScale( void ) const
{
- // REAL ret = EvaluateFunctionNow( this->scale_ );
- // ret = ret > 0 ? ret : 0;
-
-
// HACK, to be implemented later and differently
// Should get this info from the shape, not the zone
REAL scale = 0.0;
if(0 != shape) {
- scale = EvaluateFunctionNow( shape->getScale() ) ;
+ scale = shape->GetCurrentScale();
}
return scale;
}
@@ -613,14 +546,6 @@
void zZone::SetReferenceTime( void )
{
- // set offsets to current values
- /*
- this->posx_.SetOffset( EvaluateFunctionNow( this->posx_ ) );
- this->posy_.SetOffset( EvaluateFunctionNow( this->posy_ ) );
- this->scale_.SetOffset( EvaluateFunctionNow( this->scale_ ) );
- this->rotationSpeed_.SetOffset( EvaluateFunctionNow( this->rotationSpeed_ ) );
- */
-
// FIXME: zZone didn't originally do this, but it is added for compat w/
// Zones v1 porting; nothing in zones v2 seems to actually use this
// function
@@ -645,7 +570,9 @@
{
// HACK, to be implemented later and differently
// Should get this info from the shape, not the zone
+ if (!shape)
return tCoord(0.0, 0.0);
+ return shape->GetRotation();
}
// *******************************************************************************
Modified: armagetronad/trunk/armagetronad/src/tron/zone/zZone.h
===================================================================
--- armagetronad/trunk/armagetronad/src/tron/zone/zZone.h 2009-02-28 20:37:58 UTC (rev 9085)
+++ armagetronad/trunk/armagetronad/src/tron/zone/zZone.h 2009-02-28 23:17:07 UTC (rev 9086)
@@ -44,34 +44,11 @@
class gParserState;
-/*
class zZone: public eNetGameObject
{
- zZone(eGrid *grid); //!< local constructor
- zZone(nMessage &m); //!< network constructor
- ~zZone(); //!< destructor
-
- void SetReferenceTime(); //!< sets the reference time to the current time
-
- protected:
- virtual bool Timestep(REAL currentTime); //!< simulates behaviour up to currentTime
- virtual void OnVanish(); //!< called when the zone vanishes
private:
- virtual void WriteCreate(nMessage &m); //!< writes data for network constructor
- virtual void WriteSync(nMessage &m); //!< writes sync data
- virtual void ReadSync(nMessage &m); //!< reads sync data
-
- virtual void InteractWith( eGameObject *target,REAL time,int recursion=1 ); //!< looks for objects inzide the zone and reacts on them
- virtual nDescriptor& CreatorDescriptor() const; //!< returns the descriptor to recreate this object over the network
-
- virtual void Render(const eCamera *cam); //!< renders the zone
-}
-*/
-
-class zZone: public eNetGameObject
-{
-private:
- // TODO FIXME void*pos; //!< pos is not valid for zones
+ static
+ void*pos; //!< pos is not valid for zones
public: // DEPRECATED methods: please do NOT use in new code, and REPLACE in old code
REAL __deprecated GetRotationSpeed();
void __deprecated SetRotationSpeed(REAL r);
@@ -99,32 +76,11 @@
virtual void setupVisuals(gParserState &);
virtual void readXML(tXmlParser::node const &);
- eCoord GetPosition ( void ) const; //!< Gets the current position
- zZone const & GetPosition ( eCoord & position ) const; //!< Gets the current position
- tCoord const GetRotation ( void ) const; //!< Gets the current rotation state
- REAL GetScale ( void ) const; //!< Gets the current scale
- rColor const GetColor( void ) const; //!< Gets the current color
- /*
- zZone & SetPosition ( eCoord const & position ); //!< Sets the current position
- zZone & SetVelocity ( eCoord const & velocity ); //!< Sets the current velocity
- eCoord GetVelocity ( void ) const; //!< Gets the current velocity
- zZone const & GetVelocity ( eCoord & velocity ) const; //!< Gets the current velocity
- zZone & SetScale ( REAL scale ); //!< Sets the current scale
- REAL GetScale ( void ) const; //!< Gets the current scale
- zZone const & GetScale ( REAL & scale ) const; //!< Gets the current scale
- zZone & SetExpansionSpeed ( REAL expansionSpeed ); //!< Sets the current expansion speed
- REAL GetExpansionSpeed ( void ) const; //!< Gets the current expansion speed
- zZone const & GetExpansionSpeed ( REAL & expansionSpeed ) const;//!< Gets the current expansion speed
- zZone & SetRotationSpeed ( REAL rotationSpeed ); //!< Sets the current rotation speed
- REAL GetRotationSpeed ( void ) const; //!< Gets the current rotation speed
- tCoord const & GetRotation ( void ) const; //!< Gets the current rotation state
- zZone const & GetRotationSpeed ( REAL & rotationSpeed ) const; //!< Gets the current rotation speed
- zZone & SetRotationAcceleration( REAL rotationAcceleration ); //!< Sets the current acceleration of the rotation
- REAL GetRotationAcceleration( void ) const; //!< Gets the current acceleration of the rotation
- zZone const & GetRotationAcceleration( REAL & rotationAcceleration ) const; //!< Gets the current acceleration of the rotation
- rColor const & GetColor( void ) const; //!< Gets the current color
- void SetColor( rColor const & color ); //!< Sets the current color
- */
+ eCoord __deprecated GetPosition ( void ) const; //!< Gets the current position
+ zZone const & __deprecated GetPosition ( eCoord & position ) const; //!< Gets the current position
+ tCoord const __deprecated GetRotation ( void ) const; //!< Gets the current rotation state
+ REAL __deprecated GetScale ( void ) const; //!< Gets the current scale
+ rColor const __deprecated GetColor( void ) const; //!< Gets the current color
void addEffectGroupEnter (zEffectGroupPtr anEffectGroup) {effectGroupEnter.push_back (anEffectGroup);};
void addEffectGroupInside (zEffectGroupPtr anEffectGroup) {effectGroupInside.push_back (anEffectGroup);};
@@ -134,30 +90,14 @@
void setShape (zShapePtr aShape) { shape = aShape; };
zShapePtr getShape() { return shape; };
- // HACK
- // Enables fortress described in maps from format 1 to be assigned to a team according to the old behavior
- void setOldFortressAutomaticAssignmentBehavior(bool oldFortressAutomaticAssignmentBehavior)
- {
- oldFortressAutomaticAssignmentBehavior_ = oldFortressAutomaticAssignmentBehavior;
- };
- bool getOldFortressAutomaticAssignmentBehavior() { return oldFortressAutomaticAssignmentBehavior_; };
-
void setName(string name) {name_ = name;};
string getName() { return name_; };
protected:
- // rColor color_; //!< the zone's color
REAL createTime_; //!< the time the zone was created at
zShapePtr shape; //!< the shape(s) of this zone
REAL referenceTime_; //!< reference time for function evaluations
- /*
- tFunction posx_; //!< time dependence of x component of position
- tFunction posy_; //!< time dependence of y component of position
- tFunction scale_; //!< time dependence of scale
- tFunction rotationSpeed_; //!< the zone's rotation speed
- eCoord rotation_; //!< the current rotation state
- */
virtual bool Timestep(REAL currentTime); //!< simulates behaviour up to currentTime
virtual void OnVanish(); //!< called when the zone vanishes
@@ -182,15 +122,11 @@
//! returns the descriptor responsible for this class
virtual nNetObjectDescriptorBase const & DoGetDescriptor() const;
- // REAL Scale() const; //!< returns the current scale
+ inline REAL __deprecated EvaluateFunctionNow( tFunction const & f ) const; //!< evaluates the given function with lastTime - referenceTime_ as argument
+ inline void __deprecated SetFunctionNow( tFunction & f, REAL value ) const; //!< makes sure EvaluateFunctionNow() returns the given value
- inline REAL EvaluateFunctionNow( tFunction const & f ) const; //!< evaluates the given function with lastTime - referenceTime_ as argument
- inline void SetFunctionNow( tFunction & f, REAL value ) const; //!< makes sure EvaluateFunctionNow() returns the given value
-
void RemoveFromZoneList(void); //!< Removes the zone from the sg_Zones list if it's there
- bool oldFortressAutomaticAssignmentBehavior_;
-
string name_;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|