fly/fgdata
1
0
Fork 0
Code Activity

Revert "Test orientation change"

Browse source 
This reverts commit 399ac94ec3.
This commit is contained in:
fly 2021-12-11 21:40:55 +01:00
parent a90607596b
commit fe2b788d72
3 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Effects/projection.eff
View file

@ -6,12 +6,9 @@
<vfov><use>/surround/vfov</use></vfov>
<auto_vfov><use>/surround/auto-vfov</use></auto_vfov>
<enable_overlay><use>/surround/enable-overlay</use></enable_overlay>
<rot_x><use>/surround/testx</use></rot_x>
<rot_y><use>/surround/testy</use></rot_y>
<rot_z><use>/surround/testz</use></rot_z>
<!--rot_x><use>/sim/current-view/raw-orientation[1]</use></rot_x>
<rot_x><use>/sim/current-view/raw-orientation[0]</use></rot_x>
<rot_y><use>/sim/current-view/raw-orientation[1]</use></rot_y>
<rot_z><use>/sim/current-view/raw-orientation[2]</use></rot_z-->
<rot_z><use>/sim/current-view/raw-orientation[2]</use></rot_z>
<display_xsize>
<use>/sim/startup/xsize</use>
</display_xsize>

2
Shaders/projection.frag
View file

@ -63,7 +63,7 @@ void main(void)
rayt = rot3d(ray, vec3(1.0, 0.0, 0.0), i_rot_x);
rayt = rot3d(rayt, vec3(0.0, 1.0, 0.0), i_rot_y);
rayt = rot3d(rayt, vec3(0.0, 0.0, 1.0), i_rot_z);
ray = rot3d(ray, vec3(i_rot_x, i_rot_y, i_rot_z), 1.0);
// ray = rot3d(ray, vec3(i_rot_x, i_rot_y, i_rot_z), 0.0);
vec4 ret = textureCube( iChannel0, ray );
if (enable_overlay == 1)

8
defaults.xml
View file

@ -1490,13 +1490,5 @@ Started September 2000 by David Megginson, david@megginson.com
<max-radius-nm type="double" userarchive="n">5.0</max-radius-nm>
</ai-wake>
</fdm>
<surround>
<vfov type="float">180</vfov>
<auto-vfov type="int">1</auto-vfov>
<enable-overlay type="int">0</enable-overlay>
<testx type="float">0.0</testx>
<testy type="float">0.0</testy>
<testz type="float">0.0</testz>
</surround>
</PropertyList>
<!-- end of defaults.xml -->