Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-12-23 11:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity
18022 commits 10 branches 176 tags 1 GiB
Commit graph

509 commits

Author SHA1 Message Date
Richard Davey
c5d7c94cb4 Fixed JSDocs 2020-11-20 16:20:35 +00:00
Richard Davey
ea59b47d1c Force post pipeline skip 2020-11-20 15:18:28 +00:00
Richard Davey
750880fe5f Fix culled tiles return 2020-11-20 14:58:43 +00:00
Richard Davey
ed756d16f1 Fixed Get Tiles Within Shape function 2020-11-20 12:39:18 +00:00
Richard Davey
377d27c8a4 Added Tile.right and Tile.bottom properties. Fix #5400 2020-11-20 11:51:12 +00:00
Richard Davey
0d23aea281 Allow TilemapLayers to set post pipelines 2020-11-06 17:22:32 +00:00
Richard Davey
d3c70002ea Removed use of _tempMatrix from all renderers 2020-11-06 09:44:29 +00:00
Richard Davey
536f08a4bf Avoid deep diving into loads of functions 2020-10-15 11:47:11 +01:00
Richard Davey
67b787ab7c Update GetTilesWithinWorldXY.js 2020-10-15 11:09:52 +01:00
Richard Davey
db2fdc14d1 Update GetTileAt.js 2020-10-15 11:09:37 +01:00
Richard Davey
f130f5e9a3 Fixed incorrect parameter type 2020-10-15 11:09:19 +01:00
Richard Davey
b4fed98aa2 Update SetCollisionBetween.js 2020-10-15 11:08:18 +01:00
Brown Dragon
ca0ca97f59 Fix up tiled json parsing. 
Phaser currently discards the tiled `type` field (which is very useful for objects-from-tiles, as well as somewhat useful for handling tile variants).
It also discards wang set information, which is somewhat meaningful.

This diff adds both back; let me know if it goes too far and I can restrict it to only including `type`.
 2020-10-12 19:54:14 -04:00
