mac fixes, missing files
This commit is contained in:
parent
0104dd8ada
commit
a7449695aa
2 changed files with 5 additions and 5 deletions
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
(define (ornament-colour) (vector 0.7 0.7 0.7))
|
(define (ornament-colour) (vector 0.7 0.7 0.7))
|
||||||
(define (pickup-colour) (vector 1 1 1))
|
(define (pickup-colour) (vector 1 1 1))
|
||||||
(define (earth-colour) (vector 0.2 0.15 0.1))
|
(define (earth-colour) (vector 0.1 0.1 0.1))
|
||||||
(define (dust-colour) (vmul (vector 0.05 0.05 0.05) (* 2 (rndf))))
|
(define (dust-colour) (vmul (vector 0.05 0.05 0.05) (* 2 (rndf))))
|
||||||
(define (stones-colour) (vmul (vector 0.5 0.5 0.5) (* (crndf) 0.5)))
|
(define (stones-colour) (vmul (vector 0.5 0.5 0.5) (* (crndf) 0.5)))
|
||||||
(define (alive-colour) (vmul (vector 1 1 1) (+ 0.5 (* (rndf) 0.5))))
|
(define (alive-colour) (vmul (vector 1 1 1) (+ 0.5 (* (rndf) 0.5))))
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
(define fin-grow-prob 200)
|
(define fin-grow-prob 200)
|
||||||
(define max-fins-per-twig 5)
|
(define max-fins-per-twig 5)
|
||||||
|
|
||||||
(define above-fog-col (vector 0.9 1 0.95))
|
(define above-fog-col (vector 0.95 0.95 0.95))
|
||||||
(define above-fog-strength 0.01)
|
(define above-fog-strength 0.01)
|
||||||
(define ground-change-duration 4)
|
(define ground-change-duration 4)
|
||||||
|
|
||||||
|
|
|
@ -29,15 +29,15 @@ void main()
|
||||||
float t = fract(Time*0.1)*3.0;
|
float t = fract(Time*0.1)*3.0;
|
||||||
if (t<1.0) // mix bet 0 and 1
|
if (t<1.0) // mix bet 0 and 1
|
||||||
{
|
{
|
||||||
texture = mix(texture2D(Maps[0], T*10),texture2D(Maps[1], T*10),t);
|
texture = mix(texture2D(Maps[0], T*10.0),texture2D(Maps[1], T*10.0),t);
|
||||||
}
|
}
|
||||||
else if (t<2.0 && t>1.0) // mix bet 1 and 2
|
else if (t<2.0 && t>1.0) // mix bet 1 and 2
|
||||||
{
|
{
|
||||||
texture = mix(texture2D(Maps[1], T*10),texture2D(Maps[2], T*10),t-1.0);
|
texture = mix(texture2D(Maps[1], T*10.0),texture2D(Maps[2], T*10.0),t-1.0);
|
||||||
}
|
}
|
||||||
else // mix bet 2 and 0
|
else // mix bet 2 and 0
|
||||||
{
|
{
|
||||||
texture = mix(texture2D(Maps[2], T*10),texture2D(Maps[0], T*10),t-2.0);
|
texture = mix(texture2D(Maps[2], T*10.0),texture2D(Maps[0], T*10.0),t-2.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
float lambert = dot(l,bn);
|
float lambert = dot(l,bn);
|
||||||
|
|
Loading…
Reference in a new issue