From e2e90c011c82579a36a6e20dd2026f6a0adb24b7 Mon Sep 17 00:00:00 2001 From: Hemant Singh Date: Sun, 5 Jun 2016 11:20:20 +0530 Subject: [PATCH 1/4] Magenta Screen for demos --- examples/color_magenta_screen.html | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 examples/color_magenta_screen.html diff --git a/examples/color_magenta_screen.html b/examples/color_magenta_screen.html new file mode 100644 index 0000000..0463e65 --- /dev/null +++ b/examples/color_magenta_screen.html @@ -0,0 +1,35 @@ + + + + + + tracking.js - magenta screen + + + + + + + + +
+

tracking.js － magenta screen for demo - open on mobile

+
+ +
+ +
+ + + + From d01436a950c8bea030df93de7251c8e8d0555414 Mon Sep 17 00:00:00 2001 From: Hemant Singh Date: Sun, 5 Jun 2016 18:25:42 +0530 Subject: [PATCH 2/4] Link to magenta screen added to top bar --- examples/color_fish_tank.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/color_fish_tank.html b/examples/color_fish_tank.html index b107920..b76ef59 100644 --- a/examples/color_fish_tank.html +++ b/examples/color_fish_tank.html @@ -22,7 +22,7 @@
-

tracking.js － use a magenta colored object to control the scene

+

tracking.js － use a magenta colored object to control the scene or open get.al/magenta on mobile

From ae6dfb6a3fae3a4541b7a1c2d5ddb871d1ac9d8b Mon Sep 17 00:00:00 2001 From: Hemant Singh Date: Sun, 5 Jun 2016 19:10:17 +0530 Subject: [PATCH 3/4] Adding a mobile screen as a tool for Draw Something demo This screen has two simple icon buttons - pencil and eraser Pencil changes the color of the screen to magenta Eraser changes the color of the screen to cyan This can be used accurately for drawing demo --- examples/assets/eraser.png | Bin 0 -> 1713 bytes examples/assets/pencil.png | Bin 0 -> 2000 bytes ...olor_draw_something_controller_mobile.html | 57 ++++++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 examples/assets/eraser.png create mode 100644 examples/assets/pencil.png create mode 100644 examples/color_draw_something_controller_mobile.html diff --git a/examples/assets/eraser.png b/examples/assets/eraser.png new file mode 100644 index 0000000000000000000000000000000000000000..2329c4f43f94c244ba8b74057264c18bf455e072 GIT binary patch literal 1713 zcmeHHiBpmZ6i1=J0}sMdwvWED?64G*v`~_dOUw%c%0}BXF`+}<#C2CYR1~%P5<4`n z5;dbQJ2ahk)!hy^qS6gmX_s;uovcM;YjaW4ESLU`oqaRE_nY^dH@}(p=FKbP$Ase@ zNscHK3Ln8^Z?$p$7vRvgY#pkYwh=mu86m{saLbGvm(<9W)@#?>+B-UL{qSQ~_fJ3HzH|3p?=SZ?53~;-J?`s&qSG4&j4xh}{5}4U zbz*Yr!}QF@*-xL*eeyxuDYr(jA)%+&)w|mh&ZZGDx=m^jSRG{XK(m<+^Yfhgd3SgL zjivK^?VJgW(w*f+N5*EKCBEyPs?NARk8PkVj1>@;bai>e9q>vezTd(=9e7_-iMT(^ z=1$PD?)ww=h&Plr)ayH0Ro#8&*Qz%Sa(C_cHuDfkTyM=JAUz`5hf1_)5k0YB@5eR3 zAs8}7yH=?l?P`+y2dL9^y(`p?Pt8MF&Pc5_(;c~&P5VHUBPC=%hNuI=E=l1}7<#`~ z9}6}Qp~Z)-nJ&nwXxewKrgga+okXKPK#$xKMDKt^l?`%^c4l>RcI(6)0gH3lQc7$|w#dbgsG>p|P+Fl(3<9wR$quoV2*T z#L7n-KRW|Gg%)>uUH%xO(&cOB(5RyHLP>ksBJT^}^i&RmrLsf6{tacY;e(IGE! z?C3B~7;YY3Eq-DK^E{CzD`mbZi>4(Pj(O5U3oP>hu`4sXj!b4vo^ol&Hqao~axjmB zt^UL}>UvpP%_w-&6%kk|jwTEsMpVef609=X0PXP?W?L!tCL+*0#Sq1M8>jM=bCSUl z%LX_Zb6HjK0&kR(F0a8%AJ@>eEz;RCFigjLSBMmF+X;}5#F;gz(6|*27RAv5KYqovHw9oAl*in1Q#A zVPvMLgiEJ6q7oK3M z{S5IBIZ6&GSas}hi@pH7t&8`~A0xo85;4+^m-?;qdK`}t(By?0`D@HzkhU_IO! zzDp|l2@1Zn=b$|GlECBLJh&(nYUu55Xz4`r-TmVMATjPIpk(inZA+$!fVoe=i3t-3 zgW^H~p-@N+kB*EF3F3zmW8#j;K2q=i0Nc)HahV#81`Z;A&94OhcLJnWvI9$va@#}k)5_|b#|d_ zqtfWx89R2mdw6=WcJ21@<#7G{0}dPv(7hp0RXYtgF)ve z47SV00}bp~o#h0Sr^5Lu6}=fE_}4cE#vS~t3b*!@q>Vb!{L;qQR5R-?bDg?{#qcIJ zqvy--!sfB_QV-X!ln3`dIX+e5BwX`%ml^{{zRe%>U*uZeY8oJ)Y-?5!S+zx`oJ?Z7 z@ZZo4$xpPW%hz`Xt&Th_%DRkIk;R%`XI-qQ`Q)J%D7E{YK>ftak(5Mo}U8_O~ui!B405Pxxu;a%5lW1o?Loy_LGuH=033i zD}K#5RckrmGfz+fbA+@1YK&t$H)1%fx?yrSOVyyKdV8 zQyb9^-HIO&*h`*9jXj<$6i49L>h4YfcI$RLTO9!QhR~Fe+U!@n^E(k#V>vEYJ$qk{ zhc?e4C;v2m|uGZ#tb;&nenw>odc**^-X@r?z9-7tPyhh>w=FhfaAUpHgShO1n? zqX5DgiAr1n9+U0BK$!Pf+RznVv$yh7xfWz~F}d|mvMA?L1YDKZpj+&T<&B~SvDN8Y zkTE6n;xoi+CWm`06($#Ca@s@RhY`);i|b`5FhBesdFffXQf?EE>{~c(o31Q)>y&NS zXc4Z6bsxI&PO-58Z}h}`L2-WpbVRDPk6xo}vTJqGoyl5T0ULPSuOvX!?BK&GEw`U0 z31+E!hhd1^&VHkbv83~b%fS!Ob-f8i(zpX1mNJ=fH-93&&<;E{O2}-R)w5554YWB9 zoI5)zWuR8JguQ{v$eP667JC7L%8z-iUUeMJssm~h#ka1gUuT1Xh zr2Ib6Ex6>rMnqnu_kW)$IpeY{64BL>bNm|x6!o7hV8T?6vPm2V-K!UrkA^HYw(cLY z@?)R7fpybEIiqDK%FFEaBMTqdSOsiuHRTv$ + + + + + tracking.js - magenta screen + + + + + + + + +
+

