CrizGames/RayMarchingGo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small opti

Browse source
This commit is contained in:
Crizomb 2025-09-28 02:45:46 +02:00
parent 0cf71d7abb
commit a6a3785a9f
5 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/sdf.go
View file

@ -73,7 +73,7 @@ type UnionSDF struct {
func (s UnionSDF) Distance(p Vector3) (float64, *Material) {
d1, color1 := s.primitive1.Distance(p)
d2, color2 := s.primitive2.Distance(p)
d := math.Min(d1, d2)
d := min(d1, d2)
color := color1
if d2 < d1 {
@ -91,7 +91,7 @@ func (s SubstractionSDF) Distance(p Vector3) (float64, *Material) {
d1, color1 := s.primitive1.Distance(p)
d2, _ := s.primitive2.Distance(p)
d := math.Max(d1, -d2)
d := max(d1, -d2)
return d, color1
}
@ -104,7 +104,7 @@ func (s IntersectionSDF) Distance(p Vector3) (float64, *Material) {
d1, mat1 := s.primitive1.Distance(p)
d2, mat2 := s.primitive2.Distance(p)
d := math.Max(d1, d2)
d := max(d1, d2)
var mat Material = MixedMaterial{mat1, mat2, 0.5, p}
return d, &mat
@ -120,8 +120,8 @@ func (s SmoothUnionSDF) Distance(p Vector3) (float64, *Material) {
k := 4 * s.k
d1, mat1 := s.primitive1.Distance(p)
d2, mat2 := s.primitive2.Distance(p)
h := math.Max(k-math.Abs(d1-d2), 0.0)
d := math.Min(d1, d2) - h*h*0.25/k
h := max(k-math.Abs(d1-d2), 0.0)
d := min(d1, d2) - h*h*0.25/k
t := SmoothStep(d2-d1, -k, k)
var mat Material = MixedMaterial{mat2, mat1, t, p}
return d, &mat
@ -137,8 +137,8 @@ func (s SmoothSubstractionSDF) Distance(p Vector3) (float64, *Material) {
k := 4 * s.k
d1, mat1 := s.primitive1.Distance(p)
d2, mat2 := s.primitive2.Distance(p)
h := math.Max(k-math.Abs(-d1-d2), 0.0)
d := math.Max(d1, -d2) + h*h*0.25/k
h := max(k-math.Abs(-d1-d2), 0.0)
d := max(d1, -d2) + h*h*0.25/k
t := SmoothStep(d1-d2, -k, k)
var mat Material = MixedMaterial{mat1, mat2, t, p}
return d, &mat
@ -154,8 +154,8 @@ func (s SmoothIntersectionSDF) Distance(p Vector3) (float64, *Material) {
k := 4 * s.k
d1, mat1 := s.primitive1.Distance(p)
d2, mat2 := s.primitive2.Distance(p)
h := math.Max(k-math.Abs(d1-d2), 0.0)
d := math.Max(d1, d2) + h*h*0.25/k
h := max(k-math.Abs(d1-d2), 0.0)
d := max(d1, d2) + h*h*0.25/k
t := SmoothStep(d2-d1, -k, k)
var mat Material = MixedMaterial{mat1, mat2, t, p}
return d, &mat