From 281236280ee64431b2b0f36b2a0e805ffe4d82d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 17 Feb 2016 18:46:31 +0100 Subject: [PATCH 1/2] Fix NavigationPolygon references in _bind_method Also sync the doc accordingly --- doc/base/classes.xml | 25 +++++++++++++------------ scene/2d/navigation_polygon.cpp | 4 ++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 1dff3079593..164557578d0 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -9608,7 +9608,8 @@ This approximation makes straight segments between each point, then subdivides t Directory type. - Directory type. Is used to manage directories and their content (not restricted to the project folder). + + Directory type. Is used to manage directories and their content (not restricted to the project folder). How to iterate through the files of a directory example: @@ -9633,21 +9634,21 @@ func dir(path): -Opens a directory to work with. Needs a path, example "res://folder" + Opens a directory to work with. Needs a path, example "res://folder" -Loads all file names of the current directory (prepares the get_next() function). + Loads all file names of the current directory (prepares the get_next() function). -Is used to iterate through the files of the current directory. Returns the name(no path) of the current file/directory, it also contains "." and ".." . + Is used to iterate through the files of the current directory. Returns the name(no path) of the current file/directory, it also contains "." and ".." . Returns an empty String "" at the end of the list. @@ -9655,12 +9656,12 @@ Returns an empty String "" at the end of the list. -Returns true if the current file you are looking at with get_next() is a directory or "." or ".." otherwise false. + Returns true if the current file you are looking at with get_next() is a directory or "." or ".." otherwise false. -Run this to empty the list of remaining files in get_next(). You can use it to end the iteration, as soon as your goal is reached. + Run this to empty the list of remaining files in get_next(). You can use it to end the iteration, as soon as your goal is reached. @@ -9683,14 +9684,14 @@ Run this to empty the list of remaining files in get_next(). You can use it to e -Needs a path or name to the next directory. When the target directory is in the current directory you can use "newfolder" otherwise you need the full path "res://currentfolder/newfolder" + Needs a path or name to the next directory. When the target directory is in the current directory you can use "newfolder" otherwise you need the full path "res://currentfolder/newfolder" -Returns a path to the current directory, example: "res://folder" + Returns a path to the current directory, example: "res://folder" @@ -9723,7 +9724,7 @@ Returns a path to the current directory, example: "res://folder" -Returns true if directory exists otherwise false. Needs a path, example: "res://folder" + Returns true if directory exists otherwise false. Needs a path, example: "res://folder" @@ -18475,13 +18476,13 @@ verify_host will check the SSL identity of the host if set to true. - + - + @@ -36428,7 +36429,7 @@ This method controls whether the position between two cached points is interpola - Return whether the referenced cell is transposed, i.e. the X and Y axes are swapped (mirroring with regard to the (1,1) vector). + Return whether the referenced cell is transposed, i.e. the X and Y axes are swapped (mirroring with regard to the (1,1) vector). diff --git a/scene/2d/navigation_polygon.cpp b/scene/2d/navigation_polygon.cpp index 4c00d8cec9d..376aeb2d850 100644 --- a/scene/2d/navigation_polygon.cpp +++ b/scene/2d/navigation_polygon.cpp @@ -429,8 +429,8 @@ void NavigationPolygonInstance::_navpoly_changed() { void NavigationPolygonInstance::_bind_methods() { - ObjectTypeDB::bind_method(_MD("set_navigation_polygon","navpoly"),&NavigationPolygonInstance::set_navigation_polygon); - ObjectTypeDB::bind_method(_MD("get_navigation_polygon"),&NavigationPolygonInstance::get_navigation_polygon); + ObjectTypeDB::bind_method(_MD("set_navigation_polygon","navpoly:NavigationPolygon"),&NavigationPolygonInstance::set_navigation_polygon); + ObjectTypeDB::bind_method(_MD("get_navigation_polygon:NavigationPolygon"),&NavigationPolygonInstance::get_navigation_polygon); ObjectTypeDB::bind_method(_MD("set_enabled","enabled"),&NavigationPolygonInstance::set_enabled); ObjectTypeDB::bind_method(_MD("is_enabled"),&NavigationPolygonInstance::is_enabled); From 54997552922a9eb3b2ca08a6a54add17abc35ff9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 17 Feb 2016 21:14:59 +0100 Subject: [PATCH 2/2] Drop polygon path finder demo It is obsoleted by the easier NavigationPolygon API and the feature will likely be dropped in the future (see #3740) --- demos/3d/polygon_path_finder/engine.cfg | 5 -- demos/3d/polygon_path_finder/icon.png | Bin 712 -> 0 bytes .../polygon_path_finder/poly_with_holes.scn | Bin 2974 -> 0 bytes .../polygon_path_finder/polygonpathfinder.gd | 77 ------------------ 4 files changed, 82 deletions(-) delete mode 100644 demos/3d/polygon_path_finder/engine.cfg delete mode 100644 demos/3d/polygon_path_finder/icon.png delete mode 100644 demos/3d/polygon_path_finder/poly_with_holes.scn delete mode 100644 demos/3d/polygon_path_finder/polygonpathfinder.gd diff --git a/demos/3d/polygon_path_finder/engine.cfg b/demos/3d/polygon_path_finder/engine.cfg deleted file mode 100644 index 47450408af8..00000000000 --- a/demos/3d/polygon_path_finder/engine.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[application] - -name="Polygon Pathfinder" -main_scene="res://poly_with_holes.scn" -icon="res://icon.png" diff --git a/demos/3d/polygon_path_finder/icon.png b/demos/3d/polygon_path_finder/icon.png deleted file mode 100644 index 643f5595ee6aaf2512d96a3061b6fc7aeb8d75b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 712 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1SD0tpLGH$wj^(N7l!{JxM1({$v_d#0*}aI z1_r((Aj~*bn@<`j$X?><>&kwgTUb=vAfP2Ng@J)7)YHW=B;(%OTl>8aJBS?kI9=Yi zCCc%r)>;nHIVBUi7U|`2-LiMzFuQd1KgNIRT4lvSSFX7_7HEh?iM(9meJSR3z@40; z_j)_;INpmpG=1Oc=WQ8FgE&LvWJTtyD7-V2tlK>4b)IhB2ix%K96y__&mVKnIJG`( z{jKC_2mgdz`mLEGzw7<;X`U|ZJ6!zJyC)~FuhKgE=gPi!g6DPLU-j3!Zd~U7LbAX% zd2)F@1B1@y`l6k2mOK8J1vxR7O}mx8b!))6_+#%v_00Od%g3A-5Z@5_gXg2{q>a^A zUz^T;tnz@#q#|rO6m;@2 zOuN|sCGT;CTjhGcerB};#@o2$1wKZoIWo3$+=$GYf31s2Z-&ML0mg?yVqyhb7@ZGU z=*I;zxJ!RVErm?((gK=^HU|P(I~03(Ep{;|wrpf{7ggvn zV0*BF$wjD*RnNk~CQ;)-6LXSckDSFSQ6YZ`)dKCEc?AwJEf-CAGX6D6aB}BVyz_be zN%&al+-Z#l>li#alKCgJ8%$%k$>GfI;UQ7gnxf1juArXS!H~(hm}|oP4GS1va&mJ3 z84V0SIX`m;G#Tt?Q03r`P(!qz09S;yT8SFO(mxRlWZhnC2KfUHx3vIVCg!07aq~tpET3 diff --git a/demos/3d/polygon_path_finder/poly_with_holes.scn b/demos/3d/polygon_path_finder/poly_with_holes.scn deleted file mode 100644 index 6b340377b7b2c0fa0ced7c3b08fb82de929279f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2974 zcmXw5dvp}#6~FV?N3t7|kjLh|-zGo^k0c}@r=ZE5-3)Rtv;P|EosYPg|reEmk{&DyFzPWQ> z^Sk%=_4S8BF!?J1xYGx4y$fIt55NHA7+`Zw1{lJDmvBX^Ybq&hx zf@V%s1~cOv&}_GH4AnCT#c=pR--%tY}50(>CLi{uD{t&N7@8q-CxghiOn@ zbLo7A?QR{1Zkun-S72-Ke%rlX{y9|JUO8al6`_?jTpp3PO^eB9 z0o)BsLYo~cWJ@tr@-56F6}UZoI`2Xc0-AXbrt%(ekUA=zqaIw08_|aza1$SPQ;p43 z&xd#6a{h@!v${Q`4%-lV*5p0mL-gGz>HoWVk8mXT5=Wb$+vYgotDMi~fXQ_SA3~q= z?hn4~n)Y$M4V^t}@E&F+QM-qO+o*l$sm(Pp&@Eib`+~RUd`u3*+i`?y zEd{W7uq%qgHuh6JZ+>m~FL@s{(0F~|C!V~Iq3JR{2u!Y_k;*n`y1brtSx&z!XIz%e zlTz?gy%wAG1-t3ykyGc_0|ds|`6Ua-&Y!wwJ#?QsyFMKFiW>^;W9I-QE`;Uq-taEa zS`f_0g^(*e0{zpk4u2Eocu`Gf^pnLjxO?&6&^6Xls5kyvT+s zhoM9jHQRDhss+<_EFgzn2}O)32~~?fY%>d_s+Ql_j+>jmWer)J`TWcwMmB8s0!Ktm zr6PJulkHF_j2Usrc2p%F1hHi`lTu;)j+ zkcv?dciC(eh|RZC#h84^u`HcdVrpP1EFDwjQ?RPJQr-cfz!!`m$KB+!;SF2#1-sw+^8rSQSLneR%DJdI$#)zX2nza_s7m- zt4qcKyr})=HXkJ4I(r@VAYXH(c3s<&t+O znmV|su4%KrhXJw$IBX-3uaQ>RObs5#8r;TY<>ogS&C11>)_y+wS3Te4&9Fk@Ck00t zQ4H(^YxYhylNxC3Wku5p+zn=v-{xlG98S>Gv{WA2k0sI>P;WhsUsB&bT+eibrCE3Z zr=p87wK>0r%*;PP%I4=TeNd`l44n)G-X+6~l94%Xcj2}!yb3wk*tk(D=iXjY-Hj!^ zy0lPg#Uk1~L_iMfqd#DVHIx)t4O!bUhI6HQNHpbbephe3RBgkq`yIj_>U>@A3nH zC{vl>B{Qf`s3Bf(5e_4`31VaucR90mI)0wZbKiaax_}>!*A8ZjwfziZoY>BJEs@va~UviKb#%s+KTC zF|s#!376pB!svi$>1k0m5~fs!M;&u1vzXDQW~o$o2E*fUB{kj!)x>Q>e6mN#2TqZ4 zn4)MTfkaT4&amVZ+?Yid-bZ_i3r)T;Nij66d=s`oDV78xT<4jJPUKwk&Qu(}=4|WJ zSjH`&C&UFWVX^0<+ClvBsu{wjR}W!s4U-9?OX#}{!oLPlWG5zyC6QV@DC9tEtY%Fh zWGZ9{2NR<}3MIfP_!HbkH6Ej$%aC3n0LmyT(%30Hh|TnYO4%!o{$n-Zrc72W#HoiI zHi3uu=;{Evf+g4)e2XTr7G2>N=-G61!Bnyk`>8S96Fgzp?!ghtj610dm%V%sRFF~H zxO?#Q%gsKi^k`nMQQtjNn>e{76 zg*8~m7cJ`z_mQa%q$nzP2MPC7`J+kV_2-v`g`f6rkN)%AIl1cf+%2O!{9C$zG%h`` zwZEPDZe`qm+lIP}@0NTIuWn+Oc;`qpN!O~vC0Dh-CB4IOMcawSA=f&U?S-lp?~FYQ=-#Op73zw(2Z*ESt(JHme5 zUGTGE&$pWu|ElH#dvAJZ;q+~r8>-IdaqD%(-uYGkXdvrenfUzDfA*jEch}#$rJ!n} z{i$C@kNc^#L=cJJ)vZ=I+rIK&h{>Wb+r-tm`L82c<1E)4u+` JP#?XS{}<