Richard Davey
b3a74a6d5d ParseTilesets will now correctly handle non-consequtive tile IDs. It also now correctly sets the maxId property, fixing a bug where tiles wouldn't render if from IDs outside the expected range. Fix #4367 2020-10-12 13:52:31 +01:00
Richard Davey
e526af7cb9 Lint fix 2020-10-12 13:38:57 +01:00
Richard Davey
3e2041a3c5 Overhauled createFromObjects to make it much more useful. Fix #3817 #4613 2020-10-12 13:31:30 +01:00
Richard Davey
80287f6ee4 Path fixes 2020-10-12 11:51:05 +01:00
Richard Davey
04d80a8b5c Allow use of old method calls for now 2020-10-12 11:50:13 +01:00
Richard Davey
24777aa327 No need for isoCullDistances, just use existing cullPadding properties 2020-10-12 11:42:01 +01:00
Richard Davey
607fec9450 Use a cached Rectangle for speed 2020-10-12 11:40:52 +01:00
Richard Davey
0ba1f08f80 The Static and Dynamic Tilemap Layer objects have been removed and consolidated into the new TilemapLayer class. 2020-10-12 11:40:40 +01:00
Richard Davey
fb11821730 Fixed lots of missing JSDocs 2020-10-12 11:33:33 +01:00
Richard Davey
ae4c45f14a Fixed renderer so it draws multi tileset isometric tiles properly 2020-10-11 23:05:08 +01:00
Richard Davey
f00bb446f8 Formating fix 2020-10-11 23:04:11 +01:00
Richard Davey
9e68f41118 Formatting 2020-10-11 23:04:00 +01:00
Richard Davey
39f74d2e95 Use a cached vector to save constant allocation and fixed y culling limit 2020-10-11 23:03:52 +01:00
Richard Davey
2e50061699 Opps :) 2020-10-10 11:38:16 +01:00
Richard Davey
114201f497 Fixed tilemaps with missing function 2020-10-08 11:07:05 +01:00
Richard Davey
d9d4d74c89 Updated docs 2020-10-02 14:03:32 +01:00
Richard Davey
42d6188b7a Now using the GetCullTilesFunction #4922 2020-10-02 13:53:20 +01:00
Richard Davey
c0c00b66be Tilemaps.Components.IsometricCullTiles is a new function that culls tiles in a isometric map. 2020-10-02 13:48:52 +01:00
Richard Davey
ab753ffe10 Tilemaps.Components.StaggeredCullTiles is a new function that culls tiles in a staggered map. 2020-10-02 13:48:42 +01:00
Richard Davey
0b8b9fb3ba Tilemaps.Components.HexagonalCullTiles is a new function that culls tiles in a hexagonal map. 2020-10-02 13:48:33 +01:00
Richard Davey
c44c43a553 Tilemaps.Components.StaggeredCullBounds is a new function that calculates the cull bounds for a staggered map. 2020-10-02 13:48:22 +01:00
Richard Davey
e42b407721 Tilemaps.Components.HexagonalCullBounds is a new function that calculates the cull bounds for a hexagonal map. 2020-10-02 13:48:13 +01:00
Richard Davey
2450a16911 Tilemaps.Components.GetCullTilesFunction is a new function that returns the correct culling function to use. 2020-10-02 13:48:01 +01:00
Richard Davey
c66df4b94b Deleted unused files 2020-10-02 13:47:49 +01:00
Richard Davey
9c92fccd3a Updated to use new components 2020-10-02 13:47:36 +01:00
Richard Davey
f58ec09489 Tilemaps.Components.CullBounds is a new function that calculates the cull bounds for an orthogonal map. 2020-10-02 13:47:27 +01:00
Richard Davey
b11e5fe1fb Tilemaps.Components.RunCull is a new function that runs the culling process from the combined bounds and tilemap. 2020-10-02 13:47:10 +01:00
Richard Davey
7980beaeab Fixed references and docs #4922 2020-10-02 12:09:58 +01:00
Richard Davey
da651dc650 Fixed require filename 2020-10-02 12:06:07 +01:00
Richard Davey
1839e58581 Tidied up formatting #4922 2020-10-02 12:05:52 +01:00
Richard Davey
8ea29b6cf2 Removed console warnings 2020-10-02 12:02:48 +01:00
Richard Davey
89cec01b39 Updated types 2020-10-02 12:02:40 +01:00
Richard Davey
04ecc38a61 Fixed JSDocs and const path #4922 2020-10-02 11:57:37 +01:00
Richard Davey
b09197d8cb Added proper JSDocs and fixed private accessors #4922 2020-10-02 11:53:23 +01:00
Richard Davey
d5561ad97a Use cached vec2s to avoid constant vector creation 2020-10-02 11:41:11 +01:00
Richard Davey
aafd5c6cee Use cached vec2s to avoid constant vector creation 2020-10-02 11:36:44 +01:00
Richard Davey
f03ddf033b Formatting fix #4992 2020-10-02 11:27:50 +01:00
Richard Davey
a3f67973cd Corrected documentation and tidied up #4992 2020-10-02 11:25:48 +01:00
Richard Davey
ffb49bdb3a Tilemaps.Components.StaggeredTileToWorldXY is a new function that converts staggered tile coordinates to world coordinates. 2020-10-02 11:22:48 +01:00
Richard Davey
4281bc1763 Tilemaps.Components.IsometricTileToWorldXY is a new function that converts isometric tile coordinates to world coordinates. 2020-10-02 11:22:39 +01:00
Richard Davey
3c3c01d4d5 Tilemaps.Components.HexagonalTileToWorldXY is a new function that converts hexagonal tile coordinates to world coordinates. 2020-10-02 11:22:30 +01:00
Richard Davey
a51e0b8a68 Tilemaps.Components.GetWorldToTileXYFunction is a new function that returns the correct conversion function to use. 2020-10-02 11:22:18 +01:00
Richard Davey
6049701d91 Restored previous function 2020-10-02 11:22:02 +01:00
Richard Davey
a89a58bd6c Restore previous function 2020-10-02 11:16:32 +01:00
Richard Davey
769850a400 Tilemaps.Components.StaggeredTileToWorldY is a new function that converts a staggered Y coordinate to a world coordinate. 2020-10-02 11:16:18 +01:00
Richard Davey
0b7d3236b4 Tilemaps.Components.HexagonalTileToWorldY is a new function that converts a hexagonal Y coordinate to a world coordinate. 2020-10-02 11:16:07 +01:00
Richard Davey
0b630754f7 Tilemaps.Components.GetTileToWorldYFunction is a new function that returns the correct conversion function to use. 2020-10-02 11:15:54 +01:00
Richard Davey
00603c0d39 Tilemaps.Components.GetTileToWorldXFunction is a new function that returns the correct conversion function to use. 2020-10-02 11:03:56 +01:00
Richard Davey
3eaacffb37 Restore previous function #4992 2020-10-02 11:03:03 +01:00
Richard Davey
0952421bfb Expose the new functtions #4992 2020-10-02 11:00:30 +01:00
Richard Davey
da3d0108f4 Restore back to previous version 2020-10-02 10:59:24 +01:00
Richard Davey
9c22133bb2 Tilemaps.Components.StaggeredWorldToTileXY is a new function that converts world coordinates to staggered tile coordinates. 2020-10-02 10:58:36 +01:00
Richard Davey
b8520f3b0d Tilemaps.Components.IsometricWorldToTileXY is a new function that converts world coordinates to isometric tile coordinates. 2020-10-02 10:58:18 +01:00
Richard Davey
7402d22c53 Tilemaps.Components.HexagonalWorldToTileXY is a new function that converts world coordinates to hexagonal tile coordinates. 2020-10-02 10:57:57 +01:00
Richard Davey
7d39bf9217 Tidy return statements 2020-10-02 10:57:14 +01:00
Richard Davey
ef2d4f6d7a Tilemaps.Components.GetWorldToTileXYFunction is a new function that returns the correct conversion function to use. 2020-10-02 10:56:44 +01:00
Richard Davey
2537e3ff70 Tilemaps.Components.GetWorldToTileXFunction is a new function that returns the correct conversion function to use. 2020-10-02 10:37:41 +01:00
Richard Davey
3352bd800c Restored previous version #4992 2020-10-02 10:37:30 +01:00
Richard Davey
92b431646a Tilemaps.Components.GetWorldToTileYFunction is a new function that returns the correct type of translation to use. 2020-10-02 10:31:02 +01:00
Richard Davey
f1c85fc220 Tilemaps.Components.HexagonalWorldToTileY is a new function that converts world Y coordinates from pixels to hexagonal tile Y coordinates. 2020-10-02 10:30:53 +01:00
Richard Davey
cb09374f9d Tilemaps.Components.StaggeredWorldToTileY is a new function that converts world Y coordinates from pixels to staggered tile Y coordinates. 2020-10-02 10:30:43 +01:00
Richard Davey
17df0f7135 Restored to previous version. #4992 2020-10-02 10:30:30 +01:00
Richard Davey
398bdf4314 Tilemap.hexSideLength is a new property that holds the length of the hexagon sides, if using Hexagonal Tilemaps. 2020-10-02 10:30:08 +01:00
Richard Davey
24437485af Fixed static function #4992 2020-10-02 10:19:13 +01:00
Richard Davey
ba4be029be Create TilemapOrientationType.js 2020-10-02 10:18:57 +01:00
Richard Davey
a8bd2204f2 Fixed updatePixelXY and prioritied orthogonal maps. #4992 2020-10-02 09:52:40 +01:00
Richard Davey
555c47e773 Moved Tilemap const declarations to the correct place. #4992 2020-10-02 09:48:44 +01:00
Richard Davey
c3c35322c4
Merge pull request #4992 from svipal/master 
Preliminary PR for isometric support
 2020-10-02 09:42:47 +01:00
