godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16705 from Chaosus/generate_normals_flip

Browse Source 
Add flip switch to SurfaceTool.generate_normals
This commit is contained in:
Juan Linietsky 2018-04-08 17:18:03 -03:00 committed by GitHub
commit b756172bdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/classes/SurfaceTool.xml
View File

@ -196,8 +196,11 @@
<method name="generate_normals"> <method name="generate_normals">
<return type="void"> <return type="void">
</return> </return>
<argument index="0" name="flip" type="bool" default="false">
</argument>
<description> <description>
Generates normals from Vertices so you do not have to do it manually. Generates normals from Vertices so you do not have to do it manually.
Setting "flip" [code]true[/code] inverts resulting normals.
</description> </description>
</method> </method>
<method name="generate_tangents"> <method name="generate_tangents">

10
scene/resources/surface_tool.cpp
View File

@ -861,7 +861,7 @@ void SurfaceTool::generate_tangents() {
} }
} }
void SurfaceTool::generate_normals() { void SurfaceTool::generate_normals(bool p_flip) {
ERR_FAIL_COND(primitive != Mesh::PRIMITIVE_TRIANGLES); ERR_FAIL_COND(primitive != Mesh::PRIMITIVE_TRIANGLES);
@ -887,7 +887,11 @@ void SurfaceTool::generate_normals() {
ERR_FAIL_COND(!v[2]); ERR_FAIL_COND(!v[2]);
E = v[2]->next(); E = v[2]->next();
Vector3 normal = Plane(v[0]->get().vertex, v[1]->get().vertex, v[2]->get().vertex).normal; Vector3 normal;
if (!p_flip)
normal = Plane(v[0]->get().vertex, v[1]->get().vertex, v[2]->get().vertex).normal;
else
normal = Plane(v[2]->get().vertex, v[1]->get().vertex, v[0]->get().vertex).normal;
if (smooth) { if (smooth) {
@ -980,7 +984,7 @@ void SurfaceTool::_bind_methods() {
ClassDB::bind_method(D_METHOD("index"), &SurfaceTool::index); ClassDB::bind_method(D_METHOD("index"), &SurfaceTool::index);
ClassDB::bind_method(D_METHOD("deindex"), &SurfaceTool::deindex); ClassDB::bind_method(D_METHOD("deindex"), &SurfaceTool::deindex);
ClassDB::bind_method(D_METHOD("generate_normals"), &SurfaceTool::generate_normals); ClassDB::bind_method(D_METHOD("generate_normals", "flip"), &SurfaceTool::generate_normals, DEFVAL(false));
ClassDB::bind_method(D_METHOD("generate_tangents"), &SurfaceTool::generate_tangents); ClassDB::bind_method(D_METHOD("generate_tangents"), &SurfaceTool::generate_tangents);
ClassDB::bind_method(D_METHOD("add_to_format", "flags"), &SurfaceTool::add_to_format); ClassDB::bind_method(D_METHOD("add_to_format", "flags"), &SurfaceTool::add_to_format);

2
scene/resources/surface_tool.h
View File

@ -116,7 +116,7 @@ public:
void index(); void index();
void deindex(); void deindex();
void generate_normals(); void generate_normals(bool p_flip = false);
void generate_tangents(); void generate_tangents();
void add_to_format(int p_flags) { format |= p_flags; } void add_to_format(int p_flags) { format |= p_flags; }