summaryrefslogtreecommitdiff
path: root/scene/main
diff options
context:
space:
mode:
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/canvas_layer.cpp4
-rw-r--r--scene/main/canvas_layer.h6
-rw-r--r--scene/main/http_request.cpp44
-rw-r--r--scene/main/http_request.h4
-rw-r--r--scene/main/instance_placeholder.cpp2
-rw-r--r--scene/main/scene_main_loop.cpp2
-rw-r--r--scene/main/viewport.cpp48
-rw-r--r--scene/main/viewport.h22
8 files changed, 66 insertions, 66 deletions
diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp
index c5fdcddf15..2e2e1d6c80 100644
--- a/scene/main/canvas_layer.cpp
+++ b/scene/main/canvas_layer.cpp
@@ -43,7 +43,7 @@ int CanvasLayer::get_layer() const{
return layer;
}
-void CanvasLayer::set_transform(const Matrix32& p_xform) {
+void CanvasLayer::set_transform(const Transform2D& p_xform) {
transform=p_xform;
locrotscale_dirty=true;
@@ -52,7 +52,7 @@ void CanvasLayer::set_transform(const Matrix32& p_xform) {
}
-Matrix32 CanvasLayer::get_transform() const {
+Transform2D CanvasLayer::get_transform() const {
return transform;
}
diff --git a/scene/main/canvas_layer.h b/scene/main/canvas_layer.h
index ea05fd7e1f..8efbbd5a05 100644
--- a/scene/main/canvas_layer.h
+++ b/scene/main/canvas_layer.h
@@ -43,7 +43,7 @@ class CanvasLayer : public Node {
Size2 scale;
real_t rot;
int layer;
- Matrix32 transform;
+ Transform2D transform;
Ref<World2D> canvas;
ObjectID custom_viewport_id; // to check validity
@@ -71,8 +71,8 @@ public:
void set_layer(int p_xform);
int get_layer() const;
- void set_transform(const Matrix32& p_xform);
- Matrix32 get_transform() const;
+ void set_transform(const Transform2D& p_xform);
+ Transform2D get_transform() const;
void set_offset(const Vector2& p_offset);
Vector2 get_offset() const;
diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp
index 848be375ca..25180b568f 100644
--- a/scene/main/http_request.cpp
+++ b/scene/main/http_request.cpp
@@ -150,7 +150,7 @@ Error HTTPRequest::request(const String& p_url, const Vector<String>& p_custom_h
client->set_blocking_mode(false);
err = _request();
if (err!=OK) {
- call_deferred("_request_done",RESULT_CANT_CONNECT,0,StringArray(),ByteArray());
+ call_deferred("_request_done",RESULT_CANT_CONNECT,0,PoolStringArray(),PoolByteArray());
return ERR_CANT_CONNECT;
}
@@ -170,7 +170,7 @@ void HTTPRequest::_thread_func(void *p_userdata) {
Error err = hr->_request();
if (err!=OK) {
- hr->call_deferred("_request_done",RESULT_CANT_CONNECT,0,StringArray(),ByteArray());
+ hr->call_deferred("_request_done",RESULT_CANT_CONNECT,0,PoolStringArray(),PoolByteArray());
} else {
while(!hr->thread_request_quit) {
@@ -216,7 +216,7 @@ void HTTPRequest::cancel_request() {
bool HTTPRequest::_handle_response(bool *ret_value) {
if (!client->has_response()) {
- call_deferred("_request_done",RESULT_NO_RESPONSE,0,StringArray(),ByteArray());
+ call_deferred("_request_done",RESULT_NO_RESPONSE,0,PoolStringArray(),PoolByteArray());
*ret_value=true;
return true;
}
@@ -236,7 +236,7 @@ bool HTTPRequest::_handle_response(bool *ret_value) {
//redirect
if (max_redirects>=0 && redirections>=max_redirects) {
- call_deferred("_request_done",RESULT_REDIRECT_LIMIT_REACHED,response_code,response_headers,ByteArray());
+ call_deferred("_request_done",RESULT_REDIRECT_LIMIT_REACHED,response_code,response_headers,PoolByteArray());
*ret_value=true;
return true;
}
@@ -288,7 +288,7 @@ bool HTTPRequest::_update_connection() {
switch( client->get_status() ) {
case HTTPClient::STATUS_DISCONNECTED: {
- call_deferred("_request_done",RESULT_CANT_CONNECT,0,StringArray(),ByteArray());
+ call_deferred("_request_done",RESULT_CANT_CONNECT,0,PoolStringArray(),PoolByteArray());
return true; //end it, since it's doing something
} break;
case HTTPClient::STATUS_RESOLVING: {
@@ -297,7 +297,7 @@ bool HTTPRequest::_update_connection() {
return false;
} break;
case HTTPClient::STATUS_CANT_RESOLVE: {
- call_deferred("_request_done",RESULT_CANT_RESOLVE,0,StringArray(),ByteArray());
+ call_deferred("_request_done",RESULT_CANT_RESOLVE,0,PoolStringArray(),PoolByteArray());
return true;
} break;
@@ -308,7 +308,7 @@ bool HTTPRequest::_update_connection() {
} break; //connecting to ip
case HTTPClient::STATUS_CANT_CONNECT: {
- call_deferred("_request_done",RESULT_CANT_CONNECT,0,StringArray(),ByteArray());
+ call_deferred("_request_done",RESULT_CANT_CONNECT,0,PoolStringArray(),PoolByteArray());
return true;
} break;
@@ -326,7 +326,7 @@ bool HTTPRequest::_update_connection() {
return ret_value;
- call_deferred("_request_done",RESULT_SUCCESS,response_code,response_headers,ByteArray());
+ call_deferred("_request_done",RESULT_SUCCESS,response_code,response_headers,PoolByteArray());
return true;
}
if (got_response && body_len<0) {
@@ -336,7 +336,7 @@ bool HTTPRequest::_update_connection() {
}
- call_deferred("_request_done",RESULT_CHUNKED_BODY_SIZE_MISMATCH,response_code,response_headers,ByteArray());
+ call_deferred("_request_done",RESULT_CHUNKED_BODY_SIZE_MISMATCH,response_code,response_headers,PoolByteArray());
return true;
//request migh have been done
} else {
@@ -344,7 +344,7 @@ bool HTTPRequest::_update_connection() {
Error err = client->request(method,request_string,headers,request_data);
if (err!=OK) {
- call_deferred("_request_done",RESULT_CONNECTION_ERROR,0,StringArray(),ByteArray());
+ call_deferred("_request_done",RESULT_CONNECTION_ERROR,0,PoolStringArray(),PoolByteArray());
return true;
}
@@ -370,7 +370,7 @@ bool HTTPRequest::_update_connection() {
if (!client->is_response_chunked() && client->get_response_body_length()==0) {
- call_deferred("_request_done",RESULT_SUCCESS,response_code,response_headers,ByteArray());
+ call_deferred("_request_done",RESULT_SUCCESS,response_code,response_headers,PoolByteArray());
return true;
}
@@ -381,7 +381,7 @@ bool HTTPRequest::_update_connection() {
body_len=client->get_response_body_length();
if (body_size_limit>=0 && body_len>body_size_limit) {
- call_deferred("_request_done",RESULT_BODY_SIZE_LIMIT_EXCEEDED,response_code,response_headers,ByteArray());
+ call_deferred("_request_done",RESULT_BODY_SIZE_LIMIT_EXCEEDED,response_code,response_headers,PoolByteArray());
return true;
}
}
@@ -390,7 +390,7 @@ bool HTTPRequest::_update_connection() {
file=FileAccess::open(download_to_file,FileAccess::WRITE);
if (!file) {
- call_deferred("_request_done",RESULT_DOWNLOAD_FILE_CANT_OPEN,response_code,response_headers,ByteArray());
+ call_deferred("_request_done",RESULT_DOWNLOAD_FILE_CANT_OPEN,response_code,response_headers,PoolByteArray());
return true;
}
}
@@ -400,14 +400,14 @@ bool HTTPRequest::_update_connection() {
//print_line("BODY: "+itos(body.size()));
client->poll();
- ByteArray chunk = client->read_response_body_chunk();
+ PoolByteArray chunk = client->read_response_body_chunk();
downloaded+=chunk.size();
if (file) {
- ByteArray::Read r=chunk.read();
+ PoolByteArray::Read r=chunk.read();
file->store_buffer(r.ptr(),chunk.size());
if (file->get_error()!=OK) {
- call_deferred("_request_done",RESULT_DOWNLOAD_FILE_WRITE_ERROR,response_code,response_headers,ByteArray());
+ call_deferred("_request_done",RESULT_DOWNLOAD_FILE_WRITE_ERROR,response_code,response_headers,PoolByteArray());
return true;
}
} else {
@@ -415,7 +415,7 @@ bool HTTPRequest::_update_connection() {
}
if (body_size_limit>=0 && downloaded>body_size_limit) {
- call_deferred("_request_done",RESULT_BODY_SIZE_LIMIT_EXCEEDED,response_code,response_headers,ByteArray());
+ call_deferred("_request_done",RESULT_BODY_SIZE_LIMIT_EXCEEDED,response_code,response_headers,PoolByteArray());
return true;
}
@@ -435,11 +435,11 @@ bool HTTPRequest::_update_connection() {
} break; // request resulted in body: { } break which must be read
case HTTPClient::STATUS_CONNECTION_ERROR: {
- call_deferred("_request_done",RESULT_CONNECTION_ERROR,0,StringArray(),ByteArray());
+ call_deferred("_request_done",RESULT_CONNECTION_ERROR,0,PoolStringArray(),PoolByteArray());
return true;
} break;
case HTTPClient::STATUS_SSL_HANDSHAKE_ERROR: {
- call_deferred("_request_done",RESULT_SSL_HANDSHAKE_ERROR,0,StringArray(),ByteArray());
+ call_deferred("_request_done",RESULT_SSL_HANDSHAKE_ERROR,0,PoolStringArray(),PoolByteArray());
return true;
} break;
@@ -449,7 +449,7 @@ bool HTTPRequest::_update_connection() {
}
-void HTTPRequest::_request_done(int p_status, int p_code, const StringArray& headers, const ByteArray& p_data) {
+void HTTPRequest::_request_done(int p_status, int p_code, const PoolStringArray& headers, const PoolByteArray& p_data) {
cancel_request();
@@ -540,7 +540,7 @@ int HTTPRequest::get_body_size() const{
void HTTPRequest::_bind_methods() {
ClassDB::bind_method(_MD("set_ip_type","ip_type"),&HTTPRequest::set_ip_type);
- ClassDB::bind_method(_MD("request","url","custom_headers","ssl_validate_domain","method","request_data"),&HTTPRequest::request,DEFVAL(StringArray()),DEFVAL(true),DEFVAL(HTTPClient::METHOD_GET),DEFVAL(String()));
+ ClassDB::bind_method(_MD("request","url","custom_headers","ssl_validate_domain","method","request_data"),&HTTPRequest::request,DEFVAL(PoolStringArray()),DEFVAL(true),DEFVAL(HTTPClient::METHOD_GET),DEFVAL(String()));
ClassDB::bind_method(_MD("cancel_request"),&HTTPRequest::cancel_request);
ClassDB::bind_method(_MD("get_http_client_status"),&HTTPRequest::get_http_client_status);
@@ -567,7 +567,7 @@ void HTTPRequest::_bind_methods() {
ADD_PROPERTY(PropertyInfo(Variant::INT,"body_size_limit",PROPERTY_HINT_RANGE,"-1,2000000000"),_SCS("set_body_size_limit"),_SCS("get_body_size_limit"));
ADD_PROPERTY(PropertyInfo(Variant::INT,"max_redirects",PROPERTY_HINT_RANGE,"-1,1024"),_SCS("set_max_redirects"),_SCS("get_max_redirects"));
- ADD_SIGNAL(MethodInfo("request_completed",PropertyInfo(Variant::INT,"result"),PropertyInfo(Variant::INT,"response_code"),PropertyInfo(Variant::STRING_ARRAY,"headers"),PropertyInfo(Variant::RAW_ARRAY,"body")));
+ ADD_SIGNAL(MethodInfo("request_completed",PropertyInfo(Variant::INT,"result"),PropertyInfo(Variant::INT,"response_code"),PropertyInfo(Variant::POOL_STRING_ARRAY,"headers"),PropertyInfo(Variant::POOL_BYTE_ARRAY,"body")));
BIND_CONSTANT( RESULT_SUCCESS );
//BIND_CONSTANT( RESULT_NO_BODY );
diff --git a/scene/main/http_request.h b/scene/main/http_request.h
index 59be980077..51c5ddeb69 100644
--- a/scene/main/http_request.h
+++ b/scene/main/http_request.h
@@ -71,7 +71,7 @@ private:
bool request_sent;
Ref<HTTPClient> client;
- ByteArray body;
+ PoolByteArray body;
volatile bool use_threads;
bool got_response;
@@ -107,7 +107,7 @@ private:
Thread *thread;
- void _request_done(int p_status, int p_code, const StringArray& headers, const ByteArray& p_data);
+ void _request_done(int p_status, int p_code, const PoolStringArray& headers, const PoolByteArray& p_data);
static void _thread_func(void *p_userdata);
protected:
diff --git a/scene/main/instance_placeholder.cpp b/scene/main/instance_placeholder.cpp
index 289adc3c53..5d1b0495c0 100644
--- a/scene/main/instance_placeholder.cpp
+++ b/scene/main/instance_placeholder.cpp
@@ -106,7 +106,7 @@ void InstancePlaceholder::replace_by_instance(const Ref<PackedScene> &p_custom_s
Dictionary InstancePlaceholder::get_stored_values(bool p_with_order) {
Dictionary ret;
- StringArray order;
+ PoolStringArray order;
for(List<PropSet>::Element *E=stored_values.front();E;E=E->next()) {
ret[E->get().name] = E->get().value;
diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp
index 5cb60d25d9..487b740c34 100644
--- a/scene/main/scene_main_loop.cpp
+++ b/scene/main/scene_main_loop.cpp
@@ -2245,7 +2245,7 @@ void SceneTree::_bind_methods() {
ADD_SIGNAL( MethodInfo("idle_frame"));
ADD_SIGNAL( MethodInfo("fixed_frame"));
- ADD_SIGNAL( MethodInfo("files_dropped",PropertyInfo(Variant::STRING_ARRAY,"files"),PropertyInfo(Variant::INT,"screen")) );
+ ADD_SIGNAL( MethodInfo("files_dropped",PropertyInfo(Variant::POOL_STRING_ARRAY,"files"),PropertyInfo(Variant::INT,"screen")) );
ADD_SIGNAL( MethodInfo("network_peer_connected",PropertyInfo(Variant::INT,"id")));
ADD_SIGNAL( MethodInfo("network_peer_disconnected",PropertyInfo(Variant::INT,"id")));
ADD_SIGNAL( MethodInfo("connected_to_server"));
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index bd80f97c22..fe363d97f7 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -203,7 +203,7 @@ void Viewport::_update_stretch_transform() {
//print_line("sive override size "+size_override_size);
//print_line("rect size "+size);
- stretch_transform=Matrix32();
+ stretch_transform=Transform2D();
Size2 scale = size/(size_override_size+size_override_margin*2);
stretch_transform.scale(scale);
stretch_transform.elements[2]=size_override_margin*scale;
@@ -212,7 +212,7 @@ void Viewport::_update_stretch_transform() {
} else {
- stretch_transform=Matrix32();
+ stretch_transform=Transform2D();
}
_update_global_transform();
@@ -833,14 +833,14 @@ bool Viewport::is_audio_listener_2d() const {
return audio_listener_2d;
}
-void Viewport::set_canvas_transform(const Matrix32& p_transform) {
+void Viewport::set_canvas_transform(const Transform2D& p_transform) {
canvas_transform=p_transform;
VisualServer::get_singleton()->viewport_set_canvas_transform(viewport,find_world_2d()->get_canvas(),canvas_transform);
- Matrix32 xform = (global_canvas_transform * canvas_transform).affine_inverse();
+ Transform2D xform = (global_canvas_transform * canvas_transform).affine_inverse();
Size2 ss = get_visible_rect().size;
- SpatialSound2DServer::get_singleton()->listener_set_transform(internal_listener_2d, Matrix32(0, xform.xform(ss*0.5)));
+ SpatialSound2DServer::get_singleton()->listener_set_transform(internal_listener_2d, Transform2D(0, xform.xform(ss*0.5)));
Vector2 ss2 = ss*xform.get_scale();
float panrange = MAX(ss2.x,ss2.y);
@@ -849,7 +849,7 @@ void Viewport::set_canvas_transform(const Matrix32& p_transform) {
}
-Matrix32 Viewport::get_canvas_transform() const{
+Transform2D Viewport::get_canvas_transform() const{
return canvas_transform;
}
@@ -859,13 +859,13 @@ Matrix32 Viewport::get_canvas_transform() const{
void Viewport::_update_global_transform() {
- Matrix32 sxform = stretch_transform * global_canvas_transform;
+ Transform2D sxform = stretch_transform * global_canvas_transform;
VisualServer::get_singleton()->viewport_set_global_canvas_transform(viewport,sxform);
- Matrix32 xform = (sxform * canvas_transform).affine_inverse();
+ Transform2D xform = (sxform * canvas_transform).affine_inverse();
Size2 ss = get_visible_rect().size;
- SpatialSound2DServer::get_singleton()->listener_set_transform(internal_listener_2d, Matrix32(0, xform.xform(ss*0.5)));
+ SpatialSound2DServer::get_singleton()->listener_set_transform(internal_listener_2d, Transform2D(0, xform.xform(ss*0.5)));
Vector2 ss2 = ss*xform.get_scale();
float panrange = MAX(ss2.x,ss2.y);
@@ -874,7 +874,7 @@ void Viewport::_update_global_transform() {
}
-void Viewport::set_global_canvas_transform(const Matrix32& p_transform) {
+void Viewport::set_global_canvas_transform(const Transform2D& p_transform) {
global_canvas_transform=p_transform;
@@ -883,7 +883,7 @@ void Viewport::set_global_canvas_transform(const Matrix32& p_transform) {
}
-Matrix32 Viewport::get_global_canvas_transform() const{
+Transform2D Viewport::get_global_canvas_transform() const{
return global_canvas_transform;
}
@@ -1205,7 +1205,7 @@ Camera* Viewport::get_camera() const {
}
-Matrix32 Viewport::get_final_transform() const {
+Transform2D Viewport::get_final_transform() const {
return stretch_transform * global_canvas_transform;
}
@@ -1383,9 +1383,9 @@ void Viewport::clear() {
}
-Matrix32 Viewport::_get_input_pre_xform() const {
+Transform2D Viewport::_get_input_pre_xform() const {
- Matrix32 pre_xf;
+ Transform2D pre_xf;
if (to_screen_rect!=Rect2()) {
@@ -1415,7 +1415,7 @@ void Viewport::_make_input_local(InputEvent& ev) {
Vector2 vp_ofs = _get_window_offset();
- Matrix32 ai = get_final_transform().affine_inverse() * _get_input_pre_xform();
+ Transform2D ai = get_final_transform().affine_inverse() * _get_input_pre_xform();
Vector2 g = ai.xform(Vector2(ev.mouse_button.global_x,ev.mouse_button.global_y));
Vector2 l = ai.xform(Vector2(ev.mouse_button.x,ev.mouse_button.y)-vp_ofs);
@@ -1430,7 +1430,7 @@ void Viewport::_make_input_local(InputEvent& ev) {
Vector2 vp_ofs = _get_window_offset();
- Matrix32 ai = get_final_transform().affine_inverse() * _get_input_pre_xform();
+ Transform2D ai = get_final_transform().affine_inverse() * _get_input_pre_xform();
Vector2 g = ai.xform(Vector2(ev.mouse_motion.global_x,ev.mouse_motion.global_y));
Vector2 l = ai.xform(Vector2(ev.mouse_motion.x,ev.mouse_motion.y)-vp_ofs);
Vector2 r = ai.basis_xform(Vector2(ev.mouse_motion.relative_x,ev.mouse_motion.relative_y));
@@ -1451,7 +1451,7 @@ void Viewport::_make_input_local(InputEvent& ev) {
Vector2 vp_ofs = _get_window_offset();
- Matrix32 ai = get_final_transform().affine_inverse() * _get_input_pre_xform();
+ Transform2D ai = get_final_transform().affine_inverse() * _get_input_pre_xform();
Vector2 t = ai.xform(Vector2(ev.screen_touch.x,ev.screen_touch.y)-vp_ofs);
@@ -1463,7 +1463,7 @@ void Viewport::_make_input_local(InputEvent& ev) {
Vector2 vp_ofs = _get_window_offset();
- Matrix32 ai = get_final_transform().affine_inverse() * _get_input_pre_xform();
+ Transform2D ai = get_final_transform().affine_inverse() * _get_input_pre_xform();
Vector2 t = ai.xform(Vector2(ev.screen_drag.x,ev.screen_drag.y)-vp_ofs);
Vector2 r = ai.basis_xform(Vector2(ev.screen_drag.relative_x,ev.screen_drag.relative_y));
Vector2 s = ai.basis_xform(Vector2(ev.screen_drag.speed_x,ev.screen_drag.speed_y));
@@ -1699,7 +1699,7 @@ Control* Viewport::_gui_find_control(const Point2& p_global) {
if (!sw->is_visible())
continue;
- Matrix32 xform;
+ Transform2D xform;
CanvasItem *pci = sw->get_parent_item();
if (pci)
xform=pci->get_global_transform_with_canvas();
@@ -1719,7 +1719,7 @@ Control* Viewport::_gui_find_control(const Point2& p_global) {
if (!sw->is_visible())
continue;
- Matrix32 xform;
+ Transform2D xform;
CanvasItem *pci = sw->get_parent_item();
if (pci)
xform=pci->get_global_transform_with_canvas();
@@ -1737,7 +1737,7 @@ Control* Viewport::_gui_find_control(const Point2& p_global) {
}
-Control* Viewport::_gui_find_control_at_pos(CanvasItem* p_node,const Point2& p_global,const Matrix32& p_xform,Matrix32& r_inv_xform) {
+Control* Viewport::_gui_find_control_at_pos(CanvasItem* p_node,const Point2& p_global,const Transform2D& p_xform,Transform2D& r_inv_xform) {
if (p_node->cast_to<Viewport>())
return NULL;
@@ -1755,7 +1755,7 @@ Control* Viewport::_gui_find_control_at_pos(CanvasItem* p_node,const Point2& p_g
return NULL; //canvas item hidden, discard
}
- Matrix32 matrix = p_xform * p_node->get_transform();
+ Transform2D matrix = p_xform * p_node->get_transform();
// matrix.basis_determinant() == 0.0f implies that node does not exist on scene
if(matrix.basis_determinant() == 0.0f)
return NULL;
@@ -2060,7 +2060,7 @@ void Viewport::_gui_input_event(InputEvent p_event) {
}
- Matrix32 localizer = over->get_global_transform_with_canvas().affine_inverse();
+ Transform2D localizer = over->get_global_transform_with_canvas().affine_inverse();
Size2 pos = localizer.xform(mpos);
Vector2 speed = localizer.basis_xform(Point2(p_event.mouse_motion.speed_x,p_event.mouse_motion.speed_y));
Vector2 rel = localizer.basis_xform(Point2(p_event.mouse_motion.relative_x,p_event.mouse_motion.relative_y));
@@ -2587,7 +2587,7 @@ void Viewport::set_physics_object_picking(bool p_enable) {
Vector2 Viewport::get_camera_coords(const Vector2 &p_viewport_coords) const {
- Matrix32 xf = get_final_transform();
+ Transform2D xf = get_final_transform();
return xf.xform(p_viewport_coords);
diff --git a/scene/main/viewport.h b/scene/main/viewport.h
index 6666565069..1f30044cef 100644
--- a/scene/main/viewport.h
+++ b/scene/main/viewport.h
@@ -137,9 +137,9 @@ friend class ViewportTexture;
bool audio_listener_2d;
RID internal_listener_2d;
- Matrix32 canvas_transform;
- Matrix32 global_canvas_transform;
- Matrix32 stretch_transform;
+ Transform2D canvas_transform;
+ Transform2D global_canvas_transform;
+ Transform2D stretch_transform;
Size2 size;
Rect2 to_screen_rect;
@@ -232,7 +232,7 @@ friend class ViewportTexture;
float tooltip_delay;
List<Control*> modal_stack;
unsigned int cancelled_input_ID;
- Matrix32 focus_inv_xform;
+ Transform2D focus_inv_xform;
bool subwindow_order_dirty;
List<Control*> subwindows;
bool roots_order_dirty;
@@ -250,14 +250,14 @@ friend class ViewportTexture;
void _gui_sort_roots();
void _gui_sort_modal_stack();
Control* _gui_find_control(const Point2& p_global);
- Control* _gui_find_control_at_pos(CanvasItem* p_node,const Point2& p_global,const Matrix32& p_xform,Matrix32& r_inv_xform);
+ Control* _gui_find_control_at_pos(CanvasItem* p_node,const Point2& p_global,const Transform2D& p_xform,Transform2D& r_inv_xform);
void _gui_input_event(InputEvent p_event);
void update_worlds();
- _FORCE_INLINE_ Matrix32 _get_input_pre_xform() const;
+ _FORCE_INLINE_ Transform2D _get_input_pre_xform() const;
void _vp_enter_tree();
void _vp_exit_tree();
@@ -351,13 +351,13 @@ public:
Ref<World2D> find_world_2d() const;
- void set_canvas_transform(const Matrix32& p_transform);
- Matrix32 get_canvas_transform() const;
+ void set_canvas_transform(const Transform2D& p_transform);
+ Transform2D get_canvas_transform() const;
- void set_global_canvas_transform(const Matrix32& p_transform);
- Matrix32 get_global_canvas_transform() const;
+ void set_global_canvas_transform(const Transform2D& p_transform);
+ Transform2D get_global_canvas_transform() const;
- Matrix32 get_final_transform() const;
+ Transform2D get_final_transform() const;
void set_transparent_background(bool p_enable);
bool has_transparent_background() const;
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-09 03:41:37 +0000