Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure tileset loading and storing. #22579

Merged
merged 55 commits into from
Dec 12, 2017
Merged

Restructure tileset loading and storing. #22579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
8421ed6
Move cata_tiles::create_tile_surface out of the class.
BevapDin Dec 3, 2017
b2cc1f9
Remove one level of indentation by returning early.
BevapDin Dec 7, 2017
6ffb2e7
Remove pointless and redundant check for weighted_int_list::empty
BevapDin Dec 7, 2017
12bd5a1
Extract code into a separate function.
BevapDin Dec 7, 2017
cc1a584
Move code from load_tilejson_from_file into its caller.
BevapDin Dec 7, 2017
c4160d0
Move clearing tileset_mutation_overlay_ordering into init()
BevapDin Dec 7, 2017
9491111
Remove pointless checks for use_tiles.
BevapDin Dec 7, 2017
ac2eacd
Change parameter type to be a boolean.
BevapDin Dec 7, 2017
1037b45
Move simple lookup access of cata_tiles::tile_ids into function.
BevapDin Dec 7, 2017
e645877
Extract code to get ASCII fallback tile id into separate function.
BevapDin Dec 7, 2017
19d0e85
Move default_tile_(width|height) into new class tileset.
BevapDin Dec 8, 2017
f8838ab
Move tile_values, (shadow|night|overexposed)_tile_values into class t…
BevapDin Dec 7, 2017
362cceb
Move tile_ids into class tileset
BevapDin Dec 7, 2017
c97f520
Change cata_tiles::create_default_item_highlight into ensure_default_…
BevapDin Dec 7, 2017
422e19c
Call ensure_default_item_highlight after loading the tileset.
BevapDin Dec 7, 2017
97247a2
Change tileset::ensure_default_item_highlight to throw upon errors.
BevapDin Dec 7, 2017
76101b4
Move cata_tiles::add_ascii_subtile into class tileset
BevapDin Dec 7, 2017
7e51fcc
Move tile_pixelscale into class tileset.
BevapDin Dec 7, 2017
403d894
Move cata_tiles::load_ascii_set into class tileset_loader
BevapDin Dec 7, 2017
2a92d02
Move tileset::add_ascii_subtile into class tileset_loader
BevapDin Dec 7, 2017
5e0afca
Move cata_tiles::load_ascii_tilejson_from_file into class tileset_loader
BevapDin Dec 7, 2017
11ffdd1
Move sprite_offset_(x|y) into class tileset_loader
BevapDin Dec 7, 2017
6cd6021
Move some more functions into class tileset_loader
BevapDin Dec 7, 2017
f20c9e0
Move offset variable into class tileset_loader.
BevapDin Dec 7, 2017
b7158e6
Move size variable into class tileset_loader
BevapDin Dec 7, 2017
bd6c603
Move cata_tiles::load_tileset into tileset_loader.
BevapDin Dec 7, 2017
8ca8021
Move cata_tiles::load_tilejson_from_file into tileset_loader.
BevapDin Dec 7, 2017
b1cd648
Remove pointless setting of tile_(width|height).
BevapDin Dec 9, 2017
91ab81f
Make sprite_(width|height) members of class tileset_loader.
BevapDin Dec 7, 2017
0a28efb
Move R,G,B into class tileset_loader.
BevapDin Dec 7, 2017
3fd6c8e
Move cata_tiles::load_tilejson into class tileset_loader
BevapDin Dec 7, 2017
94d3539
Move ensure_default_item_highlight into class tileses_loader.
BevapDin Dec 7, 2017
755ea0c
Remove declaration of friend cata_tiles from class tileset.
BevapDin Dec 7, 2017
eb7fa26
Rename tileset_loader::load_tilejson to load
BevapDin Dec 8, 2017
22f10d5
Inline code of tileset_loader::load_tilejson_from_file
BevapDin Dec 8, 2017
c04e768
Store SDL_Texture used for tile values as separate type.
BevapDin Oct 6, 2017
5d9f6cf
Encapsulate SDL_Texture even more:
BevapDin Oct 6, 2017
6552cb5
Throw errors when texture creation fails.
BevapDin Oct 6, 2017
1dbab5d
Implement rect_range to iterate over rectangles.
BevapDin Dec 3, 2017
d0ff6ae
Change texture to contain a shared pointer to SDL_Texture
BevapDin Oct 6, 2017
83997e0
Move common code for creating alternative tilesets into function.
BevapDin Dec 3, 2017
a57c7ad
Move creating the texture from surface into separate function.
BevapDin Dec 3, 2017
2747ac4
Move creation of alternative tilesets into existing function.
BevapDin Dec 3, 2017
a8d7e64
Extract into yet another function.
BevapDin Dec 3, 2017
2c617c0
Combine function calls to eliminate variables.
BevapDin Dec 3, 2017
1194e3f
Respect maximal texture size as reported by SDL:
BevapDin Dec 3, 2017
e1522e8
Move code from cata_tiles::init into tileset_loader::load
BevapDin Dec 8, 2017
8a48008
Inline code of cata_tiles::clear_buffer
BevapDin Dec 9, 2017
3c5997a
Move tex_pool into class cata_tiles.
BevapDin Dec 9, 2017
f68ed61
Default the destructor of class cata_tiles
BevapDin Dec 9, 2017
a01a416
Inline code of cata_tiles::clear.
BevapDin Dec 9, 2017
b192f47
Load tileset after loading the game data, not upon program start.
BevapDin Dec 9, 2017
a243bd1
Fix accessing tileset data before its loaded.
BevapDin Dec 9, 2017
18e472a
Load the tileset into a separate instance
BevapDin Dec 9, 2017
17d3f46
Fix tileset being loaded in test application.
BevapDin Dec 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading