Skip to content

Commit

Permalink
Improved UI behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
andon authored and andon committed Jan 22, 2017
1 parent ef8a5dd commit 4b5404c
Show file tree
Hide file tree
Showing 18 changed files with 88 additions and 16,565 deletions.
2 changes: 1 addition & 1 deletion include/DLL_VERSION.H
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#define TBF_MAJOR 0
#define TBF_MINOR 3
#define TBF_BUILD 2
#define TBF_BUILD 3
#define TBF_REV 0


Expand Down
1 change: 1 addition & 0 deletions include/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ struct tbf_config_t
float lod_bias = -0.2666f;
int32_t max_cache_in_mib = 2048L;
int32_t worker_threads = 6;
bool show_loading_text = false;
} textures;

struct {
Expand Down
776 changes: 0 additions & 776 deletions include/imgui/imgui_internal.h

This file was deleted.

43 changes: 28 additions & 15 deletions src/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ struct {
tbf::ParameterBool* dump;
tbf::ParameterInt* cache_size;
tbf::ParameterInt* worker_threads;
tbf::ParameterBool* show_loading_text;
} textures;


Expand Down Expand Up @@ -251,6 +252,16 @@ TBF_LoadConfig (std::wstring name)
L"Texture.System",
L"WorkerThreads" );

textures.show_loading_text =
static_cast <tbf::ParameterBool *>
(g_ParameterFactory.create_parameter <bool> (
L"Show a loading indicator in OSD")
);
textures.show_loading_text->register_to_ini (
render_ini,
L"Texture.System",
L"ShowLoadingIndicator" );


render.dump_shaders =
static_cast <tbf::ParameterBool *>
Expand Down Expand Up @@ -354,7 +365,7 @@ TBF_LoadConfig (std::wstring name)
render_ini->parse ();
}

input.gamepad.texture_set->load (config.input.gamepad.texture_set);
input.gamepad.texture_set->load (config.input.gamepad.texture_set);

render.rescale_shadows->load (config.render.shadow_rescale);
render.rescale_env_shadows->load (config.render.env_shadow_rescale);
Expand All @@ -363,13 +374,14 @@ TBF_LoadConfig (std::wstring name)

framerate.replace_limiter->load (config.framerate.replace_limiter);

textures.remaster->load (config.textures.remaster);
textures.uncompressed->load (config.textures.uncompressed);
textures.lod_bias->load (config.textures.lod_bias);
textures.cache->load (config.textures.cache);
textures.dump->load (config.textures.dump);
textures.cache_size->load (config.textures.max_cache_in_mib);
textures.worker_threads->load (config.textures.worker_threads);
textures.remaster->load (config.textures.remaster);
textures.uncompressed->load (config.textures.uncompressed);
textures.lod_bias->load (config.textures.lod_bias);
textures.cache->load (config.textures.cache);
textures.dump->load (config.textures.dump);
textures.cache_size->load (config.textures.max_cache_in_mib);
textures.worker_threads->load (config.textures.worker_threads);
textures.show_loading_text->load (config.textures.show_loading_text);

if (empty)
return false;
Expand All @@ -392,13 +404,14 @@ TBF_SaveConfig (std::wstring name, bool close_config)
render.rescale_shadows->store (config.render.shadow_rescale);
render.rescale_env_shadows->store (config.render.env_shadow_rescale);

textures.remaster->store (config.textures.remaster);
textures.uncompressed->store (config.textures.uncompressed);
textures.lod_bias->store (config.textures.lod_bias);
textures.cache->store (config.textures.cache);
textures.dump->store (config.textures.dump);
textures.cache_size->store (config.textures.max_cache_in_mib);
textures.worker_threads->store (config.textures.worker_threads);
textures.remaster->store (config.textures.remaster);
textures.uncompressed->store (config.textures.uncompressed);
textures.lod_bias->store (config.textures.lod_bias);
textures.cache->store (config.textures.cache);
textures.dump->store (config.textures.dump);
textures.cache_size->store (config.textures.max_cache_in_mib);
textures.worker_threads->store (config.textures.worker_threads);
textures.show_loading_text->store (config.textures.show_loading_text);

input.gamepad.texture_set->store (config.input.gamepad.texture_set);

Expand Down
21 changes: 0 additions & 21 deletions src/imgui/LICENSE

This file was deleted.

Loading

0 comments on commit 4b5404c

Please sign in to comment.