From: Rudolf Polzer Date: Tue, 24 Sep 2013 10:35:13 +0000 (+0200) Subject: fix math X-Git-Tag: xonotic-v0.8.0~319 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c1542910d82ed06646b2b3158bd611fe40660584;p=xonotic%2Fxonotic-data.pk3dir.git fix math --- diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 1220ae060..d22d02ef1 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -126,15 +126,15 @@ set rpn_linear_to_sRGB "dup 1.0 2.4 div pow 1.055 mul 0.055 sub exch 12.92 mul d // With that, do: // ]skybox_nosRGB_to_sRGB 340 47 110 // rpn: still on stack: new_sunlight: -// rpn: still on stack: 412.122467 +// rpn: still on stack: 556.365417 // rpn: still on stack: new_skylight: -// rpn: still on stack: 11.4826183 +// rpn: still on stack: 24.4562988 // // The equivalent -sRGB shader then will have: // -// q3map_sunExt 1 0.6875 0.375 412.122467 25 47 0 16 -// q3map_skylight 11.4826183 3 -alias skybox_nosRGB_to_sRGB "rpn $3 1024 div $rpn_sRGB_to_linear 1024 mul /new_skylight: $3 1024 div $1 256 div $2 0.017453 mul sin mul add $rpn_sRGB_to_linear $3 1024 div $rpn_sRGB_to_linear sub 256 mul $2 0.017453 mul sin div /new_sunlight:" +// q3map_sunExt 1 0.6875 0.375 556.365417 25 47 0 16 +// q3map_skylight 24.4562988 3 +alias skybox_nosRGB_to_sRGB "rpn $3 402.123 div $rpn_sRGB_to_linear 402.123 mul /new_skylight: $3 402.123 div $1 256 div $2 0.017453 mul sin mul add $rpn_sRGB_to_linear $3 402.123 div $rpn_sRGB_to_linear sub 256 mul $2 0.017453 mul sin div /new_sunlight:" // these settings determine how much the view is affected by movement/damage cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition