Fixed formatting

This commit is contained in:
korenkonder
2024-04-03 21:05:08 +03:00
parent eea0d2aeb9
commit bac08d7c7f
13 changed files with 29 additions and 31 deletions
+2 -2
View File
@@ -242,7 +242,7 @@ namespace Glitter {
dst.random_range = 0.0;
}
}
void Curve::FitKeysIntoCurve(GLT) {
keys_rev.clear();
@@ -509,7 +509,7 @@ namespace Glitter {
dst.min_value = (float_t)src.value;
}
}
void Curve::Recalculate(GLT) {
keys.clear();
+2 -2
View File
@@ -161,7 +161,7 @@ namespace Glitter {
if (emitter)
emitters.push_back(emitter);
}
if (!init)
ResetInit(GPM_VAL, GLT_VAL, sc);
}
@@ -1115,7 +1115,7 @@ namespace Glitter {
}
}
}
bool XEffectInst::ResetInit(GPM, Scene* sc, float_t* a3) {
if (data.start_time < 1)
return false;
+1 -1
View File
@@ -2085,7 +2085,7 @@ namespace Glitter {
if (effect.read_bool("use_emission")) {
enum_or(eff->data.flags, EFFECT_EMISSION);
for (Emitter*& k : eff->emitters)
if (k)
for (Particle*& l : k->particles)
-1
View File
@@ -124,7 +124,6 @@ namespace Glitter {
add_key = add_f2_key_no_random_range;
get_size = get_f2_size_no_random_range;
}
KeyType key_type = c->keys.front().type;
+1 -1
View File
@@ -4280,7 +4280,7 @@ static void auth_3d_dof_set(auth_3d_dof* d, render_context* rctx) {
float_t focus = vec3::distance(d->model_transform.translation_value, view_point);
rctx->render.set_dof_enable(fabsf(d->model_transform.translation_value.x) > 0.000001f);
rctx->render.set_dof_data(focus, d->model_transform.scale_value.x,
rctx->render.set_dof_data(focus, d->model_transform.scale_value.x,
d->model_transform.rotation_value.x, d->model_transform.rotation_value.y);
}
+1 -1
View File
@@ -1204,7 +1204,7 @@ namespace mdl {
data.push_back(0.0f);
data.push_back(1.0f);
data.push_back(0.0f);
data.push_back(-1.0f);
data.push_back(0.0f);
data.push_back(-1.0f);
+2 -2
View File
@@ -945,7 +945,7 @@ void object_material_msgpack_read(const char* path, const char* set_name,
msgpack* b = color_mult->read("b");
if (b)
_color_mult.z = b->read_float_t();
obj_vertex_data* vtx = mesh.vertex_array;
uint32_t num_vertex = mesh.num_vertex;
for (uint32_t i = num_vertex; i; i--, vtx++)
@@ -1532,7 +1532,7 @@ inline obj* object_storage_get_obj(object_info obj_info) {
obj_set* set = elem_modern->second.obj_set;
if (!set)
return 0;
auto elem_obj = elem_modern->second.obj_id_data.find(obj_info.id);
if (elem_obj != elem_modern->second.obj_id_data.end())
return set->obj_data[elem_obj->second];
+1 -1
View File
@@ -211,7 +211,7 @@ namespace rndr {
void RenderManager::set_clear(bool value) {
clear = value;
}
void RenderManager::set_effect_texture(texture* value) {
effect_texture = value;
}
+9 -9
View File
@@ -433,17 +433,17 @@ void skin_param_osage_root_parse(void* kv, const char* name,
const char* bone1_name;
if (_kv->read("bone.1.name", bone1_name)) {
c->node_idx[1] = bone_data->get_skeleton_object_bone_index(
bone_database_skeleton_type_to_string(BONE_DATABASE_SKELETON_COMMON), bone1_name);
bone_database_skeleton_type_to_string(BONE_DATABASE_SKELETON_COMMON), bone1_name);
vec3 bone1_pos = 0.0f;
if (!_kv->read("bone.1.posx", bone1_pos.x)
|| !_kv->read("bone.1.posy", bone1_pos.y)
|| !_kv->read("bone.1.posz", bone1_pos.z)) {
_kv->close_scope();
break;
}
vec3 bone1_pos = 0.0f;
if (!_kv->read("bone.1.posx", bone1_pos.x)
|| !_kv->read("bone.1.posy", bone1_pos.y)
|| !_kv->read("bone.1.posz", bone1_pos.z)) {
_kv->close_scope();
break;
}
c->pos[1] = bone1_pos;
c->pos[1] = bone1_pos;
}
_kv->close_scope();
}
+1 -1
View File
@@ -108,7 +108,7 @@ struct string_hash {
inline const char* c_str() const {
return str.c_str();
}
inline size_t size() const {
return str.size();
}
+1 -1
View File
@@ -1393,7 +1393,7 @@ bool SubGameState::Selector::Dest() {
sel->del();
return false;
}
x_pv_game_selector_free();
#endif
#endif
+1 -1
View File
@@ -4432,7 +4432,7 @@ static void glitter_editor_property_particle(GlitterEditor* glt_edt) {
ObjsetInfo* set_info = object_storage_get_objset_info(set_id);
ssize_t object_set_count = object_storage_get_obj_set_count();
extern std::map<uint32_t, ObjsetInfo> object_storage_data_modern;
extern std::map<uint32_t, ObjsetInfo> object_storage_data_modern;
ImGui::StartPropertyColumn("Object Set");
if (ImGui::BeginCombo("##Object Set", set_info ? set_info->name.c_str() : "None", 0)) {
ImGui::PushID(-1);
+7 -8
View File
@@ -7220,7 +7220,7 @@ bool x_pv_game::ctrl() {
char category[0x40];
sprintf_s(category, sizeof(category), "CAMPV%03d", pv_data.pv_id);
replace_names(category);
char name[0x40];
sprintf_s(name, sizeof(name), "CAMPV%03d_BASE", pv_data.pv_id);
replace_names(name);
@@ -7299,7 +7299,7 @@ bool x_pv_game::ctrl() {
object_database x_pack_obj_db;
x_pack_obj_db.add(&baker->obj_db);
texture_database x_pack_tex_db;
x_pack_tex_db.add(&baker->tex_db);
@@ -7770,7 +7770,7 @@ bool x_pv_game::ctrl() {
if (focus_range.joinable())
focus_range.join();
//if (focus.joinable())
// focus.join();
@@ -8712,10 +8712,10 @@ pv_tit_spr_set_ids(), pv_tit_aet_ids(), pv_tit_init(), start(), exit(), next() {
for (uint32_t& i : pv_tit_aet_set_ids)
i = hash_murmurhash_empty;
for (uint32_t& i : pv_tit_spr_set_ids)
i = hash_murmurhash_empty;
for (uint32_t& i : pv_tit_aet_ids)
i = hash_murmurhash_empty;
@@ -9799,16 +9799,15 @@ static bool x_pv_game_write_auth_3d(farc* f, auth_3d* auth,
replace_names(i.parent_name);
replace_names(i.uid_name);
}
for (std::string& i : a.object_hrc_list)
replace_names(i);
for (std::string& i : a.object_list)
replace_names(i);
bool own_farc = !f;
if (own_farc)
f = new farc;