diff options
Diffstat (limited to 'tools/editor')
44 files changed, 222 insertions, 222 deletions
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index ba18d382ce..a98a435ea2 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -3525,7 +3525,7 @@ int AnimationKeyEditor::_confirm_insert(InsertData p_id,int p_last_track) { h.type==Variant::VECTOR2 || h.type==Variant::RECT2 || h.type==Variant::VECTOR3 || - h.type==Variant::_AABB || + h.type==Variant::RECT3 || h.type==Variant::QUAT || h.type==Variant::COLOR || h.type==Variant::TRANSFORM ) { diff --git a/tools/editor/asset_library_editor_plugin.cpp b/tools/editor/asset_library_editor_plugin.cpp index 422bc0db58..11d7a2b58b 100644 --- a/tools/editor/asset_library_editor_plugin.cpp +++ b/tools/editor/asset_library_editor_plugin.cpp @@ -321,7 +321,7 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() { } /////////////////////////////////////////////////////////////////////////////////// -void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int p_code, const StringArray& headers, const ByteArray& p_data) { +void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int p_code, const PoolStringArray& headers, const PoolByteArray& p_data) { String error_text; @@ -691,12 +691,12 @@ void EditorAssetLibrary::_select_asset(int p_id){ description->popup_centered_minsize();*/ } -void EditorAssetLibrary::_image_update(bool use_cache, bool final, const ByteArray& p_data, int p_queue_id) { +void EditorAssetLibrary::_image_update(bool use_cache, bool final, const PoolByteArray& p_data, int p_queue_id) { Object *obj = ObjectDB::get_instance(image_queue[p_queue_id].target); if (obj) { bool image_set = false; - ByteArray image_data = p_data; + PoolByteArray image_data = p_data; if(use_cache) { String cache_filename_base = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp").plus_file("assetimage_"+image_queue[p_queue_id].image_url.md5_text()); @@ -704,11 +704,11 @@ void EditorAssetLibrary::_image_update(bool use_cache, bool final, const ByteArr FileAccess* file = FileAccess::open(cache_filename_base+".data", FileAccess::READ); if(file) { - ByteArray cached_data; + PoolByteArray cached_data; int len=file->get_32(); cached_data.resize(len); - ByteArray::Write w=cached_data.write(); + PoolByteArray::Write w=cached_data.write(); file->get_buffer(w.ptr(), len); image_data = cached_data; @@ -717,7 +717,7 @@ void EditorAssetLibrary::_image_update(bool use_cache, bool final, const ByteArr } int len=image_data.size(); - ByteArray::Read r=image_data.read(); + PoolByteArray::Read r=image_data.read(); Image image(r.ptr(),len); if (!image.empty()) { float max_height = 10000; @@ -745,7 +745,7 @@ void EditorAssetLibrary::_image_update(bool use_cache, bool final, const ByteArr } } -void EditorAssetLibrary::_image_request_completed(int p_status, int p_code, const StringArray& headers, const ByteArray& p_data,int p_queue_id) { +void EditorAssetLibrary::_image_request_completed(int p_status, int p_code, const PoolStringArray& headers, const PoolByteArray& p_data,int p_queue_id) { ERR_FAIL_COND( !image_queue.has(p_queue_id) ); @@ -767,7 +767,7 @@ void EditorAssetLibrary::_image_request_completed(int p_status, int p_code, cons } int len=p_data.size(); - ByteArray::Read r=p_data.read(); + PoolByteArray::Read r=p_data.read(); file = FileAccess::open(cache_filename_base+".data", FileAccess::WRITE); if(file) { file->store_32(len); @@ -855,7 +855,7 @@ void EditorAssetLibrary::_request_image(ObjectID p_for,String p_image_url,ImageT add_child(iq.request); - _image_update(true, false, ByteArray(), iq.queue_id); + _image_update(true, false, PoolByteArray(), iq.queue_id); _update_image_queue(); @@ -1021,14 +1021,14 @@ void EditorAssetLibrary::_api_request(const String& p_request, RequestType p_req -void EditorAssetLibrary::_http_request_completed(int p_status, int p_code, const StringArray& headers, const ByteArray& p_data) { +void EditorAssetLibrary::_http_request_completed(int p_status, int p_code, const PoolStringArray& headers, const PoolByteArray& p_data) { String str; { int datalen=p_data.size(); - ByteArray::Read r = p_data.read(); + PoolByteArray::Read r = p_data.read(); str.parse_utf8((const char*)r.ptr(),datalen); } diff --git a/tools/editor/asset_library_editor_plugin.h b/tools/editor/asset_library_editor_plugin.h index c7d6ad8bea..4ae229cefe 100644 --- a/tools/editor/asset_library_editor_plugin.h +++ b/tools/editor/asset_library_editor_plugin.h @@ -162,7 +162,7 @@ class EditorAssetLibraryItemDownload : public PanelContainer { void _close(); void _install(); void _make_request(); - void _http_download_completed(int p_status, int p_code, const StringArray& headers, const ByteArray& p_data); + void _http_download_completed(int p_status, int p_code, const PoolStringArray& headers, const PoolByteArray& p_data); protected: @@ -259,8 +259,8 @@ class EditorAssetLibrary : public PanelContainer { int last_queue_id; Map<int,ImageQueue> image_queue; - void _image_update(bool use_cache, bool final, const ByteArray& p_data, int p_queue_id); - void _image_request_completed(int p_status, int p_code, const StringArray& headers, const ByteArray& p_data, int p_queue_id); + void _image_update(bool use_cache, bool final, const PoolByteArray& p_data, int p_queue_id); + void _image_request_completed(int p_status, int p_code, const PoolStringArray& headers, const PoolByteArray& p_data, int p_queue_id); void _request_image(ObjectID p_for,String p_image_url,ImageType p_type,int p_image_index); void _update_image_queue(); @@ -298,8 +298,8 @@ class EditorAssetLibrary : public PanelContainer { void _search(int p_page=0); void _rerun_search(int p_ignore); void _api_request(const String& p_request, RequestType p_request_type, const String &p_arguments=""); - void _http_request_completed(int p_status, int p_code, const StringArray& headers, const ByteArray& p_data); - void _http_download_completed(int p_status, int p_code, const StringArray& headers, const ByteArray& p_data); + void _http_request_completed(int p_status, int p_code, const PoolStringArray& headers, const PoolByteArray& p_data); + void _http_download_completed(int p_status, int p_code, const PoolStringArray& headers, const PoolByteArray& p_data); void _repository_changed(int p_repository_id); void _support_toggled(int p_support); diff --git a/tools/editor/connections_dialog.cpp b/tools/editor/connections_dialog.cpp index 33612293d0..6e53c32080 100644 --- a/tools/editor/connections_dialog.cpp +++ b/tools/editor/connections_dialog.cpp @@ -249,8 +249,8 @@ void ConnectDialog::_add_bind() { case Variant::VECTOR3: value = Vector3(); break; case Variant::PLANE: value = Plane(); break; case Variant::QUAT: value = Quat(); break; - case Variant::_AABB: value = AABB(); break; - case Variant::MATRIX3: value = Matrix3(); break; + case Variant::RECT3: value = Rect3(); break; + case Variant::BASIS: value = Basis(); break; case Variant::TRANSFORM: value = Transform(); break; case Variant::COLOR: value = Color(); break; case Variant::IMAGE: value = Image(); break; @@ -343,8 +343,8 @@ ConnectDialog::ConnectDialog() { type_list->add_item("Vector3",Variant::VECTOR3); type_list->add_item("Plane",Variant::PLANE); type_list->add_item("Quat",Variant::QUAT); - type_list->add_item("AABB",Variant::_AABB); - type_list->add_item("Matrix3",Variant::MATRIX3); + type_list->add_item("Rect3",Variant::RECT3); + type_list->add_item("Basis",Variant::BASIS); type_list->add_item("Transform",Variant::TRANSFORM); //type_list->add_separator(); type_list->add_item("Color",Variant::COLOR); @@ -475,7 +475,7 @@ void ConnectionsDock::_connect() { bool defer=connect_dialog->get_deferred(); bool oshot=connect_dialog->get_oneshot(); Vector<Variant> binds = connect_dialog->get_binds(); - StringArray args = it->get_metadata(0).operator Dictionary()["args"]; + PoolStringArray args = it->get_metadata(0).operator Dictionary()["args"]; int flags = CONNECT_PERSIST | (defer?CONNECT_DEFERRED:0) | (oshot?CONNECT_ONESHOT:0); undo_redo->create_action(vformat(TTR("Connect '%s' to '%s'"),signal,String(dst_method))); @@ -668,7 +668,7 @@ void ConnectionsDock::update_tree() { String signaldesc; signaldesc=mi.name+"("; - StringArray argnames; + PoolStringArray argnames; if (mi.arguments.size()) { signaldesc+=" "; for(int i=0;i<mi.arguments.size();i++) { diff --git a/tools/editor/editor_autoload_settings.cpp b/tools/editor/editor_autoload_settings.cpp index 516863eae2..071a237ea8 100644 --- a/tools/editor/editor_autoload_settings.cpp +++ b/tools/editor/editor_autoload_settings.cpp @@ -377,7 +377,7 @@ Variant EditorAutoloadSettings::get_drag_data_fw(const Point2& p_point, Control if (autoload_cache.size() <= 1) return false; - StringArray autoloads; + PoolStringArray autoloads; TreeItem *next = tree->get_next_selected(NULL); @@ -471,7 +471,7 @@ void EditorAutoloadSettings::drop_data_fw(const Point2& p_point, const Variant& } Dictionary drop_data = p_data; - StringArray autoloads = drop_data["autoloads"]; + PoolStringArray autoloads = drop_data["autoloads"]; Vector<int> orders; orders.resize(autoload_cache.size()); diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp index 99165c6ed6..408818f729 100644 --- a/tools/editor/editor_file_dialog.cpp +++ b/tools/editor/editor_file_dialog.cpp @@ -1211,7 +1211,7 @@ void EditorFileDialog::_bind_methods() { ClassDB::bind_method(_MD("invalidate"),&EditorFileDialog::invalidate); ADD_SIGNAL(MethodInfo("file_selected",PropertyInfo( Variant::STRING,"path"))); - ADD_SIGNAL(MethodInfo("files_selected",PropertyInfo( Variant::STRING_ARRAY,"paths"))); + ADD_SIGNAL(MethodInfo("files_selected",PropertyInfo( Variant::POOL_STRING_ARRAY,"paths"))); ADD_SIGNAL(MethodInfo("dir_selected",PropertyInfo( Variant::STRING,"dir"))); BIND_CONSTANT( MODE_OPEN_FILE ); diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp index 1804016f47..0003e232c8 100644 --- a/tools/editor/editor_import_export.cpp +++ b/tools/editor/editor_import_export.cpp @@ -84,9 +84,9 @@ void EditorImportPlugin::_bind_methods() { ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::STRING,"get_visible_name")); ClassDB::add_virtual_method(get_class_static(),MethodInfo("import_dialog",PropertyInfo(Variant::STRING,"from"))); ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::INT,"import",PropertyInfo(Variant::STRING,"path"),PropertyInfo(Variant::OBJECT,"from",PROPERTY_HINT_RESOURCE_TYPE,"ResourceImportMetadata"))); - ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::RAW_ARRAY,"custom_export",PropertyInfo(Variant::STRING,"path"),PropertyInfo(Variant::OBJECT,"platform",PROPERTY_HINT_RESOURCE_TYPE,"EditorExportPlatform"))); - ClassDB::add_virtual_method(get_class_static(),MethodInfo("import_from_drop",PropertyInfo(Variant::STRING_ARRAY,"files"),PropertyInfo(Variant::STRING,"dest_path"))); - ClassDB::add_virtual_method(get_class_static(),MethodInfo("reimport_multiple_files",PropertyInfo(Variant::STRING_ARRAY,"files"))); + ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::POOL_BYTE_ARRAY,"custom_export",PropertyInfo(Variant::STRING,"path"),PropertyInfo(Variant::OBJECT,"platform",PROPERTY_HINT_RESOURCE_TYPE,"EditorExportPlatform"))); + ClassDB::add_virtual_method(get_class_static(),MethodInfo("import_from_drop",PropertyInfo(Variant::POOL_STRING_ARRAY,"files"),PropertyInfo(Variant::STRING,"dest_path"))); + ClassDB::add_virtual_method(get_class_static(),MethodInfo("reimport_multiple_files",PropertyInfo(Variant::POOL_STRING_ARRAY,"files"))); ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::BOOL,"can_reimport_multiple_files")); // BIND_VMETHOD( mi ); @@ -175,7 +175,7 @@ EditorImportPlugin::EditorImportPlugin() { void EditorExportPlugin::_bind_methods() { MethodInfo mi = MethodInfo("custom_export:Variant",PropertyInfo(Variant::STRING,"name"),PropertyInfo(Variant::OBJECT,"platform",PROPERTY_HINT_RESOURCE_TYPE,"EditorExportPlatform")); - mi.return_val.type=Variant::RAW_ARRAY; + mi.return_val.type=Variant::POOL_BYTE_ARRAY; BIND_VMETHOD( mi ); } @@ -188,7 +188,7 @@ Vector<uint8_t> EditorExportPlugin::custom_export(String& p_path,const Ref<Edito Variant d = get_script_instance()->call("custom_export",p_path,p_platform); if (d.get_type()==Variant::NIL) return Vector<uint8_t>(); - if (d.get_type()==Variant::RAW_ARRAY) + if (d.get_type()==Variant::POOL_BYTE_ARRAY) return d; ERR_FAIL_COND_V(d.get_type()!=Variant::DICTIONARY,Vector<uint8_t>()); diff --git a/tools/editor/editor_initialize_ssl.cpp b/tools/editor/editor_initialize_ssl.cpp index b7f8e2aad5..9ac4f90e9f 100644 --- a/tools/editor/editor_initialize_ssl.cpp +++ b/tools/editor/editor_initialize_ssl.cpp @@ -34,10 +34,10 @@ void editor_initialize_certificates() { - ByteArray data; + PoolByteArray data; data.resize(_certs_uncompressed_size+1); { - ByteArray::Write w = data.write(); + PoolByteArray::Write w = data.write(); Compression::decompress(w.ptr(),_certs_uncompressed_size,_certs_compressed,_certs_compressed_size,Compression::MODE_DEFLATE); w[_certs_uncompressed_size]=0; //make sure it ends at zero } diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 5fd8f244f7..096999d5e7 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -5358,7 +5358,7 @@ void EditorNode::_bind_methods() { ADD_SIGNAL( MethodInfo("pause_pressed") ); ADD_SIGNAL( MethodInfo("stop_pressed") ); ADD_SIGNAL( MethodInfo("request_help") ); - ADD_SIGNAL( MethodInfo("script_add_function_request",PropertyInfo(Variant::OBJECT,"obj"),PropertyInfo(Variant::STRING,"function"),PropertyInfo(Variant::STRING_ARRAY,"args")) ); + ADD_SIGNAL( MethodInfo("script_add_function_request",PropertyInfo(Variant::OBJECT,"obj"),PropertyInfo(Variant::STRING,"function"),PropertyInfo(Variant::POOL_STRING_ARRAY,"args")) ); ADD_SIGNAL( MethodInfo("resource_saved",PropertyInfo(Variant::OBJECT,"obj")) ); @@ -6784,7 +6784,7 @@ void EditorPluginList::edit(Object* p_object) { } -bool EditorPluginList::forward_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { +bool EditorPluginList::forward_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event) { bool discard = false; @@ -6809,7 +6809,7 @@ bool EditorPluginList::forward_spatial_gui_input(Camera* p_camera, const InputEv return discard; } -void EditorPluginList::forward_draw_over_canvas(const Matrix32& p_canvas_xform,Control* p_canvas) { +void EditorPluginList::forward_draw_over_canvas(const Transform2D& p_canvas_xform,Control* p_canvas) { for (int i = 0; i < plugins_list.size(); i++) { plugins_list[i]->forward_draw_over_canvas(p_canvas_xform,p_canvas); diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index fcfd5ca389..2cb1cd00ab 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -792,9 +792,9 @@ public: void make_visible(bool p_visible); void edit(Object *p_object); - bool forward_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event); + bool forward_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event); bool forward_spatial_gui_input(Camera* p_camera, const InputEvent& p_event); - void forward_draw_over_canvas(const Matrix32& p_canvas_xform,Control* p_canvas); + void forward_draw_over_canvas(const Transform2D& p_canvas_xform,Control* p_canvas); void clear(); bool empty(); diff --git a/tools/editor/editor_plugin.cpp b/tools/editor/editor_plugin.cpp index 5722fc556a..8769fe2cd8 100644 --- a/tools/editor/editor_plugin.cpp +++ b/tools/editor/editor_plugin.cpp @@ -141,7 +141,7 @@ Ref<SpatialEditorGizmo> EditorPlugin::create_spatial_gizmo(Spatial* p_spatial) { return Ref<SpatialEditorGizmo>(); } -bool EditorPlugin::forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { +bool EditorPlugin::forward_canvas_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event) { if (get_script_instance() && get_script_instance()->has_method("forward_canvas_gui_input")) { return get_script_instance()->call("forward_canvas_gui_input",p_canvas_xform,p_event); @@ -149,7 +149,7 @@ bool EditorPlugin::forward_canvas_gui_input(const Matrix32& p_canvas_xform,const return false; } -void EditorPlugin::forward_draw_over_canvas(const Matrix32& p_canvas_xform,Control *p_canvas) { +void EditorPlugin::forward_draw_over_canvas(const Transform2D& p_canvas_xform,Control *p_canvas) { if (get_script_instance() && get_script_instance()->has_method("forward_draw_over_canvas")) { get_script_instance()->call("forward_draw_over_canvas",p_canvas_xform,p_canvas); @@ -253,7 +253,7 @@ void EditorPlugin::apply_changes() { void EditorPlugin::get_breakpoints(List<String> *p_breakpoints) { if (get_script_instance() && get_script_instance()->has_method("get_breakpoints")) { - StringArray arr = get_script_instance()->call("get_breakpoints"); + PoolStringArray arr = get_script_instance()->call("get_breakpoints"); for(int i=0;i<arr.size();i++) p_breakpoints->push_back(arr[i]); } @@ -377,8 +377,8 @@ void EditorPlugin::_bind_methods() { ClassDB::bind_method(_MD("queue_save_layout"),&EditorPlugin::queue_save_layout); ClassDB::bind_method(_MD("edit_resource"),&EditorPlugin::edit_resource); - ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::BOOL,"forward_canvas_gui_input",PropertyInfo(Variant::MATRIX32,"canvas_xform"),PropertyInfo(Variant::INPUT_EVENT,"event"))); - ClassDB::add_virtual_method(get_class_static(),MethodInfo("forward_draw_over_canvas",PropertyInfo(Variant::MATRIX32,"canvas_xform"),PropertyInfo(Variant::OBJECT,"canvas:Control"))); + ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::BOOL,"forward_canvas_gui_input",PropertyInfo(Variant::TRANSFORM2D,"canvas_xform"),PropertyInfo(Variant::INPUT_EVENT,"event"))); + ClassDB::add_virtual_method(get_class_static(),MethodInfo("forward_draw_over_canvas",PropertyInfo(Variant::TRANSFORM2D,"canvas_xform"),PropertyInfo(Variant::OBJECT,"canvas:Control"))); ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::BOOL,"forward_spatial_gui_input",PropertyInfo(Variant::OBJECT,"camera",PROPERTY_HINT_RESOURCE_TYPE,"Camera"),PropertyInfo(Variant::INPUT_EVENT,"event"))); MethodInfo gizmo = MethodInfo(Variant::OBJECT,"create_spatial_gizmo",PropertyInfo(Variant::OBJECT,"for_spatial:Spatial")); gizmo.return_val.hint=PROPERTY_HINT_RESOURCE_TYPE; @@ -394,7 +394,7 @@ void EditorPlugin::_bind_methods() { ClassDB::add_virtual_method(get_class_static(),MethodInfo("clear")); ClassDB::add_virtual_method(get_class_static(),MethodInfo("save_external_data")); ClassDB::add_virtual_method(get_class_static(),MethodInfo("apply_changes")); - ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::STRING_ARRAY,"get_breakpoints")); + ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::POOL_STRING_ARRAY,"get_breakpoints")); ClassDB::add_virtual_method(get_class_static(),MethodInfo("set_window_layout",PropertyInfo(Variant::OBJECT,"layout",PROPERTY_HINT_RESOURCE_TYPE,"ConfigFile"))); ClassDB::add_virtual_method(get_class_static(),MethodInfo("get_window_layout",PropertyInfo(Variant::OBJECT,"layout",PROPERTY_HINT_RESOURCE_TYPE,"ConfigFile"))); diff --git a/tools/editor/editor_plugin.h b/tools/editor/editor_plugin.h index cfa309be11..9943e94d98 100644 --- a/tools/editor/editor_plugin.h +++ b/tools/editor/editor_plugin.h @@ -104,8 +104,8 @@ public: void edit_resource(const Ref<Resource>& p_resource); virtual Ref<SpatialEditorGizmo> create_spatial_gizmo(Spatial* p_spatial); - virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform, const InputEvent& p_event); - virtual void forward_draw_over_canvas(const Matrix32& p_canvas_xform,Control *p_canvas); + virtual bool forward_canvas_gui_input(const Transform2D& p_canvas_xform, const InputEvent& p_event); + virtual void forward_draw_over_canvas(const Transform2D& p_canvas_xform,Control *p_canvas); virtual bool forward_spatial_gui_input(Camera* p_camera,const InputEvent& p_event); virtual String get_name() const; virtual bool has_main_screen() const; diff --git a/tools/editor/filesystem_dock.cpp b/tools/editor/filesystem_dock.cpp index d52247573e..1bf91d4ceb 100644 --- a/tools/editor/filesystem_dock.cpp +++ b/tools/editor/filesystem_dock.cpp @@ -1650,7 +1650,7 @@ void FileSystemDock::_bind_methods() { ClassDB::bind_method(_MD("_preview_invalidated"),&FileSystemDock::_preview_invalidated); - ADD_SIGNAL(MethodInfo("instance", PropertyInfo(Variant::STRING_ARRAY, "files"))); + ADD_SIGNAL(MethodInfo("instance", PropertyInfo(Variant::POOL_STRING_ARRAY, "files"))); ADD_SIGNAL(MethodInfo("open")); } diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp index 4a1270c1ca..8fd78f11f3 100644 --- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp @@ -1773,7 +1773,7 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh> // get mesh instance and bounding box MeshInstance *mi = p_node->cast_to<MeshInstance>(); - AABB aabb = mi->get_aabb(); + Rect3 aabb = mi->get_aabb(); // create a new rigid body collision node RigidBody * rigid_body = memnew( RigidBody ); @@ -1788,7 +1788,7 @@ Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh> Node * mesh = p_node->duplicate(); mesh->set_name(_fixstr(name,"rigid")); // reset the xform matrix of the duplicated node so it can inherit parent node xform - mesh->cast_to<Spatial>()->set_transform(Transform(Matrix3())); + mesh->cast_to<Spatial>()->set_transform(Transform(Basis())); // reparent the new mesh node to the rigid body collision node p_node->add_child(mesh); mesh->set_owner(p_node->get_owner()); diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 74a80abbec..5fce9f8f53 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -440,7 +440,7 @@ bool CanvasItemEditor::_is_part_of_subscene(CanvasItem *p_item) { } // slow but modern computers should have no problem -CanvasItem* CanvasItemEditor::_select_canvas_item_at_pos(const Point2& p_pos,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform) { +CanvasItem* CanvasItemEditor::_select_canvas_item_at_pos(const Point2& p_pos,Node* p_node,const Transform2D& p_parent_xform,const Transform2D& p_canvas_xform) { if (!p_node) return NULL; @@ -479,7 +479,7 @@ CanvasItem* CanvasItemEditor::_select_canvas_item_at_pos(const Point2& p_pos,Nod return NULL; } -void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform, Vector<_SelectResult> &r_items) { +void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos,Node* p_node,const Transform2D& p_parent_xform,const Transform2D& p_canvas_xform, Vector<_SelectResult> &r_items) { if (!p_node) return; if (p_node->cast_to<Viewport>()) @@ -519,7 +519,7 @@ void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos,Node* p_nod return; } -void CanvasItemEditor::_find_canvas_items_at_rect(const Rect2& p_rect,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform,List<CanvasItem*> *r_items) { +void CanvasItemEditor::_find_canvas_items_at_rect(const Rect2& p_rect,Node* p_node,const Transform2D& p_parent_xform,const Transform2D& p_canvas_xform,List<CanvasItem*> *r_items) { if (!p_node) return; @@ -550,7 +550,7 @@ void CanvasItemEditor::_find_canvas_items_at_rect(const Rect2& p_rect,Node* p_no if (c && c->is_visible() && !c->has_meta("_edit_lock_") && !c->cast_to<CanvasLayer>()) { Rect2 rect = c->get_item_rect(); - Matrix32 xform = p_parent_xform * p_canvas_xform * c->get_transform(); + Transform2D xform = p_parent_xform * p_canvas_xform * c->get_transform(); if ( p_rect.has_point( xform.xform( rect.pos ) ) && p_rect.has_point( xform.xform( rect.pos+Vector2(rect.size.x,0) ) ) && @@ -708,7 +708,7 @@ void CanvasItemEditor::_key_move(const Vector2& p_dir, bool p_snap, KeyMoveMODE if (Node2D *node_2d = canvas_item->cast_to<Node2D>()) { if (p_move_mode == MOVE_LOCAL_WITH_ROT) { - Matrix32 m; + Transform2D m; m.rotate( node_2d->get_rotation() ); drag = m.xform(drag); } @@ -747,7 +747,7 @@ Point2 CanvasItemEditor::_find_topleftmost_point() { Rect2 rect=canvas_item->get_item_rect(); - Matrix32 xform=canvas_item->get_global_transform_with_canvas(); + Transform2D xform=canvas_item->get_global_transform_with_canvas(); r2.expand_to(xform.xform(rect.pos)); r2.expand_to(xform.xform(rect.pos+Vector2(rect.size.x,0))); @@ -805,15 +805,15 @@ CanvasItem *CanvasItemEditor::get_single_item() { return single_item; } -CanvasItemEditor::DragType CanvasItemEditor::_find_drag_type(const Matrix32& p_xform, const Rect2& p_local_rect, const Point2& p_click, Vector2& r_point) { +CanvasItemEditor::DragType CanvasItemEditor::_find_drag_type(const Transform2D& p_xform, const Rect2& p_local_rect, const Point2& p_click, Vector2& r_point) { CanvasItem *canvas_item = get_single_item(); ERR_FAIL_COND_V(!canvas_item,DRAG_NONE); Rect2 rect=canvas_item->get_item_rect(); - Matrix32 xforml=canvas_item->get_global_transform_with_canvas(); - Matrix32 xform=transform * xforml; + Transform2D xforml=canvas_item->get_global_transform_with_canvas(); + Transform2D xform=transform * xforml; Vector2 endpoints[4]={ @@ -1003,7 +1003,7 @@ void CanvasItemEditor::_list_select(const InputEventMouseButton& b) { if (!scene) return; - _find_canvas_items_at_pos(click, scene,transform,Matrix32(), selection_results); + _find_canvas_items_at_pos(click, scene,transform,Transform2D(), selection_results); for(int i=0;i<selection_results.size();i++) { CanvasItem *item=selection_results[i].item; @@ -1295,7 +1295,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) { if (bsfrom.y>bsto.y) SWAP(bsfrom.y,bsto.y); - _find_canvas_items_at_rect(Rect2(bsfrom,bsto-bsfrom),scene,transform,Matrix32(),&selitems); + _find_canvas_items_at_rect(Rect2(bsfrom,bsto-bsfrom),scene,transform,Transform2D(),&selitems); for(List<CanvasItem*>::Element *E=selitems.front();E;E=E->next()) { @@ -1415,7 +1415,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) { return; } - Matrix32 xform = transform * canvas_item->get_global_transform_with_canvas(); + Transform2D xform = transform * canvas_item->get_global_transform_with_canvas(); Rect2 rect=canvas_item->get_item_rect(); // float handle_radius = handle_len * 1.4144; //magic number, guess what it means! @@ -1504,7 +1504,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) { } if (!c) { - c =_select_canvas_item_at_pos(click, scene,transform,Matrix32()); + c =_select_canvas_item_at_pos(click, scene,transform,Transform2D()); CanvasItem* cn = c; @@ -1748,7 +1748,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent& p_event) { Node2D *n2d = canvas_item->cast_to<Node2D>(); - Matrix32 final_xform = bone_orig_xform; + Transform2D final_xform = bone_orig_xform; @@ -1920,7 +1920,7 @@ void CanvasItemEditor::_viewport_draw() { if (snap_show_grid) { Size2 s = viewport->get_size(); int last_cell; - Matrix32 xform = transform.affine_inverse(); + Transform2D xform = transform.affine_inverse(); if (snap_step.x!=0) { for(int i=0;i<s.width;i++) { @@ -1980,7 +1980,7 @@ void CanvasItemEditor::_viewport_draw() { Rect2 rect=canvas_item->get_item_rect(); - Matrix32 xform=transform * canvas_item->get_global_transform_with_canvas(); + Transform2D xform=transform * canvas_item->get_global_transform_with_canvas(); VisualServer::get_singleton()->canvas_item_add_set_transform(ci,xform); Vector2 endpoints[4]={ @@ -1993,7 +1993,7 @@ void CanvasItemEditor::_viewport_draw() { Color c = Color(1,0.6,0.4,0.7); - VisualServer::get_singleton()->canvas_item_add_set_transform(ci,Matrix32()); + VisualServer::get_singleton()->canvas_item_add_set_transform(ci,Transform2D()); for(int i=0;i<4;i++) { viewport->draw_line(endpoints[i],endpoints[(i+1)%4],c,2); @@ -2043,7 +2043,7 @@ void CanvasItemEditor::_viewport_draw() { } pivot_button->set_disabled(!pivot_found); - VisualServer::get_singleton()->canvas_item_add_set_transform(ci,Matrix32()); + VisualServer::get_singleton()->canvas_item_add_set_transform(ci,Transform2D()); @@ -2215,7 +2215,7 @@ void CanvasItemEditor::_notification(int p_what) { Rect2 r=canvas_item->get_item_rect(); - Matrix32 xform = canvas_item->get_transform(); + Transform2D xform = canvas_item->get_transform(); if (r != se->prev_rect || xform!=se->prev_xform) { viewport->update(); @@ -2330,7 +2330,7 @@ void CanvasItemEditor::edit(CanvasItem *p_canvas_item) { } -void CanvasItemEditor::_find_canvas_items_span(Node *p_node, Rect2& r_rect, const Matrix32& p_xform) { +void CanvasItemEditor::_find_canvas_items_span(Node *p_node, Rect2& r_rect, const Transform2D& p_xform) { @@ -2347,7 +2347,7 @@ void CanvasItemEditor::_find_canvas_items_span(Node *p_node, Rect2& r_rect, cons if (c && !c->is_set_as_toplevel()) _find_canvas_items_span(p_node->get_child(i),r_rect,p_xform * c->get_transform()); else - _find_canvas_items_span(p_node->get_child(i),r_rect,Matrix32()); + _find_canvas_items_span(p_node->get_child(i),r_rect,Transform2D()); } @@ -2355,7 +2355,7 @@ void CanvasItemEditor::_find_canvas_items_span(Node *p_node, Rect2& r_rect, cons if (c) { Rect2 rect = c->get_item_rect(); - Matrix32 xform = p_xform * c->get_transform(); + Transform2D xform = p_xform * c->get_transform(); LockList lock; @@ -2416,7 +2416,7 @@ void CanvasItemEditor::_update_scrollbars() { if (editor->get_edited_scene()) - _find_canvas_items_span(editor->get_edited_scene(),canvas_item_rect,Matrix32()); + _find_canvas_items_span(editor->get_edited_scene(),canvas_item_rect,Transform2D()); List<Map<ObjectID,BoneList>::Element*> bone_to_erase; @@ -2497,7 +2497,7 @@ void CanvasItemEditor::_update_scroll(float) { // current_window->set_scroll(-ofs); - transform=Matrix32(); + transform=Transform2D(); transform.scale_basis(Size2(zoom,zoom)); transform.elements[2]=-ofs; @@ -3160,7 +3160,7 @@ void CanvasItemEditor::_focus_selection(int p_op) { Vector2 scale = canvas_item->get_global_transform().get_scale(); real_t angle = canvas_item->get_global_transform().get_rotation(); - Matrix32 t(angle, Vector2(0.f,0.f)); + Transform2D t(angle, Vector2(0.f,0.f)); item_rect = t.xform(item_rect); Rect2 canvas_item_rect(pos + scale*item_rect.pos, scale*item_rect.size); if (count == 1) { @@ -3783,7 +3783,7 @@ void CanvasItemEditorViewport::_create_nodes(Node* parent, Node* child, String& if (parent->has_method("get_global_pos")) { pos=parent->call("get_global_pos"); } - Matrix32 trans=canvas->get_canvas_transform(); + Transform2D trans=canvas->get_canvas_transform(); Point2 target_pos = (p_point-trans.get_origin())/trans.get_scale().x-pos; if (default_type=="Polygon2D" || default_type=="TouchScreenButton" || default_type=="TextureFrame" || default_type=="Patch9Frame") { target_pos -= texture_size/2; @@ -3831,7 +3831,7 @@ bool CanvasItemEditorViewport::_create_instance(Node* parent, String& path, cons pos=parent_control->get_global_pos(); } } - Matrix32 trans=canvas->get_canvas_transform(); + Transform2D trans=canvas->get_canvas_transform(); editor_data->get_undo_redo().add_do_method(instanced_scene,"set_pos",(p_point-trans.get_origin())/trans.get_scale().x-pos); return true; @@ -3911,7 +3911,7 @@ bool CanvasItemEditorViewport::can_drop_data(const Point2& p_point,const Variant if (!preview->get_parent()){ // create preview only once _create_preview(files); } - Matrix32 trans=canvas->get_canvas_transform(); + Transform2D trans=canvas->get_canvas_transform(); preview->set_position((p_point-trans.get_origin())/trans.get_scale().x); label->set_text(vformat(TTR("Adding %s..."),default_type)); } diff --git a/tools/editor/plugins/canvas_item_editor_plugin.h b/tools/editor/plugins/canvas_item_editor_plugin.h index ee36554477..f4f628fe28 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.h +++ b/tools/editor/plugins/canvas_item_editor_plugin.h @@ -51,7 +51,7 @@ public: Variant undo_state; Vector2 undo_pivot; - Matrix32 prev_xform; + Transform2D prev_xform; float prev_rot; Rect2 prev_rect; @@ -166,7 +166,7 @@ class CanvasItemEditor : public VBoxContainer { VScrollBar *v_scroll; HBoxContainer *hb; - Matrix32 transform; + Transform2D transform; float zoom; Vector2 snap_offset; Vector2 snap_step; @@ -212,7 +212,7 @@ class CanvasItemEditor : public VBoxContainer { struct BoneList { - Matrix32 xform; + Transform2D xform; Vector2 from; Vector2 to; ObjectID bone; @@ -222,7 +222,7 @@ class CanvasItemEditor : public VBoxContainer { uint64_t bone_last_frame; Map<ObjectID,BoneList> bone_list; - Matrix32 bone_orig_xform; + Transform2D bone_orig_xform; struct BoneIK { @@ -300,9 +300,9 @@ class CanvasItemEditor : public VBoxContainer { int handle_len; bool _is_part_of_subscene(CanvasItem *p_item); - CanvasItem* _select_canvas_item_at_pos(const Point2 &p_pos,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform); - void _find_canvas_items_at_pos(const Point2 &p_pos,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform, Vector<_SelectResult> &r_items); - void _find_canvas_items_at_rect(const Rect2& p_rect,Node* p_node,const Matrix32& p_parent_xform,const Matrix32& p_canvas_xform,List<CanvasItem*> *r_items); + CanvasItem* _select_canvas_item_at_pos(const Point2 &p_pos,Node* p_node,const Transform2D& p_parent_xform,const Transform2D& p_canvas_xform); + void _find_canvas_items_at_pos(const Point2 &p_pos,Node* p_node,const Transform2D& p_parent_xform,const Transform2D& p_canvas_xform, Vector<_SelectResult> &r_items); + void _find_canvas_items_at_rect(const Rect2& p_rect,Node* p_node,const Transform2D& p_parent_xform,const Transform2D& p_canvas_xform,List<CanvasItem*> *r_items); bool _select(CanvasItem *item, Point2 p_click_pos, bool p_append, bool p_drag=true); @@ -322,7 +322,7 @@ class CanvasItemEditor : public VBoxContainer { void _key_move(const Vector2& p_dir, bool p_snap, KeyMoveMODE p_move_mode); void _list_select(const InputEventMouseButton& b); - DragType _find_drag_type(const Matrix32& p_xform, const Rect2& p_local_rect, const Point2& p_click, Vector2& r_point); + DragType _find_drag_type(const Transform2D& p_xform, const Rect2& p_local_rect, const Point2& p_click, Vector2& r_point); void _popup_callback(int p_op); bool updating_scroll; @@ -342,7 +342,7 @@ class CanvasItemEditor : public VBoxContainer { Point2 _find_topleftmost_point(); - void _find_canvas_items_span(Node *p_node, Rect2& r_rect, const Matrix32& p_xform); + void _find_canvas_items_span(Node *p_node, Rect2& r_rect, const Transform2D& p_xform); Object *_get_editor_data(Object *p_what); @@ -407,7 +407,7 @@ public: Vector2 snap_point(Vector2 p_target, Vector2 p_start = Vector2(0, 0)) const; float snap_angle(float p_target, float p_start = 0) const; - Matrix32 get_canvas_transform() const { return transform; } + Transform2D get_canvas_transform() const { return transform; } static CanvasItemEditor *get_singleton() { return singleton; } Dictionary get_state() const; diff --git a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp index 710b9a80c0..263d96ecdf 100644 --- a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp @@ -111,7 +111,7 @@ bool CollisionPolygon2DEditor::forward_gui_input(const InputEvent& p_event) { const InputEventMouseButton &mb=p_event.mouse_button; - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Vector2 gpoint = Point2(mb.x,mb.y); @@ -346,7 +346,7 @@ void CollisionPolygon2DEditor::_canvas_draw() { poly=node->get_polygon(); - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Ref<Texture> handle= get_icon("EditorHandle","EditorIcons"); for(int i=0;i<poly.size();i++) { diff --git a/tools/editor/plugins/collision_polygon_2d_editor_plugin.h b/tools/editor/plugins/collision_polygon_2d_editor_plugin.h index 89f5ed9f06..2c573c1dcf 100644 --- a/tools/editor/plugins/collision_polygon_2d_editor_plugin.h +++ b/tools/editor/plugins/collision_polygon_2d_editor_plugin.h @@ -95,7 +95,7 @@ class CollisionPolygon2DEditorPlugin : public EditorPlugin { public: - virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); } + virtual bool forward_canvas_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); } virtual String get_name() const { return "CollisionPolygon2D"; } bool has_main_screen() const { return false; } diff --git a/tools/editor/plugins/collision_shape_2d_editor_plugin.cpp b/tools/editor/plugins/collision_shape_2d_editor_plugin.cpp index a7b8e1d704..626ca9e132 100644 --- a/tools/editor/plugins/collision_shape_2d_editor_plugin.cpp +++ b/tools/editor/plugins/collision_shape_2d_editor_plugin.cpp @@ -321,7 +321,7 @@ bool CollisionShape2DEditor::forward_gui_input(const InputEvent& p_event) { case InputEvent::MOUSE_BUTTON: { const InputEventMouseButton& mb = p_event.mouse_button; - Matrix32 gt = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D gt = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Point2 gpoint(mb.x,mb.y); @@ -436,7 +436,7 @@ void CollisionShape2DEditor::_canvas_draw() { } Control *c = canvas_item_editor->get_viewport_control(); - Matrix32 gt = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D gt = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Ref<Texture> h = get_icon("EditorHandle","EditorIcons"); Vector2 size = h->get_size()*0.5; diff --git a/tools/editor/plugins/collision_shape_2d_editor_plugin.h b/tools/editor/plugins/collision_shape_2d_editor_plugin.h index 589f7ae9f8..37708db5e0 100644 --- a/tools/editor/plugins/collision_shape_2d_editor_plugin.h +++ b/tools/editor/plugins/collision_shape_2d_editor_plugin.h @@ -86,7 +86,7 @@ class CollisionShape2DEditorPlugin : public EditorPlugin { EditorNode* editor; public: - virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_shape_2d_editor->forward_gui_input(p_event); } + virtual bool forward_canvas_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event) { return collision_shape_2d_editor->forward_gui_input(p_event); } virtual String get_name() const { return "CollisionShape2D"; } bool has_main_screen() const { return false; } diff --git a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp index c468404f0f..f6a51632a0 100644 --- a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp +++ b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp @@ -121,7 +121,7 @@ bool LightOccluder2DEditor::forward_gui_input(const InputEvent& p_event) { const InputEventMouseButton &mb=p_event.mouse_button; - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Vector2 gpoint = Point2(mb.x,mb.y); @@ -361,7 +361,7 @@ void LightOccluder2DEditor::_canvas_draw() { poly=Variant(node->get_occluder_polygon()->get_polygon()); - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Ref<Texture> handle= get_icon("EditorHandle","EditorIcons"); for(int i=0;i<poly.size();i++) { diff --git a/tools/editor/plugins/light_occluder_2d_editor_plugin.h b/tools/editor/plugins/light_occluder_2d_editor_plugin.h index 8f96e44df5..431c01fe75 100644 --- a/tools/editor/plugins/light_occluder_2d_editor_plugin.h +++ b/tools/editor/plugins/light_occluder_2d_editor_plugin.h @@ -99,7 +99,7 @@ class LightOccluder2DEditorPlugin : public EditorPlugin { public: - virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); } + virtual bool forward_canvas_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); } virtual String get_name() const { return "LightOccluder2D"; } bool has_main_screen() const { return false; } diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/tools/editor/plugins/multimesh_editor_plugin.cpp index f70eb1fddb..cce1c52215 100644 --- a/tools/editor/plugins/multimesh_editor_plugin.cpp +++ b/tools/editor/plugins/multimesh_editor_plugin.cpp @@ -236,7 +236,7 @@ void MultiMeshEditor::_populate() { xform = xform * axis_xform; - Matrix3 post_xform; + Basis post_xform; post_xform.rotate(xform.basis.get_axis(1),-Math::random(-_rotate_random,_rotate_random)*Math_PI); post_xform.rotate(xform.basis.get_axis(2),-Math::random(-_tilt_random,_tilt_random)*Math_PI); diff --git a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp index cefab98e6d..b2d62af7bb 100644 --- a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp +++ b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp @@ -137,7 +137,7 @@ bool NavigationPolygonEditor::forward_gui_input(const InputEvent& p_event) { const InputEventMouseButton &mb=p_event.mouse_button; - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Vector2 gpoint = Point2(mb.x,mb.y); @@ -411,7 +411,7 @@ void NavigationPolygonEditor::_canvas_draw() { if (node->get_navigation_polygon().is_null()) return; - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Ref<Texture> handle= get_icon("EditorHandle","EditorIcons"); diff --git a/tools/editor/plugins/navigation_polygon_editor_plugin.h b/tools/editor/plugins/navigation_polygon_editor_plugin.h index d3e56de042..50df4df744 100644 --- a/tools/editor/plugins/navigation_polygon_editor_plugin.h +++ b/tools/editor/plugins/navigation_polygon_editor_plugin.h @@ -101,7 +101,7 @@ class NavigationPolygonEditorPlugin : public EditorPlugin { public: - virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); } + virtual bool forward_canvas_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); } virtual String get_name() const { return "NavigationPolygonInstance"; } bool has_main_screen() const { return false; } diff --git a/tools/editor/plugins/path_2d_editor_plugin.cpp b/tools/editor/plugins/path_2d_editor_plugin.cpp index 4e3a0ab720..69be969c51 100644 --- a/tools/editor/plugins/path_2d_editor_plugin.cpp +++ b/tools/editor/plugins/path_2d_editor_plugin.cpp @@ -79,7 +79,7 @@ bool Path2DEditor::forward_gui_input(const InputEvent& p_event) { const InputEventMouseButton &mb=p_event.mouse_button; - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Vector2 gpoint = Point2(mb.x,mb.y); Vector2 cpoint = !mb.mod.alt? canvas_item_editor->snap_point(xform.affine_inverse().xform(gpoint)) @@ -421,7 +421,7 @@ bool Path2DEditor::forward_gui_input(const InputEvent& p_event) { if ( action!=ACTION_NONE) { - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Vector2 gpoint = Point2(mm.x,mm.y); Vector2 cpoint = !mm.mod.alt? canvas_item_editor->snap_point(xform.affine_inverse().xform(gpoint)) : node->get_global_transform().affine_inverse().xform( canvas_item_editor->snap_point(canvas_item_editor->get_canvas_transform().affine_inverse().xform(gpoint)) ); @@ -481,7 +481,7 @@ void Path2DEditor::_canvas_draw() { if (!node->get_curve().is_valid()) return ; - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Ref<Texture> handle= get_icon("EditorHandle","EditorIcons"); Size2 handle_size = handle->get_size(); diff --git a/tools/editor/plugins/path_2d_editor_plugin.h b/tools/editor/plugins/path_2d_editor_plugin.h index 407d07905f..aa940e4edf 100644 --- a/tools/editor/plugins/path_2d_editor_plugin.h +++ b/tools/editor/plugins/path_2d_editor_plugin.h @@ -108,7 +108,7 @@ class Path2DEditorPlugin : public EditorPlugin { public: - virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return path2d_editor->forward_gui_input(p_event); } + virtual bool forward_canvas_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event) { return path2d_editor->forward_gui_input(p_event); } virtual String get_name() const { return "Path2D"; } bool has_main_screen() const { return false; } diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp index ebff3f3130..ee625cf703 100644 --- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp @@ -227,7 +227,7 @@ bool Polygon2DEditor::forward_gui_input(const InputEvent& p_event) { const InputEventMouseButton &mb=p_event.mouse_button; - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Vector2 gpoint = Point2(mb.x,mb.y); @@ -463,7 +463,7 @@ void Polygon2DEditor::_canvas_draw() { poly=Variant(node->get_polygon()); - Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); + Transform2D xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform(); Ref<Texture> handle= get_icon("EditorHandle","EditorIcons"); for(int i=0;i<poly.size();i++) { @@ -499,7 +499,7 @@ void Polygon2DEditor::_uv_mode(int p_mode) { void Polygon2DEditor::_uv_input(const InputEvent& p_input) { - Matrix32 mtx; + Transform2D mtx; mtx.elements[2]=-uv_draw_ofs; mtx.scale_basis(Vector2(uv_draw_zoom,uv_draw_zoom)); @@ -680,13 +680,13 @@ void Polygon2DEditor::_uv_draw() { if (base_tex.is_null()) return; - Matrix32 mtx; + Transform2D mtx; mtx.elements[2]=-uv_draw_ofs; mtx.scale_basis(Vector2(uv_draw_zoom,uv_draw_zoom)); VS::get_singleton()->canvas_item_add_set_transform(uv_edit_draw->get_canvas_item(),mtx); uv_edit_draw->draw_texture(base_tex,Point2()); - VS::get_singleton()->canvas_item_add_set_transform(uv_edit_draw->get_canvas_item(),Matrix32()); + VS::get_singleton()->canvas_item_add_set_transform(uv_edit_draw->get_canvas_item(),Transform2D()); if (snap_show_grid) { Size2 s = uv_edit_draw->get_size(); diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.h b/tools/editor/plugins/polygon_2d_editor_plugin.h index c3051ca88d..bff7f4c44c 100644 --- a/tools/editor/plugins/polygon_2d_editor_plugin.h +++ b/tools/editor/plugins/polygon_2d_editor_plugin.h @@ -151,7 +151,7 @@ class Polygon2DEditorPlugin : public EditorPlugin { public: - virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); } + virtual bool forward_canvas_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event) { return collision_polygon_editor->forward_gui_input(p_event); } virtual String get_name() const { return "Polygon2D"; } bool has_main_screen() const { return false; } diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index e167ba2d56..5b2cb4aa5d 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -1654,7 +1654,7 @@ void ScriptEditor::_editor_stop() { } -void ScriptEditor::_add_callback(Object *p_obj, const String& p_function, const StringArray& p_args) { +void ScriptEditor::_add_callback(Object *p_obj, const String& p_function, const PoolStringArray& p_args) { //print_line("add callback! hohoho"); kinda sad to remove this ERR_FAIL_COND(!p_obj); diff --git a/tools/editor/plugins/script_editor_plugin.h b/tools/editor/plugins/script_editor_plugin.h index e84c0af9e0..26120c8497 100644 --- a/tools/editor/plugins/script_editor_plugin.h +++ b/tools/editor/plugins/script_editor_plugin.h @@ -99,7 +99,7 @@ public: virtual void reload(bool p_soft)=0; virtual void get_breakpoints(List<int> *p_breakpoints)=0; virtual bool goto_method(const String& p_method)=0; - virtual void add_callback(const String& p_function,StringArray p_args)=0; + virtual void add_callback(const String& p_function,PoolStringArray p_args)=0; virtual void update_settings()=0; virtual void set_debugger_active(bool p_active)=0; virtual bool can_lose_focus_on_node_selection() { return true; } @@ -243,7 +243,7 @@ class ScriptEditor : public VBoxContainer { int edit_pass; - void _add_callback(Object *p_obj, const String& p_function, const StringArray& p_args); + void _add_callback(Object *p_obj, const String& p_function, const PoolStringArray& p_args); void _res_saved_callback(const Ref<Resource>& p_res); bool trim_trailing_whitespace_on_save; diff --git a/tools/editor/plugins/script_text_editor.cpp b/tools/editor/plugins/script_text_editor.cpp index 391578817a..05a2bfdba0 100644 --- a/tools/editor/plugins/script_text_editor.cpp +++ b/tools/editor/plugins/script_text_editor.cpp @@ -225,7 +225,7 @@ void ScriptTextEditor::_notification(int p_what) { } } -void ScriptTextEditor::add_callback(const String& p_function,StringArray p_args) { +void ScriptTextEditor::add_callback(const String& p_function,PoolStringArray p_args) { String code = code_editor->get_text_edit()->get_text(); int pos = script->get_language()->find_function(p_function,code); diff --git a/tools/editor/plugins/script_text_editor.h b/tools/editor/plugins/script_text_editor.h index 215d0626f0..e30a78340e 100644 --- a/tools/editor/plugins/script_text_editor.h +++ b/tools/editor/plugins/script_text_editor.h @@ -137,7 +137,7 @@ public: virtual void reload(bool p_soft); virtual void get_breakpoints(List<int> *p_breakpoints); - virtual void add_callback(const String& p_function,StringArray p_args); + virtual void add_callback(const String& p_function,PoolStringArray p_args); virtual void update_settings(); virtual bool goto_method(const String& p_method); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 7bf0843b2c..6a1098bc6e 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -894,7 +894,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { continue; //optimize by checking AABB (although should pre sort by distance) - AABB aabb = vi->get_global_transform().xform(vi->get_aabb()); + Rect3 aabb = vi->get_global_transform().xform(vi->get_aabb()); if (p.distance_to(aabb.get_support(-ray_dir))>min_d) continue; @@ -1352,7 +1352,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { Transform original=se->original; - Transform base=Transform( Matrix3(), _edit.center); + Transform base=Transform( Basis(), _edit.center); Transform t=base * (r * (base.inverse() * original)); sp->set_global_transform(t); @@ -1501,7 +1501,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { Transform original=se->original; - Transform base=Transform( Matrix3(), _edit.center); + Transform base=Transform( Basis(), _edit.center); Transform t=base * r * base.inverse() * original; sp->set_global_transform(t); @@ -1791,7 +1791,7 @@ void SpatialEditorViewport::_notification(int p_what) { if (se->aabb.has_no_surface()) { - se->aabb=vi?vi->get_aabb():AABB( Vector3(-0.2,-0.2,-0.2),Vector3(0.4,0.4,0.4)); + se->aabb=vi?vi->get_aabb():Rect3( Vector3(-0.2,-0.2,-0.2),Vector3(0.4,0.4,0.4)); } Transform t=sp->get_global_transform(); @@ -2486,10 +2486,10 @@ void SpatialEditor::select_gizmo_hilight_axis(int p_axis) { void SpatialEditor::update_transform_gizmo() { List<Node*> &selection = editor_selection->get_selected_node_list(); - AABB center; + Rect3 center; bool first=true; - Matrix3 gizmo_basis; + Basis gizmo_basis; bool local_gizmo_coords = transform_menu->get_popup()->is_item_checked( transform_menu->get_popup()->get_item_index(MENU_TRANSFORM_LOCAL_COORDS) ); @@ -2513,7 +2513,7 @@ void SpatialEditor::update_transform_gizmo() { } } else { center.expand_to(xf.origin); - gizmo_basis=Matrix3(); + gizmo_basis=Basis(); } // count++; } @@ -2551,7 +2551,7 @@ Object *SpatialEditor::_get_editor_data(Object *p_what) { void SpatialEditor::_generate_selection_box() { - AABB aabb( Vector3(), Vector3(1,1,1) ); + Rect3 aabb( Vector3(), Vector3(1,1,1) ); aabb.grow_by( aabb.get_longest_axis_size()/20.0 ); Ref<SurfaceTool> st = memnew( SurfaceTool ); @@ -3343,8 +3343,8 @@ void SpatialEditor::_init_indicators() { for(int k = 0; k < 7 ; k++) { - Matrix3 ma(ivec,Math_PI*2*float(k)/arrow_sides); - Matrix3 mb(ivec,Math_PI*2*float(k+1)/arrow_sides); + Basis ma(ivec,Math_PI*2*float(k)/arrow_sides); + Basis mb(ivec,Math_PI*2*float(k+1)/arrow_sides); for(int j=0;j<arrow_points-1;j++) { @@ -3388,8 +3388,8 @@ void SpatialEditor::_init_indicators() { for(int k = 0; k < 33 ; k++) { - Matrix3 ma(ivec,Math_PI*2*float(k)/32); - Matrix3 mb(ivec,Math_PI*2*float(k+1)/32); + Basis ma(ivec,Math_PI*2*float(k)/32); + Basis mb(ivec,Math_PI*2*float(k+1)/32); for(int j=0;j<4;j++) { diff --git a/tools/editor/plugins/spatial_editor_plugin.h b/tools/editor/plugins/spatial_editor_plugin.h index e09a29d4f8..b05b7d8545 100644 --- a/tools/editor/plugins/spatial_editor_plugin.h +++ b/tools/editor/plugins/spatial_editor_plugin.h @@ -271,7 +271,7 @@ class SpatialEditorSelectedItem : public Object { public: - AABB aabb; + Rect3 aabb; Transform original; // original location when moving Transform last_xform; // last transform Spatial *sp; diff --git a/tools/editor/plugins/texture_region_editor_plugin.cpp b/tools/editor/plugins/texture_region_editor_plugin.cpp index fd3e8fb0f3..15fe95075c 100644 --- a/tools/editor/plugins/texture_region_editor_plugin.cpp +++ b/tools/editor/plugins/texture_region_editor_plugin.cpp @@ -57,13 +57,13 @@ void TextureRegionEditor::_region_draw() if (base_tex.is_null()) return; - Matrix32 mtx; + Transform2D mtx; mtx.elements[2]=-draw_ofs; mtx.scale_basis(Vector2(draw_zoom,draw_zoom)); VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(),mtx); edit_draw->draw_texture(base_tex,Point2()); - VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(),Matrix32()); + VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(),Transform2D()); if (snap_mode == SNAP_GRID) { Size2 s = edit_draw->get_size(); @@ -203,7 +203,7 @@ void TextureRegionEditor::_region_draw() void TextureRegionEditor::_region_input(const InputEvent& p_input) { - Matrix32 mtx; + Transform2D mtx; mtx.elements[2]=-draw_ofs; mtx.scale_basis(Vector2(draw_zoom,draw_zoom)); diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp index 1b3bcb7d2c..0d384ea3a2 100644 --- a/tools/editor/plugins/tile_map_editor_plugin.cpp +++ b/tools/editor/plugins/tile_map_editor_plugin.cpp @@ -417,7 +417,7 @@ void TileMapEditor::_select(const Point2i& p_from, const Point2i& p_to) { canvas_item_editor->update(); } -void TileMapEditor::_draw_cell(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Matrix32& p_xform) { +void TileMapEditor::_draw_cell(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Transform2D& p_xform) { Ref<Texture> t = node->get_tileset()->tile_get_texture(p_cell); @@ -505,7 +505,7 @@ void TileMapEditor::_draw_cell(int p_cell, const Point2i& p_point, bool p_flip_h canvas_item_editor->draw_texture_rect_region(t, rect, r, Color(1,1,1,0.5), p_transpose); } -void TileMapEditor::_draw_fill_preview(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Matrix32& p_xform) { +void TileMapEditor::_draw_fill_preview(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Transform2D& p_xform) { PoolVector<Vector2> points = _bucket_fill(p_point, false, true); PoolVector<Vector2>::Read pr = points.read(); @@ -600,8 +600,8 @@ bool TileMapEditor::forward_gui_input(const InputEvent& p_event) { if (!node || !node->get_tileset().is_valid() || !node->is_visible()) return false; - Matrix32 xform = CanvasItemEditor::get_singleton()->get_canvas_transform() * node->get_global_transform(); - Matrix32 xform_inv = xform.affine_inverse(); + Transform2D xform = CanvasItemEditor::get_singleton()->get_canvas_transform() * node->get_global_transform(); + Transform2D xform_inv = xform.affine_inverse(); switch(p_event.type) { @@ -1071,10 +1071,10 @@ void TileMapEditor::_canvas_draw() { if (!node) return; - Matrix32 cell_xf = node->get_cell_transform(); + Transform2D cell_xf = node->get_cell_transform(); - Matrix32 xform = CanvasItemEditor::get_singleton()->get_canvas_transform() * node->get_global_transform(); - Matrix32 xform_inv = xform.affine_inverse(); + Transform2D xform = CanvasItemEditor::get_singleton()->get_canvas_transform() * node->get_global_transform(); + Transform2D xform_inv = xform.affine_inverse(); Size2 screen_size=canvas_item_editor->get_size(); diff --git a/tools/editor/plugins/tile_map_editor_plugin.h b/tools/editor/plugins/tile_map_editor_plugin.h index 79c2dcd0bd..08032d9afd 100644 --- a/tools/editor/plugins/tile_map_editor_plugin.h +++ b/tools/editor/plugins/tile_map_editor_plugin.h @@ -141,8 +141,8 @@ class TileMapEditor : public VBoxContainer { void _select(const Point2i& p_from, const Point2i& p_to); - void _draw_cell(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Matrix32& p_xform); - void _draw_fill_preview(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Matrix32& p_xform); + void _draw_cell(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Transform2D& p_xform); + void _draw_fill_preview(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Transform2D& p_xform); void _clear_bucket_cache(); void _update_copydata(); @@ -190,7 +190,7 @@ class TileMapEditorPlugin : public EditorPlugin { public: - virtual bool forward_canvas_gui_input(const Matrix32& p_canvas_xform,const InputEvent& p_event) { return tile_map_editor->forward_gui_input(p_event); } + virtual bool forward_canvas_gui_input(const Transform2D& p_canvas_xform,const InputEvent& p_event) { return tile_map_editor->forward_gui_input(p_event); } virtual String get_name() const { return "TileMap"; } bool has_main_screen() const { return false; } diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index 74ae66d727..fa41090624 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -1133,7 +1133,7 @@ void ProjectManager::_install_project(const String& p_zip_path,const String& p_t npdialog->show_dialog(); } -void ProjectManager::_files_dropped(StringArray p_files, int p_screen) { +void ProjectManager::_files_dropped(PoolStringArray p_files, int p_screen) { Set<String> folders_set; DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); for (int i = 0; i < p_files.size(); i++) { @@ -1142,7 +1142,7 @@ void ProjectManager::_files_dropped(StringArray p_files, int p_screen) { } memdelete(da); if (folders_set.size()>0) { - StringArray folders; + PoolStringArray folders; for (Set<String>::Element *E=folders_set.front();E;E=E->next()) { folders.append(E->get()); } @@ -1174,7 +1174,7 @@ void ProjectManager::_files_dropped(StringArray p_files, int p_screen) { } } -void ProjectManager::_scan_multiple_folders(StringArray p_files) +void ProjectManager::_scan_multiple_folders(PoolStringArray p_files) { for (int i = 0; i < p_files.size(); i++) { _scan_begin(p_files.get(i)); diff --git a/tools/editor/project_manager.h b/tools/editor/project_manager.h index 2240e252fc..1fd8a301ea 100644 --- a/tools/editor/project_manager.h +++ b/tools/editor/project_manager.h @@ -95,8 +95,8 @@ class ProjectManager : public Control { void _panel_input(const InputEvent& p_ev,Node *p_hb); void _unhandled_input(const InputEvent& p_ev); void _favorite_pressed(Node *p_hb); - void _files_dropped(StringArray p_files, int p_screen); - void _scan_multiple_folders(StringArray p_files); + void _files_dropped(PoolStringArray p_files, int p_screen); + void _scan_multiple_folders(PoolStringArray p_files); protected: diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp index 6e9ea5e873..968333d466 100644 --- a/tools/editor/project_settings.cpp +++ b/tools/editor/project_settings.cpp @@ -795,7 +795,7 @@ void ProjectSettings::add_translation(const String& p_translation) { void ProjectSettings::_translation_add(const String& p_path) { - StringArray translations = GlobalConfig::get_singleton()->get("locale/translations"); + PoolStringArray translations = GlobalConfig::get_singleton()->get("locale/translations"); for(int i=0;i<translations.size();i++) { @@ -828,7 +828,7 @@ void ProjectSettings::_translation_delete(Object *p_item,int p_column, int p_but int idx=ti->get_metadata(0); - StringArray translations = GlobalConfig::get_singleton()->get("locale/translations"); + PoolStringArray translations = GlobalConfig::get_singleton()->get("locale/translations"); ERR_FAIL_INDEX(idx,translations.size()); @@ -865,7 +865,7 @@ void ProjectSettings::_translation_res_add(const String& p_path){ if (remaps.has(p_path)) return; //pointless already has it - remaps[p_path]=StringArray(); + remaps[p_path]=PoolStringArray(); undo_redo->create_action(TTR("Add Remapped Path")); undo_redo->add_do_property(GlobalConfig::get_singleton(),"locale/translation_remaps",remaps); @@ -895,7 +895,7 @@ void ProjectSettings::_translation_res_option_add(const String& p_path) { String key = k->get_metadata(0); ERR_FAIL_COND(!remaps.has(key)); - StringArray r = remaps[key]; + PoolStringArray r = remaps[key]; r.push_back(p_path+":"+"en"); remaps[key]=r; @@ -948,7 +948,7 @@ void ProjectSettings::_translation_res_option_changed() { ERR_FAIL_COND(!remaps.has(key)); - StringArray r = remaps[key]; + PoolStringArray r = remaps[key]; ERR_FAIL_INDEX(idx,r.size()); r.set(idx,path+":"+langs[which]); remaps[key]=r; @@ -1014,7 +1014,7 @@ void ProjectSettings::_translation_res_option_delete(Object *p_item,int p_column int idx = ed->get_metadata(0); ERR_FAIL_COND(!remaps.has(key)); - StringArray r = remaps[key]; + PoolStringArray r = remaps[key]; ERR_FAIL_INDEX(idx,remaps.size()); r.remove(idx); remaps[key]=r; @@ -1045,7 +1045,7 @@ void ProjectSettings::_update_translations() { translation_list->set_hide_root(true); if (GlobalConfig::get_singleton()->has("locale/translations")) { - StringArray translations = GlobalConfig::get_singleton()->get("locale/translations"); + PoolStringArray translations = GlobalConfig::get_singleton()->get("locale/translations"); for(int i=0;i<translations.size();i++) { TreeItem *t = translation_list->create_item(root); @@ -1105,7 +1105,7 @@ void ProjectSettings::_update_translations() { t->select(0); translation_res_option_add_button->set_disabled(false); - StringArray selected = remaps[keys[i]]; + PoolStringArray selected = remaps[keys[i]]; for(int j=0;j<selected.size();j++) { String s = selected[j]; diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index c4a93c4af0..d59833f0ed 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -721,7 +721,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty value_editor[3]->set_text( String::num( q.w ) ); } break; - case Variant::_AABB: { + case Variant::RECT3: { List<String> names; names.push_back("px"); @@ -732,7 +732,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty names.push_back("sz"); config_value_editors(6,3,16,names); - AABB aabb=v; + Rect3 aabb=v; value_editor[0]->set_text( String::num( aabb.pos.x ) ); value_editor[1]->set_text( String::num( aabb.pos.y ) ); value_editor[2]->set_text( String::num( aabb.pos.z ) ); @@ -741,7 +741,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty value_editor[5]->set_text( String::num( aabb.size.z ) ); } break; - case Variant::MATRIX32: { + case Variant::TRANSFORM2D: { List<String> names; names.push_back("xx"); @@ -752,14 +752,14 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty names.push_back("oy"); config_value_editors(6,2,16,names); - Matrix32 basis=v; + Transform2D basis=v; for(int i=0;i<6;i++) { value_editor[i]->set_text( String::num( basis.elements[i/2][i%2] ) ); } } break; - case Variant::MATRIX3: { + case Variant::BASIS: { List<String> names; names.push_back("xx"); @@ -773,7 +773,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty names.push_back("zz"); config_value_editors(9,3,16,names); - Matrix3 basis=v; + Basis basis=v; for(int i=0;i<9;i++) { value_editor[i]->set_text( String::num( basis.elements[i/3][i%3] ) ); @@ -1005,27 +1005,27 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty } break; - case Variant::RAW_ARRAY: { + case Variant::POOL_BYTE_ARRAY: { } break; - case Variant::INT_ARRAY: { + case Variant::POOL_INT_ARRAY: { } break; - case Variant::REAL_ARRAY: { + case Variant::POOL_REAL_ARRAY: { } break; - case Variant::STRING_ARRAY: { + case Variant::POOL_STRING_ARRAY: { } break; - case Variant::VECTOR3_ARRAY: { + case Variant::POOL_VECTOR3_ARRAY: { } break; - case Variant::COLOR_ARRAY: { + case Variant::POOL_COLOR_ARRAY: { } break; @@ -1703,7 +1703,7 @@ void CustomPropertyEditor::_modified(String p_string) { emit_signal("variant_changed"); } break; - case Variant::_AABB: { + case Variant::RECT3: { Vector3 pos; Vector3 size; @@ -1723,13 +1723,13 @@ void CustomPropertyEditor::_modified(String p_string) { size.y=value_editor[4]->get_text().to_double(); size.z=value_editor[5]->get_text().to_double(); } - v=AABB(pos,size); + v=Rect3(pos,size); emit_signal("variant_changed"); } break; - case Variant::MATRIX32: { + case Variant::TRANSFORM2D: { - Matrix32 m; + Transform2D m; for(int i=0;i<6;i++) { if (evaluator) { m.elements[i/2][i%2]=evaluator->eval(value_editor[i]->get_text()); @@ -1742,9 +1742,9 @@ void CustomPropertyEditor::_modified(String p_string) { emit_signal("variant_changed"); } break; - case Variant::MATRIX3: { + case Variant::BASIS: { - Matrix3 m; + Basis m; for(int i=0;i<9;i++) { if (evaluator) { @@ -1760,7 +1760,7 @@ void CustomPropertyEditor::_modified(String p_string) { } break; case Variant::TRANSFORM: { - Matrix3 basis; + Basis basis; for(int i=0;i<9;i++) { if (evaluator) { @@ -1820,27 +1820,27 @@ void CustomPropertyEditor::_modified(String p_string) { } break; - case Variant::RAW_ARRAY: { + case Variant::POOL_BYTE_ARRAY: { } break; - case Variant::INT_ARRAY: { + case Variant::POOL_INT_ARRAY: { } break; - case Variant::REAL_ARRAY: { + case Variant::POOL_REAL_ARRAY: { } break; - case Variant::STRING_ARRAY: { + case Variant::POOL_STRING_ARRAY: { } break; - case Variant::VECTOR3_ARRAY: { + case Variant::POOL_VECTOR3_ARRAY: { } break; - case Variant::COLOR_ARRAY: { + case Variant::POOL_COLOR_ARRAY: { } break; @@ -1865,9 +1865,9 @@ void CustomPropertyEditor::_focus_enter() { case Variant::VECTOR3: case Variant::PLANE: case Variant::QUAT: - case Variant::_AABB: - case Variant::MATRIX32: - case Variant::MATRIX3: + case Variant::RECT3: + case Variant::TRANSFORM2D: + case Variant::BASIS: case Variant::TRANSFORM: { for (int i=0;i<MAX_VALUE_EDITORS;++i) { if (value_editor[i]->has_focus()) { @@ -1890,9 +1890,9 @@ void CustomPropertyEditor::_focus_exit() { case Variant::VECTOR3: case Variant::PLANE: case Variant::QUAT: - case Variant::_AABB: - case Variant::MATRIX32: - case Variant::MATRIX3: + case Variant::RECT3: + case Variant::TRANSFORM2D: + case Variant::BASIS: case Variant::TRANSFORM: { for (int i=0;i<MAX_VALUE_EDITORS;++i) { value_editor[i]->select(0, 0); @@ -2419,10 +2419,10 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p case Variant::VECTOR3: case Variant::QUAT: case Variant::VECTOR2: - case Variant::_AABB: + case Variant::RECT3: case Variant::RECT2: - case Variant::MATRIX32: - case Variant::MATRIX3: + case Variant::TRANSFORM2D: + case Variant::BASIS: case Variant::TRANSFORM: { p_item->set_text(1,obj->get(p_name)); @@ -3505,7 +3505,7 @@ void PropertyEditor::update_tree() { } break; - case Variant::INT_ARRAY: { + case Variant::POOL_INT_ARRAY: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); item->add_button(1,get_icon("EditResource","EditorIcons")); @@ -3520,7 +3520,7 @@ void PropertyEditor::update_tree() { } break; - case Variant::REAL_ARRAY: { + case Variant::POOL_REAL_ARRAY: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); item->add_button(1,get_icon("EditResource","EditorIcons")); @@ -3535,7 +3535,7 @@ void PropertyEditor::update_tree() { } break; - case Variant::STRING_ARRAY: { + case Variant::POOL_STRING_ARRAY: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); item->add_button(1,get_icon("EditResource","EditorIcons")); @@ -3550,7 +3550,7 @@ void PropertyEditor::update_tree() { } break; - case Variant::RAW_ARRAY: { + case Variant::POOL_BYTE_ARRAY: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); item->add_button(1,get_icon("EditResource","EditorIcons")); @@ -3565,7 +3565,7 @@ void PropertyEditor::update_tree() { } break; - case Variant::VECTOR2_ARRAY: { + case Variant::POOL_VECTOR2_ARRAY: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); item->add_button(1,get_icon("EditResource","EditorIcons")); @@ -3580,7 +3580,7 @@ void PropertyEditor::update_tree() { } break; - case Variant::VECTOR3_ARRAY: { + case Variant::POOL_VECTOR3_ARRAY: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); item->add_button(1,get_icon("EditResource","EditorIcons")); @@ -3595,7 +3595,7 @@ void PropertyEditor::update_tree() { } break; - case Variant::COLOR_ARRAY: { + case Variant::POOL_COLOR_ARRAY: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); item->add_button(1,get_icon("EditResource","EditorIcons")); @@ -3637,8 +3637,8 @@ void PropertyEditor::update_tree() { item->set_icon( 0,get_icon("Vector","EditorIcons") ); } break; - case Variant::MATRIX32: - case Variant::MATRIX3: { + case Variant::TRANSFORM2D: + case Variant::BASIS: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); item->set_editable( 1, true ); @@ -3662,11 +3662,11 @@ void PropertyEditor::update_tree() { item->set_icon( 0,get_icon("Plane","EditorIcons") ); } break; - case Variant::_AABB: { + case Variant::RECT3: { item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM ); item->set_editable( 1, true ); - item->set_text(1,"AABB"); + item->set_text(1,"Rect3"); if (show_type_icons) item->set_icon( 0,get_icon("Rect3","EditorIcons") ); } break; @@ -3986,10 +3986,10 @@ void PropertyEditor::_item_edited() { case Variant::QUAT: { } break; - case Variant::_AABB: { + case Variant::RECT3: { } break; - case Variant::MATRIX3: { + case Variant::BASIS: { } break; case Variant::TRANSFORM: { @@ -4015,22 +4015,22 @@ void PropertyEditor::_item_edited() { } break; // arrays - case Variant::RAW_ARRAY: { + case Variant::POOL_BYTE_ARRAY: { } break; - case Variant::INT_ARRAY: { + case Variant::POOL_INT_ARRAY: { } break; - case Variant::REAL_ARRAY: { + case Variant::POOL_REAL_ARRAY: { } break; - case Variant::STRING_ARRAY: { + case Variant::POOL_STRING_ARRAY: { } break; - case Variant::VECTOR3_ARRAY: { + case Variant::POOL_VECTOR3_ARRAY: { } break; - case Variant::COLOR_ARRAY: { + case Variant::POOL_COLOR_ARRAY: { } break; @@ -4223,7 +4223,7 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) { emit_signal("object_id_selected",obj->get(n)); print_line("OBJ ID SELECTED"); - } else if (t==Variant::ARRAY || t==Variant::INT_ARRAY || t==Variant::REAL_ARRAY || t==Variant::STRING_ARRAY || t==Variant::VECTOR2_ARRAY || t==Variant::VECTOR3_ARRAY || t==Variant::COLOR_ARRAY || t==Variant::RAW_ARRAY) { + } else if (t==Variant::ARRAY || t==Variant::POOL_INT_ARRAY || t==Variant::POOL_REAL_ARRAY || t==Variant::POOL_STRING_ARRAY || t==Variant::POOL_VECTOR2_ARRAY || t==Variant::POOL_VECTOR3_ARRAY || t==Variant::POOL_COLOR_ARRAY || t==Variant::POOL_BYTE_ARRAY) { Variant v = obj->get(n); diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index 4052c0d468..1c881dfd5e 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -1134,7 +1134,7 @@ void SceneTreeEditor::_bind_methods() { ADD_SIGNAL( MethodInfo("node_changed") ); ADD_SIGNAL( MethodInfo("nodes_dragged") ); ADD_SIGNAL( MethodInfo("nodes_rearranged",PropertyInfo(Variant::ARRAY,"paths"),PropertyInfo(Variant::NODE_PATH,"to_path"),PropertyInfo(Variant::INT,"type") ) ); - ADD_SIGNAL( MethodInfo("files_dropped",PropertyInfo(Variant::STRING_ARRAY,"files"),PropertyInfo(Variant::NODE_PATH,"to_path"),PropertyInfo(Variant::INT,"type") ) ); + ADD_SIGNAL( MethodInfo("files_dropped",PropertyInfo(Variant::POOL_STRING_ARRAY,"files"),PropertyInfo(Variant::NODE_PATH,"to_path"),PropertyInfo(Variant::INT,"type") ) ); ADD_SIGNAL( MethodInfo("script_dropped",PropertyInfo(Variant::STRING,"file"),PropertyInfo(Variant::NODE_PATH,"to_path"))); ADD_SIGNAL( MethodInfo("rmb_pressed",PropertyInfo(Variant::VECTOR2,"pos")) ) ; diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp index ed96fe9e3f..62de22a4b3 100644 --- a/tools/editor/spatial_editor_gizmos.cpp +++ b/tools/editor/spatial_editor_gizmos.cpp @@ -144,7 +144,7 @@ void EditorSpatialGizmo::add_lines(const Vector<Vector3> &p_lines, const Ref<Mat } if (md) { - mesh->set_custom_aabb(AABB(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0)); + mesh->set_custom_aabb(Rect3(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0)); } } @@ -193,7 +193,7 @@ void EditorSpatialGizmo::add_unscaled_billboard(const Ref<Material>& p_material, } if (md) { - mesh->set_custom_aabb(AABB(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0)); + mesh->set_custom_aabb(Rect3(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0)); } } @@ -271,7 +271,7 @@ void EditorSpatialGizmo::add_handles(const Vector<Vector3> &p_handles, bool p_bi } if (md) { - mesh->set_custom_aabb(AABB(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0)); + mesh->set_custom_aabb(Rect3(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0)); } } @@ -800,8 +800,8 @@ void LightSpatialGizmo::redraw() { for(int i = 0; i < arrow_sides ; i++) { - Matrix3 ma(Vector3(0,0,1),Math_PI*2*float(i)/arrow_sides); - Matrix3 mb(Vector3(0,0,1),Math_PI*2*float(i+1)/arrow_sides); + Basis ma(Vector3(0,0,1),Math_PI*2*float(i)/arrow_sides); + Basis mb(Vector3(0,0,1),Math_PI*2*float(i+1)/arrow_sides); for(int j=1;j<arrow_points-1;j++) { @@ -1219,7 +1219,7 @@ void SkeletonSpatialGizmo::redraw() { weights[0]=1; - AABB aabb; + Rect3 aabb; Color bonecolor = Color(1.0,0.4,0.4,0.3); Color rootcolor = Color(0.4,1.0,0.4,0.1); @@ -1915,7 +1915,7 @@ void CollisionShapeSpatialGizmo::redraw(){ Ref<BoxShape> bs=s; Vector<Vector3> lines; - AABB aabb; + Rect3 aabb; aabb.pos=-bs->get_extents(); aabb.size=aabb.pos*-2; @@ -2163,7 +2163,7 @@ void VisibilityNotifierGizmo::set_handle(int p_idx,Camera *p_camera, const Point //gt.orthonormalize(); Transform gi = gt.affine_inverse(); - AABB aabb = notifier->get_aabb(); + Rect3 aabb = notifier->get_aabb(); Vector3 ray_from = p_camera->project_ray_origin(p_point); Vector3 ray_dir = p_camera->project_ray_normal(p_point); @@ -2205,7 +2205,7 @@ void VisibilityNotifierGizmo::redraw(){ clear(); Vector<Vector3> lines; - AABB aabb = notifier->get_aabb(); + Rect3 aabb = notifier->get_aabb(); for(int i=0;i<12;i++) { Vector3 a,b; @@ -2257,7 +2257,7 @@ String ReflectionProbeGizmo::get_handle_name(int p_idx) const { } Variant ReflectionProbeGizmo::get_handle_value(int p_idx) const{ - return AABB(probe->get_extents(),probe->get_origin_offset()); + return Rect3(probe->get_extents(),probe->get_origin_offset()); } void ReflectionProbeGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point){ @@ -2313,7 +2313,7 @@ void ReflectionProbeGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& void ReflectionProbeGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){ - AABB restore = p_restore; + Rect3 restore = p_restore; if (p_cancel) { probe->set_extents(restore.pos); @@ -2339,7 +2339,7 @@ void ReflectionProbeGizmo::redraw(){ Vector<Vector3> internal_lines; Vector3 extents = probe->get_extents(); - AABB aabb; + Rect3 aabb; aabb.pos=-extents; aabb.size=extents*2; @@ -2468,7 +2468,7 @@ void GIProbeGizmo::redraw(){ static const int subdivs[GIProbe::SUBDIV_MAX]={64,128,256,512}; - AABB aabb = AABB(-extents,extents*2); + Rect3 aabb = Rect3(-extents,extents*2); int subdiv = subdivs[probe->get_subdiv()]; float cell_size = aabb.get_longest_axis_size()/subdiv; |