[Murleen]

Hi all,

I've been poking around in the code looking at the 2d/3d misalignment problem, and I think I've worked up a fix. There were two basic issues - the aspect scaling code was broken - it looks like it was intended to increase the horizontal fov when the width was greater than the height, and decrease the vertical fov otherwise. Unfortunately the if condition was wrong, so the vertical fov decrease was always being applied. Since the OpenGL projection fixes the vertical fov, I've changed the aspect scaling code to match. The second problem was the View_zoom being improperly applied - the 2d code was treating it as a linear zoom factor, while the 3d code multiplied it by an 80 degree vertical fov angle. Here's the patch:

Code: [Select]

Index: code/render/3dsetup.cpp
===================================================================
RCS file: /home/fs2source/cvsroot/fs2_open/code/render/3dsetup.cpp,v
retrieving revision 2.22.2.1
diff -u -r2.22.2.1 3dsetup.cpp
--- code/render/3dsetup.cpp     1 Oct 2006 19:31:19 -0000       2.22.2.1
+++ code/render/3dsetup.cpp     14 Feb 2008 17:58:32 -0000
@@ -284,15 +284,8 @@

        s = aspect*(float)Canvas_height/(float)Canvas_width;

-       if (s <= 0) {           //scale x
-               Window_scale.xyz.x = s;
-               Window_scale.xyz.y = 1.0f;
-       }
-       else {
-               Window_scale.xyz.y = 1.0f / s;
-               Window_scale.xyz.x = 1.0f;
-       }
-
+       Window_scale.xyz.x = s;
+       Window_scale.xyz.y = 1.0f;
        Window_scale.xyz.z = 1.0f;              //always 1

        init_free_points();
@@ -371,17 +364,10 @@

        Matrix_scale = Window_scale;

-       if (View_zoom <= 1.0)           //zoom in by scaling z
-
-               Matrix_scale.xyz.z =  Matrix_scale.xyz.z*View_zoom;
+       float f = 1.0 / tan((double) Proj_fov / 2.0);

-       else {                  //zoom out by scaling x&y
-
-               float s = (float)1.0 / View_zoom;
-
-               Matrix_scale.xyz.x = Matrix_scale.xyz.x*s;
-               Matrix_scale.xyz.y = Matrix_scale.xyz.y*s;
-       }
+       Matrix_scale.xyz.x = Matrix_scale.xyz.x*f;
+       Matrix_scale.xyz.y = Matrix_scale.xyz.y*f;

        //now scale matrix elements

It's more than possible that I've missed something here, but it seems to be pretty solid for me with wacky fov and aspect settings...

[karajorma]

I always get a warm feeling when someone's first post is a code fix.

[taylor]

I always get a warm feeling when someone's first post is a code fix.

Yeah, that is always pretty nice.


I need to test this out when I get back home before I can give it my official thumbs up, but this is easily the best best idea I've seen so far to address the problem.  This patch doesn't really touch on the root of the problem, it's a bit more complicated than that, but it certainly appears to come damn close to making the proper fix a wasted effort (which is would do if the proper fix didn't offer performance improvements).  I'll test it out in a few hours, and if everything appears to work fine then I'll go ahead and commit it. 

And I'm sure that you could end up getting a cookie out this, or a carrot, or a beer, or a pizza, or whatever it may be that turns you on in a congratulatory-gift sort of way.


EDIT:  Works great for me.  Fantastic work Murleen, I'll commit this later tonight!

[Jeff Vader]

And I'm sure that you could end up getting a cookie out this, or a carrot, or a beer, or a pizza, or whatever it may be that turns you on in a congratulatory-gift sort of way.

If this works, I recommend a proper custom title. As a laptop user, I'd also be happy if a widescreen fix was to be implemented.

[Kazan]

He's got Perspective.

[Goober5000]

Title'd.

Will this work for FRED too?

[taylor]

Will this work for FRED too?

Not sure yet, I'll be testing that a bit later today before I commit.  There are already a couple of issue with the fix that required some minor changes so that it works better, but that wasn't a big deal.  But after the necessary changes I haven't found any test case that doesn't work so far.