Richard Davey
8d51e8ab2c Fix #4859 2020-09-23 12:59:03 +01:00
svipal
79920709e5 removed useless change 2020-09-23 01:13:20 +02:00
Svipal
3997cad5a7 same work 2020-09-19 13:05:56 +02:00
Svipal
5fd854fd26 fixed dynamic layer 2020-09-19 11:45:46 +02:00
Svipal
a9e8c49bf0 fixed typo 2020-09-19 11:04:28 +02:00
Svipal
299f83c13d fixed conflicts 2020-09-19 10:56:05 +02:00
svipal
79fe9abc6e finished updating culling system 2020-09-18 17:16:52 +02:00
Richard Davey
6a966e3f3b Removed interpolationPercentage parameter from all render methods, as it has never been used. 2020-09-14 15:33:58 +01:00
Richard Davey
951457c881 As a result of the change to the shader, all uses of the WebGL Util function getTintAppendFloatAlphaAndSwap have been replaced with getTintAppendFloatAlpha instead. 2020-09-14 15:02:13 +01:00
Richard Davey
e450bf2f1f Swap to using constants for pipeline names 2020-09-09 13:05:18 +01:00
Richard Davey
d198818d80 Game Objects now call the new Pipeline Manager methods directly 2020-09-09 13:05:18 +01:00
Svipal
1994185d6f merged master 2020-09-08 22:17:04 +02:00
Richard Davey
0d934c730e Every single Tilemap.Component function has now been made public. This means you can call the Component functions directly, should you need to, outside of the Tilemap system. 2020-09-02 11:54:24 +01:00
Richard Davey
07865a5823 Final set of namespace changes. Fix #5062 2020-09-01 20:28:42 +01:00
Richard Davey
0dd07333af Updated to use MultiPipeline 2020-08-21 16:14:59 +01:00
Svipal
40a26256c4 oop 2020-08-09 15:55:00 +02:00
Svipal
809d0b7495 merged master 2020-08-09 13:13:09 +02:00
Svipal
241d4193e8 let's try again 2020-08-09 12:33:52 +02:00
Svipal
97bb9b4a8f bad bad idea 2020-08-09 12:33:26 +02:00
Svipal
c77731d127 bad idea 2020-08-09 12:24:56 +02:00
Svipal
b4a1473fea test 2020-08-09 12:13:29 +02:00
Svipal
a72efc8ac8 Update ParseTileLayers.js 2020-08-09 11:50:25 +02:00
Richard Davey
f3ebada1e0 Tidy up everything after rendering 2020-07-17 15:49:03 +01:00
Richard Davey
9280a73bf9 StaticTilemapLayer now includes the ModelViewProjection mixin, so it doesn't need to modify the pipeline during rendering. 2020-07-17 15:48:53 +01:00
Richard Davey
10c19bd24d StaticTilemapLayer.upload will now set the vertex attributes and buffer the data, and handles internal checks more efficiently. 2020-07-17 13:58:38 +01:00
Richard Davey
6e15f6b77d Refactored to tidy it up and also now works with Light2D pipeline 2020-07-17 13:56:56 +01:00
Richard Davey
dc04949d3d Needs fixing tomorrow 2020-07-16 18:10:40 +01:00
Richard Davey
f89d53ca0d Update DynamicTilemapLayerWebGLRenderer.js 2020-07-16 17:43:14 +01:00
Richard Davey
d34d52550d Renders using setTextureZero 2020-07-15 18:03:57 +01:00
Richard Davey
0003d278fd Updated to use new external MVP functions 2020-07-14 16:49:30 +01:00
Richard Davey
2a2a2eafe8 Reverted PR #5219 because it breaks camera zooming on tilemaps 2020-07-14 08:47:52 +01:00
Richard Davey
cbba26e08c
Merge pull request #5215 from cruzdanilo/layer-webgl-transform 
StaticTilemapLayerWebGLRenderer: apply rotation and parent transform
 2020-07-13 13:18:02 +01:00
