Skip to content

Commit 6c5dd85

Browse files
committed
Revert unstable brush plane intersection change
1 parent bb3d7d0 commit 6c5dd85

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

addons/qodot/src/data/quake_brush.gd

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,12 @@ func find_face_vertices():
2929
for face1 in self.faces:
3030
for face2 in self.faces:
3131
for face3 in self.faces:
32-
if face1 == face2 or face1 == face3 or face2 == face3:
33-
continue
34-
3532
var vertex = face1.intersect_faces(face2, face3)
36-
if vertex:
33+
34+
if vertex != null:
3735
if self.vertex_in_hull(vertex):
38-
if not face1.has_vertex(vertex) and not face2.has_vertex(vertex) and not face3.has_vertex(vertex):
39-
var normal = (face1.normal + face2.normal + face3.normal).normalized()
40-
face1.add_vertex(vertex, normal)
41-
face2.add_vertex(vertex, normal)
42-
face3.add_vertex(vertex, normal)
36+
var normal = (face1.normal + face2.normal + face3.normal).normalized()
37+
face1.add_unique_vertex(vertex, normal)
4338

4439
func find_face_centers():
4540
for face in self.faces:

addons/qodot/src/data/quake_face.gd

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ func get_distance() -> float:
4545
func intersect_faces(face2, face3):
4646
return self.plane.intersect_3(face2.plane, face3.plane)
4747

48-
func add_vertex(vertex, normal):
49-
self.face_vertices.append(vertex)
50-
self.face_normals.append(normal)
48+
func add_unique_vertex(vertex, normal):
49+
if not has_vertex(vertex):
50+
self.face_vertices.append(vertex)
51+
self.face_normals.append(normal)
5152

5253
func has_vertex(vertex):
5354
for comp_vertex in self.face_vertices:

0 commit comments

Comments
 (0)