mirror of
https://github.com/korenkonder/ReDIVA.git
synced 2026-10-05 13:18:01 +03:00
Glitter Editor improvements. Added OBJHRC to MOT conversion for PV826
This commit is contained in:
@@ -13,7 +13,7 @@ void classes_process_init(classes_data* classes, const size_t classes_count, ren
|
||||
|
||||
for (size_t i = 0; i < classes_count; i++) {
|
||||
classes_data* c = &classes[i];
|
||||
c->data.lock = new lock;
|
||||
c->data.lock = new lock_cs;
|
||||
if (c->data.lock->check_init()
|
||||
&& c->flags & (CLASSES_INIT_AT_STARTUP | CLASSES_SHOW_AT_STARTUP) && c->init) {
|
||||
lock_lock(c->data.lock);
|
||||
@@ -23,7 +23,7 @@ void classes_process_init(classes_data* classes, const size_t classes_count, ren
|
||||
c->data.flags = (class_flags)(CLASS_DISPOSED | CLASS_HIDDEN);
|
||||
c->data.imgui_focus = false;
|
||||
|
||||
if (~c->flags & CLASSES_SHOW_AT_STARTUP)
|
||||
if (!(c->flags & CLASSES_SHOW_AT_STARTUP))
|
||||
enum_or(c->data.flags, CLASS_HIDDEN);
|
||||
lock_unlock(c->data.lock);
|
||||
}
|
||||
@@ -51,7 +51,7 @@ void classes_process_ctrl(classes_data* classes, const size_t classes_count) {
|
||||
if (c->data.lock->check_init()) {
|
||||
if (c->data.flags & CLASS_HIDE) {
|
||||
lock_lock(c->data.lock);
|
||||
if (~c->data.flags & CLASS_HIDDEN && ((c->hide && c->hide(&c->data)) || !c->hide)) {
|
||||
if (!(c->data.flags & CLASS_HIDDEN) && ((c->hide && c->hide(&c->data)) || !c->hide)) {
|
||||
enum_and(c->data.flags, ~CLASS_HIDE);
|
||||
enum_or(c->data.flags, CLASS_HIDDEN);
|
||||
enum_and(c->data.flags, ~CLASS_HAS_PARENT);
|
||||
@@ -62,13 +62,13 @@ void classes_process_ctrl(classes_data* classes, const size_t classes_count) {
|
||||
if ((c->data.flags & CLASS_DISPOSE || (c->data.flags & CLASS_HIDDEN
|
||||
&& c->flags & CLASSES_DISPOSE_AT_HIDE))) {
|
||||
lock_lock(c->data.lock);
|
||||
if (~c->data.flags & CLASS_HIDDEN && ((c->hide && c->hide(&c->data)) || !c->hide)) {
|
||||
if (!(c->data.flags & CLASS_HIDDEN) && ((c->hide && c->hide(&c->data)) || !c->hide)) {
|
||||
enum_and(c->data.flags, ~CLASS_HIDE);
|
||||
enum_or(c->data.flags, CLASS_HIDDEN);
|
||||
enum_and(c->data.flags, ~CLASS_HAS_PARENT);
|
||||
}
|
||||
|
||||
if (~c->data.flags & CLASS_DISPOSED && ((c->dispose && c->dispose(&c->data)) || !c->dispose)) {
|
||||
if (!(c->data.flags & CLASS_DISPOSED) && ((c->dispose && c->dispose(&c->data)) || !c->dispose)) {
|
||||
enum_and(c->data.flags, ~CLASS_DISPOSE);
|
||||
enum_or(c->data.flags, CLASS_DISPOSED);
|
||||
c->data.imgui_focus = false;
|
||||
@@ -130,7 +130,7 @@ void classes_process_imgui(classes_data* classes, const size_t classes_count) {
|
||||
classes_data* c = &classes[i];
|
||||
if (c->data.lock->check_init()) {
|
||||
lock_lock(c->data.lock);
|
||||
if (~c->data.flags & CLASS_HIDDEN) {
|
||||
if (!(c->data.flags & CLASS_HIDDEN)) {
|
||||
if (c->imgui)
|
||||
c->imgui(&c->data);
|
||||
input_locked |= c->data.imgui_focus;
|
||||
@@ -187,13 +187,13 @@ void classes_process_dispose(classes_data* classes, const size_t classes_count)
|
||||
classes_data* c = &classes[i];
|
||||
if (c->data.lock->check_init()) {
|
||||
lock_lock(c->data.lock);
|
||||
if (~c->data.flags & CLASS_HIDDEN && ((c->hide && c->hide(&c->data)) || !c->hide)) {
|
||||
if (!(c->data.flags & CLASS_HIDDEN) && ((c->hide && c->hide(&c->data)) || !c->hide)) {
|
||||
enum_and(c->data.flags, ~CLASS_HIDE);
|
||||
enum_or(c->data.flags, CLASS_HIDDEN);
|
||||
enum_and(c->data.flags, ~CLASS_HAS_PARENT);
|
||||
}
|
||||
|
||||
if (~c->data.flags & CLASS_DISPOSED && ((c->dispose && c->dispose(&c->data)) || !c->dispose)) {
|
||||
if (!(c->data.flags & CLASS_DISPOSED) && ((c->dispose && c->dispose(&c->data)) || !c->dispose)) {
|
||||
enum_and(c->data.flags, ~CLASS_DISPOSE);
|
||||
enum_or(c->data.flags, CLASS_DISPOSED);
|
||||
c->data.imgui_focus = false;
|
||||
|
||||
Reference in New Issue
Block a user