[Woolie Wool]

Hi all,

I've been poking around in the code looking at the 2d/3d misalignment problem, and I think I've worked up a fix. There were two basic issues - the aspect scaling code was broken - it looks like it was intended to increase the horizontal fov when the width was greater than the height, and decrease the vertical fov otherwise. Unfortunately the if condition was wrong, so the vertical fov decrease was always being applied. Since the OpenGL projection fixes the vertical fov, I've changed the aspect scaling code to match. The second problem was the View_zoom being improperly applied - the 2d code was treating it as a linear zoom factor, while the 3d code multiplied it by an 80 degree vertical fov angle. Here's the patch:

Code: [Select]

Index: code/render/3dsetup.cpp
===================================================================
RCS file: /home/fs2source/cvsroot/fs2_open/code/render/3dsetup.cpp,v
retrieving revision 2.22.2.1
diff -u -r2.22.2.1 3dsetup.cpp
--- code/render/3dsetup.cpp     1 Oct 2006 19:31:19 -0000       2.22.2.1
+++ code/render/3dsetup.cpp     14 Feb 2008 17:58:32 -0000
@@ -284,15 +284,8 @@

        s = aspect*(float)Canvas_height/(float)Canvas_width;

-       if (s <= 0) {           //scale x
-               Window_scale.xyz.x = s;
-               Window_scale.xyz.y = 1.0f;
-       }
-       else {
-               Window_scale.xyz.y = 1.0f / s;
-               Window_scale.xyz.x = 1.0f;
-       }
-
+       Window_scale.xyz.x = s;
+       Window_scale.xyz.y = 1.0f;
        Window_scale.xyz.z = 1.0f;              //always 1

        init_free_points();
@@ -371,17 +364,10 @@

        Matrix_scale = Window_scale;

-       if (View_zoom <= 1.0)           //zoom in by scaling z
-
-               Matrix_scale.xyz.z =  Matrix_scale.xyz.z*View_zoom;
+       float f = 1.0 / tan((double) Proj_fov / 2.0);

-       else {                  //zoom out by scaling x&y
-
-               float s = (float)1.0 / View_zoom;
-
-               Matrix_scale.xyz.x = Matrix_scale.xyz.x*s;
-               Matrix_scale.xyz.y = Matrix_scale.xyz.y*s;
-       }
+       Matrix_scale.xyz.x = Matrix_scale.xyz.x*f;
+       Matrix_scale.xyz.y = Matrix_scale.xyz.y*f;

        //now scale matrix elements

It's more than possible that I've missed something here, but it seems to be pretty solid for me with wacky fov and aspect settings...

I think I love you. In a completely platonic way of course.

[jdjtcagle]

Great job !!!

[FSW]

[haloboy100]

All this success, and we forgot the most sacred of welcomes
And he gets a custom title with his first post!
(in a completely freindly way) CONGRAGU-****ING-LATIONS! WE FINALLY HAVE THE DAMNED WIDESCREEN FOV FIX!

Now...um...how do i use it?

[colecampbell666]

Wait for a build. Has anyone, besides the Hammer of 0wnage or Thunder Kalfireth Thunder, got a title on their first post or before posting?

[achtung]

Kind of like finding a hundred dollar bill on the street.

[Turambar]

beautiful!

no more black bars or misleading lead indicators for me!

[Bob-san]

Will this work properly for 5:4 aspect ratio as well as 16:9 and 16:10?

[haloboy100]

what kind of screen uses 5:4 anyway?

[Herra Tohtori]

1280x1024...

Rather common resolution, I daresay.

[haloboy100]

yeah, but do common CRT monitors support that? what would you need that ratio for anyway?

[CP5670]

They support it and a lot of people use it, but it's the wrong ratio for them and makes things look squished. 5:4 LCDs were made as such because this resolution was so common on CRTs.

[Reprobator]

That's a great news!
Just need to wait opengl version of softh and i ll be able to play fs2 with my 3screens   
That fix , the track ir suppport and virtual cockpit that are coming both, scp engine open his way to simulator's immersion feeling!