You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-11 13:10:58 +00:00
implement individual mesh transform for meshlibrary items
(cherry picked from commit 70108fd850)
This commit is contained in:
@@ -41,8 +41,10 @@ class MeshLibraryEditor : public Control {
|
||||
|
||||
EditorNode *editor;
|
||||
MenuButton *menu;
|
||||
ConfirmationDialog *cd;
|
||||
ConfirmationDialog *cd_remove;
|
||||
ConfirmationDialog *cd_update;
|
||||
EditorFileDialog *file;
|
||||
bool apply_xforms;
|
||||
int to_erase;
|
||||
|
||||
enum {
|
||||
@@ -50,15 +52,17 @@ class MeshLibraryEditor : public Control {
|
||||
MENU_OPTION_ADD_ITEM,
|
||||
MENU_OPTION_REMOVE_ITEM,
|
||||
MENU_OPTION_UPDATE_FROM_SCENE,
|
||||
MENU_OPTION_IMPORT_FROM_SCENE
|
||||
MENU_OPTION_IMPORT_FROM_SCENE,
|
||||
MENU_OPTION_IMPORT_FROM_SCENE_APPLY_XFORMS
|
||||
};
|
||||
|
||||
int option;
|
||||
void _import_scene_cbk(const String &p_str);
|
||||
void _menu_cbk(int p_option);
|
||||
void _menu_confirm();
|
||||
void _menu_remove_confirm();
|
||||
void _menu_update_confirm(bool p_apply_xforms);
|
||||
|
||||
static void _import_scene(Node *p_scene, Ref<MeshLibrary> p_library, bool p_merge);
|
||||
static void _import_scene(Node *p_scene, Ref<MeshLibrary> p_library, bool p_merge, bool p_apply_xforms);
|
||||
|
||||
protected:
|
||||
static void _bind_methods();
|
||||
@@ -67,7 +71,7 @@ public:
|
||||
MenuButton *get_menu_button() const { return menu; }
|
||||
|
||||
void edit(const Ref<MeshLibrary> &p_mesh_library);
|
||||
static Error update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml, bool p_merge = true);
|
||||
static Error update_library_file(Node *p_base_scene, Ref<MeshLibrary> ml, bool p_merge = true, bool p_apply_xforms = false);
|
||||
|
||||
MeshLibraryEditor(EditorNode *p_editor);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user