Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Type renames:

Browse source 
Matrix32 -> Transform2D
	Matrix3 -> Basis
	AABB -> Rect3
	RawArray -> PoolByteArray
	IntArray -> PoolIntArray
	FloatArray -> PoolFloatArray
	Vector2Array -> PoolVector2Array
	Vector3Array -> PoolVector3Array
	ColorArray -> PoolColorArray
This commit is contained in:
Juan Linietsky 2017-01-11 00:52:51 -03:00
parent 710692278d
commit bc26f90581
266 changed files with 2466 additions and 2468 deletions
Download patch file Download diff file Expand all files Collapse all files

56
tools/editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -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));
}

20
tools/editor/plugins/canvas_item_editor_plugin.h
View file

@ -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;

4
tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
View file

@ -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++) {

2
tools/editor/plugins/collision_polygon_2d_editor_plugin.h
View file

@ -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; }

4
tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
View file

@ -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;

2
tools/editor/plugins/collision_shape_2d_editor_plugin.h
View file

@ -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; }

4
tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
View file

@ -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++) {

2
tools/editor/plugins/light_occluder_2d_editor_plugin.h
View file

@ -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; }

2
tools/editor/plugins/multimesh_editor_plugin.cpp
View file

@ -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);

4
tools/editor/plugins/navigation_polygon_editor_plugin.cpp
View file

@ -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");

2
tools/editor/plugins/navigation_polygon_editor_plugin.h
View file

@ -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; }

6
tools/editor/plugins/path_2d_editor_plugin.cpp
View file

@ -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();

2
tools/editor/plugins/path_2d_editor_plugin.h
View file

@ -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; }

10
tools/editor/plugins/polygon_2d_editor_plugin.cpp
View file

@ -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();

2
tools/editor/plugins/polygon_2d_editor_plugin.h
View file

@ -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; }

2
tools/editor/plugins/script_editor_plugin.cpp
View file

@ -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);

4
tools/editor/plugins/script_editor_plugin.h
View file

@ -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;

2
tools/editor/plugins/script_text_editor.cpp
View file

@ -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);

2
tools/editor/plugins/script_text_editor.h
View file

@ -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);

24
tools/editor/plugins/spatial_editor_plugin.cpp
View file

@ -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++) {

2
tools/editor/plugins/spatial_editor_plugin.h
View file

@ -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;

6
tools/editor/plugins/texture_region_editor_plugin.cpp
View file

@ -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));

14
tools/editor/plugins/tile_map_editor_plugin.cpp
View file

@ -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();

6
tools/editor/plugins/tile_map_editor_plugin.h
View file

@ -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; }