diff options
Diffstat (limited to 'scene/resources/shape.cpp')
| -rw-r--r-- | scene/resources/shape.cpp | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/scene/resources/shape.cpp b/scene/resources/shape.cpp index a90c3b47a9..c666ff0cd3 100644 --- a/scene/resources/shape.cpp +++ b/scene/resources/shape.cpp @@ -28,25 +28,23 @@ /*************************************************************************/ #include "shape.h" -#include "servers/physics_server.h" -#include "scene/resources/mesh.h" #include "os/os.h" #include "scene/main/scene_main_loop.h" +#include "scene/resources/mesh.h" +#include "servers/physics_server.h" - -void Shape::add_vertices_to_array(PoolVector<Vector3> &array, const Transform& p_xform) { +void Shape::add_vertices_to_array(PoolVector<Vector3> &array, const Transform &p_xform) { Vector<Vector3> toadd = _gen_debug_mesh_lines(); if (toadd.size()) { - int base=array.size(); - array.resize(base+toadd.size()); + int base = array.size(); + array.resize(base + toadd.size()); PoolVector<Vector3>::Write w = array.write(); - for(int i=0;i<toadd.size();i++) { - w[i+base]=p_xform.xform(toadd[i]); + for (int i = 0; i < toadd.size(); i++) { + w[i + base] = p_xform.xform(toadd[i]); } - } } @@ -65,46 +63,39 @@ Ref<Mesh> Shape::get_debug_mesh() { array.resize(lines.size()); { - PoolVector<Vector3>::Write w=array.write(); - for(int i=0;i<lines.size();i++) { - w[i]=lines[i]; + PoolVector<Vector3>::Write w = array.write(); + for (int i = 0; i < lines.size(); i++) { + w[i] = lines[i]; } } Array arr; arr.resize(Mesh::ARRAY_MAX); - arr[Mesh::ARRAY_VERTEX]=array; + arr[Mesh::ARRAY_VERTEX] = array; - SceneTree *st=OS::get_singleton()->get_main_loop()->cast_to<SceneTree>(); + SceneTree *st = OS::get_singleton()->get_main_loop()->cast_to<SceneTree>(); - debug_mesh_cache->add_surface_from_arrays(Mesh::PRIMITIVE_LINES,arr); + debug_mesh_cache->add_surface_from_arrays(Mesh::PRIMITIVE_LINES, arr); if (st) { - debug_mesh_cache->surface_set_material(0,st->get_debug_collision_material()); + debug_mesh_cache->surface_set_material(0, st->get_debug_collision_material()); } - } - - return debug_mesh_cache; - } Shape::Shape() { ERR_PRINT("Constructor must not be called!"); - } - Shape::Shape(RID p_shape) { - shape=p_shape; + shape = p_shape; } Shape::~Shape() { PhysicsServer::get_singleton()->free(shape); } - |