diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-11-09 14:05:28 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-11-09 14:32:55 +0000 |
| commit | 324a8aab24045dc587bd9e6a111db4077c86fa26 (patch) | |
| tree | fea456097a69ec392d8c8e6f168021480ff53b94 /tools | |
| parent | 075249d6a966a4803575a1c808bea02ce69e5c86 (diff) | |
Rename scenemanager MSAA flag
To indicate that this is just a way to forcibly enable MSAA
for scenes that do not do set multisampleAA in their layers.
Support for Layer.multisampleAA is to be added on top.
Task-number: QT3DS-329
Change-Id: Icfafbcde1ef3dbc049d04032147526864c31ad4e
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/q3dsviewer/main.cpp | 4 | ||||
| -rw-r--r-- | tools/qt3dsexplorer/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/q3dsviewer/main.cpp b/tools/q3dsviewer/main.cpp index c705faf..2d96680 100644 --- a/tools/q3dsviewer/main.cpp +++ b/tools/q3dsviewer/main.cpp @@ -44,13 +44,13 @@ int main(int argc, char *argv[]) cmdLineParser.addPositionalArgument(QLatin1String("filename"), QObject::tr("UIP or UIA file to open")); QCommandLineOption noMainWindowOption({ "w", "no-main-window" }, QObject::tr("Skips the QWidget-based main window (use this for eglfs).")); cmdLineParser.addOption(noMainWindowOption); - QCommandLineOption msaaOption({ "m", "multisample" }, QObject::tr("Enable 4x MSAA")); + QCommandLineOption msaaOption({ "m", "multisample" }, QObject::tr("Force 4x MSAA")); cmdLineParser.addOption(msaaOption); cmdLineParser.process(app); Q3DStudioWindow::InitFlags initFlags = 0; if (cmdLineParser.isSet(msaaOption)) - initFlags |= Q3DStudioWindow::MSAA4x; + initFlags |= Q3DStudioWindow::Force4xMSAA; Q3DStudioWindow::initStaticPostApp(initFlags); QStringList fn = cmdLineParser.positionalArguments(); diff --git a/tools/qt3dsexplorer/main.cpp b/tools/qt3dsexplorer/main.cpp index 249788b..83259bc 100644 --- a/tools/qt3dsexplorer/main.cpp +++ b/tools/qt3dsexplorer/main.cpp @@ -41,13 +41,13 @@ int main(int argc, char *argv[]) QCommandLineParser cmdLineParser; cmdLineParser.addHelpOption(); cmdLineParser.addPositionalArgument(QLatin1String("filename"), QObject::tr("UIP or UIA file to open")); - QCommandLineOption msaaOption({ "m", "multisample" }, QObject::tr("Enable 4x MSAA")); + QCommandLineOption msaaOption({ "m", "multisample" }, QObject::tr("Force 4x MSAA")); cmdLineParser.addOption(msaaOption); cmdLineParser.process(app); Q3DStudioWindow::InitFlags initFlags = 0; if (cmdLineParser.isSet(msaaOption)) - initFlags |= Q3DStudioWindow::MSAA4x; + initFlags |= Q3DStudioWindow::Force4xMSAA; Q3DStudioWindow::initStaticPostApp(initFlags); QStringList fn = cmdLineParser.positionalArguments(); |