summaryrefslogtreecommitdiffstats
path: root/scene/main/viewport.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'scene/main/viewport.cpp')
-rw-r--r--scene/main/viewport.cpp48
1 files changed, 24 insertions, 24 deletions
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);