1
0
Fork 0

c172p: enable reflection and minor cleanup

Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
This commit is contained in:
Emilian Huminiuc 2012-06-16 12:54:38 +03:00
parent 8c072984f7
commit 3d7b7b75dd
4 changed files with 32008 additions and 31976 deletions

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Bump and specular effect -->
<PropertyList>
<name>Aircraft/c172p/Models/Effects/bumpspec-tail</name>
<name>Aircraft/c172p/Models/Effects/bumpspec</name>
<inherits-from>Effects/model-combined-deferred</inherits-from>
<parameters>
<normalmap-enabled type="int"> 1 </normalmap-enabled>
@ -15,7 +15,24 @@
<internal-format>normalized</internal-format>
</texture>
<lightmap-enabled type="int"> 0 </lightmap-enabled>
<reflection-enabled type="int"> 0 </reflection-enabled>
<reflection-enabled type="int"> 1 </reflection-enabled>
<reflection-correction type="float"> -0.7 </reflection-correction>
<reflection-dynamic type="int"> 1 </reflection-dynamic>
<reflection-fresnel type="float"> 0.0 </reflection-fresnel>
<reflection-rainbow type="float"> 0.0 </reflection-rainbow>
<reflection-noise type="float"> 0.0 </reflection-noise>
<texture n= "5" >
<type>cubemap</type>
<images>
<positive-x>Aircraft/Generic/Effects/fgfs-sky2/1.png</positive-x>
<negative-x>Aircraft/Generic/Effects/fgfs-sky2/4.png</negative-x>
<positive-y>Aircraft/Generic/Effects/fgfs-sky2/2.png</positive-y>
<negative-y>Aircraft/Generic/Effects/fgfs-sky2/3.png</negative-y>
<positive-z>Aircraft/Generic/Effects/fgfs-sky2/6.png</positive-z>
<negative-z>Aircraft/Generic/Effects/fgfs-sky2/5.png</negative-z>
</images>
</texture>
<ambient-correction type="float"> 0.1 </ambient-correction>
</parameters>
<!--WARNING: Do not edit below this line -->
<!-- ####################

View file

