Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-06 05:38:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some Glitter fixes

Browse Source
This commit is contained in:
korenkonder
2024-01-28 21:14:43 +03:00
parent ff5efbf128
commit 4fb12ee771
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ReDIVA/glitter_editor.cpp
+3 -1
View File
@@ -365,6 +365,7 @@ bool GlitterEditor::init() {
Glitter::glt_particle_manager->emission = 1.0f;
Glitter::glt_particle_manager->draw_all = true;
Glitter::glt_particle_manager->draw_all_mesh = true;
Glitter::glt_particle_manager->SetPause(true);
reset();
dtm_stg_load(0);
@@ -1171,6 +1172,7 @@ bool GlitterEditor::dest() {
Glitter::glt_particle_manager->FreeSceneEffect(scene_counter);
Glitter::glt_particle_manager->UnloadEffectGroup(hash);
glitter_editor_enable = false;
Glitter::glt_particle_manager->SetPause(false);
return true;
}
@@ -1712,7 +1714,7 @@ static void glitter_editor_load_file(GlitterEditor* glt_edt, const char* path, c
if (!glt_edt->load_data_wait) {
glitter_editor_enable = true;
glt_edt->hash = Glitter::glt_particle_manager->LoadFile(glt_edt->load_glt_type,
&data_list[glt_edt->load_data_type], file, path, -1.0f, false);
&data_list[glt_edt->load_data_type], file, path, -1.0f, true);
glt_edt->load_data_wait = true;
}
else if (Glitter::glt_particle_manager->CheckNoFileReaders(glt_edt->hash)) {
src/ReDIVA/pv_game/pv_game.cpp
-6
View File
@@ -3415,12 +3415,6 @@ bool pv_game::load() {
break;
}
for (uint32_t& i : data.obj_set_itmpv)
if (object_storage_load_obj_set_check_not_read(i)) {
wait_load |= true;
break;
}
for (uint32_t& i : data.obj_set_handitem)
if (object_storage_load_obj_set_check_not_read(i)) {
wait_load |= true;
src/ReDIVA/x_pv_game.cpp
+2 -2
View File
@@ -1072,7 +1072,7 @@ void x_pv_game_effect::load_data(int32_t pv_id) {
char buf[0x200];
size_t len = sprintf_s(buf, sizeof(buf), "eff_pv%03d_main", pv_id);
uint32_t hash = (uint32_t)Glitter::glt_particle_manager->LoadFile(Glitter::X,
x_data, buf, 0, -1.0f, false);
x_data, buf, 0, -1.0f, true);
if (hash != hash_murmurhash_empty)
pv_glitter.push_back(std::string(buf, len));
break;
@@ -4771,7 +4771,7 @@ void x_pv_game_stage::ctrl(float_t delta_time) {
for (pvsr_effect& i : sr->effect) {
uint32_t hash = (uint32_t)Glitter::glt_particle_manager->LoadFile(Glitter::X,
x_data, i.name.c_str(), 0, i.emission, false);
x_data, i.name.c_str(), 0, i.emission, true);
if (hash != hash_murmurhash_empty)
stage_glitter.push_back(hash);
}