tracking.js － tool for draw something demo - open on mobile

+
+ +
+
+ +
+ + +
+ + + + + From b7c4cc3833145160852f988ff11df370344af0b1 Mon Sep 17 00:00:00 2001 From: Hemant Singh Date: Sun, 5 Jun 2016 19:18:25 +0530 Subject: [PATCH 4/4] Added link to draw something page for the tool Removed few files and changes not related to this feature. --- examples/color_draw_something.html | 2 +- examples/color_fish_tank.html | 2 +- examples/color_magenta_screen.html | 35 ------------------------------ 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 examples/color_magenta_screen.html diff --git a/examples/color_draw_something.html b/examples/color_draw_something.html index 326efd4..9d75235 100644 --- a/examples/color_draw_something.html +++ b/examples/color_draw_something.html @@ -40,7 +40,7 @@
-

tracking.js － use magenta color to draw and cyan to erase

+

tracking.js － use magenta color to draw and cyan to erase or open this on mobile

diff --git a/examples/color_fish_tank.html b/examples/color_fish_tank.html index b76ef59..b107920 100644 --- a/examples/color_fish_tank.html +++ b/examples/color_fish_tank.html @@ -22,7 +22,7 @@
-

tracking.js － use a magenta colored object to control the scene or open get.al/magenta on mobile

+

tracking.js － use a magenta colored object to control the scene

diff --git a/examples/color_magenta_screen.html b/examples/color_magenta_screen.html deleted file mode 100644 index 0463e65..0000000 --- a/examples/color_magenta_screen.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - tracking.js - magenta screen - - - - - - - - -
-

tracking.js － magenta screen for demo - open on mobile

-
- -
- -
- - - -