Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds option to configure video interpolation method #539

Merged
merged 1 commit into from
Feb 14, 2021

Conversation

OmniBlade
Copy link
Contributor

Appearance on scaled resolutions that are not integer scaled is much improved.

@hifi
Copy link
Collaborator

hifi commented Feb 9, 2021

Can you make this an option in SettingsClass and set the default to full linear? Maybe in the Video section?

@OmniBlade OmniBlade changed the title Changes default interpolation from scanline to full linear. Adds option to configure video interpolation method Feb 9, 2021
@OmniBlade
Copy link
Contributor Author

Yes I can.

@OmniBlade OmniBlade force-pushed the feature/interpolate branch 3 times, most recently from d85ea51 to 8f1fe66 Compare February 10, 2021 22:39
Copy link
Collaborator

@hifi hifi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested the modes work as intended with a few cleanups required.

@@ -154,17 +154,15 @@ char const* Map_Selection(void)
Animate_Frame(anim, *pseudoseenbuff, 1);
for (int x = 0; x < 256; x++)
memset(&PaletteInterpolationTable[x][0], x, 256);
CopyType = 1;
Interpolate_2X_Scale(pseudoseenbuff, &SeenBuff, 0);
Settings.Video.InterpolationMode = 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this assignment and use 1 in the call. Setting it will change the ini value to 1 after you quit the game.

@@ -1697,23 +1692,23 @@ void Multi_Score_Presentation(void)
Animate_Frame(anim, *pseudoseenbuff, 1);
for (int x = 0; x < 256; x++)
memset(&PaletteInterpolationTable[x][0], x, 256);
CopyType = 1;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can either revert these changes because they are ifdeffed out or fix them to use the argument as well.

Changes default interpolation from scanline to full linear.
Adds option for conquer.ini/redalert.ini [Video] section, InterpolationMode=x
0 = Horizontal interpolation, vertical skip scanline.
1 = Horizontal interpolation, vertical doubling.
2 = Full interpolation in both axis.
@hifi hifi merged commit 9a31c7d into TheAssemblyArmada:vanilla Feb 14, 2021
@OmniBlade OmniBlade deleted the feature/interpolate branch February 14, 2021 22:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants