Commit Graph

134 Commits

Author SHA1 Message Date
Dylan Wilson 321977ff8a very nearly fully working json content reader 2019-06-26 23:01:38 +10:00
Dylan Wilson 438836078d almost worked out the generic json importer 2019-06-25 23:20:58 +10:00
Dylan Wilson e962cec448 A mix between Tiled and GUI stuff (#553)
* mostly restored the tiled importer unit tests

* code cleanup

* code cleanup

* almost got tiled maps serialization independent of the content pipeline

* refactored the tiled map content importer so that tiled maps can be loaded at runtime

* code cleanup

* removed nuspec files

* experimenting with an XML based GUI markup parser

* a few more markup parser features

* finally got a working open file dialog

* experimenting with markup bindings

* attached properties

* working on the gui stuff again

* working on a better textbox

* multiline textboxing

* new text box is really coming along

* removed the content explorer experiment

* restored the old gui demo back to the way it was before (for now)
2018-10-09 22:18:48 +10:00
stefanrbk 433e458af0 Real Tiled Group Support (#522)
* Change from storing layers by index to Dictionary key

Models are now stored with the `TiledMapLayer` they are part of.

* Allow render calls via TiledMapLayer

* Add TiledMapGroupLayer and model build recursion for groups

* Add rendering support for TiledMapGroupLayer

* Update TiledMapReader to read TiledMapGroupLayers

* Update Features Demo to Include a Map with a Layer Group

* Update TiledMapWriter and TiledMapProcessor to Support Groups

* Update TiledMap to Report Layers Correctly
2018-07-08 21:34:07 +10:00
stefanrbk e89fe97061 Build Textures With Prefered Transparent Color (#521)
Pass the transparent color provided by the .TMX or .TSX file to the Texture processor for custom transparency.
2018-07-06 10:11:25 +10:00
stefanrbk e84895d0e6 Removed BuildAndLoadAsset for BuildAsset 2018-07-02 14:07:30 -05:00
stefanrbk ff7ddd5f08 Fixed AddDependency/Build(AndLoad)Asset issues 2018-06-25 19:31:03 -05:00
stefanrbk f3ec438997 Fix build errors 2018-06-20 13:34:07 -05:00
stefanrbk eabd275a24 Merge branch 'develop' into Content 2018-06-19 17:27:48 -05:00
Jon Seaman 4c9a0136b1 [WIP] Demo conversion to .net core (#514)
* Demo.SpaceGame working

* Delete unused files, update icon

* Demo.StarWarrior building

* Removed unused files

* Demo.Features Collision

* Platform Demo Building

* Nuclex Gui Project

* got the old platformer demo running but it's still missing stuff

* Demo.Features added to solution

* Demo.Features building

Currently, most demos don't build and were excluded from the project.

* Demo.Features.NetCore building

* Demo.Features building and running

* First demo usable

* Close button

* Tiles + Sprite Demo

* More demos working

* Fix Back() for new Gui

* Remove old project files
2018-06-18 20:29:40 +10:00
Dylan Wilson b8cf165347 removed dirty hack from the projects and fixed it in the cake script 2018-06-14 21:12:58 +10:00
Dylan Wilson 207010fbd7 trying out a dirty hack to hopefully workaround issue #495 2018-06-14 20:40:38 +10:00
stefanrbk a0e3c57c30 Comments and remove file accessing
Added comments into the importers and processors to show off what the new code does. Removed unneeded code involving locating external files as `Content` handles this for us automatically.
2018-06-11 18:33:02 -05:00
stefanrbk 044712f6aa Added remaining .TMX format features
Added the remaining features of the .TMX Tiled Map format. Removed the parts of the format which aren't needed for rendering, like `TiledMapTerrainContent`. Terrains and the newer WangSets are only used in constructing a map, not for rendering. Added exception throws for non-implemented parts of the format.
2018-06-09 13:45:02 -05:00
stefanrbk 1cf24d01ae Added Rough Group Layer Support
Added the ability to load files with groups. Rendering system still doesn't understand layer groups yet, so this allows groups to be initially loaded, but the sub layers of the group are extracted to the layer root, things like offsets for the group are applied directly to the sub layers, and the groups themselves are removed.
2018-06-08 14:53:57 -05:00
stefanrbk 92dc951099 Object Templates
Added handling of `TiledMapObject` templates. Tile object templates are currently not working as the tileset info is currently ignored.
2018-06-07 15:17:15 -05:00
stefanrbk 0ca4ae70da Importer and Processor
Added importer and processor for `TiledMapTilesetContent`
2018-06-06 11:53:46 -05:00
stefanrbk 561c437023 Extract Writer and Reader for TIlesets
Pulled out the methods for writing and reading the content files for tilesets into their own classes to allow loading tilesets independently from the maps.
2018-06-05 14:51:36 -05:00
stefanrbk 184fba5928 Include tileset textures internally
Changed the reference of tileset textures so the `Texture2DContent` isn't referenced, but built into the file as tilesets don't reference the same texture more than once.
2018-06-05 09:16:55 -05:00
stefanrbk 7ce9911696 TiledMapImageContent.Content
Adds the `Content` field to `TiledMapImageContent` to reference the `Texture2DContent` instead of manually loading the content with the `ContentManager`.
2018-06-04 17:26:03 -05:00
Dylan Wilson 2791d4347a do away with the old nuspec files 2018-05-24 21:36:15 +10:00
Dylan Wilson 3ff145422e merged from develop 2018-05-23 22:51:45 +10:00
Dylan Wilson 2ec6df4db4 added nuget package metadata 2018-05-17 22:25:07 +10:00
Dylan Wilson 7dc07a9663 moved the content pipeline dll output folder 2018-05-16 21:58:49 +10:00
Dylan Wilson 2cf9ec7350 partially restored the cake build 2018-05-10 21:33:43 +10:00
Dylan Wilson 0121a2b9c5 dotnet standard 2.0 baby! 2018-05-09 21:58:40 +10:00
stefanrbk 2005c2c161 Fix Texture Alignment (#480) 2018-03-08 12:51:11 +10:00
Dylan Wilson 4126e68fb3 merge commit 2018-02-07 22:20:05 +10:00
Dylan Wilson ad03ad3251 removed most of the compiler warnings about missing XML docs 2018-02-07 22:13:43 +10:00
Jon Seaman 5470a52e05 Added XML docs to NuGet (#460) 2018-02-01 20:14:59 +10:00
Dylan Wilson 8293117ca2 fixed the content pipeline error 2018-01-31 00:19:31 +10:00
Dylan Wilson 2dad917c49 added tileset tile type 2018-01-13 22:53:24 +10:00
Dylan Wilson 97b7a32311 code cleanup 2017-11-27 20:51:05 +10:00
Dylan Wilson d1fded1ec8 one tiny tweak to rule them all 2017-11-21 20:57:32 +10:00
Dylan Wilson bfa713e91d its a bit working and a bit not 2017-11-21 20:57:32 +10:00
Dylan Wilson b3a631aff5 Gui dialogs (#410)
* started refactoring for gui windows

* a bit more work on gui windows

* fixed some bugs and broken build stuff

* fixed some bugs in gui controls

* a little code cleanup

* got gui dialogs positioning and experimenting with named styles by type

* apply control styles directly in the constructor of controls

* got everything compiling again

* all gui controls have skinnable constructors

* rework uniform grid desired size calculations

* turns out gui layouts are complicated

* include pdb files in nuget packages

* fixed a bug in find nearest glyph

* custom control styling

* added a range constructor overload that takes one value

* rethinking control desired size behaviour

* made particle emitters more editable at runtime

* moved the auto trigger code to the particle effect instead of the emitters

* tweaks

* changed the particle modifer interface to an abstract base with an optional name

* changed the particle modifer interface to an abstract base with an optional name

* an attempt at creating a gui combo box

* rolled back the nested control experiment

* pretty good (but not perfect) combo boxes

* tweaks

* name property bindings on lists

* removed and cleaned up the hacks from the gui combo box

* minor combo box styling tweaks

* minor bug fix in gui combo box

* experiments with data binding

* fixed a mistake on the texture region service interface

* working on the ability to serialize particles

* finished particle serialization

* more robust range deserialization

* added editor browable attributes

* fixed some broken demos

* made the particle modifiers editable at runtime

* fixed some issues with particle serialization

* fixed some issues with interpolators
2017-07-22 21:22:13 +10:00
Dylan Wilson b6555e8ce5 moving some things around and code cleanup 2017-06-13 21:20:02 +10:00
Jay Jeckel c864aba136 Fix TryGetTile (#380)
Change TiledMapTileLayer to store blank tiles so that TryGetTile returns the correct TiledMapTile instances.
2017-04-26 21:13:11 +10:00
Musbah Sinno 785396d171 Added the ability to get tileset tile objects. (#378) 2017-04-20 20:52:02 +10:00
Lucas Girouard-Stranks 435d973a20 Fix #361 (#368)
* Fix #361

* Clean up debugging changes.

* Fix one compile error.
2017-04-09 22:15:36 +10:00
Roman Shapiro eab2ed17ce Added kernings support to the BitmapFont (#372) 2017-04-06 21:41:21 +10:00
Dylan Wilson 432bb92ca5 Revert "- Fix Tileset.FirstGlobalIdentifier (#362)" (#363)
This reverts commit 1f321b332b.
2017-04-01 11:04:44 +10:00
Eric Brogin 1f321b332b - Fix Tileset.FirstGlobalIdentifier (#362) 2017-04-01 10:58:40 +10:00
Harry fe5aaf515d Fix project files so they can build from Linux (#357) 2017-03-23 20:48:02 +10:00
Dylan Wilson 23fe90de0b updated the nuget readme's to point to the new docs 2017-03-22 21:34:59 +10:00
Dylan Wilson 8f2caa305c updated the nuget package readme files and made every nuget package show the readme on install 2017-03-21 22:10:49 +10:00
Dylan Wilson 7b8b29a8bc merged the content pipeline projects into one and setup a separate content pipeline nuget package 2017-03-21 20:57:40 +10:00
Dylan Wilson b5656908a5 split the animations content pipeline code out into it's own content pipeline dll 2017-03-14 22:14:18 +10:00
Dylan Wilson dbfe2ea32c split the animations namespace into two nuget packages 2017-03-14 21:53:19 +10:00
Lucas Girouard-Stranks 3a164d5385 Tiled Fix (#349)
* Tiled fix.

* Remove bat file.
2017-03-05 09:18:11 +10:00