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

Stereo3d presets #3076

Merged
merged 2 commits into from Oct 4, 2015
Merged

Stereo3d presets #3076

merged 2 commits into from Oct 4, 2015

Conversation

void-ghost
Copy link
Contributor

This adds customizable stereo-3d presets.
Added 3 depth/convergence presets. These are adjustable via (existing) hotkeys - changes to depth and convergence are applied to current preset.
Added 3 new hotkeys for activating presets and a hotkey for toggle between first and second preset.
Added OSD message to convergence/depth changes.
Presets are saved into per-game configs.
Changed depth/convergence hotkeys from "onHold" to "onPress" for more precise control.

Also added getter for video config filename (and removed repeated definitions for that filename). That was needed for first implementation, that saved presets into video config. This change is not needed by current implementation (but is good nonetheless, in my opinion).

@RisingFog
Copy link
Member

@dolphin-emu-bot rebuild

_trans("Use 3d Preset 1"),
_trans("Use 3d Preset 2"),
_trans("Use 3d Preset 3"),

This comment was marked as off-topic.

std::string VideoBackend::GetConfigName() const
{
return "gfx_dx11";
}

This comment was marked as off-topic.

It reduces redundancy. Needed make possible to save current video config.
@@ -51,6 +51,14 @@ enum StereoMode
STEREO_3DVISION
};

constexpr int STEREOSCOPY_PRESETS_NUM = 3;

This comment was marked as off-topic.

This comment was marked as off-topic.

@@ -84,6 +92,8 @@ struct VideoConfig final
int iStereoDepth;
int iStereoConvergence;
bool bStereoSwapEyes;
StereoscopyPreset oStereoPresets[STEREOSCOPY_PRESETS_NUM];

This comment was marked as off-topic.

…ereo-3d presets.

Added 3 depth/convergence presets. They are adjustable via (existing) hotkeys - changes to depth and convergence are applied to current preset.
Added 3 hotkeys for activating presets. Added hotkey for toggle between first and second preset.
Added OSD message for convergence/depth changes.
Presets are saved into per-game configs.
@degasus
Copy link
Member

degasus commented Sep 24, 2015

LGTM

@phire
Copy link
Member

phire commented Sep 29, 2015

Sorry, I'm just using this PR to test those random FifoCI failures

@dolphin-emu-bot rebuild

@dolphin-emu-bot
Copy link
Contributor

FifoCI detected that this change impacts graphical rendering. Here are the behavior differences detected by the system:

  • fortune-street-white-box on ogl-lin-mesa: diff
  • chibi-robo-fastdepth on ogl-lin-nv: diff
  • mini-ninjas on ogl-lin-nv: diff
  • my-word-coach on ogl-lin-nv: diff
  • nfsu-reflections on ogl-lin-nv: diff
  • tos-invis-char on ogl-lin-nv: diff

automated-fifoci-reporter

shuffle2 added a commit that referenced this pull request Oct 4, 2015
@shuffle2 shuffle2 merged commit 81414b4 into dolphin-emu:master Oct 4, 2015
@Dogway
Copy link

Dogway commented Oct 17, 2015

How can I turn off this?
For some reason after this merge all my stereo settings behave bad (too much convergence)
As example. Mario Kart Wii before this merge was perfect with the next settings:

[Video_Enhancements]
StereoConvergence = 442
StereoDepth = 21

@Dogway
Copy link

Dogway commented Nov 28, 2015

Why isn't this commit reverted at least while the user works on fixed code?
We shouldn't be green lighting this kind of unasked "features" from fleeting developers, moreover when it's clearly this half-baked. For the time being nobody can use stereoscopic 3D.

@JMC47
Copy link
Contributor

JMC47 commented Dec 7, 2015

I would have made a revert PR myself, but, github says it cannot be automatically reverted or already was.

CrossVR added a commit to CrossVR/dolphin that referenced this pull request Dec 22, 2015
PR dolphin-emu#3076 looks to be pretty poor quality and should be reverted.
CrossVR added a commit to CrossVR/dolphin that referenced this pull request Dec 22, 2015
…presets"

This reverts commit 81414b4, reversing
changes made to b926061.

Conflicts:
	Source/Core/DolphinWX/Frame.cpp
	Source/Core/VideoCommon/VideoConfig.cpp
	Source/Core/VideoCommon/VideoConfig.h
CrossVR added a commit to CrossVR/dolphin that referenced this pull request Dec 22, 2015
…presets"

This reverts commit 81414b4, reversing
changes made to b926061.

Conflicts:
	Source/Core/DolphinWX/Frame.cpp
	Source/Core/VideoCommon/VideoConfig.cpp
	Source/Core/VideoCommon/VideoConfig.h
degasus added a commit that referenced this pull request Dec 28, 2015
Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
10 participants