ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Show progress bar before new data is extracting. It will at least show that the game is not hanged and is doing something.

Browse Source
This commit is contained in:
Deve 2018-03-08 21:44:22 +01:00
parent fa624c90e1
commit d271e27590
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/io/assets_android.cpp
View File

@ -36,6 +36,7 @@
AssetsAndroid::AssetsAndroid(FileManager* file_manager)
{
m_file_manager = file_manager;
m_progress_bar = NULL;
}
//-----------------------------------------------------------------------------
@ -203,9 +204,14 @@ void AssetsAndroid::init()
// Extract data directory from apk if it's needed
if (needs_extract_data)
{
m_progress_bar = new ProgressBarAndroid();
m_progress_bar->draw(0.01f);
removeData();
extractData();
delete m_progress_bar;
if (!m_file_manager->fileExists(m_stk_dir + "/.extracted"))
{
Log::fatal("AssetsAndroid", "Fatal error: Assets were not "
@ -262,8 +268,6 @@ void AssetsAndroid::extractData()
file.clear();
file.seekg(0, std::ios::beg);
ProgressBarAndroid* progress_bar = new ProgressBarAndroid();
progress_bar->draw(0.0f);
unsigned int current_line = 1;
while (!file.eof())
@ -277,10 +281,11 @@ void AssetsAndroid::extractData()
success = extractDir(dir_name);
assert(lines_count > 0);
progress_bar->draw((float)(current_line) / lines_count);
float pos = 0.01f + (float)(current_line) / lines_count * 0.99f;
m_progress_bar->draw(pos);
current_line++;
if (progress_bar->closeEventReceived())
if (m_progress_bar->closeEventReceived())
{
success = false;
}
@ -288,8 +293,6 @@ void AssetsAndroid::extractData()
if (!success)
break;
}
delete progress_bar;
}
}
else

2
src/io/assets_android.hpp
View File

@ -21,11 +21,13 @@
#include <string>
class FileManager;
class ProgressBarAndroid;
class AssetsAndroid
{
private:
FileManager* m_file_manager;
ProgressBarAndroid* m_progress_bar;
std::string m_stk_dir;
void extractData();