From 86f03fab200f66faf05c7419ef41ab4376ab3281 Mon Sep 17 00:00:00 2001 From: Shinmera Date: Mon, 13 Nov 2023 13:04:03 +0100 Subject: [PATCH] Some whatever material properties for defaults, roughly based on Source's --- physics/constants.lisp | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/physics/constants.lisp b/physics/constants.lisp index 7d7336b1b..4a24df9e8 100644 --- a/physics/constants.lisp +++ b/physics/constants.lisp @@ -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)) @@ -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) @@ -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)))