@ -1,135 +1,135 @@
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>iar80_glass</name>
<inherits-from>Effects/model-combined</inherits-from>
<parameters>
<normalmap-enabled type="int">0</normalmap-enabled>
<lightmap-enabled type="int">0</lightmap-enabled>
<reflection-enabled type="int">1</reflection-enabled>
<reflection-correction type="float">0.5</reflection-correction>
<reflect-map-enabled type="int">0</reflect-map-enabled>
<reflection-fresnel type="float">0.5</reflection-fresnel>
<reflection-rainbow type="float">0.3</reflection-rainbow>
<reflection-noise type="float">0.0</reflection-noise>
<reflection-dynamic type="int">1</reflection-dynamic>
<texture n= "5" >
<type>cubemap</type>
<images>
<positive-x>Aircraft/Generic/Effects/fgfs-sky2/1.png</positive-x>
<negative-x>Aircraft/Generic/Effects/fgfs-sky2/4.png</negative-x>
<positive-y>Aircraft/Generic/Effects/fgfs-sky2/2.png</positive-y>
<negative-y>Aircraft/Generic/Effects/fgfs-sky2/3.png</negative-y>
<positive-z>Aircraft/Generic/Effects/fgfs-sky2/6.png</positive-z>
<negative-z>Aircraft/Generic/Effects/fgfs-sky2/5.png</negative-z>
</images>
</texture>
<ambient-correction type="float">0.2</ambient-correction>
<rendering-hint>transparent</rendering-hint>
<transparent>true</transparent>
<render-bin>
<bin-number>111</bin-number>
<bin-name>DepthSortedBin</bin-name>
</render-bin>
</parameters>
<technique n="7">
<predicate>
<and>
<property>/sim/rendering/rembrandt/enabled</property>
<or>
<less-equal>
<value type="float">2.0</value>
<glversion/>
</less-equal>
<and>
<extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
<extension-supported>GL_EXT_gpu_shader4</extension-supported>
<extension-supported>GL_ARB_texture_rg</extension-supported>
</and>
</predicate>
<pass>
<lighting>true</lighting>
<depth>
<write-mask type="bool">false</write-mask>
</depth>
<material>
<active>
<use>material/active</use>
</active>
<ambient>
<use>material/ambient</use>
</ambient>
<diffuse>
<use>material/diffuse</use>
</diffuse>
<specular>
<use>material/specular</use>
</specular>
<emissive>
<use>material/emissive</use>
</emissive>
<shininess>
<use>material/shininess</use>
</shininess>
<color-mode>
<use>material/color-mode</use>
</color-mode>
</material>
<blend>
<active>
<use>blend/active</use>
</active>
<source>
<use>blend/source</use>
</source>
<destination>
<use>blend/destination</use>
</destination>
</blend>
<shade-model>
<use>shade-model</use>
</shade-model>
<cull-face>
<use>cull-face</use>
</cull-face>
<render-bin>
<bin-number>111</bin-number>
<bin-name>DepthSortedBin</bin-name>
</render-bin>
<texture-unit>
<active>
<use>texture[0]/active</use>
</active>
<unit>0</unit>
<image>
<use>texture[0]/image</use>
</image>
<filter>
<use>texture[0]/filter</use>
</filter>
<wrap-s>
<use>texture[0]/wrap-s</use>
</wrap-s>
<wrap-t>
<use>texture[0]/wrap-t</use>
</wrap-t>
<!--
<internal-format>
<use>texture[0]/internal-format</use>
</internal-format>
-->
<environment>
<mode>modulate</mode>
</environment>
</texture-unit>
<!-- A two-sided lighting model is set by default near the root
of the scene graph. Perhaps that ought to be set in this
effect?
-->
</pass>
</technique>
</PropertyList>
<?xml version="1.0" encoding="utf-8"?>
<PropertyList>
<name>Aircraft/c172p/Models/Effects/glass</name>
<inherits-from>Effects/model-combined</inherits-from>
<parameters>
<normalmap-enabled type="int">0</normalmap-enabled>
<lightmap-enabled type="int">0</lightmap-enabled>
<reflection-enabled type="int">1</reflection-enabled>
<reflection-correction type="float">0.5</reflection-correction>
<reflect-map-enabled type="int">0</reflect-map-enabled>
<reflection-fresnel type="float">0.5</reflection-fresnel>
<reflection-rainbow type="float">0.3</reflection-rainbow>
<reflection-noise type="float">0.0</reflection-noise>
<reflection-dynamic type="int">1</reflection-dynamic>
<texture n= "5" >
<type>cubemap</type>
<images>
<positive-x>Aircraft/Generic/Effects/fgfs-sky2/1.png</positive-x>
<negative-x>Aircraft/Generic/Effects/fgfs-sky2/4.png</negative-x>
<positive-y>Aircraft/Generic/Effects/fgfs-sky2/2.png</positive-y>
<negative-y>Aircraft/Generic/Effects/fgfs-sky2/3.png</negative-y>
<positive-z>Aircraft/Generic/Effects/fgfs-sky2/6.png</positive-z>
<negative-z>Aircraft/Generic/Effects/fgfs-sky2/5.png</negative-z>
</images>
</texture>
<ambient-correction type="float">0.2</ambient-correction>
<rendering-hint>transparent</rendering-hint>
<transparent>true</transparent>
<render-bin>
<bin-number>111</bin-number>
<bin-name>DepthSortedBin</bin-name>
</render-bin>
</parameters>
<technique n="7">
<predicate>
<and>
<property>/sim/rendering/rembrandt/enabled</property>
<or>
<less-equal>
<value type="float">2.0</value>
<glversion/>
</less-equal>
<and>
<extension-supported>GL_ARB_shader_objects</extension-supported>
<extension-supported>GL_ARB_shading_language_100</extension-supported>
<extension-supported>GL_ARB_vertex_shader</extension-supported>
<extension-supported>GL_ARB_fragment_shader</extension-supported>
</and>
</or>
<extension-supported>GL_EXT_gpu_shader4</extension-supported>
<extension-supported>GL_ARB_texture_rg</extension-supported>
</and>
</predicate>
<pass>
<lighting>true</lighting>
<depth>
<write-mask type="bool">false</write-mask>
</depth>
<material>
<active>
<use>material/active</use>
</active>
<ambient>
<use>material/ambient</use>
</ambient>
<diffuse>
<use>material/diffuse</use>
</diffuse>
<specular>
<use>material/specular</use>
</specular>
<emissive>
<use>material/emissive</use>
</emissive>
<shininess>
<use>material/shininess</use>
</shininess>
<color-mode>
<use>material/color-mode</use>
</color-mode>
</material>
<blend>
<active>
<use>blend/active</use>
</active>
<source>
<use>blend/source</use>
</source>
<destination>
<use>blend/destination</use>
</destination>
</blend>
<shade-model>
<use>shade-model</use>
</shade-model>
<cull-face>
<use>cull-face</use>
</cull-face>
<render-bin>
<bin-number>111</bin-number>
<bin-name>DepthSortedBin</bin-name>
</render-bin>
<texture-unit>
<active>
<use>texture[0]/active</use>
</active>
<unit>0</unit>
<image>
<use>texture[0]/image</use>
</image>
<filter>
<use>texture[0]/filter</use>
</filter>
<wrap-s>
<use>texture[0]/wrap-s</use>
</wrap-s>
<wrap-t>
<use>texture[0]/wrap-t</use>
</wrap-t>
<!--
<internal-format>
<use>texture[0]/internal-format</use>
</internal-format>
-->
<environment>
<mode>modulate</mode>
</environment>
</texture-unit>
<!-- A two-sided lighting model is set by default near the root
of the scene graph. Perhaps that ought to be set in this
effect?
-->
</pass>
</technique>
</PropertyList>