danilo neves cruz
7302ad1041 StaticTilemapLayerWebGLRenderer: apply rotation and parent transform 2020-07-11 02:35:20 +07:00
Svipal
b4d9d71009 fixed orthogonal world to tile 2020-06-25 15:04:57 +02:00
Svipal
9bd310810d done 2020-06-06 11:13:11 +02:00
Svipal
9c8cdd4063 trying to fix conflic in ParseTileLayers 2020-06-06 11:11:43 +02:00
Svipal
e6d468cda7 worldToTile fixed 2020-06-06 00:23:16 +02:00
samme
c963768c1e Docs: SetCollisionByExclusion() and friends 
Fixes #5179

Thanks @BoltKey
 2020-06-05 10:01:30 -07:00
Richard Davey
96b1d4c783 Update LayerDataConfig.js 2020-04-27 16:16:50 +01:00
Richard Davey
cef9aa2120 New Type Defs 2020-04-27 16:13:49 +01:00
Richard Davey
b035d190e9 Added JSDocs 2020-04-27 16:13:40 +01:00
Richard Davey
bf9cbabe50 Fixed lint errors with #4964 PR 2020-04-27 13:46:37 +01:00
Richard Davey
06f8d1b8a5
Merge pull request #4964 from gogoprog/feature/tilemapImageCollections 
Create tilesets from image collections
 2020-04-27 13:42:46 +01:00
