diff options
Diffstat (limited to 'scene/resources/surface_tool.cpp')
| -rw-r--r-- | scene/resources/surface_tool.cpp | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index cc13c0ff11..cf07f1658b 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -650,9 +650,11 @@ void SurfaceTool::append_from(const Ref<Mesh>& p_existing, int p_surface,const T for(List<int>::Element *E=nindices.front();E;E=E->next()) { int dst_index = E->get()+vfrom; - //if (dst_index <0 || dst_index>=vertex_array.size()) { - // print_line("invalid index!"); - //} + /* + if (dst_index <0 || dst_index>=vertex_array.size()) { + print_line("invalid index!"); + } + */ index_array.push_back(dst_index); } if (index_array.size()%3) @@ -850,7 +852,7 @@ void SurfaceTool::clear() { begun=false; primitive=Mesh::PRIMITIVE_LINES; format=0; - last_bones.clear();; + last_bones.clear(); last_weights.clear(); index_array.clear(); vertex_array.clear(); @@ -860,25 +862,25 @@ void SurfaceTool::clear() { void SurfaceTool::_bind_methods() { - ClassDB::bind_method(_MD("begin","primitive"),&SurfaceTool::begin); - ClassDB::bind_method(_MD("add_vertex","vertex"),&SurfaceTool::add_vertex); - ClassDB::bind_method(_MD("add_color","color"),&SurfaceTool::add_color); - ClassDB::bind_method(_MD("add_normal","normal"),&SurfaceTool::add_normal); - ClassDB::bind_method(_MD("add_tangent","tangent"),&SurfaceTool::add_tangent); - ClassDB::bind_method(_MD("add_uv","uv"),&SurfaceTool::add_uv); - ClassDB::bind_method(_MD("add_uv2","uv2"),&SurfaceTool::add_uv2); - ClassDB::bind_method(_MD("add_bones","bones"),&SurfaceTool::add_bones); - ClassDB::bind_method(_MD("add_weights","weights"),&SurfaceTool::add_weights); - ClassDB::bind_method(_MD("add_smooth_group","smooth"),&SurfaceTool::add_smooth_group); - ClassDB::bind_method(_MD("add_triangle_fan", "vertexes", "uvs", "colors", "uv2s", "normals", "tangents"),&SurfaceTool::add_triangle_fan, DEFVAL(Vector<Vector2>()), DEFVAL(Vector<Color>()), DEFVAL(Vector<Vector2>()),DEFVAL(Vector<Vector3>()), DEFVAL(Vector<Plane>())); - ClassDB::bind_method(_MD("set_material","material:Material"),&SurfaceTool::set_material); - ClassDB::bind_method(_MD("index"),&SurfaceTool::index); - ClassDB::bind_method(_MD("deindex"),&SurfaceTool::deindex); - ///ClassDB::bind_method(_MD("generate_flat_normals"),&SurfaceTool::generate_flat_normals); - ClassDB::bind_method(_MD("generate_normals"),&SurfaceTool::generate_normals); - ClassDB::bind_method(_MD("add_index", "index"), &SurfaceTool::add_index); - ClassDB::bind_method(_MD("commit:Mesh","existing:Mesh"),&SurfaceTool::commit,DEFVAL(Variant())); - ClassDB::bind_method(_MD("clear"),&SurfaceTool::clear); + ClassDB::bind_method(D_METHOD("begin","primitive"),&SurfaceTool::begin); + ClassDB::bind_method(D_METHOD("add_vertex","vertex"),&SurfaceTool::add_vertex); + ClassDB::bind_method(D_METHOD("add_color","color"),&SurfaceTool::add_color); + ClassDB::bind_method(D_METHOD("add_normal","normal"),&SurfaceTool::add_normal); + ClassDB::bind_method(D_METHOD("add_tangent","tangent"),&SurfaceTool::add_tangent); + ClassDB::bind_method(D_METHOD("add_uv","uv"),&SurfaceTool::add_uv); + ClassDB::bind_method(D_METHOD("add_uv2","uv2"),&SurfaceTool::add_uv2); + ClassDB::bind_method(D_METHOD("add_bones","bones"),&SurfaceTool::add_bones); + ClassDB::bind_method(D_METHOD("add_weights","weights"),&SurfaceTool::add_weights); + ClassDB::bind_method(D_METHOD("add_smooth_group","smooth"),&SurfaceTool::add_smooth_group); + ClassDB::bind_method(D_METHOD("add_triangle_fan", "vertexes", "uvs", "colors", "uv2s", "normals", "tangents"),&SurfaceTool::add_triangle_fan, DEFVAL(Vector<Vector2>()), DEFVAL(Vector<Color>()), DEFVAL(Vector<Vector2>()),DEFVAL(Vector<Vector3>()), DEFVAL(Vector<Plane>())); + ClassDB::bind_method(D_METHOD("set_material","material:Material"),&SurfaceTool::set_material); + ClassDB::bind_method(D_METHOD("index"),&SurfaceTool::index); + ClassDB::bind_method(D_METHOD("deindex"),&SurfaceTool::deindex); + ///ClassDB::bind_method(D_METHOD("generate_flat_normals"),&SurfaceTool::generate_flat_normals); + ClassDB::bind_method(D_METHOD("generate_normals"),&SurfaceTool::generate_normals); + ClassDB::bind_method(D_METHOD("add_index", "index"), &SurfaceTool::add_index); + ClassDB::bind_method(D_METHOD("commit:Mesh","existing:Mesh"),&SurfaceTool::commit,DEFVAL(Variant())); + ClassDB::bind_method(D_METHOD("clear"),&SurfaceTool::clear); } |