File diff suppressed because it is too large Load diff

View file

@ -7,14 +7,14 @@
<pitch-deg>-3.0</pitch-deg>
<z-m> -0.065 </z-m>
</offsets>
<nasal>
<load>
var rplayer = cmdarg();
rplayer.getNode("sim/model/door-positions/rightDoor/position-norm", 1).alias(rplayer.getNode("sim/multiplay/generic/float[0]"));
rplayer.getNode("sim/model/door-positions/leftDoor/position-norm", 1).alias(rplayer.getNode("sim/multiplay/generic/float[1]"));
rplayer.getNode("sim/model/door-positions/baggageDoor/position-norm", 1).alias(rplayer.getNode("sim/multiplay/generic/float[2]"));
var rplayer = cmdarg();
rplayer.getNode("sim/model/door-positions/rightDoor/position-norm", 1).alias(rplayer.getNode("sim/multiplay/generic/float[0]"));
rplayer.getNode("sim/model/door-positions/leftDoor/position-norm", 1).alias(rplayer.getNode("sim/multiplay/generic/float[1]"));
rplayer.getNode("sim/model/door-positions/baggageDoor/position-norm", 1).alias(rplayer.getNode("sim/multiplay/generic/float[2]"));
var livery_update = aircraft.livery_update.new(
"Aircraft/c172p/Models/Liveries", 10,
func { print("c172p livery update") });
@ -23,41 +23,98 @@
<unload>
livery_update.stop();
</unload>
</nasal>
</nasal>
<!-- Normal shader effect. Separate effects required for each normal map texture -->
<effect>
<inherits-from>Aircraft/c172p/Models/Effects/bumpspec-wing</inherits-from>
<object-name>wing_1</object-name>
<object-name>flaps</object-name>
<object-name>rightaileron</object-name>
<object-name>leftaileron</object-name>
<object-name>rightaileron</object-name>
<object-name>wing_1</object-name>
</effect>
<effect>
<inherits-from>Aircraft/c172p/Models/Effects/bumpspec-fuselage</inherits-from>
<object-name>LeftWheelStrut</object-name>
<object-name>RightWheelStrut</object-name>
<object-name>baggagedoor</object-name>
<object-name>charniere1</object-name>
<object-name>charniere2</object-name>
<object-name>charniere3</object-name>
<object-name>charniere4</object-name>
<object-name>fairing1</object-name>
<object-name>fairing2</object-name>
<object-name>fairing3</object-name>
<object-name>fuselage_1</object-name>
<object-name>leftdoor</object-name>
<object-name>rightdoor</object-name>
</effect>
<effect>
<inherits-from>Aircraft/c172p/Models/Effects/bumpspec-tail</inherits-from>
<object-name>vstab</object-name>
<object-name>rudder_1</object-name>
<object-name>hstab</object-name>
<object-name>elevatorleft</object-name>
<object-name>elevatorright</object-name>
<object-name>hstab</object-name>
<object-name>rudder_1</object-name>
<object-name>vstab</object-name>
</effect>
<!-- Transparent Surfaces for Rembrandt rendering -->
<effect>
<inherits-from>Effects/model-transparent</inherits-from>
<object-name>glas</object-name>
<object-name>rightwindow</object-name>
<object-name>leftwindow</object-name>
<object-name>Propeller.Fast</object-name>
</effect>
<!-- Specularity fix -->
<animation>
<type>material</type>
<object-name>LeftWheelStrut</object-name>
<object-name>RightWheelStrut</object-name>
<object-name>baggagedoor</object-name>
<object-name>charniere1</object-name>
<object-name>charniere2</object-name>
<object-name>charniere3</object-name>
<object-name>charniere4</object-name>
<object-name>elevatorleft</object-name>
<object-name>elevatorright</object-name>
<object-name>fairing1</object-name>
<object-name>fairing2</object-name>
<object-name>fairing3</object-name>
<object-name>flaps</object-name>
<object-name>fuselage_0</object-name>
<object-name>fuselage_1</object-name>
<object-name>hstab</object-name>
<object-name>leftaileron</object-name>
<object-name>leftdoor</object-name>
<object-name>rightaileron</object-name>
<object-name>rightdoor</object-name>
<object-name>rudder_1</object-name>
<object-name>vstab</object-name>
<object-name>wing_1</object-name>
<shininess>128</shininess>
<specular>
<r>1</r>
<g>1</g>
<b>1</b>
</specular>
<ambient>
<r>1</r>
<g>1</g>
<b>1</b>
</ambient>
</animation>
<!-- Transparent Surfaces for Rembrandt rendering -->
<effect>
<inherits-from>Aircraft/c172p/Models/Effects/glass</inherits-from>
<object-name>glas</object-name>
<object-name>rightwindow</object-name>
<object-name>leftwindow</object-name>
<object-name>landinglightcover</object-name>
</effect>
<effect>
<inherits-from>Effects/model-transparent</inherits-from>
<object-name>Propeller.Fast</object-name>
</effect>
<!-- Immatriculatoin -->
<model>
<path>Aircraft/c172p/Models/Immat/immat.xml</path>
@ -75,15 +132,6 @@
<path>Models/Aircraft/marker.xml</path>
</model>
<animation>
<type>shader</type>
<shader>chrome</shader>
<texture>glass_shader.png</texture>
<object-name>glas</object-name>
<object-name>leftwindow</object-name>
<object-name>rightwindow</object-name>
</animation>
<!--instrumentation-->
<model>
<name>MagCompass</name>
@ -2692,80 +2740,17 @@
<!--global type="bool">true</global-->
<object-name>RightWheelStrut</object-name>
<object-name>LeftWheelStrut</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture</texture-prop>
<texture>fuselage-n301dp.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>fairing1</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture</texture-prop>
<texture>fuselage-n301dp.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>fairing2</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture</texture-prop>
<texture>fuselage-n301dp.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>fairing3</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture</texture-prop>
<texture>fuselage-n301dp.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>fuselage</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture</texture-prop>
<texture>fuselage-n301dp.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>fuselage_0</object-name>
<object-name>fuselage_1</object-name>
<object-name>charniere1</object-name>
<object-name>charniere2</object-name>
<object-name>charniere3</object-name>
<object-name>charniere4</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture</texture-prop>
<texture>fuselage-n301dp.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>leftdoor</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture</texture-prop>
<texture>fuselage-n301dp.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>rightdoor</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture</texture-prop>
<texture>fuselage-n301dp.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>baggagedoor</object-name>
<property-base>sim/model/livery/</property-base>
<texture-prop>texture</texture-prop>
@ -2776,32 +2761,8 @@
<type>material</type>
<!--global type="bool">true</global-->
<object-name>wing</object-name>
<property-base>sim/model/liverywing/</property-base>
<texture-prop>texture</texture-prop>
<texture>wing.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>flaps</object-name>
<property-base>sim/model/liverywing/</property-base>
<texture-prop>texture</texture-prop>
<texture>wing.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>rightaileron</object-name>
<property-base>sim/model/liverywing/</property-base>
<texture-prop>texture</texture-prop>
<texture>wing.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>leftaileron</object-name>
<property-base>sim/model/liverywing/</property-base>
<texture-prop>texture</texture-prop>
@ -2812,32 +2773,8 @@
<type>material</type>
<!--global type="bool">true</global-->
<object-name>vstab</object-name>
<property-base>sim/model/liverytail/</property-base>
<texture-prop>texture</texture-prop>
<texture>tail.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>hstab</object-name>
<property-base>sim/model/liverytail/</property-base>
<texture-prop>texture</texture-prop>
<texture>tai.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>rudder</object-name>
<property-base>sim/model/liverytail/</property-base>
<texture-prop>texture</texture-prop>
<texture>tail.png</texture>
</animation>
<animation>
<type>material</type>
<!--global type="bool">true</global-->
<object-name>elevatorleft</object-name>
<object-name>elevatorright</object-name>
<property-base>sim/model/liverytail/</property-base>