Richard Davey
63eb41eb94
Merge pull request #5051 from samme/feature/tiled-point-and-createFromObjects 
Add Tiled point object and change offset in createFromObjects()
 2020-04-27 13:10:34 +01:00
Richard Davey
91bfd7d0c2
Merge pull request #4984 from Nightspeller/issue#4983 
Proposed fix for the issue#4983
 2020-04-27 12:39:24 +01:00
samme
56ad38f17d Docs: correct Tilemap#renderDebugFull 2020-04-26 12:38:20 -07:00
svipal
5911b94d35 Revert "clean up" 
This reverts commit 854589ddbe.

woops
 2020-04-10 20:55:31 +02:00
svipal
854589ddbe clean up 2020-04-10 20:40:52 +02:00
samme
4a711e42fe Docs: fix description for TiledObject.point 2020-04-03 20:13:13 -07:00
Svipal
8665e08f13 refactored things so that there is no more switching at runtime depending on orientation 2020-04-03 19:36:13 +02:00
samme
bc8606c65c Add Phaser.Types.Tilemaps.TiledObject.point 2020-03-22 16:09:23 -07:00
samme
5ec9e6b91a Offset by object data dimensions, allowing zero offset 2020-03-22 09:37:42 -07:00
samme
fb881a54b9 Add 'point' property for points 
https://doc.mapeditor.org/en/latest/reference/json-map-format/#point-example
 2020-03-22 09:29:10 -07:00
samme
df1537fa36 Remove redundant assignments 
Already picked
 2020-03-22 09:28:24 -07:00
Svipal
1ccc815ce7 removed a few debug prints, moved isoBounds to a new component, started to add constants 2020-03-22 12:35:24 +01:00
Svipal
33daee1d27 canvas renderer typo fix 2020-03-22 08:48:26 +01:00
svipal
9c23f7e72f
Update src/tilemaps/ParseToTilemap.js 
Co-Authored-By: Chris Andrew <hex727@gmail.com>
 2020-03-22 08:46:07 +01:00
Svipal
72cb3343d6 cleaning up debug prints and such 2020-03-21 11:25:04 +01:00
Svipal
cec71a85ea added hexagonal support 2020-03-21 10:19:03 +01:00
Svipal
406e6eb093 fixed worldtotilex on odd tiles 2020-03-14 10:57:19 +01:00
Svipal
66e99bccc6 changed a few things, preparing tiles 2020-03-14 10:23:13 +01:00
Svipal
a7d4816564 added staggered support 2020-03-14 10:11:04 +01:00
svipal
9780592a90 Update StaticTilemapLayer.js 2020-02-08 15:55:22 +01:00
svipal
8e30c5ef1c
Update TileToWorldX.js 2020-02-08 15:53:53 +01:00
svipal
cf622269e8 Update PutTileAt.js 2020-02-08 15:51:12 +01:00
svipal
a40ff084f9
Update DynamicTilemapLayerWebGLRenderer.js 2020-02-08 15:25:51 +01:00
svipal
304ff79b2b
Update StaticTilemapLayer.js 2020-02-08 12:23:09 +01:00
svipal
283bb46358
Update ParseJSONTiled.js 2020-02-08 12:15:30 +01:00
svipal
71cf182d97
Update LayerData.js 2020-02-08 12:14:49 +01:00