Skip to content

Commit

Permalink
Some whatever material properties for defaults, roughly based on Sour…
Browse files Browse the repository at this point in the history 
…ce's
  • Loading branch information
@Shinmera
Shinmera committed Nov 13, 2023
1 parent 6a5dcb0 commit 86f03fa
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions physics/constants.lisp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
(material-interaction-properties-restitution-combine material-interaction-properties))

(defvar *default-material-interaction-properties*
(make-material-interaction-properties NIL NIL 0.0 0.0 0.5))
(make-material-interaction-properties NIL NIL 0.8 0.8 0.25))

(declaim (ftype (function (material-interaction-properties material-interaction-properties)
(values single-float single-float single-float &optional))
Expand Down Expand Up @@ -119,7 +119,7 @@
(setf (material-interaction-properties ab) (apply #'make-material-interaction-properties ab NIL args)))))

(set-material-interaction-properties
'(;;A-----------------|B----------------|static friction--|dynamic friciton-|restitution------|
'(#|A-----------------|B----------------|static friction--|dynamic friciton-|restitution-|#
((:wood :wood) 0.5 0.5 0.3)
((:wood :concrete) 0.5 0.4 0.5)
((:wood :ice) 0.2 0.1 0.3)
Expand All @@ -131,4 +131,16 @@
((:rubber :concrete) 1.0 0.8 0.9)
((:wet-rubber :concrete) 0.7 0.5 0.85)
((:tire :concrete) 1.5 1.0 0.8)
((:velcro :velcro) 6.0 4.0 0.0)))
((:velcro :velcro) 6.0 4.0 0.0)
#|A-----------------------------------|static friction--|dynamic friciton-|restitution-|fcomb|rcomb|#
(:metal 0.8 0.8 0.25)
(:lubricated-metal 0.1 0.1 0.15)
(:dirt 0.8 0.8 0.01)
(:wood 0.8 0.8 0.1)
(:slime 0.9 0.9 0.1)
(:glass 0.5 0.5 0.2)
(:concrete 0.8 0.8 0.2)
(:ice 0.1 0.1 0.1)
(:rubber 0.8 0.8 0.2)
(:tire 1.0 1.0 0.2)
(:velcro 6.0 4.0 0.0 :max)))

0 comments on commit 86f03fa

Please sign in to comment.