diff options
Diffstat (limited to 'modules/gridmap/grid_map.cpp')
| -rw-r--r-- | modules/gridmap/grid_map.cpp | 940 |
1 files changed, 247 insertions, 693 deletions
diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index f241a96e58..1b932f040e 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ @@ -46,7 +46,13 @@ bool GridMap::_set(const StringName &p_name, const Variant &p_value) { set_theme(p_value); } else if (name == "cell_size") { - set_cell_size(p_value); + if (p_value.get_type() == Variant::INT || p_value.get_type() == Variant::REAL) { + //compatibility + float cs = p_value; + set_cell_size(Vector3(cs, cs, cs)); + } else { + set_cell_size(p_value); + } } else if (name == "cell_octant_size") { set_octant_size(p_value); } else if (name == "cell_center_x") { @@ -96,25 +102,6 @@ bool GridMap::_set(const StringName &p_name, const Variant &p_value) { } _recreate_octant_data(); - } else if (name.begins_with("areas/")) { - int which = name.get_slicec('/', 1).to_int(); - String what = name.get_slicec('/', 2); - if (what == "bounds") { - ERR_FAIL_COND_V(area_map.has(which), false); - create_area(which, p_value); - return true; - } - - ERR_FAIL_COND_V(!area_map.has(which), false); - - if (what == "name") - area_set_name(which, p_value); - else if (what == "disable_distance") - area_set_portal_disable_distance(which, p_value); - else if (what == "exterior_portal") - area_set_portal_disable_color(which, p_value); - else - return false; } else return false; @@ -158,19 +145,6 @@ bool GridMap::_get(const StringName &p_name, Variant &r_ret) const { d["cells"] = cells; r_ret = d; - } else if (name.begins_with("areas/")) { - int which = name.get_slicec('/', 1).to_int(); - String what = name.get_slicec('/', 2); - if (what == "bounds") - r_ret = area_get_bounds(which); - else if (what == "name") - r_ret = area_get_name(which); - else if (what == "disable_distance") - r_ret = area_get_portal_disable_distance(which); - else if (what == "exterior_portal") - r_ret = area_is_exterior_portal(which); - else - return false; } else return false; @@ -181,7 +155,7 @@ void GridMap::_get_property_list(List<PropertyInfo> *p_list) const { p_list->push_back(PropertyInfo(Variant::OBJECT, "theme", PROPERTY_HINT_RESOURCE_TYPE, "MeshLibrary")); p_list->push_back(PropertyInfo(Variant::NIL, "Cell", PROPERTY_HINT_NONE, "cell_", PROPERTY_USAGE_GROUP)); - p_list->push_back(PropertyInfo(Variant::REAL, "cell_size", PROPERTY_HINT_RANGE, "0.01,16384,0.01")); + p_list->push_back(PropertyInfo(Variant::VECTOR3, "cell_size")); p_list->push_back(PropertyInfo(Variant::INT, "cell_octant_size", PROPERTY_HINT_RANGE, "1,1024,1")); p_list->push_back(PropertyInfo(Variant::BOOL, "cell_center_x")); p_list->push_back(PropertyInfo(Variant::BOOL, "cell_center_y")); @@ -189,16 +163,6 @@ void GridMap::_get_property_list(List<PropertyInfo> *p_list) const { p_list->push_back(PropertyInfo(Variant::REAL, "cell_scale")); p_list->push_back(PropertyInfo(Variant::DICTIONARY, "data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE)); - - for (const Map<int, Area *>::Element *E = area_map.front(); E; E = E->next()) { - - String base = "areas/" + itos(E->key()) + "/"; - p_list->push_back(PropertyInfo(Variant::RECT3, base + "bounds", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE)); - p_list->push_back(PropertyInfo(Variant::STRING, base + "name", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE)); - p_list->push_back(PropertyInfo(Variant::REAL, base + "disable_distance", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE)); - p_list->push_back(PropertyInfo(Variant::COLOR, base + "disable_color", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE)); - p_list->push_back(PropertyInfo(Variant::BOOL, base + "exterior_portal", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_STORAGE)); - } } void GridMap::set_theme(const Ref<MeshLibrary> &p_theme) { @@ -218,12 +182,13 @@ Ref<MeshLibrary> GridMap::get_theme() const { return theme; } -void GridMap::set_cell_size(float p_size) { +void GridMap::set_cell_size(const Vector3 &p_size) { + ERR_FAIL_COND(p_size.x < 0.001 || p_size.y < 0.001 || p_size.z < 0.001); cell_size = p_size; _recreate_octant_data(); } -float GridMap::get_cell_size() const { +Vector3 GridMap::get_cell_size() const { return cell_size; } @@ -268,20 +233,6 @@ bool GridMap::get_center_z() const { return center_z; } -int GridMap::_find_area(const IndexKey &p_pos) const { - - for (const Map<int, Area *>::Element *E = area_map.front(); E; E = E->next()) { - //this should somehow be faster... - const Area &a = *E->get(); - if (p_pos.x >= a.from.x && p_pos.x < a.to.x && - p_pos.y >= a.from.y && p_pos.y < a.to.y && - p_pos.z >= a.from.z && p_pos.z < a.to.z) { - return E->key(); - } - } - - return 0; -} void GridMap::set_cell_item(int p_x, int p_y, int p_z, int p_item, int p_rot) { ERR_FAIL_INDEX(ABS(p_x), 1 << 20); @@ -297,58 +248,30 @@ void GridMap::set_cell_item(int p_x, int p_y, int p_z, int p_item, int p_rot) { ok.x = p_x / octant_size; ok.y = p_y / octant_size; ok.z = p_z / octant_size; - ok.area = _find_area(key); - - if (cell_map.has(key)) { - - int prev_item = cell_map[key].item; - OctantKey octantkey = ok; - - ERR_FAIL_COND(!octant_map.has(octantkey)); - Octant &g = *octant_map[octantkey]; - ERR_FAIL_COND(!g.items.has(prev_item)); - ERR_FAIL_COND(!g.items[prev_item].cells.has(key)); - - g.items[prev_item].cells.erase(key); - if (g.items[prev_item].cells.size() == 0) { - VS::get_singleton()->free(g.items[prev_item].multimesh_instance); - g.items.erase(prev_item); - } - if (g.items.empty()) { - - PhysicsServer::get_singleton()->free(g.static_body); - if (g.collision_debug.is_valid()) { - PhysicsServer::get_singleton()->free(g.collision_debug); - PhysicsServer::get_singleton()->free(g.collision_debug_instance); - } - - memdelete(&g); - octant_map.erase(octantkey); - } else { + if (p_item < 0) { + //erase + if (cell_map.has(key)) { + OctantKey octantkey = ok; + ERR_FAIL_COND(!octant_map.has(octantkey)); + Octant &g = *octant_map[octantkey]; + g.cells.erase(key); g.dirty = true; + cell_map.erase(key); + _queue_octants_dirty(); } - cell_map.erase(key); - - _queue_dirty_map(); - } - - if (p_item < 0) return; + } OctantKey octantkey = ok; - //add later if (!octant_map.has(octantkey)) { - + //create octant because it does not exist Octant *g = memnew(Octant); g->dirty = true; g->static_body = PhysicsServer::get_singleton()->body_create(PhysicsServer::BODY_MODE_STATIC); PhysicsServer::get_singleton()->body_attach_object_instance_id(g->static_body, get_instance_id()); - if (is_inside_world()) - PhysicsServer::get_singleton()->body_set_space(g->static_body, get_world()->get_space()); - SceneTree *st = SceneTree::get_singleton(); if (st && st->is_debugging_collisions_hint()) { @@ -356,45 +279,26 @@ void GridMap::set_cell_item(int p_x, int p_y, int p_z, int p_item, int p_rot) { g->collision_debug = VisualServer::get_singleton()->mesh_create(); g->collision_debug_instance = VisualServer::get_singleton()->instance_create(); VisualServer::get_singleton()->instance_set_base(g->collision_debug_instance, g->collision_debug); - if (is_inside_world()) { - VisualServer::get_singleton()->instance_set_scenario(g->collision_debug_instance, get_world()->get_scenario()); - VisualServer::get_singleton()->instance_set_transform(g->collision_debug_instance, get_global_transform()); - } } octant_map[octantkey] = g; - } - - Octant &g = *octant_map[octantkey]; - if (!g.items.has(p_item)) { - Octant::ItemInstances ii; - if (theme.is_valid() && theme->has_item(p_item)) { - ii.mesh = theme->get_item_mesh(p_item); - ii.shape = theme->get_item_shape(p_item); - ii.navmesh = theme->get_item_navmesh(p_item); + if (is_inside_world()) { + _octant_enter_world(octantkey); + _octant_transform(octantkey); } - ii.multimesh = Ref<MultiMesh>(memnew(MultiMesh)); - ii.multimesh->set_color_format(MultiMesh::COLOR_NONE); - ii.multimesh->set_transform_format(MultiMesh::TRANSFORM_3D); - ii.multimesh->set_mesh(ii.mesh); - ii.multimesh_instance = VS::get_singleton()->instance_create(); - VS::get_singleton()->instance_set_base(ii.multimesh_instance, ii.multimesh->get_rid()); - VS::get_singleton()->instance_geometry_set_flag(ii.multimesh_instance, VS::INSTANCE_FLAG_USE_BAKED_LIGHT, true); - - g.items[p_item] = ii; } - Octant::ItemInstances &ii = g.items[p_item]; - ii.cells.insert(key); + Octant &g = *octant_map[octantkey]; + g.cells.insert(key); g.dirty = true; + _queue_octants_dirty(); - _queue_dirty_map(); - - cell_map[key] = Cell(); - Cell &c = cell_map[key]; + Cell c; c.item = p_item; c.rot = p_rot; + + cell_map[key] = c; } int GridMap::get_cell_item(int p_x, int p_y, int p_z) const { @@ -429,122 +333,57 @@ int GridMap::get_cell_item_orientation(int p_x, int p_y, int p_z) const { return cell_map[key].rot; } -void GridMap::_octant_enter_tree(const OctantKey &p_key) { - ERR_FAIL_COND(!octant_map.has(p_key)); - if (navigation) { - Octant &g = *octant_map[p_key]; - - Vector3 ofs(cell_size * 0.5 * int(center_x), cell_size * 0.5 * int(center_y), cell_size * 0.5 * int(center_z)); - _octant_clear_navmesh(p_key); - - for (Map<int, Octant::ItemInstances>::Element *E = g.items.front(); E; E = E->next()) { - Octant::ItemInstances &ii = E->get(); - - for (Set<IndexKey>::Element *F = ii.cells.front(); F; F = F->next()) { - - IndexKey ik = F->get(); - Map<IndexKey, Cell>::Element *C = cell_map.find(ik); - ERR_CONTINUE(!C); - - Vector3 cellpos = Vector3(ik.x, ik.y, ik.z); - - Transform xform; - - if (clip && ((clip_above && cellpos[clip_axis] > clip_floor) || (!clip_above && cellpos[clip_axis] < clip_floor))) { - - xform.basis.set_zero(); - - } else { - - xform.basis.set_orthogonal_index(C->get().rot); - } - - xform.set_origin(cellpos * cell_size + ofs); - xform.basis.scale(Vector3(cell_scale, cell_scale, cell_scale)); - // add the item's navmesh at given xform to GridMap's Navigation ancestor - if (ii.navmesh.is_valid()) { - int nm_id = navigation->navmesh_create(ii.navmesh, xform, this); - Octant::NavMesh nm; - nm.id = nm_id; - nm.xform = xform; - g.navmesh_ids[ik] = nm; - } - } - } - } -} - -void GridMap::_octant_enter_world(const OctantKey &p_key) { +void GridMap::_octant_transform(const OctantKey &p_key) { ERR_FAIL_COND(!octant_map.has(p_key)); Octant &g = *octant_map[p_key]; PhysicsServer::get_singleton()->body_set_state(g.static_body, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform()); - PhysicsServer::get_singleton()->body_set_space(g.static_body, get_world()->get_space()); - //print_line("BODYPOS: "+get_global_transform()); if (g.collision_debug_instance.is_valid()) { - VS::get_singleton()->instance_set_scenario(g.collision_debug_instance, get_world()->get_scenario()); VS::get_singleton()->instance_set_transform(g.collision_debug_instance, get_global_transform()); - if (area_map.has(p_key.area)) { - VS::get_singleton()->instance_set_room(g.collision_debug_instance, area_map[p_key.area]->instance); - } } - for (Map<int, Octant::ItemInstances>::Element *E = g.items.front(); E; E = E->next()) { - - VS::get_singleton()->instance_set_scenario(E->get().multimesh_instance, get_world()->get_scenario()); - VS::get_singleton()->instance_set_transform(E->get().multimesh_instance, get_global_transform()); - //print_line("INSTANCEPOS: "+get_global_transform()); - if (area_map.has(p_key.area)) { - VS::get_singleton()->instance_set_room(E->get().multimesh_instance, area_map[p_key.area]->instance); - } + for (int i = 0; i < g.multimesh_instances.size(); i++) { + VS::get_singleton()->instance_set_transform(g.multimesh_instances[i].instance, get_global_transform()); } } -void GridMap::_octant_transform(const OctantKey &p_key) { - - ERR_FAIL_COND(!octant_map.has(p_key)); +bool GridMap::_octant_update(const OctantKey &p_key) { + ERR_FAIL_COND_V(!octant_map.has(p_key), false); Octant &g = *octant_map[p_key]; - PhysicsServer::get_singleton()->body_set_state(g.static_body, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform()); + if (!g.dirty) + return false; - if (g.collision_debug_instance.is_valid()) { - VS::get_singleton()->instance_set_transform(g.collision_debug_instance, get_global_transform()); - } + //erase body shapes + PhysicsServer::get_singleton()->body_clear_shapes(g.static_body); - for (Map<int, Octant::ItemInstances>::Element *E = g.items.front(); E; E = E->next()) { + //erase body shapes debug + if (g.collision_debug.is_valid()) { - VS::get_singleton()->instance_set_transform(E->get().multimesh_instance, get_global_transform()); - //print_line("UPDATEPOS: "+get_global_transform()); + VS::get_singleton()->mesh_clear(g.collision_debug); } -} -void GridMap::_octant_clear_navmesh(const OctantKey &p_key) { - Octant &g = *octant_map[p_key]; + //erase navigation if (navigation) { for (Map<IndexKey, Octant::NavMesh>::Element *E = g.navmesh_ids.front(); E; E = E->next()) { - Octant::NavMesh *nvm = &E->get(); - if (nvm && nvm->id) { - navigation->navmesh_remove(E->get().id); - } + navigation->navmesh_remove(E->get().id); } g.navmesh_ids.clear(); } -} -void GridMap::_octant_update(const OctantKey &p_key) { - ERR_FAIL_COND(!octant_map.has(p_key)); - Octant &g = *octant_map[p_key]; - if (!g.dirty) - return; - - Ref<Mesh> mesh; + //erase multimeshes - _octant_clear_navmesh(p_key); - PhysicsServer::get_singleton()->body_clear_shapes(g.static_body); + for (int i = 0; i < g.multimesh_instances.size(); i++) { - if (g.collision_debug.is_valid()) { + VS::get_singleton()->free(g.multimesh_instances[i].instance); + VS::get_singleton()->free(g.multimesh_instances[i].multimesh); + } + g.multimesh_instances.clear(); - VS::get_singleton()->mesh_clear(g.collision_debug); + if (g.cells.size() == 0) { + //octant no longer needed + _octant_clean_up(p_key); + return true; } PoolVector<Vector3> col_debug; @@ -554,80 +393,111 @@ void GridMap::_octant_update(const OctantKey &p_key) { * set item's multimesh's instance count to number of cells which have this item * and set said multimesh bounding box to one containing all cells which have this item */ - for (Map<int, Octant::ItemInstances>::Element *E = g.items.front(); E; E = E->next()) { - Octant::ItemInstances &ii = E->get(); + Map<int, List<Pair<Transform, IndexKey> > > multimesh_items; + + print_line("updating octant " + itos(p_key.x) + ", " + itos(p_key.y) + ", " + itos(p_key.z) + " cells: " + itos(g.cells.size())); - ii.multimesh->set_instance_count(ii.cells.size()); + for (Set<IndexKey>::Element *E = g.cells.front(); E; E = E->next()) { - Rect3 aabb; - Rect3 mesh_aabb = ii.mesh.is_null() ? Rect3() : ii.mesh->get_aabb(); + ERR_CONTINUE(!cell_map.has(E->get())); + const Cell &c = cell_map[E->get()]; - Vector3 ofs(cell_size * 0.5 * int(center_x), cell_size * 0.5 * int(center_y), cell_size * 0.5 * int(center_z)); + if (!theme.is_valid() || !theme->has_item(c.item)) + continue; //print_line("OCTANT, CELLS: "+itos(ii.cells.size())); - int idx = 0; - // foreach cell containing this item type - for (Set<IndexKey>::Element *F = ii.cells.front(); F; F = F->next()) { - IndexKey ik = F->get(); - Map<IndexKey, Cell>::Element *C = cell_map.find(ik); - ERR_CONTINUE(!C); - Vector3 cellpos = Vector3(ik.x, ik.y, ik.z); + Vector3 cellpos = Vector3(E->get().x, E->get().y, E->get().z); + Vector3 ofs(cell_size.x * 0.5 * int(center_x), cell_size.y * 0.5 * int(center_y), cell_size.z * 0.5 * int(center_z)); - Transform xform; + Transform xform; - if (clip && ((clip_above && cellpos[clip_axis] > clip_floor) || (!clip_above && cellpos[clip_axis] < clip_floor))) { + if (clip && ((clip_above && cellpos[clip_axis] > clip_floor) || (!clip_above && cellpos[clip_axis] < clip_floor))) { - xform.basis.set_zero(); + } else { + } - } else { + xform.basis.set_orthogonal_index(c.rot); + xform.set_origin(cellpos * cell_size + ofs); + xform.basis.scale(Vector3(cell_scale, cell_scale, cell_scale)); - xform.basis.set_orthogonal_index(C->get().rot); + if (theme->get_item_mesh(c.item).is_valid()) { + if (!multimesh_items.has(c.item)) { + multimesh_items[c.item] = List<Pair<Transform, IndexKey> >(); } - xform.set_origin(cellpos * cell_size + ofs); - xform.basis.scale(Vector3(cell_scale, cell_scale, cell_scale)); + Pair<Transform, IndexKey> p; + p.first = xform; + p.second = E->get(); + multimesh_items[c.item].push_back(p); + } - ii.multimesh->set_instance_transform(idx, xform); - //ii.multimesh->set_instance_transform(idx,Transform() ); - //ii.multimesh->set_instance_color(idx,Color(1,1,1,1)); - //print_line("MMINST: "+xform); + Vector<MeshLibrary::ShapeData> shapes = theme->get_item_shapes(c.item); + // add the item's shape at given xform to octant's static_body + for (int i = 0; i < shapes.size(); i++) { + // add the item's shape + if (!shapes[i].shape.is_valid()) + continue; + PhysicsServer::get_singleton()->body_add_shape(g.static_body, shapes[i].shape->get_rid(), xform * shapes[i].local_transform); + if (g.collision_debug.is_valid()) { + shapes[i].shape->add_vertices_to_array(col_debug, xform * shapes[i].local_transform); + } + + //print_line("PHIS x: "+xform); + } - if (idx == 0) { + // add the item's navmesh at given xform to GridMap's Navigation ancestor + Ref<NavigationMesh> navmesh = theme->get_item_navmesh(c.item); + if (navmesh.is_valid()) { + Octant::NavMesh nm; + nm.xform = xform; - aabb = xform.xform(mesh_aabb); + if (navigation) { + nm.id = navigation->navmesh_create(navmesh, xform, this); } else { - - aabb.merge_with(xform.xform(mesh_aabb)); + nm.id = -1; } + g.navmesh_ids[E->get()] = nm; + } + } - // add the item's shape at given xform to octant's static_body - if (ii.shape.is_valid()) { - // add the item's shape - PhysicsServer::get_singleton()->body_add_shape(g.static_body, ii.shape->get_rid(), xform); - if (g.collision_debug.is_valid()) { - ii.shape->add_vertices_to_array(col_debug, xform); - } + //update multimeshes + for (Map<int, List<Pair<Transform, IndexKey> > >::Element *E = multimesh_items.front(); E; E = E->next()) { + print_line("multimesh item " + itos(E->key()) + " transforms " + itos(E->get().size())); + Octant::MultimeshInstance mmi; - //print_line("PHIS x: "+xform); - } + RID mm = VS::get_singleton()->multimesh_create(); + VS::get_singleton()->multimesh_allocate(mm, E->get().size(), VS::MULTIMESH_TRANSFORM_3D, VS::MULTIMESH_COLOR_NONE); + VS::get_singleton()->multimesh_set_mesh(mm, theme->get_item_mesh(E->key())->get_rid()); - // add the item's navmesh at given xform to GridMap's Navigation ancestor - if (navigation) { - if (ii.navmesh.is_valid()) { - int nm_id = navigation->navmesh_create(ii.navmesh, xform, this); - Octant::NavMesh nm; - nm.id = nm_id; - nm.xform = xform; - g.navmesh_ids[ik] = nm; - } - } + int idx = 0; + for (List<Pair<Transform, IndexKey> >::Element *F = E->get().front(); F; F = F->next()) { + VS::get_singleton()->multimesh_instance_set_transform(mm, idx, F->get().first); +#ifdef TOOLS_ENABLED + + Octant::MultimeshInstance::Item it; + it.index = idx; + it.transform = F->get().first; + it.key = F->get().second; + mmi.items.push_back(it); +#endif idx++; } - //ii.multimesh->set_aabb(aabb); + RID instance = VS::get_singleton()->instance_create(); + VS::get_singleton()->instance_set_base(instance, mm); + + if (is_inside_tree()) { + VS::get_singleton()->instance_set_scenario(instance, get_world()->get_scenario()); + VS::get_singleton()->instance_set_transform(instance, get_global_transform()); + } + + mmi.multimesh = mm; + mmi.instance = instance; + + g.multimesh_instances.push_back(mmi); } if (col_debug.size()) { @@ -644,6 +514,39 @@ void GridMap::_octant_update(const OctantKey &p_key) { } g.dirty = false; + + return false; +} + +void GridMap::_octant_enter_world(const OctantKey &p_key) { + + ERR_FAIL_COND(!octant_map.has(p_key)); + Octant &g = *octant_map[p_key]; + PhysicsServer::get_singleton()->body_set_state(g.static_body, PhysicsServer::BODY_STATE_TRANSFORM, get_global_transform()); + PhysicsServer::get_singleton()->body_set_space(g.static_body, get_world()->get_space()); + //print_line("BODYPOS: "+get_global_transform()); + + if (g.collision_debug_instance.is_valid()) { + VS::get_singleton()->instance_set_scenario(g.collision_debug_instance, get_world()->get_scenario()); + VS::get_singleton()->instance_set_transform(g.collision_debug_instance, get_global_transform()); + } + + for (int i = 0; i < g.multimesh_instances.size(); i++) { + VS::get_singleton()->instance_set_scenario(g.multimesh_instances[i].instance, get_world()->get_scenario()); + VS::get_singleton()->instance_set_transform(g.multimesh_instances[i].instance, get_global_transform()); + } + + if (navigation && theme.is_valid()) { + for (Map<IndexKey, Octant::NavMesh>::Element *F = g.navmesh_ids.front(); F; F = F->next()) { + + if (cell_map.has(F->key()) && F->get().id < 0) { + Ref<NavigationMesh> nm = theme->get_item_navmesh(cell_map[F->key()].item); + if (nm.is_valid()) { + F->get().id = navigation->navmesh_create(nm, F->get().xform, this); + } + } + } + } } void GridMap::_octant_exit_world(const OctantKey &p_key) { @@ -655,16 +558,52 @@ void GridMap::_octant_exit_world(const OctantKey &p_key) { if (g.collision_debug_instance.is_valid()) { - VS::get_singleton()->instance_set_room(g.collision_debug_instance, RID()); VS::get_singleton()->instance_set_scenario(g.collision_debug_instance, RID()); } - for (Map<int, Octant::ItemInstances>::Element *E = g.items.front(); E; E = E->next()) { + for (int i = 0; i < g.multimesh_instances.size(); i++) { + VS::get_singleton()->instance_set_scenario(g.multimesh_instances[i].instance, RID()); + } + + if (navigation) { + for (Map<IndexKey, Octant::NavMesh>::Element *F = g.navmesh_ids.front(); F; F = F->next()) { + + if (F->get().id >= 0) { + navigation->navmesh_remove(F->get().id); + F->get().id = -1; + } + } + } +} + +void GridMap::_octant_clean_up(const OctantKey &p_key) { + + ERR_FAIL_COND(!octant_map.has(p_key)); + Octant &g = *octant_map[p_key]; + + if (g.collision_debug.is_valid()) + VS::get_singleton()->free(g.collision_debug); + if (g.collision_debug_instance.is_valid()) + VS::get_singleton()->free(g.collision_debug_instance); + + PhysicsServer::get_singleton()->free(g.static_body); + + //erase navigation + if (navigation) { + for (Map<IndexKey, Octant::NavMesh>::Element *E = g.navmesh_ids.front(); E; E = E->next()) { + navigation->navmesh_remove(E->get().id); + } + g.navmesh_ids.clear(); + } + + //erase multimeshes + + for (int i = 0; i < g.multimesh_instances.size(); i++) { - VS::get_singleton()->instance_set_scenario(E->get().multimesh_instance, RID()); - //VS::get_singleton()->instance_set_transform(E->get().multimesh_instance,get_global_transform()); - VS::get_singleton()->instance_set_room(E->get().multimesh_instance, RID()); + VS::get_singleton()->free(g.multimesh_instances[i].instance); + VS::get_singleton()->free(g.multimesh_instances[i].multimesh); } + g.multimesh_instances.clear(); } void GridMap::_notification(int p_what) { @@ -673,19 +612,22 @@ void GridMap::_notification(int p_what) { case NOTIFICATION_ENTER_WORLD: { - _update_area_instances(); + Spatial *c = this; + while (c) { + navigation = Object::cast_to<Navigation>(c); + if (navigation) { + break; + } + + c = Object::cast_to<Spatial>(c->get_parent()); + } + + last_transform = get_global_transform(); for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) { - //IndexKey ik; - //ik.key = E->key().indexkey; _octant_enter_world(E->key()); - _octant_update(E->key()); } - awaiting_update = false; - - last_transform = get_global_transform(); - } break; case NOTIFICATION_TRANSFORM_CHANGED: { @@ -706,104 +648,47 @@ void GridMap::_notification(int p_what) { _octant_exit_world(E->key()); } - //_queue_dirty_map(MAP_DIRTY_INSTANCES|MAP_DIRTY_TRANSFORMS); - //_update_dirty_map_callback(); - //_update_area_instances(); - - } break; - case NOTIFICATION_ENTER_TREE: { - - Spatial *c = this; - while (c) { - navigation = c->cast_to<Navigation>(); - if (navigation) { - break; - } - - c = c->get_parent()->cast_to<Spatial>(); - } - - if (navigation) { - for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) { - if (navigation) { - _octant_enter_tree(E->key()); - } - } - } - - _queue_dirty_map(); - } break; - case NOTIFICATION_EXIT_TREE: { - for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) { - if (navigation) { - _octant_clear_navmesh(E->key()); - } - } - navigation = NULL; + //_queue_octants_dirty(MAP_DIRTY_INSTANCES|MAP_DIRTY_TRANSFORMS); + //_update_octants_callback(); + //_update_area_instances(); + } break; } } -void GridMap::_queue_dirty_map() { +void GridMap::_queue_octants_dirty() { if (awaiting_update) return; - if (is_inside_world()) { - - MessageQueue::get_singleton()->push_call(this, "_update_dirty_map_callback"); - awaiting_update = true; - } + MessageQueue::get_singleton()->push_call(this, "_update_octants_callback"); + awaiting_update = true; } void GridMap::_recreate_octant_data() { Map<IndexKey, Cell> cell_copy = cell_map; - _clear_internal(true); + _clear_internal(); for (Map<IndexKey, Cell>::Element *E = cell_copy.front(); E; E = E->next()) { set_cell_item(E->key().x, E->key().y, E->key().z, E->get().item, E->get().rot); } } -void GridMap::_clear_internal(bool p_keep_areas) { +void GridMap::_clear_internal() { for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) { if (is_inside_world()) _octant_exit_world(E->key()); - for (Map<int, Octant::ItemInstances>::Element *F = E->get()->items.front(); F; F = F->next()) { - - VS::get_singleton()->free(F->get().multimesh_instance); - } - - if (E->get()->collision_debug.is_valid()) - VS::get_singleton()->free(E->get()->collision_debug); - if (E->get()->collision_debug_instance.is_valid()) - VS::get_singleton()->free(E->get()->collision_debug_instance); - - PhysicsServer::get_singleton()->free(E->get()->static_body); + _octant_clean_up(E->key()); memdelete(E->get()); } octant_map.clear(); cell_map.clear(); - - if (p_keep_areas) - return; - - for (Map<int, Area *>::Element *E = area_map.front(); E; E = E->next()) { - - VS::get_singleton()->free(E->get()->base_portal); - VS::get_singleton()->free(E->get()->instance); - for (int i = 0; i < E->get()->portals.size(); i++) { - VS::get_singleton()->free(E->get()->portals[i].instance); - } - - memdelete(E->get()); - } } void GridMap::clear() { @@ -816,13 +701,23 @@ void GridMap::resource_changed(const RES &p_res) { _recreate_octant_data(); } -void GridMap::_update_dirty_map_callback() { +void GridMap::_update_octants_callback() { if (!awaiting_update) return; + List<OctantKey> to_delete; for (Map<OctantKey, Octant *>::Element *E = octant_map.front(); E; E = E->next()) { - _octant_update(E->key()); + + if (_octant_update(E->key())) { + to_delete.push_back(E->key()); + } + } + + while (to_delete.front()) { + memdelete(octant_map[to_delete.front()->get()]); + octant_map.erase(to_delete.front()->get()); + to_delete.pop_back(); } awaiting_update = false; @@ -844,7 +739,7 @@ void GridMap::_bind_methods() { ClassDB::bind_method(D_METHOD("get_cell_item_orientation", "x", "y", "z"), &GridMap::get_cell_item_orientation); //ClassDB::bind_method(D_METHOD("_recreate_octants"),&GridMap::_recreate_octants); - ClassDB::bind_method(D_METHOD("_update_dirty_map_callback"), &GridMap::_update_dirty_map_callback); + ClassDB::bind_method(D_METHOD("_update_octants_callback"), &GridMap::_update_octants_callback); ClassDB::bind_method(D_METHOD("resource_changed", "resource"), &GridMap::resource_changed); ClassDB::bind_method(D_METHOD("set_center_x", "enable"), &GridMap::set_center_x); @@ -856,19 +751,6 @@ void GridMap::_bind_methods() { ClassDB::bind_method(D_METHOD("set_clip", "enabled", "clipabove", "floor", "axis"), &GridMap::set_clip, DEFVAL(true), DEFVAL(0), DEFVAL(Vector3::AXIS_X)); - ClassDB::bind_method(D_METHOD("create_area", "id", "area"), &GridMap::create_area); - ClassDB::bind_method(D_METHOD("area_get_bounds", "area"), &GridMap::area_get_bounds); - ClassDB::bind_method(D_METHOD("area_set_exterior_portal", "area", "enable"), &GridMap::area_set_exterior_portal); - ClassDB::bind_method(D_METHOD("area_set_name", "area", "name"), &GridMap::area_set_name); - ClassDB::bind_method(D_METHOD("area_get_name", "area"), &GridMap::area_get_name); - ClassDB::bind_method(D_METHOD("area_is_exterior_portal", "area"), &GridMap::area_is_exterior_portal); - ClassDB::bind_method(D_METHOD("area_set_portal_disable_distance", "area", "distance"), &GridMap::area_set_portal_disable_distance); - ClassDB::bind_method(D_METHOD("area_get_portal_disable_distance", "area"), &GridMap::area_get_portal_disable_distance); - ClassDB::bind_method(D_METHOD("area_set_portal_disable_color", "area", "color"), &GridMap::area_set_portal_disable_color); - ClassDB::bind_method(D_METHOD("area_get_portal_disable_color", "area"), &GridMap::area_get_portal_disable_color); - ClassDB::bind_method(D_METHOD("erase_area", "area"), &GridMap::erase_area); - ClassDB::bind_method(D_METHOD("get_unused_area_id"), &GridMap::get_unused_area_id); - ClassDB::bind_method(D_METHOD("clear"), &GridMap::clear); ClassDB::bind_method(D_METHOD("get_meshes"), &GridMap::get_meshes); @@ -895,341 +777,13 @@ void GridMap::set_clip(bool p_enabled, bool p_clip_above, int p_floor, Vector3:: g->dirty = true; } awaiting_update = true; - _update_dirty_map_callback(); -} - -void GridMap::_update_areas() { - - //clear the portals - for (Map<int, Area *>::Element *E = area_map.front(); E; E = E->next()) { - //this should somehow be faster... - Area &a = *E->get(); - a.portals.clear(); - if (a.instance.is_valid()) { - VisualServer::get_singleton()->free(a.instance); - a.instance = RID(); - } - } - - //test all areas against all areas and create portals - this sucks (slow :( ) - for (Map<int, Area *>::Element *E = area_map.front(); E; E = E->next()) { - Area &a = *E->get(); - if (a.exterior_portal) //that's pretty much all it does... yes it is - continue; - Vector3 from_a(a.from.x, a.from.y, a.from.z); - Vector3 to_a(a.to.x, a.to.y, a.to.z); - - for (Map<int, Area *>::Element *F = area_map.front(); F; F = F->next()) { - - Area &b = *F->get(); - Vector3 from_b(b.from.x, b.from.y, b.from.z); - Vector3 to_b(b.to.x, b.to.y, b.to.z); - - // initially test intersection and discards - int axis = -1; - float sign = 0; - bool valid = true; - Vector3 axmin, axmax; - - for (int i = 0; i < 3; i++) { - - if (from_a[i] == to_b[i]) { - - if (axis != -1) { - valid = false; - break; - } - - axis = i; - sign = -1; - } else if (from_b[i] == to_a[i]) { - - if (axis != -1) { - valid = false; - break; - } - axis = i; - sign = +1; - } - - if (from_a[i] > to_b[i] || to_a[i] < from_b[i]) { - valid = false; - break; - } else { - - axmin[i] = (from_a[i] > from_b[i]) ? from_a[i] : from_b[i]; - axmax[i] = (to_a[i] < to_b[i]) ? to_a[i] : to_b[i]; - } - } - - if (axis == -1 || !valid) - continue; - - Transform xf; - - for (int i = 0; i < 3; i++) { - - int ax = (axis + i) % 3; - Vector3 axis_vec; - float scale = (i == 0) ? sign : ((axmax[ax] - axmin[ax]) * cell_size); - axis_vec[ax] = scale; - xf.basis.set_axis((2 + i) % 3, axis_vec); - xf.origin[i] = axmin[i] * cell_size; - } - - Area::Portal portal; - portal.xform = xf; - a.portals.push_back(portal); - } - } - - _update_area_instances(); -} - -void GridMap::_update_area_instances() { - - Transform base_xform; - if (_in_tree) - base_xform = get_global_transform(); - - for (Map<int, Area *>::Element *E = area_map.front(); E; E = E->next()) { - //this should somehow be faster... - Area &a = *E->get(); - if (a.instance.is_valid() != _in_tree) { - - if (!_in_tree) { - - for (int i = 0; i < a.portals.size(); i++) { - - Area::Portal &p = a.portals[i]; - ERR_CONTINUE(!p.instance.is_valid()); - VisualServer::get_singleton()->free(p.instance); - p.instance = RID(); - } - - VisualServer::get_singleton()->free(a.instance); - a.instance = RID(); - - } else { - - //a.instance = VisualServer::get_singleton()->instance_create2(base_room,get_world()->get_scenario()); - for (int i = 0; i < a.portals.size(); i++) { - - Area::Portal &p = a.portals[i]; - ERR_CONTINUE(p.instance.is_valid()); - p.instance = VisualServer::get_singleton()->instance_create2(a.base_portal, get_world()->get_scenario()); - VisualServer::get_singleton()->instance_set_room(p.instance, a.instance); - } - } - } - - if (a.instance.is_valid()) { - Transform xform; - - Vector3 from_a(a.from.x, a.from.y, a.from.z); - Vector3 to_a(a.to.x, a.to.y, a.to.z); - - for (int i = 0; i < 3; i++) { - xform.origin[i] = from_a[i] * cell_size; - Vector3 s; - s[i] = (to_a[i] - from_a[i]) * cell_size; - xform.basis.set_axis(i, s); - } - - VisualServer::get_singleton()->instance_set_transform(a.instance, base_xform * xform); - - for (int i = 0; i < a.portals.size(); i++) { - - Area::Portal &p = a.portals[i]; - ERR_CONTINUE(!p.instance.is_valid()); - - VisualServer::get_singleton()->instance_set_transform(p.instance, base_xform * xform); - } - } - } -} - -Error GridMap::create_area(int p_id, const Rect3 &p_bounds) { - - ERR_FAIL_COND_V(area_map.has(p_id), ERR_ALREADY_EXISTS); - ERR_EXPLAIN("ID 0 is taken as global area, start from 1"); - ERR_FAIL_COND_V(p_id == 0, ERR_INVALID_PARAMETER); - ERR_FAIL_COND_V(p_bounds.has_no_area(), ERR_INVALID_PARAMETER); - - // FIRST VALIDATE AREA - IndexKey from, to; - from.x = p_bounds.position.x; - from.y = p_bounds.position.y; - from.z = p_bounds.position.z; - to.x = p_bounds.position.x + p_bounds.size.x; - to.y = p_bounds.position.y + p_bounds.size.y; - to.z = p_bounds.position.z + p_bounds.size.z; - - for (Map<int, Area *>::Element *E = area_map.front(); E; E = E->next()) { - //this should somehow be faster... - Area &a = *E->get(); - - //does it interset with anything else? - - if (from.x >= a.to.x || - to.x <= a.from.x || - from.y >= a.to.y || - to.y <= a.from.y || - from.z >= a.to.z || - to.z <= a.from.z) { - - // all good - } else { - - return ERR_INVALID_PARAMETER; - } - } - - Area *area = memnew(Area); - area->from = from; - area->to = to; - area->portal_disable_distance = 0; - area->exterior_portal = false; - area->name = "Area " + itos(p_id); - area_map[p_id] = area; - _recreate_octant_data(); - return OK; -} - -Rect3 GridMap::area_get_bounds(int p_area) const { - - ERR_FAIL_COND_V(!area_map.has(p_area), Rect3()); - - const Area *a = area_map[p_area]; - Rect3 aabb; - aabb.position = Vector3(a->from.x, a->from.y, a->from.z); - aabb.size = Vector3(a->to.x, a->to.y, a->to.z) - aabb.position; - - return aabb; -} - -void GridMap::area_set_name(int p_area, const String &p_name) { - - ERR_FAIL_COND(!area_map.has(p_area)); - - Area *a = area_map[p_area]; - a->name = p_name; -} - -String GridMap::area_get_name(int p_area) const { - - ERR_FAIL_COND_V(!area_map.has(p_area), ""); - - const Area *a = area_map[p_area]; - return a->name; -} - -void GridMap::area_set_exterior_portal(int p_area, bool p_enable) { - - ERR_FAIL_COND(!area_map.has(p_area)); - - Area *a = area_map[p_area]; - if (a->exterior_portal == p_enable) - return; - a->exterior_portal = p_enable; - - _recreate_octant_data(); -} - -bool GridMap::area_is_exterior_portal(int p_area) const { - - ERR_FAIL_COND_V(!area_map.has(p_area), false); - - const Area *a = area_map[p_area]; - return a->exterior_portal; -} - -void GridMap::area_set_portal_disable_distance(int p_area, float p_distance) { - - ERR_FAIL_COND(!area_map.has(p_area)); - - Area *a = area_map[p_area]; - a->portal_disable_distance = p_distance; -} - -float GridMap::area_get_portal_disable_distance(int p_area) const { - - ERR_FAIL_COND_V(!area_map.has(p_area), 0); - - const Area *a = area_map[p_area]; - return a->portal_disable_distance; -} - -void GridMap::area_set_portal_disable_color(int p_area, Color p_color) { - - ERR_FAIL_COND(!area_map.has(p_area)); - - Area *a = area_map[p_area]; - a->portal_disable_color = p_color; -} - -Color GridMap::area_get_portal_disable_color(int p_area) const { - - ERR_FAIL_COND_V(!area_map.has(p_area), Color()); - - const Area *a = area_map[p_area]; - return a->portal_disable_color; -} - -void GridMap::get_area_list(List<int> *p_areas) const { - - for (const Map<int, Area *>::Element *E = area_map.front(); E; E = E->next()) { - - p_areas->push_back(E->key()); - } -} - -GridMap::Area::Portal::~Portal() { - - if (instance.is_valid()) - VisualServer::get_singleton()->free(instance); -} - -GridMap::Area::Area() { - - base_portal = VisualServer::get_singleton()->portal_create(); - Vector<Point2> points; - points.push_back(Point2(0, 1)); - points.push_back(Point2(1, 1)); - points.push_back(Point2(1, 0)); - points.push_back(Point2(0, 0)); - VisualServer::get_singleton()->portal_set_shape(base_portal, points); -} - -GridMap::Area::~Area() { - - if (instance.is_valid()) - VisualServer::get_singleton()->free(instance); - VisualServer::get_singleton()->free(base_portal); -} - -void GridMap::erase_area(int p_area) { - - ERR_FAIL_COND(!area_map.has(p_area)); - - Area *a = area_map[p_area]; - memdelete(a); - area_map.erase(p_area); - _recreate_octant_data(); -} - -int GridMap::get_unused_area_id() const { - - if (area_map.empty()) - return 1; - else - return area_map.back()->key() + 1; + _update_octants_callback(); } void GridMap::set_cell_scale(float p_scale) { cell_scale = p_scale; - _queue_dirty_map(); + _queue_octants_dirty(); } float GridMap::get_cell_scale() const { @@ -1242,7 +796,7 @@ Array GridMap::get_meshes() { if (theme.is_null()) return Array(); - Vector3 ofs(cell_size * 0.5 * int(center_x), cell_size * 0.5 * int(center_y), cell_size * 0.5 * int(center_z)); + Vector3 ofs(cell_size.x * 0.5 * int(center_x), cell_size.y * 0.5 * int(center_y), cell_size.z * 0.5 * int(center_z)); Array meshes; for (Map<IndexKey, Cell>::Element *E = cell_map.front(); E; E = E->next()) { @@ -1274,7 +828,7 @@ Array GridMap::get_meshes() { GridMap::GridMap() { - cell_size = 2; + cell_size = Vector3(2, 2, 2); octant_size = 4; awaiting_update = false; _in_tree = false; |