Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2025-01-11 13:51:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix triangle winding order issues.

Browse Source
This commit is contained in:
Relintai 2022-01-15 01:01:40 +01:00
parent 2a93318ff8
commit 5185d29150
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
game/addons/mesh_data_resource_editor/MIDGizmo.gd
View File

@ -511,6 +511,14 @@ func add_triangle_to_edge(edge : int) -> void:
ei0 = ti0 ei0 = ti0
ei1 = ti1 ei1 = ti1
erefind = ti2 erefind = ti2
var fo : Vector3 = MDRMeshUtils.get_face_normal(_vertices[ti0], _vertices[ti1], _vertices[ti2])
var fn : Vector3 = MDRMeshUtils.get_face_normal(_vertices[ei0], _vertices[ei1], _vertices[erefind])
if fo.dot(fn) < 0:
var t : int = ei0
ei0 = ei1
ei1 = t
MDRMeshUtils.append_triangle_to_tri_edge(_mdr, _vertices[ei0], _vertices[ei1], _vertices[erefind]) MDRMeshUtils.append_triangle_to_tri_edge(_mdr, _vertices[ei0], _vertices[ei1], _vertices[erefind])

10
game/addons/mesh_data_resource_editor/utilities/mdred_mesh_utils.gd
View File

@ -4,9 +4,8 @@ extends Object
# Appends a triangle to the mesh. It's created from miroring v2 to the ev0, and ev1 edge # Appends a triangle to the mesh. It's created from miroring v2 to the ev0, and ev1 edge
static func append_triangle_to_tri_edge(mdr : MeshDataResource, ev0 : Vector3, ev1 : Vector3, v2 : Vector3) -> void: static func append_triangle_to_tri_edge(mdr : MeshDataResource, ev0 : Vector3, ev1 : Vector3, v2 : Vector3) -> void:
var vref : Vector3 = reflect_vertex(ev0, ev1, v2) var vref : Vector3 = reflect_vertex(ev0, ev1, v2)
var should_flip : bool = should_flip_reflected_triangle(ev0, ev1, v2)
add_triangle_at(mdr, ev1, ev0, vref, false)
add_triangle_at(mdr, ev0, ev1, vref, should_flip)
static func add_triangle_at(mdr : MeshDataResource, v0 : Vector3, v1 : Vector3, v2 : Vector3, flip : bool = false) -> void: static func add_triangle_at(mdr : MeshDataResource, v0 : Vector3, v1 : Vector3, v2 : Vector3, flip : bool = false) -> void:
var st : SurfaceTool = SurfaceTool.new() var st : SurfaceTool = SurfaceTool.new()
@ -19,7 +18,7 @@ static func add_triangle_at(mdr : MeshDataResource, v0 : Vector3, v1 : Vector3,
st.add_vertex(v1) st.add_vertex(v1)
st.add_uv(Vector2(1, 1)) st.add_uv(Vector2(1, 1))
st.add_vertex(v2) st.add_vertex(v2)
if !flip: if !flip:
st.add_index(0) st.add_index(0)
st.add_index(1) st.add_index(1)
@ -357,7 +356,6 @@ static func get_arrays_prepared(mdr : MeshDataResource) -> Array:
# There are probably better ways to do this # There are probably better ways to do this
static func should_flip_reflected_triangle(v0 : Vector3, v1 : Vector3, v2 : Vector3) -> bool: static func should_flip_reflected_triangle(v0 : Vector3, v1 : Vector3, v2 : Vector3) -> bool:
var reflected : Vector3 = reflect_vertex(v0, v1, v2) var reflected : Vector3 = reflect_vertex(v0, v1, v2)
var nn : Vector3 = get_face_normal(v0, v1, v2) var nn : Vector3 = get_face_normal(v0, v1, v2)
return should_triangle_flip(v0, v1, reflected, nn) return should_triangle_flip(v0, v1, reflected, nn)
@ -382,7 +380,7 @@ static func get_face_normal(v0 : Vector3, v1 : Vector3, v2 : Vector3, flipped :
return Plane(v2, v1, v0).normal return Plane(v2, v1, v0).normal
static func should_triangle_flip(v0 : Vector3, v1 : Vector3, v2 : Vector3, similar_dir_normal : Vector3) -> bool: static func should_triangle_flip(v0 : Vector3, v1 : Vector3, v2 : Vector3, similar_dir_normal : Vector3) -> bool:
var normal : Vector3 = get_face_normal(v0, v1, v2) var normal : Vector3 = get_face_normal(v0, v1, v2)
var ndns : float = normal.dot(similar_dir_normal) var ndns : float = normal.dot(similar_dir_normal)