Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-26 14:13:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #43554 from lawnjelly/refactor_pixel_snap

Browse Source 
Add 2d snap transforms option
This commit is contained in:
Rémi Verschelde 2020-11-16 18:24:10 +01:00 committed by GitHub
commit 4d667dadb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/engine.cpp
View File

@ -228,6 +228,7 @@ Engine::Engine() {
_target_fps = 0;
_time_scale = 1.0;
_pixel_snap = false;
_snap_2d_transforms = false;
_physics_frames = 0;
_idle_frames = 0;
_in_physics = false;

2
core/engine.h
View File

@ -62,6 +62,7 @@ private:
int _target_fps;
float _time_scale;
bool _pixel_snap;
bool _snap_2d_transforms;
uint64_t _physics_frames;
float _physics_interpolation_fraction;
@ -110,6 +111,7 @@ public:
Object *get_singleton_object(const String &p_name) const;
_FORCE_INLINE_ bool get_use_pixel_snap() const { return _pixel_snap; }
bool get_snap_2d_transforms() const { return _snap_2d_transforms; }
#ifdef TOOLS_ENABLED
_FORCE_INLINE_ void set_editor_hint(bool p_enabled) { editor_hint = p_enabled; }

1
main/main.cpp
View File

@ -1113,6 +1113,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
}
Engine::get_singleton()->_pixel_snap = GLOBAL_DEF("rendering/quality/2d/use_pixel_snap", false);
Engine::get_singleton()->_snap_2d_transforms = GLOBAL_DEF("rendering/quality/2d/use_transform_snap", false);
OS::get_singleton()->_keep_screen_on = GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true);
if (rtm == -1) {
rtm = GLOBAL_DEF("rendering/threads/thread_model", OS::RENDER_THREAD_SAFE);

2
scene/2d/animated_sprite.cpp
View File

@ -452,7 +452,7 @@ void AnimatedSprite::_notification(int p_what) {
if (centered)
ofs -= s / 2;
if (Engine::get_singleton()->get_use_pixel_snap()) {
if (Engine::get_singleton()->get_snap_2d_transforms()) {
ofs = ofs.floor();
}
Rect2 dst_rect(ofs, s);

4
scene/2d/sprite.cpp
View File

@ -99,7 +99,7 @@ void Sprite::_get_rects(Rect2 &r_src_rect, Rect2 &r_dst_rect, bool &r_filter_cli
Point2 dest_offset = offset;
if (centered)
dest_offset -= frame_size / 2;
if (Engine::get_singleton()->get_use_pixel_snap()) {
if (Engine::get_singleton()->get_snap_2d_transforms()) {
dest_offset = dest_offset.floor();
}
@ -378,7 +378,7 @@ Rect2 Sprite::get_rect() const {
Point2 ofs = offset;
if (centered)
ofs -= Size2(s) / 2;
if (Engine::get_singleton()->get_use_pixel_snap()) {
if (Engine::get_singleton()->get_snap_2d_transforms()) {
ofs = ofs.floor();
}

8
servers/visual/visual_server_canvas.cpp
View File

@ -98,7 +98,12 @@ void VisualServerCanvas::_render_canvas_item(Item *p_canvas_item, const Transfor
}
Rect2 rect = ci->get_rect();
Transform2D xform = p_transform * ci->xform;
Transform2D xform = ci->xform;
if (snap_2d_transforms) {
xform.elements[2] = xform.elements[2].floor();
}
xform = p_transform * xform;
Rect2 global_rect = xform.xform(rect);
global_rect.position += p_clip_rect.position;
@ -1477,6 +1482,7 @@ VisualServerCanvas::VisualServerCanvas() {
z_last_list = (RasterizerCanvas::Item **)memalloc(z_range * sizeof(RasterizerCanvas::Item *));
disable_scale = false;
snap_2d_transforms = Engine::get_singleton()->get_snap_2d_transforms();
}
VisualServerCanvas::~VisualServerCanvas() {

1
servers/visual/visual_server_canvas.h
View File

@ -158,6 +158,7 @@ public:
RID_Owner<RasterizerCanvas::Light> canvas_light_owner;
bool disable_scale;
bool snap_2d_transforms;
private:
void _render_canvas_item_tree(Item *p_canvas_item, const Transform2D &p_transform, const Rect2 &p_clip_rect, const Color &p_modulate, RasterizerCanvas::Light *p_lights);