From d85fb30cb7053a4166629e1ac786bf3607997f63 Mon Sep 17 00:00:00 2001 From: Mohamad Moneimne Date: Thu, 15 Jun 2017 13:19:39 -0400 Subject: [PATCH 1/5] Fixed version directive when combining shaders --- Source/Renderer/ShaderSource.js | 2 +- Specs/Renderer/ShaderSourceSpec.js | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Source/Renderer/ShaderSource.js b/Source/Renderer/ShaderSource.js index 09a35221884a..1376fe4212a1 100644 --- a/Source/Renderer/ShaderSource.js +++ b/Source/Renderer/ShaderSource.js @@ -202,7 +202,7 @@ define([ // #version must be first // defaults to #version 100 if not specified if (defined(version)) { - result = '#version ' + version; + result = '#version ' + version + '\n'; } if (isFragmentShader) { diff --git a/Specs/Renderer/ShaderSourceSpec.js b/Specs/Renderer/ShaderSourceSpec.js index f46cd84eca29..dfaf3feccdd7 100644 --- a/Specs/Renderer/ShaderSourceSpec.js +++ b/Specs/Renderer/ShaderSourceSpec.js @@ -65,4 +65,12 @@ defineSuite([ }); }).toThrowDeveloperError(); }); + + it('combines #version to shader', function() { + var source = new ShaderSource({ + sources : ['#version 300 es\nvoid main() {gl_FragColor = vec4(1.0); }'] + }); + var shaderText = source.createCombinedVertexShader(); + expect(shaderText).toStartWith('#version 300 es\n'); + }); }); From a70fba709aa7b5c43acbd4abc721a7f17a53e672 Mon Sep 17 00:00:00 2001 From: Ottavio Hartman Date: Thu, 15 Jun 2017 18:51:33 -0400 Subject: [PATCH 2/5] Enable guard-for-in, no-caller, no-floating-decimal, and no-new ESLint rules. --- .eslintrc.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.eslintrc.json b/.eslintrc.json index 5559ce5b6e87..1857b9939180 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,10 @@ { "extends": "./Tools/eslint-config-cesium/browser.js", "rules": { + "guard-for-in": ["error"], + "no-caller": ["error"], + "no-floating-decimal": ["error"], + "no-new": ["error"], "no-unused-vars": ["error", {"vars": "all", "args": "none"}] } } From 6292d0b71b0745cdcee692a5650a4809583ed745 Mon Sep 17 00:00:00 2001 From: Rachel Hwang Date: Mon, 12 Jun 2017 12:08:15 -0400 Subject: [PATCH 3/5] Adding clock sandcastle example --- Apps/Sandcastle/gallery/Clock.html | 68 +++++++++++++++++++++++++++++ Apps/Sandcastle/gallery/Clock.jpg | Bin 0 -> 35944 bytes CHANGES.md | 1 + 3 files changed, 69 insertions(+) create mode 100644 Apps/Sandcastle/gallery/Clock.html create mode 100644 Apps/Sandcastle/gallery/Clock.jpg diff --git a/Apps/Sandcastle/gallery/Clock.html b/Apps/Sandcastle/gallery/Clock.html new file mode 100644 index 000000000000..f415378e6e41 --- /dev/null +++ b/Apps/Sandcastle/gallery/Clock.html @@ -0,0 +1,68 @@ + + + + + + + + + Cesium Demo + + + + + + +
+

Loading...

+
+ + + diff --git a/Apps/Sandcastle/gallery/Clock.jpg b/Apps/Sandcastle/gallery/Clock.jpg new file mode 100644 index 0000000000000000000000000000000000000000..09031a408368d1d64cdf7d5530f58e884bc9857b GIT binary patch literal 35944 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

LM-A43H$=vmDSoJo{t7OP zcd%zo?zsy?-l|$m0C4l5y-g3*(hMVXB{296?fo3MU?GYDlu&!h1bxw5SRY^*xl{MT zLZq-opjKj!W#s7DaDue%%P6h^d~LV>HGJ@02(x35t^7xUGBw^Wt_(z6TJ>T(q3+#k=qU&cc zD1mz1{AS6gTkIbISIErGAr-qU^>k$@HeGRuac*5A(|}+>vW$}w=ISvm&**4(y|+UI*(q%J7_hw}n?h1jy^ zBY8fUp7xbqYo*|X`mN%A+xNw^1MGE*bc7#(3dSss4u1YkEWbUh>A%C`O@AEHsv*}9 zd+~Y-R5MjA9rLBNzBzklYw<#>5#5T+(VSWpw)nMWG&?hn-JH!3QS~Xq&2@&k2{p#P zT+B07(aqyYcb@w6Rno9TMt!P6!D4D_;#*-ZkAAlPr)vA@;<8&>bTN~WYU+7v3dNjE zD&FN!-e}Po<#IkaQ1I~-iCYxZFcV2y_(#TcY00uPxm@WLUF~Em>$Z2xWgWKyhuL`^ zK*A^UA5Dl6W%|H>5zCK7rft4|Tvd(qfBX`s`L}urLuCS6xemKl5a<7t;cMBPOZD-+ z64gf~nbrk$@Xd;>QpioSTwV^>UzgMZ_!A3Fl?uZzCEQEvSk4_UY8Al^&%^Vv8>V1u zJg>Enet}eRNig4&XCZ#qe-Q#`PKqv& z+V~1L6=WRLB|XmiV9aamGU6`85nZG`ih)G@rX?MfpfA8kjMZSP&ien<07a_5P>fkW_&Y6tOBF%4d-@Hm2GM);h*t@wo?+YCi zWOF93+VrZquPtl7X&`7`pk4X*h^BB1!No0)vcNIb_1x`f=jZ~_5&&hMjQ+J}(UPdR zyFHb`c-YU_-y7nWH@&7plNf`JFo$>o02POing7obJzuXZEGJr9Bc!dl6%kY>o>}G4 zNY`L&Zou==aW4z=iO$y|DzsvaJpO3h6`KlKKR&h!Lzvri_*^TsJ#?Q&t5W%3`xv*X6j)h(mn%?n#Ua>;n2X%I^*?4AykG-c;Mua zrXZpe<-Xh!yu#?oV0l9`|CX6vdBmHf+F$$)3#Y<^KuRi~Fv#aa+?mOqyWrQzA5GdA zgUG!00L@+C`xE47Za>6s7tIVe^o$x={b4&n&$|`wI91{-#b!9;Z#pFnJD4WN^X^h7 zc0hX!c!;xCy~jpAfjoP8%Ln(2D~|vOPO)4W<3VTnQgHj^H#Z$;4wnlj*;j%J>+Pfy z&ob&;y$h>uHt(-iUp0QqNqp-fpzBhOg;2Wbi_o0nGX#bS>3s7hFwcQ z^V=8S!LG$n^JXsuj_46SWDC#8gPahx5y@#@i_8IYXlHan(q1?*31*H*MO*NC)=t% z*8lr`N|f&RMzATSt%4ZwVD4lyj88b~dWPsd)kmq^E`}*3f;Um`FVCD$GiMgcEePrc z6nD(`=yJKyoOHbQcc1a8 z7|EvIF`ZJskexk&6b#HSVUcxiL+25xgxfB;)l)tRv6x8{pfLYC%L z+tTHaONx5fu4Nbte6JK~@&4n-eK_ltam33aTpPQq*a9?lfT4vgQq(Dzsdw+J0&?jG* zABGL1{N`Ozv$Gjy`B@=OAx;q`7OoE?PQxo5cos}t1I>!{RQ>GA%^{pHw;(6))E~Z! zuF~?cs3}*&GC>#hYISkCG=ojeu40426@nwG#eQA?egZ^7Pz+i!w7>JDCFdX26gM05qp zIwa{%O{Z7GR&GRw_f@or^ftBSTBDCRTa+rnW3(Ur%U6Q!c7&$42J@+y^!(~Kl)D}^ zInlt-|Q<={{E)SJ>7M&m%_oPOtte+v&~%@1P$*g(KY+I;V~*J z^Y_Q{Sd27F?d~b>D}BXAo%4v;P^pk7&C6jb?Dc%8rk;w5E~WzOkNW6I#MR2HRCaz= zEFwQvO7|x=x>jw8f1dF0Byt*ZGU>;8=0BtR6g>T!ZwqdeJI#C8TM}7*GekYGQrSxn z)>6cO&(Q8*5+;R5DnB+%-*MiLknq0St_!fm(j>!8&eHR0nJ~dw2+T3P$`1<(3$d`_ zgf9?HH&mq!(bgAdEa{W%PWKkYJ`;{lrv-Xq;+UjX&IdG1z!1NPCi9LZTL9mTp9&t`=h^CVSX54HkLbsquieUv;0196R(- zuUs(T#oVzrY<)2%D5&<3qf2_8)Bo)4HY#rMvVEU7q%8>Xx7X6>7JvOrGjdWrMZBwb zAN=hBqk(w}pqJT~in3q;+q1j;s*c+IsyHX(q9T%?vCSyRTVEn5F$~kdWG(_Lj$ioR zVKwuKn|VZlFQM&orY63RJ-TJ0=32tMWUr;3xX87IRri|ot1gtPQed*m02HR#1Ks?# z&QxXG2<&@o`5*%q)}~I{^bi@IcoBR#c_=fz(1jZ!-*CU0reNTZM=#QFmBaOseo(VE zKqk*aQZLoupcR_Fd8a5 z;XPa>6{Hq)(8=Vao!00B6VfR*+CEY2omipTN0rg|!EfzP1@dj&bA=Rs@kU~Bz|fD_ zt^u&W_7jY4&#9hlMf! zgx#Mf%0imM_%}ir94|mPx26oYkgTaetLZD|1>%baYG0EEg!&bg*JYCpSkta(sac%w z%|=YYb3)tYGvZiP-WQ|oyqH=<`aPD=CUnxpJdYVPaw0{jmFvP!DQz8|IiNu^<+vF@ zEV9;m5wT=+ron;6du^ZZDiSLlfP07eM@G)y{ul3f1F&b@W_Dnt`Ui<+SD>p#@nQIH)sgt*~sK!}R0L)hA|32la14S1R=CknPMt zq(AMlZKO@2AkZvte>;)F-c)lxp{f)_mU-m*Jfarx7TZf`nLAvonPsu=2V zq;XxT&7&0G?4|$u@Mq%pNHr{Q_fPfye!EyaI<-K*MePMs9>Ao{KkazFX$DuCP2lpm zor}b|;JHnrNmHRQmz%}Ns9UJAG!Ku2c!_6VTIpZo8XbdG4lk7D`md5zQO?vmy?pYA zcP7`X*i8dtJ}8>14|Z=XlT8iEFm#!yK)m$UZf{{g%5vNGh!`V;o~Wsu)2=dNh zW;I$Pe&9;tzHbV{=?A$=l?70gUSPLo$ zWK&Z6S<@Ly=Kb7fG`n2jZK8hAT(jyLG!ofXjf4N57b9YLk+bGj+k-R5+PjU=D2>V@ zzjE!Mke5tG-0ROUpyIvJTYrz5oK>A_{P#Kr9c>?Eg ze!v|snr*tMU;n^pAn!xftM8{&fmt1_EiP4o{t|(uq;xK%bhF1-MN)C8XFW$5UjQzr z?E?W}d|P|jwjiMGZ&uh?f5&%Wud~DRJ-&-Q$Yjc6A#wQd8BRo2Ov=VV=lX5!whP1$ z5=#VZ*rTK!!uy}X!*pt$B{*Mk2Eq-O%cwPdWS3sD$OQ(kR-IhSWUkJCq|T% zEhv})Yx_SkV;nx<=(T;q-Rudme0%jS`TP0iYW;|J1p*6dP+^H@91xg*@H=kFaxVhp zBx&Q!eDMYL&kPKe^p6Y)IXA}D*H>Q-%*M<3j`zzdSw+rpxPTrlEK&a9>&s%7=s6beJEK3@=!SQ|@_QlS zf_v)_7|!N}dC?-aU3IdSP#upG(x#Ih@trK^c0FL6P!{%kgz%Ieka4(n&(XVo&Rbq( zyt1?%F?n?HL123fapFJ-JAM4~%R{TB2saNFgiPZLz+f#vg>kGOFY}H%5CF8AWK2dCGN! z2uPB43l>xl6kDRZxyDzqjKW~b_RNYirR3j?RlMx?uhVNd>2rHr*vDOqp06+Bpm#(b zh8JLA8~Ezh8Ke38(PY6+pWoKEJ40C~_ks;u(0rhnLR}sUu9%x0d=>3t=%6xVVj#|{ zz#Axa%iD*7eSC}l3d;?#BJZtC6*84Fp|VZmeNCzY?CBl8y3=w`v;HgmTNH(Z<{v@H z738Pw{MD-sR6^08o1?Vr*65=&3pt={?7_B&-R^1_E&gYxml2The`JSGUzIHEiDyc5 zmh$qDBRj6BK(+a@U_%bRbpF{cCOkv%}b7JjOmp(+EJ#d(Cz6D%l&c)-D; zixy(3C_S$Am~Orju#@`|{Zl>0aa##dsf<`9GEsxaCEH~uK$4r<|9X^Q3;PtD4s6i> zJ%)oSn(D!!5~Ss3DW6?>+VvlzTx0AZhRTIu1sng!Zew<9udHf0#R`iI2tA;|-MTkm zo`DRB;6G)~70hgY=p5AVp}Q|cB~*5!q#016Ml^NU4=3DilA14%-1TJl0X42mn9@H~ z%VZ9CdMefR4QkOizn1`p(c4#*2f-!5wn2bh$GR-P=QWNP4_evWTcNh6?voEOLx31S+uxKsT%aJU~I&$*>k?h%Atg-YBDbl}V zVfVnWd1kJ|lS_UCPH?Qu{GzHoJ3^RY@mjX+@G&yV zo~wBTjpMRU>jEWmWM%Kz-m7C=T{wLFsqbMw&CT}~^vN~c%DwZ8XUCU_umXJbDs6n~ z;Wi)w&1?Hd#vj0R|1`=358I)*IVV7=hI2j)Vz`j`oxJiQ)g>4O?{Rsof$A=g&-KT? zoyS0mn*{%cls!z-Cn5e?y$S_9$^A~k*jrL zUMx<=g&!i%u_b4~P6(|8Oz_XL)km5EW@6$bLQ23C&K^bXzu$9v%E!`N5L4pxpkErX zCBU0<84af zMw`qV44}KiwY?Kp>=Pcc7l?9|D!^&g>~v;%jlo+5sh5_(|NBZn&*hIhz=Ho}CPiuj ziZjZ}0+M`1i)=d3G0$iULI?#UAdwPy^JWEtBpr&_#j=7j_;}zF^buS<>4Hd;>!Eb! zfStv?gm=^H)dfQN{N%5f-ItVIL#10Fw$~~>8fqFej{~7yl2a@KhVdV%-c=$gm!u>? z)AQS&#HI+y`&^7BM>yaix|ChexKf;=!TOHRb=1CRxXbiuq91LX&)pA9>EoRgg#<0i z8pkq@$3UPI$3L>-p`(jGje2qEdBEosTu<`)>t?0J4}!_)YfE*>CD>utVhU}dyN76n zRn(smD16#LhSy5vdTYImE_a&<1W1{7(>hQX`m~22>?$)0ef}Axs&ZRH{^QWCJzJ%G z?<9X2Klsi#C^4?ZzLtzWCpBVry9}`mUosZ;i~_}EDzrPtOUG7AA#y-9fG9=9$5XLF zjlloIx3ieactSAakk7SF99cYcHc0OqsPf}&MKRx;+GV3oB-y*Uw`6YWqw$=Hw4RtL zMaGoNs0?A0h9B=`L+ZM{SLa}4g4|UpY1Du>MSSwpY%8XDN$j--Z6OhccVtDwMk3F2 z^TJhiZUSK&E+uasN?I)~s7%lc3df@yt~f3p^y9S#^zYKle_OsjI3YBL-YC3i!y&X` za{uefd@iWX;BRpOC=?W&p|8uP5d1IR zO-9Y-Z`vv&>B3?J*n?S*l%Co#~R3bgFHZeKmZ`cH_oyofPfd1Gfw+YH(ui-52`n(aD>=gLCo-Jto!fRQa!CGJ7ht-A*-l`FYP=olrFo zgy)A&)iA@!Rp_QqesW;tn6Qpc zPc|6~KFT$& zy+xpR7RjEL`A1fEDeKktXMKTB&yo$y=UY|VTPU7nlVDGHpNdZj?fUGkJLx=NQAvSx z3$6q>ulC8Ge9PuBUv)+vMFL%oMc7R9cTF*7U;2x}S_OmQ0-3e*|8KAjJ>p?uvP-z* zh*T`k_EtiZ_-r;xA464Q-*Scir8ZoY$=IG;$_Wg6K saf=wM5nLPY!oMAUcIM$V(Y~=^3~;;83ogU!>q7(^1`l^hNB`#j50vM%p#T5? literal 0 HcmV?d00001 diff --git a/CHANGES.md b/CHANGES.md index 3ae8a50f6d45..3c77d74ee45a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,6 +16,7 @@ Change Log * Added Sandcastle demo for ArcticDEM data. [#5224](https://github.com/AnalyticalGraphicsInc/cesium/issues/5224) * `CzmlDataSource` and `KmlDataSource` load functions now take an optional `query` object, which will append query parameters to all network requests. [#5419](https://github.com/AnalyticalGraphicsInc/cesium/pull/5419), [#5434](https://github.com/AnalyticalGraphicsInc/cesium/pull/5434) * Fixed geocoder bug so geocoder can accurately handle NSEW inputs [#5407] (https://github.com/AnalyticalGraphicsInc/cesium/pull/5407) +* Added a Sandcastle demo for setting time with the Clock API [#5457](https://github.com/AnalyticalGraphicsInc/cesium/pull/5457); ### 1.34 - 2017-06-01 From 6b86c4b1720e0b1d46443bdf437f086e4db5ebff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=BCseyin=20ATE=C5=9E?= Date: Mon, 19 Jun 2017 15:38:58 +0300 Subject: [PATCH 4/5] doc fix in CylinderGraphics --- Source/DataSources/CylinderGraphics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/DataSources/CylinderGraphics.js b/Source/DataSources/CylinderGraphics.js index e1a7c01cbe44..8f1a5b3a1f18 100644 --- a/Source/DataSources/CylinderGraphics.js +++ b/Source/DataSources/CylinderGraphics.js @@ -118,7 +118,7 @@ define([ * Gets or sets the Property specifying the number of edges around the perimeter of the cylinder. * @memberof CylinderGraphics.prototype * @type {Property} - * @default 16 + * @default 128 */ slices : createPropertyDescriptor('slices'), From da4a2777c224478fc3912832b4dbb93c4940f208 Mon Sep 17 00:00:00 2001 From: Ottavio Hartman Date: Mon, 19 Jun 2017 10:49:59 -0400 Subject: [PATCH 5/5] Add rule to ESLint shareable config. Update CHANGES.md --- .eslintrc.json | 4 ---- Tools/eslint-config-cesium/CHANGES.md | 3 +++ Tools/eslint-config-cesium/index.js | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 1857b9939180..5559ce5b6e87 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,10 +1,6 @@ { "extends": "./Tools/eslint-config-cesium/browser.js", "rules": { - "guard-for-in": ["error"], - "no-caller": ["error"], - "no-floating-decimal": ["error"], - "no-new": ["error"], "no-unused-vars": ["error", {"vars": "all", "args": "none"}] } } diff --git a/Tools/eslint-config-cesium/CHANGES.md b/Tools/eslint-config-cesium/CHANGES.md index e4de4fad8708..48231db74701 100644 --- a/Tools/eslint-config-cesium/CHANGES.md +++ b/Tools/eslint-config-cesium/CHANGES.md @@ -1,5 +1,8 @@ Change Log ========== +### 2.0.0 + +* Enable [`no-floating-decimal`](http://eslint.org/docs/rules/no-floating-decimal) ### 1.0.0 - 2017-06-12 diff --git a/Tools/eslint-config-cesium/index.js b/Tools/eslint-config-cesium/index.js index b3a82e9a3763..9383db082ef4 100644 --- a/Tools/eslint-config-cesium/index.js +++ b/Tools/eslint-config-cesium/index.js @@ -25,6 +25,7 @@ module.exports = { 'no-empty': ['error'], 'no-extend-native': ['error'], 'no-extra-boolean-cast': 'off', + 'no-floating-decimal': ['error'], 'no-irregular-whitespace': ['error'], 'no-new': ['error'], 'no-undef': ['error'],