diff options
Diffstat (limited to 'scene/2d/tile_map.cpp')
| -rw-r--r-- | scene/2d/tile_map.cpp | 923 |
1 files changed, 432 insertions, 491 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index f89a72e1b9..02b41fbd0c 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -28,11 +28,9 @@ /*************************************************************************/ #include "tile_map.h" #include "io/marshalls.h" -#include "servers/physics_2d_server.h" #include "method_bind_ext.inc" #include "os/os.h" - - +#include "servers/physics_2d_server.h" int TileMap::_get_quadrant_size() const { @@ -44,51 +42,49 @@ int TileMap::_get_quadrant_size() const { void TileMap::_notification(int p_what) { - switch(p_what) { + switch (p_what) { case NOTIFICATION_ENTER_TREE: { - Node2D *c=this; - while(c) { + Node2D *c = this; + while (c) { - navigation=c->cast_to<Navigation2D>(); + navigation = c->cast_to<Navigation2D>(); if (navigation) { break; } - c=c->get_parent()->cast_to<Node2D>(); + c = c->get_parent()->cast_to<Node2D>(); } - pending_update=true; + pending_update = true; _update_dirty_quadrants(); RID space = get_world_2d()->get_space(); _update_quadrant_transform(); _update_quadrant_space(space); - } break; case NOTIFICATION_EXIT_TREE: { _update_quadrant_space(RID()); - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - Quadrant &q=E->get(); + Quadrant &q = E->get(); if (navigation) { - for(Map<PosKey,Quadrant::NavPoly>::Element *E=q.navpoly_ids.front();E;E=E->next()) { + for (Map<PosKey, Quadrant::NavPoly>::Element *E = q.navpoly_ids.front(); E; E = E->next()) { navigation->navpoly_remove(E->get().id); } q.navpoly_ids.clear(); } - for(Map<PosKey,Quadrant::Occluder>::Element *E=q.occluder_instances.front();E;E=E->next()) { + for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) { VS::get_singleton()->free(E->get().id); } q.occluder_instances.clear(); } - navigation=NULL; - + navigation = NULL; } break; case NOTIFICATION_TRANSFORM_CHANGED: { @@ -100,12 +96,12 @@ void TileMap::_notification(int p_what) { } } -void TileMap::_update_quadrant_space(const RID& p_space) { +void TileMap::_update_quadrant_space(const RID &p_space) { - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - Quadrant &q=E->get(); - Physics2DServer::get_singleton()->body_set_space(q.body,p_space); + Quadrant &q = E->get(); + Physics2DServer::get_singleton()->body_set_space(q.body, p_space); } } @@ -120,43 +116,42 @@ void TileMap::_update_quadrant_transform() { if (navigation) nav_rel = get_relative_transform_to_parent(navigation); - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - Quadrant &q=E->get(); + Quadrant &q = E->get(); Transform2D xform; - xform.set_origin( q.pos ); + xform.set_origin(q.pos); xform = global_transform * xform; - Physics2DServer::get_singleton()->body_set_state(q.body,Physics2DServer::BODY_STATE_TRANSFORM,xform); + Physics2DServer::get_singleton()->body_set_state(q.body, Physics2DServer::BODY_STATE_TRANSFORM, xform); if (navigation) { - for(Map<PosKey,Quadrant::NavPoly>::Element *E=q.navpoly_ids.front();E;E=E->next()) { + for (Map<PosKey, Quadrant::NavPoly>::Element *E = q.navpoly_ids.front(); E; E = E->next()) { - navigation->navpoly_set_transform(E->get().id,nav_rel * E->get().xform); + navigation->navpoly_set_transform(E->get().id, nav_rel * E->get().xform); } } - for(Map<PosKey,Quadrant::Occluder>::Element *E=q.occluder_instances.front();E;E=E->next()) { - VS::get_singleton()->canvas_light_occluder_set_transform(E->get().id,global_transform * E->get().xform); + for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) { + VS::get_singleton()->canvas_light_occluder_set_transform(E->get().id, global_transform * E->get().xform); } } } -void TileMap::set_tileset(const Ref<TileSet>& p_tileset) { +void TileMap::set_tileset(const Ref<TileSet> &p_tileset) { if (tile_set.is_valid()) - tile_set->disconnect("changed",this,"_recreate_quadrants"); + tile_set->disconnect("changed", this, "_recreate_quadrants"); _clear_quadrants(); - tile_set=p_tileset; + tile_set = p_tileset; if (tile_set.is_valid()) - tile_set->connect("changed",this,"_recreate_quadrants"); + tile_set->connect("changed", this, "_recreate_quadrants"); else clear(); _recreate_quadrants(); emit_signal("settings_changed"); - } Ref<TileSet> TileMap::get_tileset() const { @@ -166,14 +161,12 @@ Ref<TileSet> TileMap::get_tileset() const { void TileMap::set_cell_size(Size2 p_size) { - ERR_FAIL_COND(p_size.x<1 || p_size.y<1); + ERR_FAIL_COND(p_size.x < 1 || p_size.y < 1); _clear_quadrants(); - cell_size=p_size; + cell_size = p_size; _recreate_quadrants(); emit_signal("settings_changed"); - - } Size2 TileMap::get_cell_size() const { @@ -181,13 +174,12 @@ Size2 TileMap::get_cell_size() const { } void TileMap::set_quadrant_size(int p_size) { - ERR_FAIL_COND(p_size<1); + ERR_FAIL_COND(p_size < 1); _clear_quadrants(); - quadrant_size=p_size; + quadrant_size = p_size; _recreate_quadrants(); emit_signal("settings_changed"); - } int TileMap::get_quadrant_size() const { @@ -196,11 +188,9 @@ int TileMap::get_quadrant_size() const { void TileMap::set_center_x(bool p_enable) { - center_x=p_enable; + center_x = p_enable; _recreate_quadrants(); emit_signal("settings_changed"); - - } bool TileMap::get_center_x() const { @@ -208,24 +198,22 @@ bool TileMap::get_center_x() const { } void TileMap::set_center_y(bool p_enable) { - center_y=p_enable; + center_y = p_enable; _recreate_quadrants(); emit_signal("settings_changed"); - } bool TileMap::get_center_y() const { return center_y; } -void TileMap::_fix_cell_transform(Transform2D& xform,const Cell& p_cell, const Vector2& p_offset, const Size2 &p_sc) { +void TileMap::_fix_cell_transform(Transform2D &xform, const Cell &p_cell, const Vector2 &p_offset, const Size2 &p_sc) { - Size2 s=p_sc; + Size2 s = p_sc; Vector2 offset = p_offset; - - if (tile_origin==TILE_ORIGIN_BOTTOM_LEFT) - offset.y+=cell_size.y; + if (tile_origin == TILE_ORIGIN_BOTTOM_LEFT) + offset.y += cell_size.y; if (s.y > s.x) { if ((p_cell.flip_h && (p_cell.flip_v || p_cell.transpose)) || (p_cell.flip_v && !p_cell.transpose)) @@ -242,26 +230,25 @@ void TileMap::_fix_cell_transform(Transform2D& xform,const Cell& p_cell, const V SWAP(s.x, s.y); } if (p_cell.flip_h) { - xform.elements[0].x=-xform.elements[0].x; - xform.elements[1].x=-xform.elements[1].x; - if (tile_origin==TILE_ORIGIN_TOP_LEFT || tile_origin==TILE_ORIGIN_BOTTOM_LEFT) - offset.x=s.x-offset.x; + xform.elements[0].x = -xform.elements[0].x; + xform.elements[1].x = -xform.elements[1].x; + if (tile_origin == TILE_ORIGIN_TOP_LEFT || tile_origin == TILE_ORIGIN_BOTTOM_LEFT) + offset.x = s.x - offset.x; } if (p_cell.flip_v) { - xform.elements[0].y=-xform.elements[0].y; - xform.elements[1].y=-xform.elements[1].y; - if (tile_origin==TILE_ORIGIN_TOP_LEFT) - offset.y=s.y-offset.y; - else if (tile_origin==TILE_ORIGIN_BOTTOM_LEFT) { - if(p_cell.transpose) - offset.y+=s.y; + xform.elements[0].y = -xform.elements[0].y; + xform.elements[1].y = -xform.elements[1].y; + if (tile_origin == TILE_ORIGIN_TOP_LEFT) + offset.y = s.y - offset.y; + else if (tile_origin == TILE_ORIGIN_BOTTOM_LEFT) { + if (p_cell.transpose) + offset.y += s.y; else - offset.y-=s.y; + offset.y -= s.y; } } - xform.elements[2].x+=offset.x; - xform.elements[2].y+=offset.y; - + xform.elements[2].x += offset.x; + xform.elements[2].y += offset.y; } void TileMap::_update_dirty_quadrants() { @@ -276,26 +263,26 @@ void TileMap::_update_dirty_quadrants() { VisualServer *vs = VisualServer::get_singleton(); Physics2DServer *ps = Physics2DServer::get_singleton(); Vector2 tofs = get_cell_draw_offset(); - Vector2 tcenter = cell_size/2; + Vector2 tcenter = cell_size / 2; Transform2D nav_rel; if (navigation) nav_rel = get_relative_transform_to_parent(navigation); Vector2 qofs; - SceneTree *st=SceneTree::get_singleton(); + SceneTree *st = SceneTree::get_singleton(); Color debug_collision_color; bool debug_shapes = st && st->is_debugging_collisions_hint(); if (debug_shapes) { - debug_collision_color=st->get_debug_collisions_color(); + debug_collision_color = st->get_debug_collisions_color(); } while (dirty_quadrant_list.first()) { Quadrant &q = *dirty_quadrant_list.first()->self(); - for (List<RID>::Element *E=q.canvas_items.front();E;E=E->next()) { + for (List<RID>::Element *E = q.canvas_items.front(); E; E = E->next()) { vs->free(E->get()); } @@ -303,17 +290,17 @@ void TileMap::_update_dirty_quadrants() { q.canvas_items.clear(); ps->body_clear_shapes(q.body); - int shape_idx=0; + int shape_idx = 0; if (navigation) { - for(Map<PosKey,Quadrant::NavPoly>::Element *E=q.navpoly_ids.front();E;E=E->next()) { + for (Map<PosKey, Quadrant::NavPoly>::Element *E = q.navpoly_ids.front(); E; E = E->next()) { navigation->navpoly_remove(E->get().id); } q.navpoly_ids.clear(); } - for(Map<PosKey,Quadrant::Occluder>::Element *E=q.occluder_instances.front();E;E=E->next()) { + for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) { VS::get_singleton()->free(E->get().id); } q.occluder_instances.clear(); @@ -321,10 +308,10 @@ void TileMap::_update_dirty_quadrants() { RID prev_canvas_item; RID prev_debug_canvas_item; - for(int i=0;i<q.cells.size();i++) { + for (int i = 0; i < q.cells.size(); i++) { - Map<PosKey,Cell>::Element *E=tile_map.find( q.cells[i] ); - Cell &c=E->get(); + Map<PosKey, Cell>::Element *E = tile_map.find(q.cells[i]); + Cell &c = E->get(); //moment of truth if (!tile_set->has_tile(c.id)) continue; @@ -342,57 +329,55 @@ void TileMap::_update_dirty_quadrants() { RID canvas_item; RID debug_canvas_item; - if (prev_canvas_item==RID() || prev_material!=mat) { + if (prev_canvas_item == RID() || prev_material != mat) { - canvas_item=vs->canvas_item_create(); + canvas_item = vs->canvas_item_create(); if (mat.is_valid()) - vs->canvas_item_set_material(canvas_item,mat->get_rid()); - vs->canvas_item_set_parent( canvas_item, get_canvas_item() ); + vs->canvas_item_set_material(canvas_item, mat->get_rid()); + vs->canvas_item_set_parent(canvas_item, get_canvas_item()); Transform2D xform; - xform.set_origin( q.pos ); - vs->canvas_item_set_transform( canvas_item, xform ); - vs->canvas_item_set_light_mask(canvas_item,get_light_mask()); + xform.set_origin(q.pos); + vs->canvas_item_set_transform(canvas_item, xform); + vs->canvas_item_set_light_mask(canvas_item, get_light_mask()); q.canvas_items.push_back(canvas_item); if (debug_shapes) { - debug_canvas_item=vs->canvas_item_create(); - vs->canvas_item_set_parent( debug_canvas_item, canvas_item ); - vs->canvas_item_set_z_as_relative_to_parent(debug_canvas_item,false); - vs->canvas_item_set_z(debug_canvas_item,VS::CANVAS_ITEM_Z_MAX-1); + debug_canvas_item = vs->canvas_item_create(); + vs->canvas_item_set_parent(debug_canvas_item, canvas_item); + vs->canvas_item_set_z_as_relative_to_parent(debug_canvas_item, false); + vs->canvas_item_set_z(debug_canvas_item, VS::CANVAS_ITEM_Z_MAX - 1); q.canvas_items.push_back(debug_canvas_item); - prev_debug_canvas_item=debug_canvas_item; + prev_debug_canvas_item = debug_canvas_item; } - prev_canvas_item=canvas_item; - prev_material=mat; + prev_canvas_item = canvas_item; + prev_material = mat; } else { - canvas_item=prev_canvas_item; + canvas_item = prev_canvas_item; if (debug_shapes) { - debug_canvas_item=prev_debug_canvas_item; + debug_canvas_item = prev_debug_canvas_item; } } - - Rect2 r = tile_set->tile_get_region(c.id); Size2 s = tex->get_size(); - if (r==Rect2()) + if (r == Rect2()) s = tex->get_size(); else { s = r.size; - r.pos.x+=fp_adjust; - r.pos.y+=fp_adjust; - r.size.x-=fp_adjust*2.0; - r.size.y-=fp_adjust*2.0; + r.pos.x += fp_adjust; + r.pos.y += fp_adjust; + r.size.x -= fp_adjust * 2.0; + r.size.y -= fp_adjust * 2.0; } Rect2 rect; - rect.pos=offset.floor(); - rect.size=s; + rect.pos = offset.floor(); + rect.size = s; if (rect.size.y > rect.size.x) { if ((c.flip_h && (c.flip_v || c.transpose)) || (c.flip_v && !c.transpose)) @@ -402,75 +387,72 @@ void TileMap::_update_dirty_quadrants() { tile_ofs.x += rect.size.x - rect.size.y; } - /* rect.size.x+=fp_adjust; + /* rect.size.x+=fp_adjust; rect.size.y+=fp_adjust;*/ if (c.transpose) SWAP(tile_ofs.x, tile_ofs.y); if (c.flip_h) { - rect.size.x=-rect.size.x; - tile_ofs.x=-tile_ofs.x; + rect.size.x = -rect.size.x; + tile_ofs.x = -tile_ofs.x; } if (c.flip_v) { - rect.size.y=-rect.size.y; - tile_ofs.y=-tile_ofs.y; + rect.size.y = -rect.size.y; + tile_ofs.y = -tile_ofs.y; } Vector2 center_ofs; - if (tile_origin==TILE_ORIGIN_TOP_LEFT) { - rect.pos+=tile_ofs; - - } else if (tile_origin==TILE_ORIGIN_BOTTOM_LEFT) { - - rect.pos+=tile_ofs; - - if(c.transpose) - { - if(c.flip_h) - rect.pos.x-=cell_size.x; + if (tile_origin == TILE_ORIGIN_TOP_LEFT) { + rect.pos += tile_ofs; + + } else if (tile_origin == TILE_ORIGIN_BOTTOM_LEFT) { + + rect.pos += tile_ofs; + + if (c.transpose) { + if (c.flip_h) + rect.pos.x -= cell_size.x; else - rect.pos.x+=cell_size.x; + rect.pos.x += cell_size.x; } else { - if(c.flip_v) - rect.pos.y-=cell_size.y; + if (c.flip_v) + rect.pos.y -= cell_size.y; else - rect.pos.y+=cell_size.y; + rect.pos.y += cell_size.y; } - - } else if (tile_origin==TILE_ORIGIN_CENTER) { - rect.pos+=tcenter; - Vector2 center = (s/2) - tile_ofs; - center_ofs=tcenter-(s/2); + } else if (tile_origin == TILE_ORIGIN_CENTER) { + rect.pos += tcenter; + + Vector2 center = (s / 2) - tile_ofs; + center_ofs = tcenter - (s / 2); if (c.flip_h) - rect.pos.x-=s.x-center.x; + rect.pos.x -= s.x - center.x; else - rect.pos.x-=center.x; + rect.pos.x -= center.x; if (c.flip_v) - rect.pos.y-=s.y-center.y; + rect.pos.y -= s.y - center.y; else - rect.pos.y-=center.y; + rect.pos.y -= center.y; } - Color modulate = tile_set->tile_get_modulate(c.id); Color self_modulate = get_self_modulate(); - modulate = Color(modulate.r*self_modulate.r, modulate.g*self_modulate.g, - modulate.b*self_modulate.b, modulate.a*self_modulate.a); - if (r==Rect2()) { - tex->draw_rect(canvas_item,rect,false,modulate,c.transpose); + modulate = Color(modulate.r * self_modulate.r, modulate.g * self_modulate.g, + modulate.b * self_modulate.b, modulate.a * self_modulate.a); + if (r == Rect2()) { + tex->draw_rect(canvas_item, rect, false, modulate, c.transpose); } else { - tex->draw_rect_region(canvas_item,rect,r,modulate,c.transpose); + tex->draw_rect_region(canvas_item, rect, r, modulate, c.transpose); } - Vector< Ref<Shape2D> > shapes = tile_set->tile_get_shapes(c.id); - + Vector<Ref<Shape2D> > shapes = tile_set->tile_get_shapes(c.id); - for(int i=0;i<shapes.size();i++) { + for (int i = 0; i < shapes.size(); i++) { Ref<Shape2D> shape = shapes[i]; if (shape.is_valid()) { @@ -479,21 +461,19 @@ void TileMap::_update_dirty_quadrants() { Transform2D xform; xform.set_origin(offset.floor()); - _fix_cell_transform(xform,c,shape_ofs+center_ofs,s); + _fix_cell_transform(xform, c, shape_ofs + center_ofs, s); if (debug_canvas_item.is_valid()) { - vs->canvas_item_add_set_transform(debug_canvas_item,xform); - shape->draw(debug_canvas_item,debug_collision_color); - + vs->canvas_item_add_set_transform(debug_canvas_item, xform); + shape->draw(debug_canvas_item, debug_collision_color); } - ps->body_add_shape(q.body,shape->get_rid(),xform); - ps->body_set_shape_metadata(q.body,shape_idx++,Vector2(E->key().x,E->key().y)); - + ps->body_add_shape(q.body, shape->get_rid(), xform); + ps->body_set_shape_metadata(q.body, shape_idx++, Vector2(E->key().x, E->key().y)); } } if (debug_canvas_item.is_valid()) { - vs->canvas_item_add_set_transform(debug_canvas_item,Transform2D()); + vs->canvas_item_add_set_transform(debug_canvas_item, Transform2D()); } if (navigation) { @@ -501,145 +481,134 @@ void TileMap::_update_dirty_quadrants() { if (navpoly.is_valid()) { Vector2 npoly_ofs = tile_set->tile_get_navigation_polygon_offset(c.id); Transform2D xform; - xform.set_origin(offset.floor()+q.pos); - _fix_cell_transform(xform,c,npoly_ofs+center_ofs,s); + xform.set_origin(offset.floor() + q.pos); + _fix_cell_transform(xform, c, npoly_ofs + center_ofs, s); - - int pid = navigation->navpoly_create(navpoly,nav_rel * xform); + int pid = navigation->navpoly_create(navpoly, nav_rel * xform); Quadrant::NavPoly np; - np.id=pid; - np.xform=xform; - q.navpoly_ids[E->key()]=np; + np.id = pid; + np.xform = xform; + q.navpoly_ids[E->key()] = np; } } - - Ref<OccluderPolygon2D> occluder=tile_set->tile_get_light_occluder(c.id); + Ref<OccluderPolygon2D> occluder = tile_set->tile_get_light_occluder(c.id); if (occluder.is_valid()) { Vector2 occluder_ofs = tile_set->tile_get_occluder_offset(c.id); Transform2D xform; - xform.set_origin(offset.floor()+q.pos); - _fix_cell_transform(xform,c,occluder_ofs+center_ofs,s); + xform.set_origin(offset.floor() + q.pos); + _fix_cell_transform(xform, c, occluder_ofs + center_ofs, s); RID orid = VS::get_singleton()->canvas_light_occluder_create(); - VS::get_singleton()->canvas_light_occluder_set_transform(orid,get_global_transform() * xform); - VS::get_singleton()->canvas_light_occluder_set_polygon(orid,occluder->get_rid()); - VS::get_singleton()->canvas_light_occluder_attach_to_canvas(orid,get_canvas()); - VS::get_singleton()->canvas_light_occluder_set_light_mask(orid,occluder_light_mask); + VS::get_singleton()->canvas_light_occluder_set_transform(orid, get_global_transform() * xform); + VS::get_singleton()->canvas_light_occluder_set_polygon(orid, occluder->get_rid()); + VS::get_singleton()->canvas_light_occluder_attach_to_canvas(orid, get_canvas()); + VS::get_singleton()->canvas_light_occluder_set_light_mask(orid, occluder_light_mask); Quadrant::Occluder oc; - oc.xform=xform; - oc.id=orid; - q.occluder_instances[E->key()]=oc; + oc.xform = xform; + oc.id = orid; + q.occluder_instances[E->key()] = oc; } } - dirty_quadrant_list.remove( dirty_quadrant_list.first() ); - quadrant_order_dirty=true; + dirty_quadrant_list.remove(dirty_quadrant_list.first()); + quadrant_order_dirty = true; } - - - pending_update=false; + pending_update = false; if (quadrant_order_dirty) { - int index=-0x80000000; //always must be drawn below children - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + int index = -0x80000000; //always must be drawn below children + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - Quadrant &q=E->get(); - for (List<RID>::Element *E=q.canvas_items.front();E;E=E->next()) { + Quadrant &q = E->get(); + for (List<RID>::Element *E = q.canvas_items.front(); E; E = E->next()) { - VS::get_singleton()->canvas_item_set_draw_index(E->get(),index++); + VS::get_singleton()->canvas_item_set_draw_index(E->get(), index++); } } - quadrant_order_dirty=false; + quadrant_order_dirty = false; } _recompute_rect_cache(); - } void TileMap::_recompute_rect_cache() { - #ifdef DEBUG_ENABLED if (!rect_cache_dirty) return; Rect2 r_total; - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { - + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { Rect2 r; - r.pos=_map_to_world(E->key().x*_get_quadrant_size(), E->key().y*_get_quadrant_size()); - r.expand_to( _map_to_world(E->key().x*_get_quadrant_size()+_get_quadrant_size(), E->key().y*_get_quadrant_size()) ); - r.expand_to( _map_to_world(E->key().x*_get_quadrant_size()+_get_quadrant_size(), E->key().y*_get_quadrant_size()+_get_quadrant_size()) ); - r.expand_to( _map_to_world(E->key().x*_get_quadrant_size(), E->key().y*_get_quadrant_size()+_get_quadrant_size()) ); - if (E==quadrant_map.front()) - r_total=r; + r.pos = _map_to_world(E->key().x * _get_quadrant_size(), E->key().y * _get_quadrant_size()); + r.expand_to(_map_to_world(E->key().x * _get_quadrant_size() + _get_quadrant_size(), E->key().y * _get_quadrant_size())); + r.expand_to(_map_to_world(E->key().x * _get_quadrant_size() + _get_quadrant_size(), E->key().y * _get_quadrant_size() + _get_quadrant_size())); + r.expand_to(_map_to_world(E->key().x * _get_quadrant_size(), E->key().y * _get_quadrant_size() + _get_quadrant_size())); + if (E == quadrant_map.front()) + r_total = r; else - r_total=r_total.merge(r); - + r_total = r_total.merge(r); } - if (r_total==Rect2()) { - rect_cache=Rect2(-10,-10,20,20); + if (r_total == Rect2()) { + rect_cache = Rect2(-10, -10, 20, 20); } else { - rect_cache=r_total.grow(MAX(cell_size.x,cell_size.y)*_get_quadrant_size()); + rect_cache = r_total.grow(MAX(cell_size.x, cell_size.y) * _get_quadrant_size()); } item_rect_changed(); - rect_cache_dirty=false; + rect_cache_dirty = false; #endif - - } -Map<TileMap::PosKey,TileMap::Quadrant>::Element *TileMap::_create_quadrant(const PosKey& p_qk) { +Map<TileMap::PosKey, TileMap::Quadrant>::Element *TileMap::_create_quadrant(const PosKey &p_qk) { Transform2D xform; //xform.set_origin(Point2(p_qk.x,p_qk.y)*cell_size*quadrant_size); Quadrant q; - q.pos = _map_to_world(p_qk.x*_get_quadrant_size(),p_qk.y*_get_quadrant_size()); - q.pos+=get_cell_draw_offset(); - if (tile_origin==TILE_ORIGIN_CENTER) - q.pos+=cell_size/2; - else if (tile_origin==TILE_ORIGIN_BOTTOM_LEFT) - q.pos.y+=cell_size.y; - - - xform.set_origin( q.pos ); + q.pos = _map_to_world(p_qk.x * _get_quadrant_size(), p_qk.y * _get_quadrant_size()); + q.pos += get_cell_draw_offset(); + if (tile_origin == TILE_ORIGIN_CENTER) + q.pos += cell_size / 2; + else if (tile_origin == TILE_ORIGIN_BOTTOM_LEFT) + q.pos.y += cell_size.y; + + xform.set_origin(q.pos); //q.canvas_item = VisualServer::get_singleton()->canvas_item_create(); - q.body=Physics2DServer::get_singleton()->body_create(use_kinematic?Physics2DServer::BODY_MODE_KINEMATIC:Physics2DServer::BODY_MODE_STATIC); - Physics2DServer::get_singleton()->body_attach_object_instance_ID(q.body,get_instance_ID()); - Physics2DServer::get_singleton()->body_set_layer_mask(q.body,collision_layer); - Physics2DServer::get_singleton()->body_set_collision_mask(q.body,collision_mask); - Physics2DServer::get_singleton()->body_set_param(q.body,Physics2DServer::BODY_PARAM_FRICTION,friction); - Physics2DServer::get_singleton()->body_set_param(q.body,Physics2DServer::BODY_PARAM_BOUNCE,bounce); + q.body = Physics2DServer::get_singleton()->body_create(use_kinematic ? Physics2DServer::BODY_MODE_KINEMATIC : Physics2DServer::BODY_MODE_STATIC); + Physics2DServer::get_singleton()->body_attach_object_instance_ID(q.body, get_instance_ID()); + Physics2DServer::get_singleton()->body_set_layer_mask(q.body, collision_layer); + Physics2DServer::get_singleton()->body_set_collision_mask(q.body, collision_mask); + Physics2DServer::get_singleton()->body_set_param(q.body, Physics2DServer::BODY_PARAM_FRICTION, friction); + Physics2DServer::get_singleton()->body_set_param(q.body, Physics2DServer::BODY_PARAM_BOUNCE, bounce); if (is_inside_tree()) { xform = get_global_transform() * xform; RID space = get_world_2d()->get_space(); - Physics2DServer::get_singleton()->body_set_space(q.body,space); + Physics2DServer::get_singleton()->body_set_space(q.body, space); } - Physics2DServer::get_singleton()->body_set_state(q.body,Physics2DServer::BODY_STATE_TRANSFORM,xform); + Physics2DServer::get_singleton()->body_set_state(q.body, Physics2DServer::BODY_STATE_TRANSFORM, xform); - rect_cache_dirty=true; - quadrant_order_dirty=true; - return quadrant_map.insert(p_qk,q); + rect_cache_dirty = true; + quadrant_order_dirty = true; + return quadrant_map.insert(p_qk, q); } -void TileMap::_erase_quadrant(Map<PosKey,Quadrant>::Element *Q) { +void TileMap::_erase_quadrant(Map<PosKey, Quadrant>::Element *Q) { - Quadrant &q=Q->get(); + Quadrant &q = Q->get(); Physics2DServer::get_singleton()->free(q.body); - for (List<RID>::Element *E=q.canvas_items.front();E;E=E->next()) { + for (List<RID>::Element *E = q.canvas_items.front(); E; E = E->next()) { VisualServer::get_singleton()->free(E->get()); } @@ -648,58 +617,58 @@ void TileMap::_erase_quadrant(Map<PosKey,Quadrant>::Element *Q) { dirty_quadrant_list.remove(&q.dirty_list); if (navigation) { - for(Map<PosKey,Quadrant::NavPoly>::Element *E=q.navpoly_ids.front();E;E=E->next()) { + for (Map<PosKey, Quadrant::NavPoly>::Element *E = q.navpoly_ids.front(); E; E = E->next()) { navigation->navpoly_remove(E->get().id); } q.navpoly_ids.clear(); } - for(Map<PosKey,Quadrant::Occluder>::Element *E=q.occluder_instances.front();E;E=E->next()) { + for (Map<PosKey, Quadrant::Occluder>::Element *E = q.occluder_instances.front(); E; E = E->next()) { VS::get_singleton()->free(E->get().id); } q.occluder_instances.clear(); quadrant_map.erase(Q); - rect_cache_dirty=true; + rect_cache_dirty = true; } -void TileMap::_make_quadrant_dirty(Map<PosKey,Quadrant>::Element *Q) { +void TileMap::_make_quadrant_dirty(Map<PosKey, Quadrant>::Element *Q) { - Quadrant &q=Q->get(); + Quadrant &q = Q->get(); if (!q.dirty_list.in_list()) dirty_quadrant_list.add(&q.dirty_list); if (pending_update) return; - pending_update=true; + pending_update = true; if (!is_inside_tree()) return; call_deferred("_update_dirty_quadrants"); } -void TileMap::set_cellv(const Vector2& p_pos,int p_tile,bool p_flip_x,bool p_flip_y,bool p_transpose) { +void TileMap::set_cellv(const Vector2 &p_pos, int p_tile, bool p_flip_x, bool p_flip_y, bool p_transpose) { - set_cell(p_pos.x,p_pos.y,p_tile,p_flip_x,p_flip_y,p_transpose); + set_cell(p_pos.x, p_pos.y, p_tile, p_flip_x, p_flip_y, p_transpose); } -void TileMap::set_cell(int p_x,int p_y,int p_tile,bool p_flip_x,bool p_flip_y,bool p_transpose) { +void TileMap::set_cell(int p_x, int p_y, int p_tile, bool p_flip_x, bool p_flip_y, bool p_transpose) { - PosKey pk(p_x,p_y); + PosKey pk(p_x, p_y); - Map<PosKey,Cell>::Element *E=tile_map.find(pk); - if (!E && p_tile==INVALID_CELL) + Map<PosKey, Cell>::Element *E = tile_map.find(pk); + if (!E && p_tile == INVALID_CELL) return; //nothing to do - PosKey qk(p_x/_get_quadrant_size(),p_y/_get_quadrant_size()); - if (p_tile==INVALID_CELL) { + PosKey qk(p_x / _get_quadrant_size(), p_y / _get_quadrant_size()); + if (p_tile == INVALID_CELL) { //erase existing tile_map.erase(pk); - Map<PosKey,Quadrant>::Element *Q = quadrant_map.find(qk); + Map<PosKey, Quadrant>::Element *Q = quadrant_map.find(qk); ERR_FAIL_COND(!Q); - Quadrant &q=Q->get(); + Quadrant &q = Q->get(); q.cells.erase(pk); - if (q.cells.size()==0) + if (q.cells.size() == 0) _erase_quadrant(Q); else _make_quadrant_dirty(Q); @@ -707,79 +676,75 @@ void TileMap::set_cell(int p_x,int p_y,int p_tile,bool p_flip_x,bool p_flip_y,bo return; } - Map<PosKey,Quadrant>::Element *Q = quadrant_map.find(qk); + Map<PosKey, Quadrant>::Element *Q = quadrant_map.find(qk); if (!E) { - E=tile_map.insert(pk,Cell()); + E = tile_map.insert(pk, Cell()); if (!Q) { - Q=_create_quadrant(qk); + Q = _create_quadrant(qk); } - Quadrant &q=Q->get(); + Quadrant &q = Q->get(); q.cells.insert(pk); } else { ERR_FAIL_COND(!Q); // quadrant should exist... - if (E->get().id==p_tile && E->get().flip_h==p_flip_x && E->get().flip_v==p_flip_y && E->get().transpose==p_transpose) + if (E->get().id == p_tile && E->get().flip_h == p_flip_x && E->get().flip_v == p_flip_y && E->get().transpose == p_transpose) return; //nothing changed - } - Cell &c = E->get(); - c.id=p_tile; - c.flip_h=p_flip_x; - c.flip_v=p_flip_y; - c.transpose=p_transpose; + c.id = p_tile; + c.flip_h = p_flip_x; + c.flip_v = p_flip_y; + c.transpose = p_transpose; _make_quadrant_dirty(Q); - used_size_cache_dirty=true; - + used_size_cache_dirty = true; } -int TileMap::get_cellv(const Vector2& p_pos) const { - return get_cell(p_pos.x,p_pos.y); +int TileMap::get_cellv(const Vector2 &p_pos) const { + return get_cell(p_pos.x, p_pos.y); } -int TileMap::get_cell(int p_x,int p_y) const { +int TileMap::get_cell(int p_x, int p_y) const { - PosKey pk(p_x,p_y); + PosKey pk(p_x, p_y); - const Map<PosKey,Cell>::Element *E=tile_map.find(pk); + const Map<PosKey, Cell>::Element *E = tile_map.find(pk); if (!E) return INVALID_CELL; return E->get().id; - } -bool TileMap::is_cell_x_flipped(int p_x,int p_y) const { +bool TileMap::is_cell_x_flipped(int p_x, int p_y) const { - PosKey pk(p_x,p_y); + PosKey pk(p_x, p_y); - const Map<PosKey,Cell>::Element *E=tile_map.find(pk); + const Map<PosKey, Cell>::Element *E = tile_map.find(pk); if (!E) return false; return E->get().flip_h; } -bool TileMap::is_cell_y_flipped(int p_x,int p_y) const { +bool TileMap::is_cell_y_flipped(int p_x, int p_y) const { - PosKey pk(p_x,p_y); + PosKey pk(p_x, p_y); - const Map<PosKey,Cell>::Element *E=tile_map.find(pk); + const Map<PosKey, Cell>::Element *E = tile_map.find(pk); if (!E) return false; return E->get().flip_v; } -bool TileMap::is_cell_transposed(int p_x,int p_y) const { +bool TileMap::is_cell_transposed(int p_x, int p_y) const { - PosKey pk(p_x,p_y); + PosKey pk(p_x, p_y); - const Map<PosKey,Cell>::Element *E=tile_map.find(pk); + const Map<PosKey, Cell>::Element *E = tile_map.find(pk); if (!E) return false; @@ -787,34 +752,29 @@ bool TileMap::is_cell_transposed(int p_x,int p_y) const { return E->get().transpose; } - void TileMap::_recreate_quadrants() { _clear_quadrants(); - for (Map<PosKey,Cell>::Element *E=tile_map.front();E;E=E->next()) { + for (Map<PosKey, Cell>::Element *E = tile_map.front(); E; E = E->next()) { - PosKey qk(E->key().x/_get_quadrant_size(),E->key().y/_get_quadrant_size()); + PosKey qk(E->key().x / _get_quadrant_size(), E->key().y / _get_quadrant_size()); - Map<PosKey,Quadrant>::Element *Q=quadrant_map.find(qk); + Map<PosKey, Quadrant>::Element *Q = quadrant_map.find(qk); if (!Q) { - Q=_create_quadrant(qk); + Q = _create_quadrant(qk); dirty_quadrant_list.add(&Q->get().dirty_list); } Q->get().cells.insert(E->key()); _make_quadrant_dirty(Q); } - - - } - void TileMap::_clear_quadrants() { while (quadrant_map.size()) { - _erase_quadrant( quadrant_map.front() ); + _erase_quadrant(quadrant_map.front()); } } @@ -822,107 +782,101 @@ void TileMap::clear() { _clear_quadrants(); tile_map.clear(); - used_size_cache_dirty=true; + used_size_cache_dirty = true; } -void TileMap::_set_tile_data(const PoolVector<int>& p_data) { +void TileMap::_set_tile_data(const PoolVector<int> &p_data) { - int c=p_data.size(); + int c = p_data.size(); PoolVector<int>::Read r = p_data.read(); + for (int i = 0; i < c; i += 2) { - for(int i=0;i<c;i+=2) { - - const uint8_t *ptr=(const uint8_t*)&r[i]; + const uint8_t *ptr = (const uint8_t *)&r[i]; uint8_t local[8]; - for(int j=0;j<8;j++) - local[j]=ptr[j]; + for (int j = 0; j < 8; j++) + local[j] = ptr[j]; #ifdef BIG_ENDIAN_ENABLED - - SWAP(local[0],local[3]); - SWAP(local[1],local[2]); - SWAP(local[4],local[7]); - SWAP(local[5],local[6]); + SWAP(local[0], local[3]); + SWAP(local[1], local[2]); + SWAP(local[4], local[7]); + SWAP(local[5], local[6]); #endif int16_t x = decode_uint16(&local[0]); int16_t y = decode_uint16(&local[2]); uint32_t v = decode_uint32(&local[4]); - bool flip_h = v&(1<<29); - bool flip_v = v&(1<<30); - bool transpose = v&(1<<31); - v&=(1<<29)-1; + bool flip_h = v & (1 << 29); + bool flip_v = v & (1 << 30); + bool transpose = v & (1 << 31); + v &= (1 << 29) - 1; /* if (x<-20 || y <-20 || x>4000 || y>4000) continue; */ - set_cell(x,y,v,flip_h,flip_v,transpose); - + set_cell(x, y, v, flip_h, flip_v, transpose); } - } PoolVector<int> TileMap::_get_tile_data() const { PoolVector<int> data; - data.resize(tile_map.size()*2); + data.resize(tile_map.size() * 2); PoolVector<int>::Write w = data.write(); - int idx=0; - for(const Map<PosKey,Cell>::Element *E=tile_map.front();E;E=E->next()) { + int idx = 0; + for (const Map<PosKey, Cell>::Element *E = tile_map.front(); E; E = E->next()) { - uint8_t *ptr = (uint8_t*)&w[idx]; - encode_uint16(E->key().x,&ptr[0]); - encode_uint16(E->key().y,&ptr[2]); + uint8_t *ptr = (uint8_t *)&w[idx]; + encode_uint16(E->key().x, &ptr[0]); + encode_uint16(E->key().y, &ptr[2]); uint32_t val = E->get().id; if (E->get().flip_h) - val|=(1<<29); + val |= (1 << 29); if (E->get().flip_v) - val|=(1<<30); + val |= (1 << 30); if (E->get().transpose) - val|=(1<<31); + val |= (1 << 31); - encode_uint32(val,&ptr[4]); - idx+=2; + encode_uint32(val, &ptr[4]); + idx += 2; } - w = PoolVector<int>::Write(); return data; - } Rect2 TileMap::get_item_rect() const { - const_cast<TileMap*>(this)->_update_dirty_quadrants(); + const_cast<TileMap *>(this)->_update_dirty_quadrants(); return rect_cache; } void TileMap::set_collision_layer(uint32_t p_layer) { - collision_layer=p_layer; - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + collision_layer = p_layer; + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - Quadrant &q=E->get(); - Physics2DServer::get_singleton()->body_set_layer_mask(q.body,collision_layer); + Quadrant &q = E->get(); + Physics2DServer::get_singleton()->body_set_layer_mask(q.body, collision_layer); } } void TileMap::set_collision_mask(uint32_t p_mask) { - collision_mask=p_mask; - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + collision_mask = p_mask; + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - Quadrant &q=E->get(); - Physics2DServer::get_singleton()->body_set_collision_mask(q.body,collision_mask); + Quadrant &q = E->get(); + Physics2DServer::get_singleton()->body_set_collision_mask(q.body, collision_mask); } } -bool TileMap::get_collision_use_kinematic() const{ +bool TileMap::get_collision_use_kinematic() const { return use_kinematic; } @@ -930,42 +884,39 @@ bool TileMap::get_collision_use_kinematic() const{ void TileMap::set_collision_use_kinematic(bool p_use_kinematic) { _clear_quadrants(); - use_kinematic=p_use_kinematic; + use_kinematic = p_use_kinematic; _recreate_quadrants(); } void TileMap::set_collision_friction(float p_friction) { - friction=p_friction; - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + friction = p_friction; + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - Quadrant &q=E->get(); - Physics2DServer::get_singleton()->body_set_param(q.body,Physics2DServer::BODY_PARAM_FRICTION,p_friction); + Quadrant &q = E->get(); + Physics2DServer::get_singleton()->body_set_param(q.body, Physics2DServer::BODY_PARAM_FRICTION, p_friction); } - } -float TileMap::get_collision_friction() const{ +float TileMap::get_collision_friction() const { return friction; } -void TileMap::set_collision_bounce(float p_bounce){ +void TileMap::set_collision_bounce(float p_bounce) { - bounce=p_bounce; - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + bounce = p_bounce; + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - Quadrant &q=E->get(); - Physics2DServer::get_singleton()->body_set_param(q.body,Physics2DServer::BODY_PARAM_BOUNCE,p_bounce); + Quadrant &q = E->get(); + Physics2DServer::get_singleton()->body_set_param(q.body, Physics2DServer::BODY_PARAM_BOUNCE, p_bounce); } - } -float TileMap::get_collision_bounce() const{ +float TileMap::get_collision_bounce() const { return bounce; } - uint32_t TileMap::get_collision_layer() const { return collision_layer; @@ -979,7 +930,7 @@ uint32_t TileMap::get_collision_mask() const { void TileMap::set_mode(Mode p_mode) { _clear_quadrants(); - mode=p_mode; + mode = p_mode; _recreate_quadrants(); emit_signal("settings_changed"); } @@ -991,7 +942,7 @@ TileMap::Mode TileMap::get_mode() const { void TileMap::set_half_offset(HalfOffset p_half_offset) { _clear_quadrants(); - half_offset=p_half_offset; + half_offset = p_half_offset; _recreate_quadrants(); emit_signal("settings_changed"); } @@ -999,20 +950,19 @@ void TileMap::set_half_offset(HalfOffset p_half_offset) { void TileMap::set_tile_origin(TileOrigin p_tile_origin) { _clear_quadrants(); - tile_origin=p_tile_origin; + tile_origin = p_tile_origin; _recreate_quadrants(); emit_signal("settings_changed"); } -TileMap::TileOrigin TileMap::get_tile_origin() const{ +TileMap::TileOrigin TileMap::get_tile_origin() const { return tile_origin; } - Vector2 TileMap::get_cell_draw_offset() const { - switch(mode) { + switch (mode) { case MODE_SQUARE: { @@ -1020,22 +970,21 @@ Vector2 TileMap::get_cell_draw_offset() const { } break; case MODE_ISOMETRIC: { - return Vector2(-cell_size.x*0.5,0); + return Vector2(-cell_size.x * 0.5, 0); } break; case MODE_CUSTOM: { Vector2 min; - min.x = MIN(custom_transform[0].x,min.x); - min.y = MIN(custom_transform[0].y,min.y); - min.x = MIN(custom_transform[1].x,min.x); - min.y = MIN(custom_transform[1].y,min.y); + min.x = MIN(custom_transform[0].x, min.x); + min.y = MIN(custom_transform[0].y, min.y); + min.x = MIN(custom_transform[1].x, min.x); + min.y = MIN(custom_transform[1].y, min.y); return min; } break; } return Vector2(); - } TileMap::HalfOffset TileMap::get_half_offset() const { @@ -1044,13 +993,13 @@ TileMap::HalfOffset TileMap::get_half_offset() const { Transform2D TileMap::get_cell_transform() const { - switch(mode) { + switch (mode) { case MODE_SQUARE: { Transform2D m; - m[0]*=cell_size.x; - m[1]*=cell_size.y; + m[0] *= cell_size.x; + m[1] *= cell_size.y; return m; } break; case MODE_ISOMETRIC: { @@ -1058,8 +1007,8 @@ Transform2D TileMap::get_cell_transform() const { //isometric only makes sense when y is positive in both x and y vectors, otherwise //the drawing of tiles will overlap Transform2D m; - m[0]=Vector2(cell_size.x*0.5,cell_size.y*0.5); - m[1]=Vector2(-cell_size.x*0.5,cell_size.y*0.5); + m[0] = Vector2(cell_size.x * 0.5, cell_size.y * 0.5); + m[1] = Vector2(-cell_size.x * 0.5, cell_size.y * 0.5); return m; } break; @@ -1072,35 +1021,34 @@ Transform2D TileMap::get_cell_transform() const { return Transform2D(); } -void TileMap::set_custom_transform(const Transform2D& p_xform) { +void TileMap::set_custom_transform(const Transform2D &p_xform) { _clear_quadrants(); - custom_transform=p_xform; + custom_transform = p_xform; _recreate_quadrants(); emit_signal("settings_changed"); - } -Transform2D TileMap::get_custom_transform() const{ +Transform2D TileMap::get_custom_transform() const { return custom_transform; } -Vector2 TileMap::_map_to_world(int x,int y,bool p_ignore_ofs) const { +Vector2 TileMap::_map_to_world(int x, int y, bool p_ignore_ofs) const { - Vector2 ret = get_cell_transform().xform(Vector2(x,y)); + Vector2 ret = get_cell_transform().xform(Vector2(x, y)); if (!p_ignore_ofs) { - switch(half_offset) { + switch (half_offset) { case HALF_OFFSET_X: { - if (ABS(y)&1) { + if (ABS(y) & 1) { - ret+=get_cell_transform()[0]*0.5; + ret += get_cell_transform()[0] * 0.5; } } break; case HALF_OFFSET_Y: { - if (ABS(x)&1) { - ret+=get_cell_transform()[1]*0.5; + if (ABS(x) & 1) { + ret += get_cell_transform()[1] * 0.5; } } break; default: {} @@ -1108,25 +1056,24 @@ Vector2 TileMap::_map_to_world(int x,int y,bool p_ignore_ofs) const { } return ret; } -Vector2 TileMap::map_to_world(const Vector2& p_pos,bool p_ignore_ofs) const { +Vector2 TileMap::map_to_world(const Vector2 &p_pos, bool p_ignore_ofs) const { - return _map_to_world(p_pos.x,p_pos.y,p_ignore_ofs); + return _map_to_world(p_pos.x, p_pos.y, p_ignore_ofs); } -Vector2 TileMap::world_to_map(const Vector2& p_pos) const{ +Vector2 TileMap::world_to_map(const Vector2 &p_pos) const { Vector2 ret = get_cell_transform().affine_inverse().xform(p_pos); - - switch(half_offset) { + switch (half_offset) { case HALF_OFFSET_X: { - if ( ret.y > 0 ? int(ret.y)&1 : (int(ret.y)-1)&1 ) { - ret.x-=0.5; + if (ret.y > 0 ? int(ret.y) & 1 : (int(ret.y) - 1) & 1) { + ret.x -= 0.5; } } break; case HALF_OFFSET_Y: { - if ( ret.x > 0 ? int(ret.x)&1 : (int(ret.x)-1)&1) { - ret.y-=0.5; + if (ret.x > 0 ? int(ret.x) & 1 : (int(ret.x) - 1) & 1) { + ret.y -= 0.5; } } break; default: {} @@ -1138,11 +1085,10 @@ Vector2 TileMap::world_to_map(const Vector2& p_pos) const{ void TileMap::set_y_sort_mode(bool p_enable) { _clear_quadrants(); - y_sort_mode=p_enable; - VS::get_singleton()->canvas_item_set_sort_children_by_y(get_canvas_item(),y_sort_mode); + y_sort_mode = p_enable; + VS::get_singleton()->canvas_item_set_sort_children_by_y(get_canvas_item(), y_sort_mode); _recreate_quadrants(); emit_signal("settings_changed"); - } bool TileMap::is_y_sort_mode_enabled() const { @@ -1154,11 +1100,11 @@ Array TileMap::get_used_cells() const { Array a; a.resize(tile_map.size()); - int i=0; - for (Map<PosKey,Cell>::Element *E=tile_map.front();E;E=E->next()) { + int i = 0; + for (Map<PosKey, Cell>::Element *E = tile_map.front(); E; E = E->next()) { - Vector2 p (E->key().x,E->key().y); - a[i++]=p; + Vector2 p(E->key().x, E->key().y); + a[i++] = p; } return a; @@ -1167,14 +1113,14 @@ Array TileMap::get_used_cells() const { Rect2 TileMap::get_used_rect() { // Not const because of cache if (used_size_cache_dirty) { - if(tile_map.size() > 0) { + if (tile_map.size() > 0) { used_size_cache = Rect2(tile_map.front()->key().x, tile_map.front()->key().y, 0, 0); - for (Map<PosKey,Cell>::Element *E=tile_map.front();E;E=E->next()) { + for (Map<PosKey, Cell>::Element *E = tile_map.front(); E; E = E->next()) { used_size_cache.expand_to(Vector2(E->key().x, E->key().y)); } - used_size_cache.size += Vector2(1,1); + used_size_cache.size += Vector2(1, 1); } else { used_size_cache = Rect2(); } @@ -1185,19 +1131,18 @@ Rect2 TileMap::get_used_rect() { // Not const because of cache return used_size_cache; } - void TileMap::set_occluder_light_mask(int p_mask) { - occluder_light_mask=p_mask; - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + occluder_light_mask = p_mask; + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - for (Map<PosKey,Quadrant::Occluder>::Element *F=E->get().occluder_instances.front();F;F=F->next()) { - VisualServer::get_singleton()->canvas_light_occluder_set_light_mask(F->get().id,occluder_light_mask); + for (Map<PosKey, Quadrant::Occluder>::Element *F = E->get().occluder_instances.front(); F; F = F->next()) { + VisualServer::get_singleton()->canvas_light_occluder_set_light_mask(F->get().id, occluder_light_mask); } } } -int TileMap::get_occluder_light_mask() const{ +int TileMap::get_occluder_light_mask() const { return occluder_light_mask; } @@ -1205,154 +1150,150 @@ int TileMap::get_occluder_light_mask() const{ void TileMap::set_light_mask(int p_light_mask) { CanvasItem::set_light_mask(p_light_mask); - for (Map<PosKey,Quadrant>::Element *E=quadrant_map.front();E;E=E->next()) { + for (Map<PosKey, Quadrant>::Element *E = quadrant_map.front(); E; E = E->next()) { - for (List<RID>::Element *F=E->get().canvas_items.front();F;F=F->next()) { - VisualServer::get_singleton()->canvas_item_set_light_mask(F->get(),get_light_mask()); + for (List<RID>::Element *F = E->get().canvas_items.front(); F; F = F->next()) { + VisualServer::get_singleton()->canvas_item_set_light_mask(F->get(), get_light_mask()); } } } void TileMap::_bind_methods() { + ClassDB::bind_method(D_METHOD("set_tileset", "tileset:TileSet"), &TileMap::set_tileset); + ClassDB::bind_method(D_METHOD("get_tileset:TileSet"), &TileMap::get_tileset); - ClassDB::bind_method(D_METHOD("set_tileset","tileset:TileSet"),&TileMap::set_tileset); - ClassDB::bind_method(D_METHOD("get_tileset:TileSet"),&TileMap::get_tileset); - - ClassDB::bind_method(D_METHOD("set_mode","mode"),&TileMap::set_mode); - ClassDB::bind_method(D_METHOD("get_mode"),&TileMap::get_mode); + ClassDB::bind_method(D_METHOD("set_mode", "mode"), &TileMap::set_mode); + ClassDB::bind_method(D_METHOD("get_mode"), &TileMap::get_mode); - ClassDB::bind_method(D_METHOD("set_half_offset","half_offset"),&TileMap::set_half_offset); - ClassDB::bind_method(D_METHOD("get_half_offset"),&TileMap::get_half_offset); + ClassDB::bind_method(D_METHOD("set_half_offset", "half_offset"), &TileMap::set_half_offset); + ClassDB::bind_method(D_METHOD("get_half_offset"), &TileMap::get_half_offset); - ClassDB::bind_method(D_METHOD("set_custom_transform","custom_transform"),&TileMap::set_custom_transform); - ClassDB::bind_method(D_METHOD("get_custom_transform"),&TileMap::get_custom_transform); + ClassDB::bind_method(D_METHOD("set_custom_transform", "custom_transform"), &TileMap::set_custom_transform); + ClassDB::bind_method(D_METHOD("get_custom_transform"), &TileMap::get_custom_transform); - ClassDB::bind_method(D_METHOD("set_cell_size","size"),&TileMap::set_cell_size); - ClassDB::bind_method(D_METHOD("get_cell_size"),&TileMap::get_cell_size); + ClassDB::bind_method(D_METHOD("set_cell_size", "size"), &TileMap::set_cell_size); + ClassDB::bind_method(D_METHOD("get_cell_size"), &TileMap::get_cell_size); - ClassDB::bind_method(D_METHOD("_set_old_cell_size","size"),&TileMap::_set_old_cell_size); - ClassDB::bind_method(D_METHOD("_get_old_cell_size"),&TileMap::_get_old_cell_size); + ClassDB::bind_method(D_METHOD("_set_old_cell_size", "size"), &TileMap::_set_old_cell_size); + ClassDB::bind_method(D_METHOD("_get_old_cell_size"), &TileMap::_get_old_cell_size); - ClassDB::bind_method(D_METHOD("set_quadrant_size","size"),&TileMap::set_quadrant_size); - ClassDB::bind_method(D_METHOD("get_quadrant_size"),&TileMap::get_quadrant_size); + ClassDB::bind_method(D_METHOD("set_quadrant_size", "size"), &TileMap::set_quadrant_size); + ClassDB::bind_method(D_METHOD("get_quadrant_size"), &TileMap::get_quadrant_size); - ClassDB::bind_method(D_METHOD("set_tile_origin","origin"),&TileMap::set_tile_origin); - ClassDB::bind_method(D_METHOD("get_tile_origin"),&TileMap::get_tile_origin); + ClassDB::bind_method(D_METHOD("set_tile_origin", "origin"), &TileMap::set_tile_origin); + ClassDB::bind_method(D_METHOD("get_tile_origin"), &TileMap::get_tile_origin); - ClassDB::bind_method(D_METHOD("set_center_x","enable"),&TileMap::set_center_x); - ClassDB::bind_method(D_METHOD("get_center_x"),&TileMap::get_center_x); + ClassDB::bind_method(D_METHOD("set_center_x", "enable"), &TileMap::set_center_x); + ClassDB::bind_method(D_METHOD("get_center_x"), &TileMap::get_center_x); - ClassDB::bind_method(D_METHOD("set_center_y","enable"),&TileMap::set_center_y); - ClassDB::bind_method(D_METHOD("get_center_y"),&TileMap::get_center_y); + ClassDB::bind_method(D_METHOD("set_center_y", "enable"), &TileMap::set_center_y); + ClassDB::bind_method(D_METHOD("get_center_y"), &TileMap::get_center_y); - ClassDB::bind_method(D_METHOD("set_y_sort_mode","enable"),&TileMap::set_y_sort_mode); - ClassDB::bind_method(D_METHOD("is_y_sort_mode_enabled"),&TileMap::is_y_sort_mode_enabled); + ClassDB::bind_method(D_METHOD("set_y_sort_mode", "enable"), &TileMap::set_y_sort_mode); + ClassDB::bind_method(D_METHOD("is_y_sort_mode_enabled"), &TileMap::is_y_sort_mode_enabled); - ClassDB::bind_method(D_METHOD("set_collision_use_kinematic","use_kinematic"),&TileMap::set_collision_use_kinematic); - ClassDB::bind_method(D_METHOD("get_collision_use_kinematic"),&TileMap::get_collision_use_kinematic); + ClassDB::bind_method(D_METHOD("set_collision_use_kinematic", "use_kinematic"), &TileMap::set_collision_use_kinematic); + ClassDB::bind_method(D_METHOD("get_collision_use_kinematic"), &TileMap::get_collision_use_kinematic); - ClassDB::bind_method(D_METHOD("set_collision_layer","mask"),&TileMap::set_collision_layer); - ClassDB::bind_method(D_METHOD("get_collision_layer"),&TileMap::get_collision_layer); + ClassDB::bind_method(D_METHOD("set_collision_layer", "mask"), &TileMap::set_collision_layer); + ClassDB::bind_method(D_METHOD("get_collision_layer"), &TileMap::get_collision_layer); - ClassDB::bind_method(D_METHOD("set_collision_mask","mask"),&TileMap::set_collision_mask); - ClassDB::bind_method(D_METHOD("get_collision_mask"),&TileMap::get_collision_mask); + ClassDB::bind_method(D_METHOD("set_collision_mask", "mask"), &TileMap::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"), &TileMap::get_collision_mask); - ClassDB::bind_method(D_METHOD("set_collision_friction","value"),&TileMap::set_collision_friction); - ClassDB::bind_method(D_METHOD("get_collision_friction"),&TileMap::get_collision_friction); + ClassDB::bind_method(D_METHOD("set_collision_friction", "value"), &TileMap::set_collision_friction); + ClassDB::bind_method(D_METHOD("get_collision_friction"), &TileMap::get_collision_friction); - ClassDB::bind_method(D_METHOD("set_collision_bounce","value"),&TileMap::set_collision_bounce); - ClassDB::bind_method(D_METHOD("get_collision_bounce"),&TileMap::get_collision_bounce); + ClassDB::bind_method(D_METHOD("set_collision_bounce", "value"), &TileMap::set_collision_bounce); + ClassDB::bind_method(D_METHOD("get_collision_bounce"), &TileMap::get_collision_bounce); - ClassDB::bind_method(D_METHOD("set_occluder_light_mask","mask"),&TileMap::set_occluder_light_mask); - ClassDB::bind_method(D_METHOD("get_occluder_light_mask"),&TileMap::get_occluder_light_mask); + ClassDB::bind_method(D_METHOD("set_occluder_light_mask", "mask"), &TileMap::set_occluder_light_mask); + ClassDB::bind_method(D_METHOD("get_occluder_light_mask"), &TileMap::get_occluder_light_mask); - ClassDB::bind_method(D_METHOD("set_cell","x","y","tile","flip_x","flip_y","transpose"),&TileMap::set_cell,DEFVAL(false),DEFVAL(false),DEFVAL(false)); - ClassDB::bind_method(D_METHOD("set_cellv","pos","tile","flip_x","flip_y","transpose"),&TileMap::set_cellv,DEFVAL(false),DEFVAL(false),DEFVAL(false)); - ClassDB::bind_method(D_METHOD("get_cell","x","y"),&TileMap::get_cell); - ClassDB::bind_method(D_METHOD("get_cellv","pos"),&TileMap::get_cellv); - ClassDB::bind_method(D_METHOD("is_cell_x_flipped","x","y"),&TileMap::is_cell_x_flipped); - ClassDB::bind_method(D_METHOD("is_cell_y_flipped","x","y"),&TileMap::is_cell_y_flipped); - ClassDB::bind_method(D_METHOD("is_cell_transposed","x","y"),&TileMap::is_cell_transposed); + ClassDB::bind_method(D_METHOD("set_cell", "x", "y", "tile", "flip_x", "flip_y", "transpose"), &TileMap::set_cell, DEFVAL(false), DEFVAL(false), DEFVAL(false)); + ClassDB::bind_method(D_METHOD("set_cellv", "pos", "tile", "flip_x", "flip_y", "transpose"), &TileMap::set_cellv, DEFVAL(false), DEFVAL(false), DEFVAL(false)); + ClassDB::bind_method(D_METHOD("get_cell", "x", "y"), &TileMap::get_cell); + ClassDB::bind_method(D_METHOD("get_cellv", "pos"), &TileMap::get_cellv); + ClassDB::bind_method(D_METHOD("is_cell_x_flipped", "x", "y"), &TileMap::is_cell_x_flipped); + ClassDB::bind_method(D_METHOD("is_cell_y_flipped", "x", "y"), &TileMap::is_cell_y_flipped); + ClassDB::bind_method(D_METHOD("is_cell_transposed", "x", "y"), &TileMap::is_cell_transposed); - ClassDB::bind_method(D_METHOD("clear"),&TileMap::clear); + ClassDB::bind_method(D_METHOD("clear"), &TileMap::clear); - ClassDB::bind_method(D_METHOD("get_used_cells"),&TileMap::get_used_cells); - ClassDB::bind_method(D_METHOD("get_used_rect"),&TileMap::get_used_rect); + ClassDB::bind_method(D_METHOD("get_used_cells"), &TileMap::get_used_cells); + ClassDB::bind_method(D_METHOD("get_used_rect"), &TileMap::get_used_rect); - ClassDB::bind_method(D_METHOD("map_to_world","mappos","ignore_half_ofs"),&TileMap::map_to_world,DEFVAL(false)); - ClassDB::bind_method(D_METHOD("world_to_map","worldpos"),&TileMap::world_to_map); + ClassDB::bind_method(D_METHOD("map_to_world", "mappos", "ignore_half_ofs"), &TileMap::map_to_world, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("world_to_map", "worldpos"), &TileMap::world_to_map); - ClassDB::bind_method(D_METHOD("_clear_quadrants"),&TileMap::_clear_quadrants); - ClassDB::bind_method(D_METHOD("_recreate_quadrants"),&TileMap::_recreate_quadrants); - ClassDB::bind_method(D_METHOD("_update_dirty_quadrants"),&TileMap::_update_dirty_quadrants); + ClassDB::bind_method(D_METHOD("_clear_quadrants"), &TileMap::_clear_quadrants); + ClassDB::bind_method(D_METHOD("_recreate_quadrants"), &TileMap::_recreate_quadrants); + ClassDB::bind_method(D_METHOD("_update_dirty_quadrants"), &TileMap::_update_dirty_quadrants); - ClassDB::bind_method(D_METHOD("_set_tile_data"),&TileMap::_set_tile_data); - ClassDB::bind_method(D_METHOD("_get_tile_data"),&TileMap::_get_tile_data); + ClassDB::bind_method(D_METHOD("_set_tile_data"), &TileMap::_set_tile_data); + ClassDB::bind_method(D_METHOD("_get_tile_data"), &TileMap::_get_tile_data); - ADD_PROPERTY( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Square,Isometric,Custom"),"set_mode","get_mode"); - ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"tile_set",PROPERTY_HINT_RESOURCE_TYPE,"TileSet"),"set_tileset","get_tileset"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "mode", PROPERTY_HINT_ENUM, "Square,Isometric,Custom"), "set_mode", "get_mode"); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tile_set", PROPERTY_HINT_RESOURCE_TYPE, "TileSet"), "set_tileset", "get_tileset"); - ADD_GROUP("Cell","cell_"); - ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"cell_size",PROPERTY_HINT_RANGE,"1,8192,1"),"set_cell_size","get_cell_size"); - ADD_PROPERTY( PropertyInfo(Variant::INT,"cell_quadrant_size",PROPERTY_HINT_RANGE,"1,128,1"),"set_quadrant_size","get_quadrant_size"); - ADD_PROPERTY( PropertyInfo(Variant::TRANSFORM2D,"cell_custom_transform"),"set_custom_transform","get_custom_transform"); - ADD_PROPERTY( PropertyInfo(Variant::INT,"cell_half_offset",PROPERTY_HINT_ENUM,"Offset X,Offset Y,Disabled"),"set_half_offset","get_half_offset"); - ADD_PROPERTY( PropertyInfo(Variant::INT,"cell_tile_origin",PROPERTY_HINT_ENUM,"Top Left,Center,Bottom Left"),"set_tile_origin","get_tile_origin"); - ADD_PROPERTY( PropertyInfo(Variant::BOOL,"cell_y_sort"),"set_y_sort_mode","is_y_sort_mode_enabled"); + ADD_GROUP("Cell", "cell_"); + ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "cell_size", PROPERTY_HINT_RANGE, "1,8192,1"), "set_cell_size", "get_cell_size"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "cell_quadrant_size", PROPERTY_HINT_RANGE, "1,128,1"), "set_quadrant_size", "get_quadrant_size"); + ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM2D, "cell_custom_transform"), "set_custom_transform", "get_custom_transform"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "cell_half_offset", PROPERTY_HINT_ENUM, "Offset X,Offset Y,Disabled"), "set_half_offset", "get_half_offset"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "cell_tile_origin", PROPERTY_HINT_ENUM, "Top Left,Center,Bottom Left"), "set_tile_origin", "get_tile_origin"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "cell_y_sort"), "set_y_sort_mode", "is_y_sort_mode_enabled"); - ADD_GROUP("Collision","collision_"); - ADD_PROPERTY( PropertyInfo(Variant::BOOL,"collision_use_kinematic",PROPERTY_HINT_NONE,""),"set_collision_use_kinematic","get_collision_use_kinematic"); - ADD_PROPERTY( PropertyInfo(Variant::REAL,"collision_friction",PROPERTY_HINT_RANGE,"0,1,0.01"),"set_collision_friction","get_collision_friction"); - ADD_PROPERTY( PropertyInfo(Variant::REAL,"collision_bounce",PROPERTY_HINT_RANGE,"0,1,0.01"),"set_collision_bounce","get_collision_bounce"); - ADD_PROPERTY( PropertyInfo(Variant::INT,"collision_layers",PROPERTY_HINT_LAYERS_2D_PHYSICS),"set_collision_layer","get_collision_layer"); - ADD_PROPERTY( PropertyInfo(Variant::INT,"collision_mask",PROPERTY_HINT_LAYERS_2D_PHYSICS),"set_collision_mask","get_collision_mask"); + ADD_GROUP("Collision", "collision_"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "collision_use_kinematic", PROPERTY_HINT_NONE, ""), "set_collision_use_kinematic", "get_collision_use_kinematic"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "collision_friction", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_collision_friction", "get_collision_friction"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "collision_bounce", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_collision_bounce", "get_collision_bounce"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_layers", PROPERTY_HINT_LAYERS_2D_PHYSICS), "set_collision_layer", "get_collision_layer"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_2D_PHYSICS), "set_collision_mask", "get_collision_mask"); - ADD_GROUP("Occluder","occluder_"); - ADD_PROPERTY( PropertyInfo(Variant::INT,"occluder_light_mask",PROPERTY_HINT_LAYERS_2D_RENDER),"set_occluder_light_mask","get_occluder_light_mask"); - ADD_GROUP("",""); - ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"tile_data",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_NOEDITOR),"_set_tile_data","_get_tile_data"); + ADD_GROUP("Occluder", "occluder_"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "occluder_light_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_occluder_light_mask", "get_occluder_light_mask"); + ADD_GROUP("", ""); + ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tile_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "_set_tile_data", "_get_tile_data"); ADD_SIGNAL(MethodInfo("settings_changed")); - BIND_CONSTANT( INVALID_CELL ); - BIND_CONSTANT( MODE_SQUARE ); - BIND_CONSTANT( MODE_ISOMETRIC ); - BIND_CONSTANT( MODE_CUSTOM ); - BIND_CONSTANT( HALF_OFFSET_X ); - BIND_CONSTANT( HALF_OFFSET_Y ); - BIND_CONSTANT( HALF_OFFSET_DISABLED ); - BIND_CONSTANT( TILE_ORIGIN_TOP_LEFT ); - BIND_CONSTANT( TILE_ORIGIN_CENTER ); - BIND_CONSTANT( TILE_ORIGIN_BOTTOM_LEFT ); - + BIND_CONSTANT(INVALID_CELL); + BIND_CONSTANT(MODE_SQUARE); + BIND_CONSTANT(MODE_ISOMETRIC); + BIND_CONSTANT(MODE_CUSTOM); + BIND_CONSTANT(HALF_OFFSET_X); + BIND_CONSTANT(HALF_OFFSET_Y); + BIND_CONSTANT(HALF_OFFSET_DISABLED); + BIND_CONSTANT(TILE_ORIGIN_TOP_LEFT); + BIND_CONSTANT(TILE_ORIGIN_CENTER); + BIND_CONSTANT(TILE_ORIGIN_BOTTOM_LEFT); } TileMap::TileMap() { - - - rect_cache_dirty=true; - used_size_cache_dirty=true; - pending_update=false; - quadrant_order_dirty=false; - quadrant_size=16; - cell_size=Size2(64,64); - center_x=false; - center_y=false; - collision_layer=1; - collision_mask=1; - friction=1; - bounce=0; - mode=MODE_SQUARE; - half_offset=HALF_OFFSET_DISABLED; - use_kinematic=false; - navigation=NULL; - y_sort_mode=false; - occluder_light_mask=1; - - fp_adjust=0.00001; - tile_origin=TILE_ORIGIN_TOP_LEFT; + rect_cache_dirty = true; + used_size_cache_dirty = true; + pending_update = false; + quadrant_order_dirty = false; + quadrant_size = 16; + cell_size = Size2(64, 64); + center_x = false; + center_y = false; + collision_layer = 1; + collision_mask = 1; + friction = 1; + bounce = 0; + mode = MODE_SQUARE; + half_offset = HALF_OFFSET_DISABLED; + use_kinematic = false; + navigation = NULL; + y_sort_mode = false; + occluder_light_mask = 1; + + fp_adjust = 0.00001; + tile_origin = TILE_ORIGIN_TOP_LEFT; set_notify_transform(true); } |