Merge branch 'master' of gitorious.org:fg/fgdata
This commit is contained in:
commit
c49b97114d
2 changed files with 85 additions and 70 deletions
|
@ -34,6 +34,21 @@
|
||||||
</axis>
|
</axis>
|
||||||
</animation>
|
</animation>
|
||||||
|
|
||||||
|
<animation>
|
||||||
|
<name>Horizon Offset</name>
|
||||||
|
<type>translate</type>
|
||||||
|
<object-name>Pitch</object-name>
|
||||||
|
<property>instrumentation/attitude-indicator/horizon-offset-deg</property>
|
||||||
|
<factor>-0.0007</factor>
|
||||||
|
<min-m>-0.01575</min-m>
|
||||||
|
<max-m>0.01575</max-m>
|
||||||
|
<axis>
|
||||||
|
<x>0.0</x>
|
||||||
|
<y>0.0</y>
|
||||||
|
<z>1.0</z>
|
||||||
|
</axis>
|
||||||
|
</animation>
|
||||||
|
|
||||||
<animation>
|
<animation>
|
||||||
<type>rotate</type>
|
<type>rotate</type>
|
||||||
<object-name>Roll</object-name>
|
<object-name>Roll</object-name>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
// -*-C++-*-
|
// -*-C++-*-
|
||||||
// Texture switching based on face slope and snow level
|
// Texture switching based on face slope and snow level,with ideas from crop.frag, forest.frag
|
||||||
// default.frag (c) 2010 ??
|
// © 2011 - Frederic Bouvier, Emilian Huminiuc, Tim Moore, Yves Sablonier
|
||||||
// (c)2011 - Emilian Huminiuc, with ideas from crop.frag, forest.frag
|
|
||||||
// Ambient term comes in gl_Color.rgb.
|
// Ambient term comes in gl_Color.rgb.
|
||||||
#version 120
|
#version 120
|
||||||
varying vec4 diffuse_term, RawPos;
|
varying vec4 diffuse_term, RawPos;
|
||||||
|
|
Loading…
Reference in a new issue