AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9407e24c29
skia2/tools/viewer/Viewer.cpp

2119 lines
81 KiB
C++
Raw Normal View History

First pass at VulkanViewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
2016-04-06 13:08:59 +00:00
/*
* Copyright 2016 Google Inc.
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
Resurrect pathfinder in viewer and rename to "bisect" Bug: skia: Change-Id: If8d2f46b8f27fefc3a0f983eb649654e0fb4afcb Reviewed-on: https://skia-review.googlesource.com/108685 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2018-02-20 20:23:32 +00:00
#include "BisectSlide.h"
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
#include "GMSlide.h"
Make GrCaps and GrShaderCaps private. Moves getCaps() from GrContext to GrContextPriv and removes unused refCaps(). Change-Id: Ic6a8951b656c0d1b2773eae73bff8e88af819866 Reviewed-on: https://skia-review.googlesource.com/127389 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2018-05-11 14:14:21 +00:00
#include "GrContext.h"
#include "GrContextPriv.h"
Display JPGs in Viewer with Split Screen and ColorSpaceXform BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2058753002 Review-Url: https://codereview.chromium.org/2058753002
2016-06-13 19:26:45 +00:00
#include "ImageSlide.h"
Experimental Particle System This adds a new "Particles" slide to viewer, that allows editing, loading, and saving particle effects. All of the particle system code is in modules/particles. There are many rough edges and some not-yet-finished changes to generalize the model[1]. A rough overview: - SkReflected.h implements a lightweight reflection system for classes derived from SkReflected. Adding a new class involves deriving from SkReflected, adding a macro to the class declaration, and implementing visitFields(), which simply calls a virtual on an SkFieldVisitor for each field. Currently, emitters and affectors use this mechanism. - SkParticleSerialization.h demonstrates two useful field visitors - for serializing to and from JSON. The driver code that uses those is directly in ParticlesSlide. - SkParticleData.h and SkCurve.h define a variety of helper types for talking about particles, both for parameterizing individual values, and communicating about the state of a particle among the effect, affectors, and emitters. - SkParticleEffect.h defines the static data definition of an effect (SkParticleEffectParams), as well as a running instance of an effect (SkParticleEffect). The effect has simple update() and draw() methods. - ParticlesSlide.cpp adds a third field visitor to generate GUIs for interactively editing the running effect. --- 1: The critical change I'd like to make is to remove all special case behavior over time and at spawn (setting sprite frames, size over time, color over time, etc...). Integration is the only fixed function behavior. Everything else is driven by two lists of affectors. One is applied at spawn time, using the effect's lifetime to evaluate curves. This allows spawning particles with different colors as the effect ages out, for example. The second list is applied every frame to update existing particles, and is driven by the particle's lifetime. This allows particles to change color after being spawned, for example. With a small set of affectors using a single expressive curve primitive (keyframed list of cubic curve segments), we can have affectors that update color, size, velocity, position, sprite frame, etc., and implement many complex behaviors. Bug: skia: Change-Id: Id9402bef22825d55d021c5a2f9e5e41791aabaf4 Reviewed-on: https://skia-review.googlesource.com/c/181404 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Reed <reed@google.com>
2019-02-12 18:27:51 +00:00
#include "ParticlesSlide.h"
Add support for resources on android Viewer BUG=skia: Change-Id: I1acc3e4fe6d0ce8bf29c52dd7280dff029a3abc2 Reviewed-on: https://skia-review.googlesource.com/5322 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
2016-11-29 21:35:19 +00:00
#include "Resources.h"
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
#include "SKPSlide.h"
Make GrCaps and GrShaderCaps private. Moves getCaps() from GrContext to GrContextPriv and removes unused refCaps(). Change-Id: Ic6a8951b656c0d1b2773eae73bff8e88af819866 Reviewed-on: https://skia-review.googlesource.com/127389 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2018-05-11 14:14:21 +00:00
#include "SampleSlide.h"
First pass at VulkanViewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
2016-04-06 13:08:59 +00:00
#include "SkCanvas.h"
Allow changing the transfer function in xform canvas mode Used this to test out some theories for different color correction approaches. Bug: skia: Change-Id: I072130733eaea736c9aa129af74887b028f035b4 Reviewed-on: https://skia-review.googlesource.com/69221 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-11-09 15:27:55 +00:00
#include "SkColorSpacePriv.h"
GN builds viewer on Linux, too BUG=skia: Change-Id: Ia0c10db49905fc5a3bdf424c38576e1a6cf09ecf Reviewed-on: https://skia-review.googlesource.com/3606 Reviewed-by: Mike Klein <mtklein@chromium.org> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2016-10-18 19:33:53 +00:00
#include "SkCommandLineFlags.h"
Make GrCaps and GrShaderCaps private. Moves getCaps() from GrContext to GrContextPriv and removes unused refCaps(). Change-Id: Ic6a8951b656c0d1b2773eae73bff8e88af819866 Reviewed-on: https://skia-review.googlesource.com/127389 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2018-05-11 14:14:21 +00:00
#include "SkCommonFlags.h"
Add a tools flag to suppress geometry shaders Bug: skia: Change-Id: I38736c5d49e3b281c2d23af3908575274ff97b5c Reviewed-on: https://skia-review.googlesource.com/86282 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-12-18 21:22:34 +00:00
#include "SkCommonFlagsGpu.h"
First stab at JSON event tracer Not yet thread safe (so it forces threading off). Builds JSON on the fly, so overhead is certainly bad. Plan to fix all of that, but this at least "works". There is now one tracing flag: 'trace'. - 'debugf' installs the SkDebugf tracer. - 'atrace' installs the Android ATrace tracer. - Any other value is interpreted as a filename, and produces a JSON file for chrome://tracing. All three modes work in DM, nanobench, and Viewer. Bug: skia: Change-Id: I3fbc22382b99418a508c670be2770195c0a1c364 Reviewed-on: https://skia-review.googlesource.com/24781 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-20 19:43:35 +00:00
#include "SkEventTracingPriv.h"
Add nativeFonts flag to Viewer. This moves DMFontMgr and several related files which are tightly related to fonts into tools/fonts, moves some flags around to prevent duplication, and adds the nativeFonts handling to Viewer. Change-Id: Id1bdad708a6b74319ac5ac9adfe21025db4ca0b2 Reviewed-on: https://skia-review.googlesource.com/108904 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2018-02-20 22:06:07 +00:00
#include "SkFontMgrPriv.h"
Add support for Atrace and hook into SkEventTracer framework. This change is a different version of: https://skia-review.googlesource.com/c/3269/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3345 Change-Id: I49d4f2987740d3ad1307f6aba3add0d63a46b22d Reviewed-on: https://skia-review.googlesource.com/3345 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Greg Daniel <egdaniel@google.com>
2016-10-14 13:12:53 +00:00
#include "SkGraphics.h"
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
#include "SkImagePriv.h"
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
#include "SkJSONWriter.h"
Take sk_sp<SkDevice> instead of SkDevice* Change-Id: I0b296bf5b80adc19758a3dc99160be9d2ed05680 Reviewed-on: https://skia-review.googlesource.com/125160 Commit-Queue: Herb Derby <herb@google.com> Commit-Queue: Mike Reed <reed@google.com> Reviewed-by: Mike Reed <reed@google.com> Auto-Submit: Herb Derby <herb@google.com>
2018-05-01 21:06:20 +00:00
#include "SkMakeUnique.h"
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
#include "SkOSFile.h"
Move SkOSPath out of include/core. It is moved to src/utils. It is almost a tool, but has two uses in src/ports. The existing SkOSFile.cpp is left empty for the time being since it is mentioned in Chromium's BUILD.gn for Skia. Change-Id: I3bb7f7c4214359eb6ab906bfe76737d20bf1d6c7 Reviewed-on: https://skia-review.googlesource.com/4536 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Ben Wagner <bungeman@google.com>
2016-11-07 23:05:29 +00:00
#include "SkOSPath.h"
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
#include "SkPaintFilterCanvas.h"
Add 'Save to SKP' option to Viewer Bug: skia: Change-Id: Iea3794ce8710c84f2529b78b21655f2bf6aaa90e Reviewed-on: https://skia-review.googlesource.com/79160 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-01 16:23:53 +00:00
#include "SkPictureRecorder.h"
Add AAA and DAA toggles to viewer Bug: skia: Change-Id: I0ee397d2b2c81a25918cb28be426cf5162da772f Reviewed-on: https://skia-review.googlesource.com/30561 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Yuqian Li <liyuqian@google.com>
2017-08-03 15:08:15 +00:00
#include "SkScan.h"
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
#include "SkStream.h"
Use Offscreen Surface for Split Screen A dashed line is also added to split the screen. Currently, drawing images with sRGB seems to still have bugs. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069653002 Review-Url: https://codereview.chromium.org/2069653002
2016-06-16 21:10:34 +00:00
#include "SkSurface.h"
Enable threaded SkTaskGroup in Viewer BUG=skia: Change-Id: I7f467c094fb0bcb983bd86d07cb9bd7be34666b3 Reviewed-on: https://skia-review.googlesource.com/8332 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-02-10 22:05:14 +00:00
#include "SkTaskGroup.h"
Add nativeFonts flag to Viewer. This moves DMFontMgr and several related files which are tightly related to fonts into tools/fonts, moves some flags around to prevent duplication, and adds the nativeFonts handling to Viewer. Change-Id: Id1bdad708a6b74319ac5ac9adfe21025db4ca0b2 Reviewed-on: https://skia-review.googlesource.com/108904 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2018-02-20 22:06:07 +00:00
#include "SkTestFontMgr.h"
Revert "Revert "SkTypes: extract SkTo"" This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876. > Original change's description: > > SkTypes: extract SkTo > > > > Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09 > > Reviewed-on: https://skia-review.googlesource.com/133620 > > Reviewed-by: Mike Klein <mtklein@google.com> Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa Reviewed-on: https://skia-review.googlesource.com/134506 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
2018-06-13 13:59:02 +00:00
#include "SkTo.h"
test,tools: whitespace changes for clang-format Change-Id: I67529f6c0ac26da603f60af22c620f8f603d8a19 Reviewed-on: https://skia-review.googlesource.com/155564 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Hal Canary <halcanary@google.com>
2018-09-19 15:31:27 +00:00
#include "SlideDir.h"
Make GrCaps and GrShaderCaps private. Moves getCaps() from GrContext to GrContextPriv and removes unused refCaps(). Change-Id: Ic6a8951b656c0d1b2773eae73bff8e88af819866 Reviewed-on: https://skia-review.googlesource.com/127389 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2018-05-11 14:14:21 +00:00
#include "SvgSlide.h"
Revert "Revert "SkTypes: extract SkTo"" This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876. > Original change's description: > > SkTypes: extract SkTo > > > > Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09 > > Reviewed-on: https://skia-review.googlesource.com/133620 > > Reviewed-by: Mike Klein <mtklein@google.com> Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa Reviewed-on: https://skia-review.googlesource.com/134506 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
2018-06-13 13:59:02 +00:00
#include "Viewer.h"
Coverage counting path renderer Initial implementation of a GPU path renderer that draws antialiased paths by counting coverage in an offscreen buffer. Initially disabled until it has had time to soak. Bug: skia: Change-Id: I003d8cfdf8dc62641581b5ea2dc4f0aa00108df6 Reviewed-on: https://skia-review.googlesource.com/21541 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2017-07-14 21:17:41 +00:00
#include "ccpr/GrCoverageCountingPathRenderer.h"
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
Revert "Revert "SkTypes: extract SkTo"" This reverts commit fdcfb8b7c23fbf18f872d2c31d27978235033876. > Original change's description: > > SkTypes: extract SkTo > > > > Change-Id: I8de790d5013db2105ad885fa2683303d7c250b09 > > Reviewed-on: https://skia-review.googlesource.com/133620 > > Reviewed-by: Mike Klein <mtklein@google.com> Change-Id: Ida74fbc5c21248a724a5edbf9fae18a33bcb23aa Reviewed-on: https://skia-review.googlesource.com/134506 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
2018-06-13 13:59:02 +00:00
#include <stdlib.h>
#include <map>
test,tools: whitespace changes for clang-format Change-Id: I67529f6c0ac26da603f60af22c620f8f603d8a19 Reviewed-on: https://skia-review.googlesource.com/155564 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Hal Canary <halcanary@google.com>
2018-09-19 15:31:27 +00:00
#include "imgui.h"
"Modularize" SkSG * relocate all SkSG-related files under modules/sksg/ * fix various tidbits to make non-sksg builds possible * drop obsolete SampleSGInval.cpp Change-Id: I54e6c5bb1a09f45030fa8d607b3eb3f7cba78957 Reviewed-on: https://skia-review.googlesource.com/130025 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@google.com>
2018-05-25 16:43:51 +00:00
[skottie] Disable on Android Framework builds Make Skottie truly optional (own flag), and disable in framework builds (to unblock landing the RapidJson refactoring). Change-Id: I4611f915e43fe11c1f6754ab4a9f63e45af2f8d3 Reviewed-on: https://skia-review.googlesource.com/125872 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@google.com>
2018-05-04 16:23:24 +00:00
#if defined(SK_ENABLE_SKOTTIE)
#include "SkottieSlide.h"
#endif
skeletal animation support added to API and software backend SkCanvas::drawVertices now supports overloads that take an array of bone deformation matrices. SkVertices::MakeCopy and SkVertices::Builder now support two additional optional attributes, boneIndices and boneWeights. Bug: skia: Change-Id: I30a3b11691e7cdb13924907cc1401ff86d127aea Reviewed-on: https://skia-review.googlesource.com/137221 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
2018-06-29 18:32:21 +00:00
#if !(defined(SK_BUILD_FOR_WIN) && defined(__clang__))
#include "NIMASlide.h"
#endif
Rename VulkanViewer to Viewer, take 2. Also puts Window and Application in sk_app namespace. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003 Review-Url: https://codereview.chromium.org/1945103003
2016-05-04 20:49:13 +00:00
using namespace sk_app;
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
static std::map<GpuPathRenderers, std::string> gPathRendererNames;
First pass at VulkanViewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
2016-04-06 13:08:59 +00:00
Application* Application::Create(int argc, char** argv, void* platformData) {
Rename VulkanViewer to Viewer, take 2. Also puts Window and Application in sk_app namespace. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003 Review-Url: https://codereview.chromium.org/1945103003
2016-05-04 20:49:13 +00:00
return new Viewer(argc, argv, platformData);
First pass at VulkanViewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
2016-04-06 13:08:59 +00:00
}
Add a tooling flag for path mask caching Adds the flag and a disables caching on the CCPR bots. Bug: skia: Change-Id: Icb85e77f89634dda1d419dacac5b8a93340723f0 Reviewed-on: https://skia-review.googlesource.com/59740 Reviewed-by: Eric Boren <borenet@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-10-13 18:35:50 +00:00
static DEFINE_string(slide, "", "Start on this sample.");
static DEFINE_bool(list, false, "List samples?");
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
Add sw support to viewer on Linux. This doesn't yet do anything with srgb/colorspace. Replaces the --vulkan flag with --backend which takes 'gl', 'vk', or 'sw'. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165813002 Review-Url: https://codereview.chromium.org/2165813002
2016-07-26 19:56:32 +00:00
#ifdef SK_VULKAN
Enable backend switching for Windows Viewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2184163003 Review-Url: https://codereview.chromium.org/2184163003
2016-07-27 21:29:18 +00:00
# define BACKENDS_STR "\"sw\", \"gl\", and \"vk\""
Add Metal context to Viewer. Bug: skia:8737 Change-Id: I5c4c839bcf39f2cd3a9a32d005bf4bdb7c42e6a5 Reviewed-on: https://skia-review.googlesource.com/c/187925 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2019-02-08 20:36:14 +00:00
#elif defined(SK_METAL) && defined(SK_BUILD_FOR_MAC)
# define BACKENDS_STR "\"sw\", \"gl\", and \"mtl\""
Add sw support to viewer on Linux. This doesn't yet do anything with srgb/colorspace. Replaces the --vulkan flag with --backend which takes 'gl', 'vk', or 'sw'. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165813002 Review-Url: https://codereview.chromium.org/2165813002
2016-07-26 19:56:32 +00:00
#else
# define BACKENDS_STR "\"sw\" and \"gl\""
#endif
GN builds viewer on Linux, too BUG=skia: Change-Id: Ia0c10db49905fc5a3bdf424c38576e1a6cf09ecf Reviewed-on: https://skia-review.googlesource.com/3606 Reviewed-by: Mike Klein <mtklein@chromium.org> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2016-10-18 19:33:53 +00:00
static DEFINE_string2(backend, b, "sw", "Backend to use. Allowed values are " BACKENDS_STR ".");
Add sw support to viewer on Linux. This doesn't yet do anything with srgb/colorspace. Replaces the --vulkan flag with --backend which takes 'gl', 'vk', or 'sw'. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165813002 Review-Url: https://codereview.chromium.org/2165813002
2016-07-26 19:56:32 +00:00
Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend."""""" This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32. Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab Reviewed-on: https://skia-review.googlesource.com/103181 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2018-02-03 01:32:49 +00:00
static DEFINE_int32(msaa, 1, "Number of subpixel samples. 0 for no HW antialiasing.");
Add the ability to enable/disable GPU path renderers Adds a bitfield to GrContextOptions that masks out path renderers. Adds commandline flags support to set this bitfield in tools apps. Removes GrGLInterfaceRemoveNVPR since we can now accomplish the same thing in the context options. BUG=skia: Change-Id: Icf2a4df36374b3ba2f69ebf0db56e8aedd6cf65f Reviewed-on: https://skia-review.googlesource.com/8786 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-22 19:00:42 +00:00
Resurrect pathfinder in viewer and rename to "bisect" Bug: skia: Change-Id: If8d2f46b8f27fefc3a0f983eb649654e0fb4afcb Reviewed-on: https://skia-review.googlesource.com/108685 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2018-02-20 20:23:32 +00:00
DEFINE_string(bisect, "", "Path to a .skp or .svg file to bisect.");
First stab at JSON event tracer Not yet thread safe (so it forces threading off). Builds JSON on the fly, so overhead is certainly bad. Plan to fix all of that, but this at least "works". There is now one tracing flag: 'trace'. - 'debugf' installs the SkDebugf tracer. - 'atrace' installs the Android ATrace tracer. - Any other value is interpreted as a filename, and produces a JSON file for chrome://tracing. All three modes work in DM, nanobench, and Viewer. Bug: skia: Change-Id: I3fbc22382b99418a508c670be2770195c0a1c364 Reviewed-on: https://skia-review.googlesource.com/24781 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-20 19:43:35 +00:00
DECLARE_int32(threads)
Add instanced rendering command line flag to viewer. Previously this could only be turned on at runtime. Change-Id: I1b626584fba17fcf8ff64135dd93f98c7f40821d Reviewed-on: https://skia-review.googlesource.com/9445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-03-08 19:03:56 +00:00
Add a single-file viewer option Pass --file/-f to open a single file for viewing. Change-Id: Ida168765ed6a5c7d76df1a8298bfe658d39d0196 Reviewed-on: https://skia-review.googlesource.com/126761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-05-08 14:36:18 +00:00
DEFINE_string2(file, f, "", "Open a single file for viewing.");
Add ANGLE support to Viewer on Windows Change-Id: I97a844b2f289d2518f60a64f94d60551c4530dd4 Reviewed-on: https://skia-review.googlesource.com/35742 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2017-08-17 18:37:06 +00:00
const char* kBackendTypeStrings[sk_app::Window::kBackendTypeCount] = {
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
"OpenGL",
Add ANGLE support to Viewer on Windows Change-Id: I97a844b2f289d2518f60a64f94d60551c4530dd4 Reviewed-on: https://skia-review.googlesource.com/35742 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2017-08-17 18:37:06 +00:00
#if SK_ANGLE && defined(SK_BUILD_FOR_WIN)
"ANGLE",
#endif
Enable viewer in non-Vulkan builds BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002 Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b Review-Url: https://codereview.chromium.org/2067023002
2016-06-17 16:29:14 +00:00
#ifdef SK_VULKAN
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
"Vulkan",
Add Metal context to Viewer. Bug: skia:8737 Change-Id: I5c4c839bcf39f2cd3a9a32d005bf4bdb7c42e6a5 Reviewed-on: https://skia-review.googlesource.com/c/187925 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2019-02-08 20:36:14 +00:00
#endif
#if defined(SK_METAL) && defined(SK_BUILD_FOR_MAC)
"Metal",
Enable viewer in non-Vulkan builds BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002 Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b Review-Url: https://codereview.chromium.org/2067023002
2016-06-17 16:29:14 +00:00
#endif
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
"Raster"
Add OpenGL context to Viewer. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1978573003 Committed: https://skia.googlesource.com/skia/+/56a11e4d6f3d436a3c2497c9c9e71a117d78a93f Review-Url: https://codereview.chromium.org/1978573003
2016-05-20 13:01:06 +00:00
};
Add sw support to viewer on Linux. This doesn't yet do anything with srgb/colorspace. Replaces the --vulkan flag with --backend which takes 'gl', 'vk', or 'sw'. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165813002 Review-Url: https://codereview.chromium.org/2165813002
2016-07-26 19:56:32 +00:00
static sk_app::Window::BackendType get_backend_type(const char* str) {
#ifdef SK_VULKAN
if (0 == strcmp(str, "vk")) {
return sk_app::Window::kVulkan_BackendType;
} else
Add ANGLE support to Viewer on Windows Change-Id: I97a844b2f289d2518f60a64f94d60551c4530dd4 Reviewed-on: https://skia-review.googlesource.com/35742 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2017-08-17 18:37:06 +00:00
#endif
#if SK_ANGLE && defined(SK_BUILD_FOR_WIN)
if (0 == strcmp(str, "angle")) {
return sk_app::Window::kANGLE_BackendType;
} else
Add Metal context to Viewer. Bug: skia:8737 Change-Id: I5c4c839bcf39f2cd3a9a32d005bf4bdb7c42e6a5 Reviewed-on: https://skia-review.googlesource.com/c/187925 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2019-02-08 20:36:14 +00:00
#endif
#if defined(SK_METAL) && defined(SK_BUILD_FOR_MAC)
if (0 == strcmp(str, "mtl")) {
return sk_app::Window::kMetal_BackendType;
} else
Add sw support to viewer on Linux. This doesn't yet do anything with srgb/colorspace. Replaces the --vulkan flag with --backend which takes 'gl', 'vk', or 'sw'. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165813002 Review-Url: https://codereview.chromium.org/2165813002
2016-07-26 19:56:32 +00:00
#endif
if (0 == strcmp(str, "gl")) {
return sk_app::Window::kNativeGL_BackendType;
} else if (0 == strcmp(str, "sw")) {
return sk_app::Window::kRaster_BackendType;
} else {
SkDebugf("Unknown backend type, %s, defaulting to sw.", str);
return sk_app::Window::kRaster_BackendType;
}
}
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
static SkColorSpacePrimaries gSrgbPrimaries = {
0.64f, 0.33f,
0.30f, 0.60f,
0.15f, 0.06f,
0.3127f, 0.3290f };
static SkColorSpacePrimaries gAdobePrimaries = {
0.64f, 0.33f,
0.21f, 0.71f,
0.15f, 0.06f,
0.3127f, 0.3290f };
static SkColorSpacePrimaries gP3Primaries = {
0.680f, 0.320f,
0.265f, 0.690f,
0.150f, 0.060f,
0.3127f, 0.3290f };
static SkColorSpacePrimaries gRec2020Primaries = {
0.708f, 0.292f,
0.170f, 0.797f,
0.131f, 0.046f,
0.3127f, 0.3290f };
struct NamedPrimaries {
const char* fName;
SkColorSpacePrimaries* fPrimaries;
} gNamedPrimaries[] = {
{ "sRGB", &gSrgbPrimaries },
{ "AdobeRGB", &gAdobePrimaries },
{ "P3", &gP3Primaries },
{ "Rec. 2020", &gRec2020Primaries },
};
static bool primaries_equal(const SkColorSpacePrimaries& a, const SkColorSpacePrimaries& b) {
return memcmp(&a, &b, sizeof(SkColorSpacePrimaries)) == 0;
}
In Viewer, use a GL window for Raster mode The GUI uses drawVertices, in a way that doesn't currently work with the raster backend. Even if it worked, drawVertices is fairly slow in raster mode, but extremely fast on GPU. This makes the GUI always usable. The tradeoff is profiling raster will be less accurate. Bug: skia: Change-Id: I69df777fc5be79f5bdd8d4505f6419bfa758c97e Reviewed-on: https://skia-review.googlesource.com/68541 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 14:54:10 +00:00
static Window::BackendType backend_type_for_window(Window::BackendType backendType) {
// In raster mode, we still use GL for the window.
// This lets us render the GUI faster (and correct).
return Window::kRaster_BackendType == backendType ? Window::kNativeGL_BackendType : backendType;
}
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
const char* kName = "name";
const char* kValue = "value";
const char* kOptions = "options";
const char* kSlideStateName = "Slide";
const char* kBackendStateName = "Backend";
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
const char* kMSAAStateName = "MSAA";
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
const char* kPathRendererStateName = "Path renderer";
Add Softkey UIState to Viewer We can use this to simulate any key/command on Android UI. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035923002 Review-Url: https://codereview.chromium.org/2035923002
2016-06-03 15:47:23 +00:00
const char* kSoftkeyStateName = "Softkey";
const char* kSoftkeyHint = "Please select a softkey";
Show FPS in UI state BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2043793002 Review-Url: https://codereview.chromium.org/2043793002
2016-06-07 13:57:40 +00:00
const char* kFpsStateName = "FPS";
Display JPGs in Viewer with Split Screen and ColorSpaceXform BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2058753002 Review-Url: https://codereview.chromium.org/2058753002
2016-06-13 19:26:45 +00:00
const char* kON = "ON";
const char* kOFF = "OFF";
More accurate render time and continuous fresh BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2129613002 Review-Url: https://codereview.chromium.org/2129613002
2016-07-06 21:11:32 +00:00
const char* kRefreshStateName = "Refresh";
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
Rename VulkanViewer to Viewer, take 2. Also puts Window and Application in sk_app namespace. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003 Review-Url: https://codereview.chromium.org/1945103003
2016-05-04 20:49:13 +00:00
Viewer::Viewer(int argc, char** argv, void* platformData)
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
: fCurrentSlide(-1)
, fRefresh(false)
Add 'Save to SKP' option to Viewer Bug: skia: Change-Id: Iea3794ce8710c84f2529b78b21655f2bf6aaa90e Reviewed-on: https://skia-review.googlesource.com/79160 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-01 16:23:53 +00:00
, fSaveToSKP(false)
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
, fShowImGuiDebugWindow(false)
Viewer: backspace jumps directly to the slide picker Bug: skia: Change-Id: I8107358e49ef20bf26ddf6a6dbb21efc07f167e7 Reviewed-on: https://skia-review.googlesource.com/71460 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2017-11-14 20:32:20 +00:00
, fShowSlidePicker(false)
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
, fShowImGuiTestWindow(false)
Pixel zoomer in viewer Made it a separate ImGui window (rather than part of the debug window). Bring it up with 'z'. Draggable/resizable. Variable zoom scale. Enjoy. BUG=skia: Change-Id: I949ab398126c892c8d353aaebcc8403765f42841 Reviewed-on: https://skia-review.googlesource.com/8357 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-13 14:39:57 +00:00
, fShowZoomWindow(false)
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
, fZoomWindowFixed(false)
, fZoomWindowLocation{0.0f, 0.0f}
Pixel zoomer in viewer Made it a separate ImGui window (rather than part of the debug window). Bring it up with 'z'. Draggable/resizable. Variable zoom scale. Enjoy. BUG=skia: Change-Id: I949ab398126c892c8d353aaebcc8403765f42841 Reviewed-on: https://skia-review.googlesource.com/8357 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-13 14:39:57 +00:00
, fLastImage(nullptr)
Add 'u' to zoom stats display on high DPI devices Still need to connect this to ImGui, but this is already useful Bug: skia: Change-Id: I925c7a9d6236cb2d865d45d6a68a5709bf2e3df7 Reviewed-on: https://skia-review.googlesource.com/143158 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-07-24 22:01:53 +00:00
, fZoomUI(false)
Enable viewer in non-Vulkan builds BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002 Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b Review-Url: https://codereview.chromium.org/2067023002
2016-06-17 16:29:14 +00:00
, fBackendType(sk_app::Window::kNativeGL_BackendType)
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
, fColorMode(ColorMode::kLegacy)
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
, fColorSpacePrimaries(gSrgbPrimaries)
Allow changing the transfer function in xform canvas mode Used this to test out some theories for different color correction approaches. Bug: skia: Change-Id: I072130733eaea736c9aa129af74887b028f035b4 Reviewed-on: https://skia-review.googlesource.com/69221 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-11-09 15:27:55 +00:00
// Our UI can only tweak gamma (currently), so start out gamma-only
Reland "Add SkColorSpace factory from 3x3 row-major gamut and transfer function" Moved named common transfer functions and gamuts to constexpr values in SkColorSpace.h, in SkNamedTransferFn and SkNamedGamut namespaces. Converted nearly all SkColorSpace::MakeRGB calls within Skia to use the new factory with the named values. Multiple clients want a way to extract named transfer function and gamut - this still doesn't provide that, but this may be a better path forward for honestly advertising how SkColorSpace works internally. Originally landed as: https://skia.googlesource.com/skia/+/a9549ab31630fc244094e6f1692371cbaf87f666 Re-landing with a new serialization format, but maintaining ability to load old serialized color spaces, for SKP compatibility. Bug: skia: Change-Id: Ib84a6e1cd5d7d9816175773fdbaff2ca32658667 Reviewed-on: https://skia-review.googlesource.com/c/181176 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-01-04 22:03:00 +00:00
, fColorSpaceTransferFn(SkNamedTransferFn::k2Dot2)
Fix to zoom on Vulkan Viewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1876853003 Review URL: https://codereview.chromium.org/1876853003
2016-04-11 15:30:40 +00:00
, fZoomLevel(0.0f)
Add Transform section to viewer tools window. This adds sliders for Zoom and Rotate. Change-Id: Ie568e5381d76bd5a457760e2d6224e42e64c7f16 Reviewed-on: https://skia-review.googlesource.com/123027 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-23 16:55:06 +00:00
, fRotation(0.0f)
Subpixel in Viewer from -1 to 1. Change the Subpixel positioning in Viewer from 0 to 1 to -1 to 1, with the origin at the center of the drag area. This allows for observing what happens when rolling over integer boundaries. Since it is no longer simple to reset to the origin, closing the collapsing header resets the drag point to the origin. Change-Id: I88d4fd489c3bfb914fb843fa261d4097fef3671a Reviewed-on: https://skia-review.googlesource.com/146643 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-08-09 19:18:46 +00:00
, fOffset{0.5f, 0.5f}
Touch input support for Windows Had to add some logic to avoid touch and mouse cross-talk, because (at least on my laptop), the touch screen generates both kinds of events. This seems really useful [1] for the many [2] Skia developers with touch-enabled Windows devices. ---------- 1: No, not really. 2: N = 1? Bug: skia: Change-Id: Ib888bf4198f2cc0a29a31581ec4b64d3d9008c33 Reviewed-on: https://skia-review.googlesource.com/18920 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-06-07 14:00:30 +00:00
, fGestureDevice(GestureDevice::kNone)
Add tiled rendering option to viewer Bug: skia: Change-Id: I4bb5e0107d06798040a37609499b4e2b48cf7e29 Reviewed-on: https://skia-review.googlesource.com/c/172962 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-11-26 19:50:05 +00:00
, fTiled(false)
, fDrawTileBoundaries(false)
, fTileScale{0.25f, 0.25f}
Add toggle for 'real' vs. 'fake' perspective in Viewer Real perspective draws content with perspective applied. Fake perspective rasterizes in ortho, then stretches the image by the perspective matrix. Change-Id: I738cd379f9a58b965469ef8a57fb2dfd597fda10 Reviewed-on: https://skia-review.googlesource.com/125442 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2018-05-02 19:40:20 +00:00
, fPerspectiveMode(kPerspective_Off)
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
{
Add support for Atrace and hook into SkEventTracer framework. This change is a different version of: https://skia-review.googlesource.com/c/3269/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3345 Change-Id: I49d4f2987740d3ad1307f6aba3add0d63a46b22d Reviewed-on: https://skia-review.googlesource.com/3345 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Greg Daniel <egdaniel@google.com>
2016-10-14 13:12:53 +00:00
SkGraphics::Init();
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
Remove unnecessary includes from Viewer Bug: skia: Change-Id: I7b20db66a7eb5b549997fd4307e41937a8753921 Reviewed-on: https://skia-review.googlesource.com/86020 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2017-12-15 19:48:09 +00:00
gPathRendererNames[GpuPathRenderers::kAll] = "All Path Renderers";
gPathRendererNames[GpuPathRenderers::kStencilAndCover] = "NV_path_rendering";
gPathRendererNames[GpuPathRenderers::kSmall] = "Small paths (cached sdf or alpha masks)";
gPathRendererNames[GpuPathRenderers::kCoverageCounting] = "Coverage counting";
gPathRendererNames[GpuPathRenderers::kTessellating] = "Tessellating";
gPathRendererNames[GpuPathRenderers::kNone] = "Software masks";
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
SkDebugf("Command line arguments: ");
for (int i = 1; i < argc; ++i) {
SkDebugf("%s ", argv[i]);
}
SkDebugf("\n");
SkCommandLineFlags::Parse(argc, argv);
Add support for resources on android Viewer BUG=skia: Change-Id: I1acc3e4fe6d0ce8bf29c52dd7280dff029a3abc2 Reviewed-on: https://skia-review.googlesource.com/5322 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
2016-11-29 21:35:19 +00:00
#ifdef SK_BUILD_FOR_ANDROID
Fix resource and skp paths in Android viewer Docs-Preview: https://skia.org/?cl=18037 Change-Id: If92e561c6c24de1f51f81477d89b927e10308f13 Reviewed-on: https://skia-review.googlesource.com/18037 Reviewed-by: Derek Sollenberger <djsollen@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-05-26 16:06:21 +00:00
SetResourcePath("/data/local/tmp/resources");
Add support for resources on android Viewer BUG=skia: Change-Id: I1acc3e4fe6d0ce8bf29c52dd7280dff029a3abc2 Reviewed-on: https://skia-review.googlesource.com/5322 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
2016-11-29 21:35:19 +00:00
#endif
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
Add nativeFonts flag to Viewer. This moves DMFontMgr and several related files which are tightly related to fonts into tools/fonts, moves some flags around to prevent duplication, and adds the nativeFonts handling to Viewer. Change-Id: Id1bdad708a6b74319ac5ac9adfe21025db4ca0b2 Reviewed-on: https://skia-review.googlesource.com/108904 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2018-02-20 22:06:07 +00:00
if (!FLAGS_nativeFonts) {
gSkFontMgr_DefaultFactory = &sk_tool_utils::MakePortableFontMgr;
}
Faster, thread-safe implementation Bug: skia: Change-Id: I401c5a9885c348aa424ab07b094acecddb209490 Reviewed-on: https://skia-review.googlesource.com/25860 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-24 15:38:01 +00:00
initializeEventTracingForTools();
First stab at JSON event tracer Not yet thread safe (so it forces threading off). Builds JSON on the fly, so overhead is certainly bad. Plan to fix all of that, but this at least "works". There is now one tracing flag: 'trace'. - 'debugf' installs the SkDebugf tracer. - 'atrace' installs the Android ATrace tracer. - Any other value is interpreted as a filename, and produces a JSON file for chrome://tracing. All three modes work in DM, nanobench, and Viewer. Bug: skia: Change-Id: I3fbc22382b99418a508c670be2770195c0a1c364 Reviewed-on: https://skia-review.googlesource.com/24781 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-07-20 19:43:35 +00:00
static SkTaskGroup::Enabler kTaskGroupEnabler(FLAGS_threads);
Add support for Atrace and hook into SkEventTracer framework. This change is a different version of: https://skia-review.googlesource.com/c/3269/ BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3345 Change-Id: I49d4f2987740d3ad1307f6aba3add0d63a46b22d Reviewed-on: https://skia-review.googlesource.com/3345 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Greg Daniel <egdaniel@google.com>
2016-10-14 13:12:53 +00:00
Add sw support to viewer on Linux. This doesn't yet do anything with srgb/colorspace. Replaces the --vulkan flag with --backend which takes 'gl', 'vk', or 'sw'. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2165813002 Review-Url: https://codereview.chromium.org/2165813002
2016-07-26 19:56:32 +00:00
fBackendType = get_backend_type(FLAGS_backend[0]);
First pass at VulkanViewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
2016-04-06 13:08:59 +00:00
fWindow = Window::CreateNativeWindow(platformData);
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
DisplayParams displayParams;
displayParams.fMSAASampleCount = FLAGS_msaa;
Add a tools flag to suppress geometry shaders Bug: skia: Change-Id: I38736c5d49e3b281c2d23af3908575274ff97b5c Reviewed-on: https://skia-review.googlesource.com/86282 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-12-18 21:22:34 +00:00
SetCtxOptionsFromCommonFlags(&displayParams.fGrContextOptions);
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
fWindow->setRequestedDisplayParams(displayParams);
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
// Configure timers
fStatsLayer.setActive(false);
fAnimateTimer = fStatsLayer.addTimer("Animate", SK_ColorMAGENTA, 0xffff66ff);
fPaintTimer = fStatsLayer.addTimer("Paint", SK_ColorGREEN);
fFlushTimer = fStatsLayer.addTimer("Flush", SK_ColorRED, 0xffff6666);
First pass at VulkanViewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
2016-04-06 13:08:59 +00:00
// register callbacks
Add flexible keybinding/command system to sk_app. Viewer demonstrates use: Just create an instance of CommandSet, register with the window, and add commands. Hopefully, we can keep all commands in one place, and get some nice side-benefits. With this framework, if you want to add a new command, you are only required to add code in ONE place. And you get added to the help screen, for free. CommandSet automatically binds 'h' to cycle through the help modes. (Functional grouping is most useful for general use, but the other mode is nice to know what a key does, or to find an unused key for a new feature). Grouped by function: https://screenshot.googleplex.com/G5h3f52wFKu.png Alphabetical by key: https://screenshot.googleplex.com/nZiopabLKJ6.png BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955293002 Review-Url: https://codereview.chromium.org/1955293002
2016-05-10 13:50:49 +00:00
fCommands.attach(fWindow);
Create a Window::Layer interface to reduce sk_app glue code This also makes it possible to manage other parts of viewer, etc (like the stats screen, command set, even samples) as additional layers in the stack. For now, it just removes a lot of boilerplate. Bug: skia: Change-Id: Ic2f80690fc76c683b3736287dc2b738c50d38614 Reviewed-on: https://skia-review.googlesource.com/82688 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-08 21:45:43 +00:00
fWindow->pushLayer(this);
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fWindow->pushLayer(&fStatsLayer);
Move ImGui support code to ImGuiLayer Viewer still has plenty of code that uses ImGui to create application specific UI, but the structural code that forwards input to ImGui, and converts per-frame ImGui rendering data to Skia draw commands is now in a single component that can be reused in any sk_app-based application. Bug: skia: Change-Id: Ic14ece659d4af8ee13b69c638bdaf7df6c24f5c0 Reviewed-on: https://skia-review.googlesource.com/82627 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-12-08 21:46:09 +00:00
fWindow->pushLayer(&fImGuiLayer);
First pass at VulkanViewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
2016-04-06 13:08:59 +00:00
Add flexible keybinding/command system to sk_app. Viewer demonstrates use: Just create an instance of CommandSet, register with the window, and add commands. Hopefully, we can keep all commands in one place, and get some nice side-benefits. With this framework, if you want to add a new command, you are only required to add code in ONE place. And you get added to the help screen, for free. CommandSet automatically binds 'h' to cycle through the help modes. (Functional grouping is most useful for general use, but the other mode is nice to know what a key does, or to find an unused key for a new feature). Grouped by function: https://screenshot.googleplex.com/G5h3f52wFKu.png Alphabetical by key: https://screenshot.googleplex.com/nZiopabLKJ6.png BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955293002 Review-Url: https://codereview.chromium.org/1955293002
2016-05-10 13:50:49 +00:00
// add key-bindings
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
fCommands.addCommand(' ', "GUI", "Toggle Debug GUI", [this]() {
this->fShowImGuiDebugWindow = !this->fShowImGuiDebugWindow;
fWindow->inval();
});
Viewer: backspace jumps directly to the slide picker Bug: skia: Change-Id: I8107358e49ef20bf26ddf6a6dbb21efc07f167e7 Reviewed-on: https://skia-review.googlesource.com/71460 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2017-11-14 20:32:20 +00:00
// Command to jump directly to the slide picker and give it focus
fCommands.addCommand('/', "GUI", "Jump to slide picker", [this]() {
this->fShowImGuiDebugWindow = true;
this->fShowSlidePicker = true;
fWindow->inval();
});
// Alias that to Backspace, to match SampleApp
fCommands.addCommand(Window::Key::kBack, "Backspace", "GUI", "Jump to slide picker", [this]() {
this->fShowImGuiDebugWindow = true;
this->fShowSlidePicker = true;
fWindow->inval();
});
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
fCommands.addCommand('g', "GUI", "Toggle GUI Demo", [this]() {
this->fShowImGuiTestWindow = !this->fShowImGuiTestWindow;
fWindow->inval();
});
Pixel zoomer in viewer Made it a separate ImGui window (rather than part of the debug window). Bring it up with 'z'. Draggable/resizable. Variable zoom scale. Enjoy. BUG=skia: Change-Id: I949ab398126c892c8d353aaebcc8403765f42841 Reviewed-on: https://skia-review.googlesource.com/8357 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-13 14:39:57 +00:00
fCommands.addCommand('z', "GUI", "Toggle zoom window", [this]() {
this->fShowZoomWindow = !this->fShowZoomWindow;
fWindow->inval();
});
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
fCommands.addCommand('Z', "GUI", "Toggle zoom window state", [this]() {
this->fZoomWindowFixed = !this->fZoomWindowFixed;
fWindow->inval();
});
Add flexible keybinding/command system to sk_app. Viewer demonstrates use: Just create an instance of CommandSet, register with the window, and add commands. Hopefully, we can keep all commands in one place, and get some nice side-benefits. With this framework, if you want to add a new command, you are only required to add code in ONE place. And you get added to the help screen, for free. CommandSet automatically binds 'h' to cycle through the help modes. (Functional grouping is most useful for general use, but the other mode is nice to know what a key does, or to find an unused key for a new feature). Grouped by function: https://screenshot.googleplex.com/G5h3f52wFKu.png Alphabetical by key: https://screenshot.googleplex.com/nZiopabLKJ6.png BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955293002 Review-Url: https://codereview.chromium.org/1955293002
2016-05-10 13:50:49 +00:00
fCommands.addCommand('s', "Overlays", "Toggle stats display", [this]() {
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fStatsLayer.setActive(!fStatsLayer.getActive());
Add flexible keybinding/command system to sk_app. Viewer demonstrates use: Just create an instance of CommandSet, register with the window, and add commands. Hopefully, we can keep all commands in one place, and get some nice side-benefits. With this framework, if you want to add a new command, you are only required to add code in ONE place. And you get added to the help screen, for free. CommandSet automatically binds 'h' to cycle through the help modes. (Functional grouping is most useful for general use, but the other mode is nice to know what a key does, or to find an unused key for a new feature). Grouped by function: https://screenshot.googleplex.com/G5h3f52wFKu.png Alphabetical by key: https://screenshot.googleplex.com/nZiopabLKJ6.png BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955293002 Review-Url: https://codereview.chromium.org/1955293002
2016-05-10 13:50:49 +00:00
fWindow->inval();
});
Add ms display to Viewer. Change-Id: I6303209d3ff597611ac1a5f558294c6d6fcba670 Reviewed-on: https://skia-review.googlesource.com/67766 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-11-03 17:36:07 +00:00
fCommands.addCommand('0', "Overlays", "Reset stats", [this]() {
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fStatsLayer.resetMeasurements();
Add ms display to Viewer. Change-Id: I6303209d3ff597611ac1a5f558294c6d6fcba670 Reviewed-on: https://skia-review.googlesource.com/67766 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-11-03 17:36:07 +00:00
this->updateTitle();
fWindow->inval();
});
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
fCommands.addCommand('c', "Modes", "Cycle color mode", [this]() {
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
switch (fColorMode) {
case ColorMode::kLegacy:
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
this->setColorMode(ColorMode::kColorManaged8888);
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
break;
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
case ColorMode::kColorManaged8888:
this->setColorMode(ColorMode::kColorManagedF16);
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
break;
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
case ColorMode::kColorManagedF16:
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
this->setColorMode(ColorMode::kLegacy);
break;
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
}
Add flexible keybinding/command system to sk_app. Viewer demonstrates use: Just create an instance of CommandSet, register with the window, and add commands. Hopefully, we can keep all commands in one place, and get some nice side-benefits. With this framework, if you want to add a new command, you are only required to add code in ONE place. And you get added to the help screen, for free. CommandSet automatically binds 'h' to cycle through the help modes. (Functional grouping is most useful for general use, but the other mode is nice to know what a key does, or to find an unused key for a new feature). Grouped by function: https://screenshot.googleplex.com/G5h3f52wFKu.png Alphabetical by key: https://screenshot.googleplex.com/nZiopabLKJ6.png BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955293002 Review-Url: https://codereview.chromium.org/1955293002
2016-05-10 13:50:49 +00:00
});
fCommands.addCommand(Window::Key::kRight, "Right", "Navigation", "Next slide", [this]() {
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
this->setCurrentSlide(fCurrentSlide < fSlides.count() - 1 ? fCurrentSlide + 1 : 0);
Add flexible keybinding/command system to sk_app. Viewer demonstrates use: Just create an instance of CommandSet, register with the window, and add commands. Hopefully, we can keep all commands in one place, and get some nice side-benefits. With this framework, if you want to add a new command, you are only required to add code in ONE place. And you get added to the help screen, for free. CommandSet automatically binds 'h' to cycle through the help modes. (Functional grouping is most useful for general use, but the other mode is nice to know what a key does, or to find an unused key for a new feature). Grouped by function: https://screenshot.googleplex.com/G5h3f52wFKu.png Alphabetical by key: https://screenshot.googleplex.com/nZiopabLKJ6.png BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955293002 Review-Url: https://codereview.chromium.org/1955293002
2016-05-10 13:50:49 +00:00
});
fCommands.addCommand(Window::Key::kLeft, "Left", "Navigation", "Previous slide", [this]() {
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
this->setCurrentSlide(fCurrentSlide > 0 ? fCurrentSlide - 1 : fSlides.count() - 1);
Add flexible keybinding/command system to sk_app. Viewer demonstrates use: Just create an instance of CommandSet, register with the window, and add commands. Hopefully, we can keep all commands in one place, and get some nice side-benefits. With this framework, if you want to add a new command, you are only required to add code in ONE place. And you get added to the help screen, for free. CommandSet automatically binds 'h' to cycle through the help modes. (Functional grouping is most useful for general use, but the other mode is nice to know what a key does, or to find an unused key for a new feature). Grouped by function: https://screenshot.googleplex.com/G5h3f52wFKu.png Alphabetical by key: https://screenshot.googleplex.com/nZiopabLKJ6.png BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955293002 Review-Url: https://codereview.chromium.org/1955293002
2016-05-10 13:50:49 +00:00
});
fCommands.addCommand(Window::Key::kUp, "Up", "Transform", "Zoom in", [this]() {
this->changeZoomLevel(1.f / 32.f);
fWindow->inval();
});
fCommands.addCommand(Window::Key::kDown, "Down", "Transform", "Zoom out", [this]() {
this->changeZoomLevel(-1.f / 32.f);
fWindow->inval();
});
Add OpenGL context to Viewer. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1978573003 Committed: https://skia.googlesource.com/skia/+/56a11e4d6f3d436a3c2497c9c9e71a117d78a93f Review-Url: https://codereview.chromium.org/1978573003
2016-05-20 13:01:06 +00:00
fCommands.addCommand('d', "Modes", "Change rendering backend", [this]() {
Add ANGLE support to Viewer on Windows Change-Id: I97a844b2f289d2518f60a64f94d60551c4530dd4 Reviewed-on: https://skia-review.googlesource.com/35742 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2017-08-17 18:37:06 +00:00
sk_app::Window::BackendType newBackend = (sk_app::Window::BackendType)(
(fBackendType + 1) % sk_app::Window::kBackendTypeCount);
Minor fixes for the Linux viewer BUG=skia:6091 Change-Id: Ia954c16610634e34f10bfe4273efc6677ca9563e Reviewed-on: https://skia-review.googlesource.com/6618 Reviewed-by: Greg Daniel <egdaniel@google.com>
2017-01-05 18:50:49 +00:00
// Switching to and from Vulkan is problematic on Linux so disabled for now
Add ANGLE support to Viewer on Windows Change-Id: I97a844b2f289d2518f60a64f94d60551c4530dd4 Reviewed-on: https://skia-review.googlesource.com/35742 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2017-08-17 18:37:06 +00:00
#if defined(SK_BUILD_FOR_UNIX) && defined(SK_VULKAN)
if (newBackend == sk_app::Window::kVulkan_BackendType) {
newBackend = (sk_app::Window::BackendType)((newBackend + 1) %
sk_app::Window::kBackendTypeCount);
} else if (fBackendType == sk_app::Window::kVulkan_BackendType) {
newBackend = sk_app::Window::kVulkan_BackendType;
Minor fixes for the Linux viewer BUG=skia:6091 Change-Id: Ia954c16610634e34f10bfe4273efc6677ca9563e Reviewed-on: https://skia-review.googlesource.com/6618 Reviewed-by: Greg Daniel <egdaniel@google.com>
2017-01-05 18:50:49 +00:00
}
#endif
Add backend selection to viewer's GUI BUG=skia: Change-Id: I3314013538792c2aa82cc49f3f072aab2cdc4a55 Reviewed-on: https://skia-review.googlesource.com/9079 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-02-28 20:45:01 +00:00
this->setBackend(newBackend);
Add OpenGL context to Viewer. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1978573003 Committed: https://skia.googlesource.com/skia/+/56a11e4d6f3d436a3c2497c9c9e71a117d78a93f Review-Url: https://codereview.chromium.org/1978573003
2016-05-20 13:01:06 +00:00
});
Add 'Save to SKP' option to Viewer Bug: skia: Change-Id: Iea3794ce8710c84f2529b78b21655f2bf6aaa90e Reviewed-on: https://skia-review.googlesource.com/79160 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-01 16:23:53 +00:00
fCommands.addCommand('K', "IO", "Save slide to SKP", [this]() {
fSaveToSKP = true;
fWindow->inval();
});
Add pixel geometry and dft selection to viewer app. Change-Id: I2fea84793383c44b102fa97b23f59235ef302ff9 Reviewed-on: https://skia-review.googlesource.com/121581 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Herb Derby <herb@google.com>
2018-04-13 18:30:23 +00:00
fCommands.addCommand('G', "Modes", "Geometry", [this]() {
DisplayParams params = fWindow->getRequestedDisplayParams();
uint32_t flags = params.fSurfaceProps.flags();
if (!fPixelGeometryOverrides) {
fPixelGeometryOverrides = true;
params.fSurfaceProps = SkSurfaceProps(flags, kUnknown_SkPixelGeometry);
} else {
switch (params.fSurfaceProps.pixelGeometry()) {
case kUnknown_SkPixelGeometry:
params.fSurfaceProps = SkSurfaceProps(flags, kRGB_H_SkPixelGeometry);
break;
case kRGB_H_SkPixelGeometry:
params.fSurfaceProps = SkSurfaceProps(flags, kBGR_H_SkPixelGeometry);
break;
case kBGR_H_SkPixelGeometry:
params.fSurfaceProps = SkSurfaceProps(flags, kRGB_V_SkPixelGeometry);
break;
case kRGB_V_SkPixelGeometry:
params.fSurfaceProps = SkSurfaceProps(flags, kBGR_V_SkPixelGeometry);
break;
case kBGR_V_SkPixelGeometry:
params.fSurfaceProps = SkSurfaceProps(flags, SkSurfaceProps::kLegacyFontHost_InitType);
fPixelGeometryOverrides = false;
break;
}
}
fWindow->setRequestedDisplayParams(params);
this->updateTitle();
fWindow->inval();
});
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fCommands.addCommand('H', "Font", "Hinting mode", [this]() {
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
if (!fFontOverrides.fHinting) {
fFontOverrides.fHinting = true;
fFont.setHinting(kNo_SkFontHinting);
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
} else {
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
switch (fFont.getHinting()) {
Revert[4] "hide nested hinting enum" This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207. Bug: skia: Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6 Reviewed-on: https://skia-review.googlesource.com/c/169520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-11-08 00:54:33 +00:00
case kNo_SkFontHinting:
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
fFont.setHinting(kSlight_SkFontHinting);
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
break;
Revert[4] "hide nested hinting enum" This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207. Bug: skia: Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6 Reviewed-on: https://skia-review.googlesource.com/c/169520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-11-08 00:54:33 +00:00
case kSlight_SkFontHinting:
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
fFont.setHinting(kNormal_SkFontHinting);
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
break;
Revert[4] "hide nested hinting enum" This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207. Bug: skia: Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6 Reviewed-on: https://skia-review.googlesource.com/c/169520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-11-08 00:54:33 +00:00
case kNormal_SkFontHinting:
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
fFont.setHinting(kFull_SkFontHinting);
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
break;
Revert[4] "hide nested hinting enum" This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207. Bug: skia: Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6 Reviewed-on: https://skia-review.googlesource.com/c/169520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-11-08 00:54:33 +00:00
case kFull_SkFontHinting:
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
fFont.setHinting(kNo_SkFontHinting);
fFontOverrides.fHinting = false;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
break;
}
}
this->updateTitle();
fWindow->inval();
});
fCommands.addCommand('A', "Paint", "Antialias Mode", [this]() {
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (!fPaintOverrides.fAntiAlias) {
fPaintOverrides.fAntiAliasState = SkPaintFields::AntiAliasState::Alias;
fPaintOverrides.fAntiAlias = true;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
fPaint.setAntiAlias(false);
gSkUseAnalyticAA = gSkForceAnalyticAA = false;
gSkUseDeltaAA = gSkForceDeltaAA = false;
} else {
fPaint.setAntiAlias(true);
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
switch (fPaintOverrides.fAntiAliasState) {
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
case SkPaintFields::AntiAliasState::Alias:
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.fAntiAliasState = SkPaintFields::AntiAliasState::Normal;
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
gSkUseAnalyticAA = gSkForceAnalyticAA = false;
gSkUseDeltaAA = gSkForceDeltaAA = false;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
break;
case SkPaintFields::AntiAliasState::Normal:
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.fAntiAliasState = SkPaintFields::AntiAliasState::AnalyticAAEnabled;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
gSkUseAnalyticAA = true;
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
gSkForceAnalyticAA = false;
gSkUseDeltaAA = gSkForceDeltaAA = false;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
break;
case SkPaintFields::AntiAliasState::AnalyticAAEnabled:
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.fAntiAliasState = SkPaintFields::AntiAliasState::AnalyticAAForced;
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
gSkUseAnalyticAA = gSkForceAnalyticAA = true;
gSkUseDeltaAA = gSkForceDeltaAA = false;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
break;
case SkPaintFields::AntiAliasState::AnalyticAAForced:
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.fAntiAliasState = SkPaintFields::AntiAliasState::DeltaAAEnabled;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
gSkUseAnalyticAA = gSkForceAnalyticAA = false;
gSkUseDeltaAA = true;
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
gSkForceDeltaAA = false;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
break;
case SkPaintFields::AntiAliasState::DeltaAAEnabled:
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.fAntiAliasState = SkPaintFields::AntiAliasState::DeltaAAForced;
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
gSkUseAnalyticAA = gSkForceAnalyticAA = false;
gSkUseDeltaAA = gSkForceDeltaAA = true;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
break;
case SkPaintFields::AntiAliasState::DeltaAAForced:
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.fAntiAliasState = SkPaintFields::AntiAliasState::Alias;
fPaintOverrides.fAntiAlias = false;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
gSkUseAnalyticAA = fPaintOverrides.fOriginalSkUseAnalyticAA;
gSkForceAnalyticAA = fPaintOverrides.fOriginalSkForceAnalyticAA;
gSkUseDeltaAA = fPaintOverrides.fOriginalSkUseDeltaAA;
gSkForceDeltaAA = fPaintOverrides.fOriginalSkForceDeltaAA;
break;
}
}
this->updateTitle();
fWindow->inval();
});
Add pixel geometry and dft selection to viewer app. Change-Id: I2fea84793383c44b102fa97b23f59235ef302ff9 Reviewed-on: https://skia-review.googlesource.com/121581 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Herb Derby <herb@google.com>
2018-04-13 18:30:23 +00:00
fCommands.addCommand('D', "Modes", "DFT", [this]() {
DisplayParams params = fWindow->getRequestedDisplayParams();
uint32_t flags = params.fSurfaceProps.flags();
flags ^= SkSurfaceProps::kUseDeviceIndependentFonts_Flag;
params.fSurfaceProps = SkSurfaceProps(flags, params.fSurfaceProps.pixelGeometry());
fWindow->setRequestedDisplayParams(params);
this->updateTitle();
fWindow->inval();
});
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fCommands.addCommand('L', "Font", "Subpixel Antialias Mode", [this]() {
expand flag to include all text-related paint fields Bug: skia: Change-Id: I8453a6d607df4902cd05c5c9bc6162feda04ef9c Reviewed-on: https://skia-review.googlesource.com/c/182969 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-10 18:55:35 +00:00
if (!fFontOverrides.fEdging) {
fFontOverrides.fEdging = true;
fFont.setEdging(SkFont::Edging::kAlias);
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
} else {
expand flag to include all text-related paint fields Bug: skia: Change-Id: I8453a6d607df4902cd05c5c9bc6162feda04ef9c Reviewed-on: https://skia-review.googlesource.com/c/182969 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-10 18:55:35 +00:00
switch (fFont.getEdging()) {
case SkFont::Edging::kAlias:
fFont.setEdging(SkFont::Edging::kAntiAlias);
break;
case SkFont::Edging::kAntiAlias:
fFont.setEdging(SkFont::Edging::kSubpixelAntiAlias);
break;
case SkFont::Edging::kSubpixelAntiAlias:
fFont.setEdging(SkFont::Edging::kAlias);
fFontOverrides.fEdging = false;
break;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
}
}
this->updateTitle();
fWindow->inval();
});
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fCommands.addCommand('S', "Font", "Subpixel Position Mode", [this]() {
expand flag to include all text-related paint fields Bug: skia: Change-Id: I8453a6d607df4902cd05c5c9bc6162feda04ef9c Reviewed-on: https://skia-review.googlesource.com/c/182969 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-10 18:55:35 +00:00
if (!fFontOverrides.fSubpixel) {
fFontOverrides.fSubpixel = true;
fFont.setSubpixel(false);
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
} else {
expand flag to include all text-related paint fields Bug: skia: Change-Id: I8453a6d607df4902cd05c5c9bc6162feda04ef9c Reviewed-on: https://skia-review.googlesource.com/c/182969 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-10 18:55:35 +00:00
if (!fFont.isSubpixel()) {
fFont.setSubpixel(true);
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
} else {
expand flag to include all text-related paint fields Bug: skia: Change-Id: I8453a6d607df4902cd05c5c9bc6162feda04ef9c Reviewed-on: https://skia-review.googlesource.com/c/182969 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-10 18:55:35 +00:00
fFontOverrides.fSubpixel = false;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
}
}
this->updateTitle();
fWindow->inval();
});
Add toggle for 'real' vs. 'fake' perspective in Viewer Real perspective draws content with perspective applied. Fake perspective rasterizes in ortho, then stretches the image by the perspective matrix. Change-Id: I738cd379f9a58b965469ef8a57fb2dfd597fda10 Reviewed-on: https://skia-review.googlesource.com/125442 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2018-05-02 19:40:20 +00:00
fCommands.addCommand('p', "Transform", "Toggle Perspective Mode", [this]() {
fPerspectiveMode = (kPerspective_Real == fPerspectiveMode) ? kPerspective_Fake
: kPerspective_Real;
this->updateTitle();
fWindow->inval();
});
fCommands.addCommand('P', "Transform", "Toggle Perspective", [this]() {
fPerspectiveMode = (kPerspective_Off == fPerspectiveMode) ? kPerspective_Real
: kPerspective_Off;
this->updateTitle();
fWindow->inval();
});
Viewer: Add ability to pause timer from GUI and keyboard Bug: skia: Change-Id: I1e4991c996cadcdee928efdbc10fc3d7ac820045 Reviewed-on: https://skia-review.googlesource.com/c/182813 Auto-Submit: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-01-10 14:40:58 +00:00
fCommands.addCommand('a', "Transform", "Toggle Animation", [this]() {
fAnimTimer.togglePauseResume();
});
Add 'u' to zoom stats display on high DPI devices Still need to connect this to ImGui, but this is already useful Bug: skia: Change-Id: I925c7a9d6236cb2d865d45d6a68a5709bf2e3df7 Reviewed-on: https://skia-review.googlesource.com/143158 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-07-24 22:01:53 +00:00
fCommands.addCommand('u', "GUI", "Zoom UI", [this]() {
fZoomUI = !fZoomUI;
fStatsLayer.setDisplayScale(fZoomUI ? 2.0f : 1.0f);
fWindow->inval();
});
Add threaded backend to viewer Bug: skia: Change-Id: Ibf672921f8a05705e7262aad0b1f3f1e6fc0ef9c Reviewed-on: https://skia-review.googlesource.com/75382 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
2017-11-22 17:07:41 +00:00
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
// set up slides
this->initSlides();
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
if (FLAGS_list) {
this->listNames();
}
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
Add perspective support (rect to rect) to Viewer Change-Id: I312d5b3e6b7f37a3a7bfd5561bcdb31b43e207b8 Reviewed-on: https://skia-review.googlesource.com/123934 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2018-04-26 19:55:00 +00:00
fPerspectivePoints[0].set(0, 0);
fPerspectivePoints[1].set(1, 0);
fPerspectivePoints[2].set(0, 1);
fPerspectivePoints[3].set(1, 1);
VulkanViewer on Android GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1903253003 Review URL: https://codereview.chromium.org/1903253003
2016-04-21 14:59:44 +00:00
fAnimTimer.run();
resources: orgainize directory. Should make it easier to ask just for images. Change-Id: If821743dc924c4bfbc6b2b2d29b14affde7b3afd Reviewed-on: https://skia-review.googlesource.com/82684 Commit-Queue: Hal Canary <halcanary@google.com> Reviewed-by: Leon Scroggins <scroggo@google.com>
2017-12-08 15:21:31 +00:00
auto gamutImage = GetResourceAsImage("images/gamut.png");
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
if (gamutImage) {
add helper makeShader for the common Clamp case Bug: skia: Change-Id: I22cac56f35fed16daede0cf1b3e34dfa6f5ae3ea Reviewed-on: https://skia-review.googlesource.com/14625 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2017-04-28 15:12:19 +00:00
fImGuiGamutPaint.setShader(gamutImage->makeShader());
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
}
fImGuiGamutPaint.setColor(SK_ColorWHITE);
fImGuiGamutPaint.setFilterQuality(kLow_SkFilterQuality);
In Viewer, use a GL window for Raster mode The GUI uses drawVertices, in a way that doesn't currently work with the raster backend. Even if it worked, drawVertices is fairly slow in raster mode, but extremely fast on GPU. This makes the GUI always usable. The tradeoff is profiling raster will be less accurate. Bug: skia: Change-Id: I69df777fc5be79f5bdd8d4505f6419bfa758c97e Reviewed-on: https://skia-review.googlesource.com/68541 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 14:54:10 +00:00
fWindow->attach(backend_type_for_window(fBackendType));
Fix startup for SampleSlide When we start up Viewer with a SampleSlide as the first slide, nothing gets rendered because SampleSlide depends on the backend being initialized before setting its dimensions. This pushes the first slide's initialization after the backend creation. Change-Id: I8f83fe7b3973c40234104f1a83c0a60750694311 Reviewed-on: https://skia-review.googlesource.com/98161 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2018-01-22 18:39:30 +00:00
this->setCurrentSlide(this->startupSlide());
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
}
Rename VulkanViewer to Viewer, take 2. Also puts Window and Application in sk_app namespace. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003 Review-Url: https://codereview.chromium.org/1945103003
2016-05-04 20:49:13 +00:00
void Viewer::initSlides() {
[viewer] Consolidate external slide loading Handle all external slides (.skp, .jpg, .json, .svg) consistently: * support both single-file/directory flags * add "directory" slides for all types Change-Id: I4881c51f597ed4cb2a5b4c61706a168c754a5a8f Reviewed-on: https://skia-review.googlesource.com/119020 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-04-05 18:34:45 +00:00
using SlideFactory = sk_sp<Slide>(*)(const SkString& name, const SkString& path);
static const struct {
const char* fExtension;
const char* fDirName;
const SkCommandLineFlags::StringArray& fFlags;
const SlideFactory fFactory;
} gExternalSlidesInfo[] = {
{ ".skp", "skp-dir", FLAGS_skps,
[](const SkString& name, const SkString& path) -> sk_sp<Slide> {
return sk_make_sp<SKPSlide>(name, path);}
},
{ ".jpg", "jpg-dir", FLAGS_jpgs,
[](const SkString& name, const SkString& path) -> sk_sp<Slide> {
return sk_make_sp<ImageSlide>(name, path);}
},
[skottie] Disable on Android Framework builds Make Skottie truly optional (own flag), and disable in framework builds (to unblock landing the RapidJson refactoring). Change-Id: I4611f915e43fe11c1f6754ab4a9f63e45af2f8d3 Reviewed-on: https://skia-review.googlesource.com/125872 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@google.com>
2018-05-04 16:23:24 +00:00
#if defined(SK_ENABLE_SKOTTIE)
[infra] Add infra support for Lottie Bug: skia:8136 Change-Id: I18c4ad549c52346ebfe23d172597d5da205e5c4d Reviewed-on: https://skia-review.googlesource.com/142105 Commit-Queue: Eric Boren <borenet@google.com> Reviewed-by: Ben Wagner <benjaminwagner@google.com>
2018-07-19 17:27:49 +00:00
{ ".json", "skottie-dir", FLAGS_lotties,
[viewer] Consolidate external slide loading Handle all external slides (.skp, .jpg, .json, .svg) consistently: * support both single-file/directory flags * add "directory" slides for all types Change-Id: I4881c51f597ed4cb2a5b4c61706a168c754a5a8f Reviewed-on: https://skia-review.googlesource.com/119020 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-04-05 18:34:45 +00:00
[](const SkString& name, const SkString& path) -> sk_sp<Slide> {
return sk_make_sp<SkottieSlide>(name, path);}
},
[skottie] Disable on Android Framework builds Make Skottie truly optional (own flag), and disable in framework builds (to unblock landing the RapidJson refactoring). Change-Id: I4611f915e43fe11c1f6754ab4a9f63e45af2f8d3 Reviewed-on: https://skia-review.googlesource.com/125872 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Mike Klein <mtklein@google.com>
2018-05-04 16:23:24 +00:00
#endif
Fix !defined(SK_XML) builds Add guards for dependent code. TBR= Change-Id: I49c0c90a2defc6f39589721f95562e9e0f17db13 Reviewed-on: https://skia-review.googlesource.com/144610 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-07-31 20:38:43 +00:00
#if defined(SK_XML)
[viewer] Consolidate external slide loading Handle all external slides (.skp, .jpg, .json, .svg) consistently: * support both single-file/directory flags * add "directory" slides for all types Change-Id: I4881c51f597ed4cb2a5b4c61706a168c754a5a8f Reviewed-on: https://skia-review.googlesource.com/119020 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-04-05 18:34:45 +00:00
{ ".svg", "svg-dir", FLAGS_svgs,
[](const SkString& name, const SkString& path) -> sk_sp<Slide> {
return sk_make_sp<SvgSlide>(name, path);}
},
Fix !defined(SK_XML) builds Add guards for dependent code. TBR= Change-Id: I49c0c90a2defc6f39589721f95562e9e0f17db13 Reviewed-on: https://skia-review.googlesource.com/144610 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-07-31 20:38:43 +00:00
#endif
skeletal animation support added to API and software backend SkCanvas::drawVertices now supports overloads that take an array of bone deformation matrices. SkVertices::MakeCopy and SkVertices::Builder now support two additional optional attributes, boneIndices and boneWeights. Bug: skia: Change-Id: I30a3b11691e7cdb13924907cc1401ff86d127aea Reviewed-on: https://skia-review.googlesource.com/137221 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Ruiqi Mao <ruiqimao@google.com>
2018-06-29 18:32:21 +00:00
#if !(defined(SK_BUILD_FOR_WIN) && defined(__clang__))
{ ".nima", "nima-dir", FLAGS_nimas,
[](const SkString& name, const SkString& path) -> sk_sp<Slide> {
return sk_make_sp<NIMASlide>(name, path);}
},
#endif
[viewer] Consolidate external slide loading Handle all external slides (.skp, .jpg, .json, .svg) consistently: * support both single-file/directory flags * add "directory" slides for all types Change-Id: I4881c51f597ed4cb2a5b4c61706a168c754a5a8f Reviewed-on: https://skia-review.googlesource.com/119020 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-04-05 18:34:45 +00:00
};
Don't use MEM_MOVE=true with SkTArrays of sk_sp The code generated from std::move()ing them should be fine. Bug: skia:8355 Change-Id: I63ef650b5fbcf9fb6356006190eae5e0977ae642 Reviewed-on: https://skia-review.googlesource.com/151982 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2018-09-05 19:41:23 +00:00
SkTArray<sk_sp<Slide>> dirSlides;
[viewer] Consolidate external slide loading Handle all external slides (.skp, .jpg, .json, .svg) consistently: * support both single-file/directory flags * add "directory" slides for all types Change-Id: I4881c51f597ed4cb2a5b4c61706a168c754a5a8f Reviewed-on: https://skia-review.googlesource.com/119020 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-04-05 18:34:45 +00:00
const auto addSlide = [&](const SkString& name,
const SkString& path,
const SlideFactory& fact) {
if (SkCommandLineFlags::ShouldSkip(FLAGS_match, name.c_str())) {
return;
Display JPGs in Viewer with Split Screen and ColorSpaceXform BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2058753002 Review-Url: https://codereview.chromium.org/2058753002
2016-06-13 19:26:45 +00:00
}
Initial Lottie loader impl (Skotty) Coarse workflow: * Construction 1) build a Json tree 2) collect asset IDs (for preComp/image layer resolution) 3) "attach" pass - traverse the Json tree - build an SkSG dom, one fragment at a time - attach "animator" objects to the dom, for each animated prop 4) done, we can throw away the Json tree * For each animation tick 1) iterate over active animators and poke their respective dom nodes/attributes 2) revalidate the SkSG dom 3) draw the SkSG dom Note: post construction, things are super-simple - we just poke SkSG DOM attributes with interpolated values, and everything else is handled by SkSG (invalidation, revalidation, render). Change-Id: I96a02be7eb4fb4cb3831f59bf2b3908ea190c0dd Reviewed-on: https://skia-review.googlesource.com/89420 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2017-12-30 17:27:00 +00:00
[viewer] Consolidate external slide loading Handle all external slides (.skp, .jpg, .json, .svg) consistently: * support both single-file/directory flags * add "directory" slides for all types Change-Id: I4881c51f597ed4cb2a5b4c61706a168c754a5a8f Reviewed-on: https://skia-review.googlesource.com/119020 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-04-05 18:34:45 +00:00
if (auto slide = fact(name, path)) {
Generic "directory" viewer slide This is a generalization of "skottie-dir", based on SkSG and operating at the Slide API level. For now it is only instantiated for Json slides, but could be used for other slide "directories" in the future. TBR= NOTRY=true Change-Id: If12429084bddeb172b234344f23eabcdadedcceb Reviewed-on: https://skia-review.googlesource.com/108002 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Florin Malita <fmalita@chromium.org>
2018-02-15 23:40:48 +00:00
dirSlides.push_back(slide);
fSlides.push_back(std::move(slide));
}
[viewer] Consolidate external slide loading Handle all external slides (.skp, .jpg, .json, .svg) consistently: * support both single-file/directory flags * add "directory" slides for all types Change-Id: I4881c51f597ed4cb2a5b4c61706a168c754a5a8f Reviewed-on: https://skia-review.googlesource.com/119020 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-04-05 18:34:45 +00:00
};
Generic "directory" viewer slide This is a generalization of "skottie-dir", based on SkSG and operating at the Slide API level. For now it is only instantiated for Json slides, but could be used for other slide "directories" in the future. TBR= NOTRY=true Change-Id: If12429084bddeb172b234344f23eabcdadedcceb Reviewed-on: https://skia-review.googlesource.com/108002 Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Florin Malita <fmalita@chromium.org>
2018-02-15 23:40:48 +00:00
Add a single-file viewer option Pass --file/-f to open a single file for viewing. Change-Id: Ida168765ed6a5c7d76df1a8298bfe658d39d0196 Reviewed-on: https://skia-review.googlesource.com/126761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-05-08 14:36:18 +00:00
if (!FLAGS_file.isEmpty()) {
// single file mode
const SkString file(FLAGS_file[0]);
if (sk_exists(file.c_str(), kRead_SkFILE_Flag)) {
for (const auto& sinfo : gExternalSlidesInfo) {
if (file.endsWith(sinfo.fExtension)) {
addSlide(SkOSPath::Basename(file.c_str()), file, sinfo.fFactory);
return;
}
}
fprintf(stderr, "Unsupported file type \"%s\"\n", file.c_str());
} else {
fprintf(stderr, "Cannot read \"%s\"\n", file.c_str());
}
return;
}
// Bisect slide.
if (!FLAGS_bisect.isEmpty()) {
sk_sp<BisectSlide> bisect = BisectSlide::Create(FLAGS_bisect[0]);
if (bisect && !SkCommandLineFlags::ShouldSkip(FLAGS_match, bisect->getName().c_str())) {
if (FLAGS_bisect.count() >= 2) {
for (const char* ch = FLAGS_bisect[1]; *ch; ++ch) {
bisect->onChar(*ch);
}
}
fSlides.push_back(std::move(bisect));
}
}
// GMs
int firstGM = fSlides.count();
sk_tool::Registry: make an iterator. Change-Id: Icf4e31b50bbd91b7ea330a1300f736d6dfd0a41c Reviewed-on: https://skia-review.googlesource.com/144500 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Hal Canary <halcanary@google.com>
2018-07-30 21:07:07 +00:00
for (skiagm::GMFactory gmFactory : skiagm::GMRegistry::Range()) {
std::unique_ptr<skiagm::GM> gm(gmFactory(nullptr));
Add a single-file viewer option Pass --file/-f to open a single file for viewing. Change-Id: Ida168765ed6a5c7d76df1a8298bfe658d39d0196 Reviewed-on: https://skia-review.googlesource.com/126761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-05-08 14:36:18 +00:00
if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, gm->getName())) {
sk_sp<Slide> slide(new GMSlide(gm.release()));
fSlides.push_back(std::move(slide));
}
}
// reverse gms
int numGMs = fSlides.count() - firstGM;
for (int i = 0; i < numGMs/2; ++i) {
std::swap(fSlides[firstGM + i], fSlides[fSlides.count() - i - 1]);
}
// samples
Move Views into Sample and Viewer. What is left of the SkView system is used only by samples or viewer. As a result, move it out of the Skia source tree and re-organize so it is a bit easier to understand and use more shared code. Move samplecode/ClockFaceView.cpp to samplecode/SampleTextEffects.cpp, sice that's what's actually in it. Move SkAnimTimer.h to tools/timer, since it's actually shared between gm and samples. Change-Id: I55dafd94c64e4f930ddbd19168e0f812af86c455 Reviewed-on: https://skia-review.googlesource.com/146161 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-08-08 15:36:17 +00:00
for (const SampleFactory factory : SampleRegistry::Range()) {
sk_sp<Slide> slide(new SampleSlide(factory));
Add a single-file viewer option Pass --file/-f to open a single file for viewing. Change-Id: Ida168765ed6a5c7d76df1a8298bfe658d39d0196 Reviewed-on: https://skia-review.googlesource.com/126761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-05-08 14:36:18 +00:00
if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, slide->getName().c_str())) {
fSlides.push_back(slide);
}
Experimental Particle System This adds a new "Particles" slide to viewer, that allows editing, loading, and saving particle effects. All of the particle system code is in modules/particles. There are many rough edges and some not-yet-finished changes to generalize the model[1]. A rough overview: - SkReflected.h implements a lightweight reflection system for classes derived from SkReflected. Adding a new class involves deriving from SkReflected, adding a macro to the class declaration, and implementing visitFields(), which simply calls a virtual on an SkFieldVisitor for each field. Currently, emitters and affectors use this mechanism. - SkParticleSerialization.h demonstrates two useful field visitors - for serializing to and from JSON. The driver code that uses those is directly in ParticlesSlide. - SkParticleData.h and SkCurve.h define a variety of helper types for talking about particles, both for parameterizing individual values, and communicating about the state of a particle among the effect, affectors, and emitters. - SkParticleEffect.h defines the static data definition of an effect (SkParticleEffectParams), as well as a running instance of an effect (SkParticleEffect). The effect has simple update() and draw() methods. - ParticlesSlide.cpp adds a third field visitor to generate GUIs for interactively editing the running effect. --- 1: The critical change I'd like to make is to remove all special case behavior over time and at spawn (setting sprite frames, size over time, color over time, etc...). Integration is the only fixed function behavior. Everything else is driven by two lists of affectors. One is applied at spawn time, using the effect's lifetime to evaluate curves. This allows spawning particles with different colors as the effect ages out, for example. The second list is applied every frame to update existing particles, and is driven by the particle's lifetime. This allows particles to change color after being spawned, for example. With a small set of affectors using a single expressive curve primitive (keyframed list of cubic curve segments), we can have affectors that update color, size, velocity, position, sprite frame, etc., and implement many complex behaviors. Bug: skia: Change-Id: Id9402bef22825d55d021c5a2f9e5e41791aabaf4 Reviewed-on: https://skia-review.googlesource.com/c/181404 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Reed <reed@google.com>
2019-02-12 18:27:51 +00:00
}
// Particle demo
{
// TODO: Convert this to a sample
sk_sp<Slide> slide(new ParticlesSlide());
if (!SkCommandLineFlags::ShouldSkip(FLAGS_match, slide->getName().c_str())) {
fSlides.push_back(std::move(slide));
}
Add a single-file viewer option Pass --file/-f to open a single file for viewing. Change-Id: Ida168765ed6a5c7d76df1a8298bfe658d39d0196 Reviewed-on: https://skia-review.googlesource.com/126761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-05-08 14:36:18 +00:00
}
[viewer] Consolidate external slide loading Handle all external slides (.skp, .jpg, .json, .svg) consistently: * support both single-file/directory flags * add "directory" slides for all types Change-Id: I4881c51f597ed4cb2a5b4c61706a168c754a5a8f Reviewed-on: https://skia-review.googlesource.com/119020 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-04-05 18:34:45 +00:00
for (const auto& info : gExternalSlidesInfo) {
for (const auto& flag : info.fFlags) {
if (SkStrEndsWith(flag.c_str(), info.fExtension)) {
// single file
addSlide(SkOSPath::Basename(flag.c_str()), flag, info.fFactory);
} else {
// directory
SkOSFile::Iter it(flag.c_str(), info.fExtension);
SkString name;
while (it.next(&name)) {
addSlide(name, SkOSPath::Join(flag.c_str(), name.c_str()), info.fFactory);
}
}
if (!dirSlides.empty()) {
fSlides.push_back(
sk_make_sp<SlideDir>(SkStringPrintf("%s[%s]", info.fDirName, flag.c_str()),
std::move(dirSlides)));
Try out clang-tidy, starting with bugprone-use-after-move - add drop-in clang-tidy cxx wrapper - get build clean for bugprone-use-after-move The wrapper can be used by setting cxx = "/path/to/skia/tools/clang-tidy.sh" in GN. Change-Id: Idbba911e23bd6ef7530b08fd31906b92c1c1b28c Reviewed-on: https://skia-review.googlesource.com/c/176523 Commit-Queue: Mike Klein <mtklein@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2018-12-11 14:54:31 +00:00
dirSlides.reset(); // NOLINT(bugprone-use-after-move)
Viewer SVG support Change-Id: I93ee61271ebe960063bec16ba472b3fd243ee149 Reviewed-on: https://skia-review.googlesource.com/118885 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-04-05 15:57:21 +00:00
}
}
}
Add slides to VulkanViewer Adds SKP loading, matching, and moving backwards as well as forwards GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873543003 Review URL: https://codereview.chromium.org/1873543003
2016-04-08 14:24:09 +00:00
}
Rename VulkanViewer to Viewer, take 2. Also puts Window and Application in sk_app namespace. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003 Review-Url: https://codereview.chromium.org/1945103003
2016-05-04 20:49:13 +00:00
Viewer::~Viewer() {
First pass at VulkanViewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
2016-04-06 13:08:59 +00:00
fWindow->detach();
delete fWindow;
}
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
struct SkPaintTitleUpdater {
SkPaintTitleUpdater(SkString* title) : fTitle(title), fCount(0) {}
void append(const char* s) {
if (fCount == 0) {
fTitle->append(" {");
} else {
fTitle->append(", ");
}
fTitle->append(s);
++fCount;
}
void done() {
if (fCount > 0) {
fTitle->append("}");
}
}
SkString* fTitle;
int fCount;
};
Add sRGB mode toggle to Viewer. Unlike SampleApp, this just switches out the format of the window surface (and then adjusts the gamma-correct flag on the SkSurfaces). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1950983007 Review-Url: https://codereview.chromium.org/1950983007
2016-05-06 20:28:57 +00:00
void Viewer::updateTitle() {
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
if (!fWindow) {
return;
}
Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend."""""" This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32. Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab Reviewed-on: https://skia-review.googlesource.com/103181 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2018-02-03 01:32:49 +00:00
if (fWindow->sampleCount() < 1) {
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
return; // Surface hasn't been created yet.
}
Rename VulkanViewer to Viewer, take 2. Also puts Window and Application in sk_app namespace. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003 Review-Url: https://codereview.chromium.org/1945103003
2016-05-04 20:49:13 +00:00
SkString title("Viewer: ");
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
title.append(fSlides[fCurrentSlide]->getName());
Lots of progress on switching to SkColorSpace rather than SkColorProfileType Fixed a bunch of code in Ganesh, as well as usage of SkColorProfileType in most of our tools (DM, SampleApp, Viewer, nanobench, skiaserve, HelloWorld). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069173002 Committed: https://skia.googlesource.com/skia/+/6a61a875467646f8dbc37cfecf49e12d1f475170 Review-Url: https://codereview.chromium.org/2069173002
2016-06-16 20:03:24 +00:00
Add AAA and DAA toggles to viewer Bug: skia: Change-Id: I0ee397d2b2c81a25918cb28be426cf5162da772f Reviewed-on: https://skia-review.googlesource.com/30561 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Yuqian Li <liyuqian@google.com>
2017-08-03 15:08:15 +00:00
if (gSkUseDeltaAA) {
if (gSkForceDeltaAA) {
title.append(" <FDAA>");
} else {
title.append(" <DAA>");
}
} else if (gSkUseAnalyticAA) {
if (gSkForceAnalyticAA) {
title.append(" <FAAA>");
} else {
title.append(" <AAA>");
}
}
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
SkPaintTitleUpdater paintTitle(&title);
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
auto paintFlag = [this, &paintTitle](bool SkPaintFields::* flag,
bool (SkPaint::* isFlag)() const,
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
const char* on, const char* off)
{
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fPaintOverrides.*flag) {
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
paintTitle.append((fPaint.*isFlag)() ? on : off);
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
}
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
};
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
auto fontFlag = [this, &paintTitle](bool SkFontFields::* flag, bool (SkFont::* isFlag)() const,
const char* on, const char* off)
{
if (fFontOverrides.*flag) {
paintTitle.append((fFont.*isFlag)() ? on : off);
}
};
paintFlag(&SkPaintFields::fAntiAlias, &SkPaint::isAntiAlias, "Antialias", "Alias");
paintFlag(&SkPaintFields::fDither, &SkPaint::isDither, "DITHER", "No Dither");
fontFlag(&SkFontFields::fForceAutoHinting, &SkFont::isForceAutoHinting,
"Force Autohint", "No Force Autohint");
fontFlag(&SkFontFields::fEmbolden, &SkFont::isEmbolden, "Fake Bold", "No Fake Bold");
fontFlag(&SkFontFields::fLinearMetrics, &SkFont::isLinearMetrics,
"Linear Metrics", "Non-Linear Metrics");
fontFlag(&SkFontFields::fEmbeddedBitmaps, &SkFont::isEmbeddedBitmaps,
"Bitmap Text", "No Bitmap Text");
fontFlag(&SkFontFields::fSubpixel, &SkFont::isSubpixel, "Subpixel Text", "Pixel Text");
if (fFontOverrides.fEdging) {
switch (fFont.getEdging()) {
case SkFont::Edging::kAlias:
paintTitle.append("Alias Text");
break;
case SkFont::Edging::kAntiAlias:
paintTitle.append("Antialias Text");
break;
case SkFont::Edging::kSubpixelAntiAlias:
paintTitle.append("Subpixel Antialias Text");
break;
}
}
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
if (fFontOverrides.fHinting) {
switch (fFont.getHinting()) {
Revert[4] "hide nested hinting enum" This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207. Bug: skia: Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6 Reviewed-on: https://skia-review.googlesource.com/c/169520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-11-08 00:54:33 +00:00
case kNo_SkFontHinting:
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
paintTitle.append("No Hinting");
break;
Revert[4] "hide nested hinting enum" This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207. Bug: skia: Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6 Reviewed-on: https://skia-review.googlesource.com/c/169520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-11-08 00:54:33 +00:00
case kSlight_SkFontHinting:
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
paintTitle.append("Slight Hinting");
break;
Revert[4] "hide nested hinting enum" This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207. Bug: skia: Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6 Reviewed-on: https://skia-review.googlesource.com/c/169520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-11-08 00:54:33 +00:00
case kNormal_SkFontHinting:
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
paintTitle.append("Normal Hinting");
break;
Revert[4] "hide nested hinting enum" This reverts commit 8e12cc6dfe3801e5a32b7bfa02a39c48fa03c207. Bug: skia: Change-Id: Ice5e3480adad75ab77d97f7366495015f36b15a6 Reviewed-on: https://skia-review.googlesource.com/c/169520 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-11-08 00:54:33 +00:00
case kFull_SkFontHinting:
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
paintTitle.append("Full Hinting");
break;
}
}
paintTitle.done();
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
switch (fColorMode) {
case ColorMode::kLegacy:
title.append(" Legacy 8888");
break;
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
case ColorMode::kColorManaged8888:
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
title.append(" ColorManaged 8888");
break;
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
case ColorMode::kColorManagedF16:
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
title.append(" ColorManaged F16");
break;
}
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
if (ColorMode::kLegacy != fColorMode) {
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
int curPrimaries = -1;
for (size_t i = 0; i < SK_ARRAY_COUNT(gNamedPrimaries); ++i) {
if (primaries_equal(*gNamedPrimaries[i].fPrimaries, fColorSpacePrimaries)) {
curPrimaries = i;
break;
}
}
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
title.appendf(" %s Gamma %f",
curPrimaries >= 0 ? gNamedPrimaries[curPrimaries].fName : "Custom",
Reland "Add SkColorSpace factory from 3x3 row-major gamut and transfer function" Moved named common transfer functions and gamuts to constexpr values in SkColorSpace.h, in SkNamedTransferFn and SkNamedGamut namespaces. Converted nearly all SkColorSpace::MakeRGB calls within Skia to use the new factory with the named values. Multiple clients want a way to extract named transfer function and gamut - this still doesn't provide that, but this may be a better path forward for honestly advertising how SkColorSpace works internally. Originally landed as: https://skia.googlesource.com/skia/+/a9549ab31630fc244094e6f1692371cbaf87f666 Re-landing with a new serialization format, but maintaining ability to load old serialized color spaces, for SKP compatibility. Bug: skia: Change-Id: Ib84a6e1cd5d7d9816175773fdbaff2ca32658667 Reviewed-on: https://skia-review.googlesource.com/c/181176 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-01-04 22:03:00 +00:00
fColorSpaceTransferFn.g);
Add sRGB mode toggle to Viewer. Unlike SampleApp, this just switches out the format of the window surface (and then adjusts the gamma-correct flag on the SkSurfaces). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1950983007 Review-Url: https://codereview.chromium.org/1950983007
2016-05-06 20:28:57 +00:00
}
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
Add pixel geometry and dft selection to viewer app. Change-Id: I2fea84793383c44b102fa97b23f59235ef302ff9 Reviewed-on: https://skia-review.googlesource.com/121581 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Herb Derby <herb@google.com>
2018-04-13 18:30:23 +00:00
const DisplayParams& params = fWindow->getRequestedDisplayParams();
if (fPixelGeometryOverrides) {
switch (params.fSurfaceProps.pixelGeometry()) {
case kUnknown_SkPixelGeometry:
title.append( " Flat");
break;
case kRGB_H_SkPixelGeometry:
title.append( " RGB");
break;
case kBGR_H_SkPixelGeometry:
title.append( " BGR");
break;
case kRGB_V_SkPixelGeometry:
title.append( " RGBV");
break;
case kBGR_V_SkPixelGeometry:
title.append( " BGRV");
break;
}
}
if (params.fSurfaceProps.isUseDeviceIndependentFonts()) {
title.append(" DFT");
}
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
title.append(" [");
Add OpenGL context to Viewer. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1978573003 Committed: https://skia.googlesource.com/skia/+/56a11e4d6f3d436a3c2497c9c9e71a117d78a93f Review-Url: https://codereview.chromium.org/1978573003
2016-05-20 13:01:06 +00:00
title.append(kBackendTypeStrings[fBackendType]);
Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend."""""" This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32. Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab Reviewed-on: https://skia-review.googlesource.com/103181 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2018-02-03 01:32:49 +00:00
int msaa = fWindow->sampleCount();
if (msaa > 1) {
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
title.appendf(" MSAA: %i", msaa);
}
title.append("]");
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
GpuPathRenderers pr = fWindow->getRequestedDisplayParams().fGrContextOptions.fGpuPathRenderers;
Merge "All" and "Default" path renderer options in viewer This removes a confusing pair of radio buttons that were always in sync Change-Id: I9bb2d4b944c1bba67f29f71e51c070c20b10d0ef Reviewed-on: https://skia-review.googlesource.com/140242 Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-07-10 15:41:22 +00:00
if (GpuPathRenderers::kAll != pr) {
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
title.appendf(" [Path renderer: %s]", gPathRendererNames[pr].c_str());
}
Add toggle for 'real' vs. 'fake' perspective in Viewer Real perspective draws content with perspective applied. Fake perspective rasterizes in ortho, then stretches the image by the perspective matrix. Change-Id: I738cd379f9a58b965469ef8a57fb2dfd597fda10 Reviewed-on: https://skia-review.googlesource.com/125442 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2018-05-02 19:40:20 +00:00
if (kPerspective_Real == fPerspectiveMode) {
title.append(" Perpsective (Real)");
} else if (kPerspective_Fake == fPerspectiveMode) {
title.append(" Perspective (Fake)");
}
Add sRGB mode toggle to Viewer. Unlike SampleApp, this just switches out the format of the window surface (and then adjusts the gamma-correct flag on the SkSurfaces). BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1950983007 Review-Url: https://codereview.chromium.org/1950983007
2016-05-06 20:28:57 +00:00
fWindow->setTitle(title.c_str());
}
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
int Viewer::startupSlide() const {
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
if (!FLAGS_slide.isEmpty()) {
int count = fSlides.count();
for (int i = 0; i < count; i++) {
if (fSlides[i]->getName().equals(FLAGS_slide[0])) {
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
return i;
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
}
}
fprintf(stderr, "Unknown slide \"%s\"\n", FLAGS_slide[0]);
this->listNames();
}
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
return 0;
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
}
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
void Viewer::listNames() const {
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
SkDebugf("All Slides:\n");
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
for (const auto& slide : fSlides) {
SkDebugf(" %s\n", slide->getName().c_str());
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
}
}
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
void Viewer::setCurrentSlide(int slide) {
SkASSERT(slide >= 0 && slide < fSlides.count());
if (slide == fCurrentSlide) {
return;
}
if (fCurrentSlide >= 0) {
fSlides[fCurrentSlide]->unload();
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
}
Display JPGs in Viewer with Split Screen and ColorSpaceXform BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2058753002 Review-Url: https://codereview.chromium.org/2058753002
2016-06-13 19:26:45 +00:00
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
fSlides[slide]->load(SkIntToScalar(fWindow->width()),
SkIntToScalar(fWindow->height()));
fCurrentSlide = slide;
this->setupCurrentSlide();
}
void Viewer::setupCurrentSlide() {
Fix startup for SampleSlide When we start up Viewer with a SampleSlide as the first slide, nothing gets rendered because SampleSlide depends on the backend being initialized before setting its dimensions. This pushes the first slide's initialization after the backend creation. Change-Id: I8f83fe7b3973c40234104f1a83c0a60750694311 Reviewed-on: https://skia-review.googlesource.com/98161 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2018-01-22 18:39:30 +00:00
if (fCurrentSlide >= 0) {
// prepare dimensions for image slides
fGesture.resetTouchState();
fDefaultMatrix.reset();
const SkISize slideSize = fSlides[fCurrentSlide]->getDimensions();
const SkRect slideBounds = SkRect::MakeIWH(slideSize.width(), slideSize.height());
const SkRect windowRect = SkRect::MakeIWH(fWindow->width(), fWindow->height());
// Start with a matrix that scales the slide to the available screen space
if (fWindow->scaleContentToFit()) {
if (windowRect.width() > 0 && windowRect.height() > 0) {
fDefaultMatrix.setRectToRect(slideBounds, windowRect, SkMatrix::kStart_ScaleToFit);
}
Correct gesture scale and translation BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1996613002 Review-Url: https://codereview.chromium.org/1996613002
2016-05-20 14:32:19 +00:00
}
Fix startup for SampleSlide When we start up Viewer with a SampleSlide as the first slide, nothing gets rendered because SampleSlide depends on the backend being initialized before setting its dimensions. This pushes the first slide's initialization after the backend creation. Change-Id: I8f83fe7b3973c40234104f1a83c0a60750694311 Reviewed-on: https://skia-review.googlesource.com/98161 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2018-01-22 18:39:30 +00:00
// Prevent the user from dragging content so far outside the window they can't find it again
Update trans limit after zoom changes in viewer Previously, the trans limit assumes that only touch gesture can change the zoom level. That's not true on desktops so we need this fix. Otherwise, we won't be able to translate when we zoomed in. Bug: skia: Change-Id: I5901600a0044639a47514ab76b7e1914f04137a2 Reviewed-on: https://skia-review.googlesource.com/116987 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
2018-03-28 20:23:31 +00:00
fGesture.setTransLimit(slideBounds, windowRect, this->computePreTouchMatrix());
Correct gesture scale and translation BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1996613002 Review-Url: https://codereview.chromium.org/1996613002
2016-05-20 14:32:19 +00:00
Fix startup for SampleSlide When we start up Viewer with a SampleSlide as the first slide, nothing gets rendered because SampleSlide depends on the backend being initialized before setting its dimensions. This pushes the first slide's initialization after the backend creation. Change-Id: I8f83fe7b3973c40234104f1a83c0a60750694311 Reviewed-on: https://skia-review.googlesource.com/98161 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2018-01-22 18:39:30 +00:00
this->updateTitle();
this->updateUIState();
Add ms display to Viewer. Change-Id: I6303209d3ff597611ac1a5f558294c6d6fcba670 Reviewed-on: https://skia-review.googlesource.com/67766 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-11-03 17:36:07 +00:00
Fix startup for SampleSlide When we start up Viewer with a SampleSlide as the first slide, nothing gets rendered because SampleSlide depends on the backend being initialized before setting its dimensions. This pushes the first slide's initialization after the backend creation. Change-Id: I8f83fe7b3973c40234104f1a83c0a60750694311 Reviewed-on: https://skia-review.googlesource.com/98161 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2018-01-22 18:39:30 +00:00
fStatsLayer.resetMeasurements();
Add ms display to Viewer. Change-Id: I6303209d3ff597611ac1a5f558294c6d6fcba670 Reviewed-on: https://skia-review.googlesource.com/67766 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-11-03 17:36:07 +00:00
Fix startup for SampleSlide When we start up Viewer with a SampleSlide as the first slide, nothing gets rendered because SampleSlide depends on the backend being initialized before setting its dimensions. This pushes the first slide's initialization after the backend creation. Change-Id: I8f83fe7b3973c40234104f1a83c0a60750694311 Reviewed-on: https://skia-review.googlesource.com/98161 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2018-01-22 18:39:30 +00:00
fWindow->inval();
}
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
}
#define MAX_ZOOM_LEVEL 8
#define MIN_ZOOM_LEVEL -8
Rename VulkanViewer to Viewer, take 2. Also puts Window and Application in sk_app namespace. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1945103003 Review-Url: https://codereview.chromium.org/1945103003
2016-05-04 20:49:13 +00:00
void Viewer::changeZoomLevel(float delta) {
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
fZoomLevel += delta;
Simplify some Viewer code, and fix a few bugs The content rect was always identical to the window rect, so most of the related code did nothing. The translation limit code is always useful (to avoid dragging the slide way off-screen with the mouse), so always include it. The auto-scaling to fit the screen is also still useful, but just base it on the window rect. The zoom code has four state variables, only used two of them, and one was a trivially derived computation. Fold most of that work into computeMatrix. (The translation was always zero -- we never changed the zoom center.) Include fDefaultMatrix in the matrix from computeMatrix, rather than needing to apply it specially to the canvas. Don't apply the inverse default matrix to touch or mouse points. The absolute positions of those touch points is not important, but because that matrix includes scale (and sometimes very large or very small scale), it just had the effect of greatly amplifying or damping the drag speed. Without it, the slide always pans at the speed of the touch/mouse drag -- which seems more desirable. The use of the inverse default matrix was a clever trick, but it caused the translation (applied to the global mtx) to be scaled, so the slide was always pinned incorrectly. Instead, supply the unmodified window rect and the default matrix, so the trans limit code can do the obvious correct thing: xform the slide bounds completely, then limit the translation that will be applied after that. Slides are now correctly pinned to screen edge regardless of how much zoom is present in the default matrix. Note: There are still several bugs related to all of this code, but given the web of xform state, it's hard to unravel. The touch gesture still doesn't know about viewer's zoom, so that's ignored when doing the pinning. Beyond that, it doesn't even know about window resize - it only configures the translation limit when setting up a slide. I had a fix for all of this (doing the translation limiting in computeMatrix), but then the touch gesture doesn't know about it, and can accumulate drag motion that needs to be un-dragged to get back on-screen, even though the slide is never really translated that far. SkTouchGesture is in include. No one uses it except viewer: TBR=bsalomon@google.com Bug: skia: Change-Id: I460cc07c3de6d36e63826f57d359faf1facf5ab3 Reviewed-on: https://skia-review.googlesource.com/18524 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-06-05 12:46:04 +00:00
fZoomLevel = SkScalarPin(fZoomLevel, MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL);
Add Transform section to viewer tools window. This adds sliders for Zoom and Rotate. Change-Id: Ie568e5381d76bd5a457760e2d6224e42e64c7f16 Reviewed-on: https://skia-review.googlesource.com/123027 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-23 16:55:06 +00:00
this->preTouchMatrixChanged();
}
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
Add Transform section to viewer tools window. This adds sliders for Zoom and Rotate. Change-Id: Ie568e5381d76bd5a457760e2d6224e42e64c7f16 Reviewed-on: https://skia-review.googlesource.com/123027 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-23 16:55:06 +00:00
void Viewer::preTouchMatrixChanged() {
// Update the trans limit as the transform changes.
Update trans limit after zoom changes in viewer Previously, the trans limit assumes that only touch gesture can change the zoom level. That's not true on desktops so we need this fix. Otherwise, we won't be able to translate when we zoomed in. Bug: skia: Change-Id: I5901600a0044639a47514ab76b7e1914f04137a2 Reviewed-on: https://skia-review.googlesource.com/116987 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
2018-03-28 20:23:31 +00:00
const SkISize slideSize = fSlides[fCurrentSlide]->getDimensions();
const SkRect slideBounds = SkRect::MakeIWH(slideSize.width(), slideSize.height());
const SkRect windowRect = SkRect::MakeIWH(fWindow->width(), fWindow->height());
fGesture.setTransLimit(slideBounds, windowRect, this->computePreTouchMatrix());
}
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
Add toggle for 'real' vs. 'fake' perspective in Viewer Real perspective draws content with perspective applied. Fake perspective rasterizes in ortho, then stretches the image by the perspective matrix. Change-Id: I738cd379f9a58b965469ef8a57fb2dfd597fda10 Reviewed-on: https://skia-review.googlesource.com/125442 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2018-05-02 19:40:20 +00:00
SkMatrix Viewer::computePerspectiveMatrix() {
SkScalar w = fWindow->width(), h = fWindow->height();
SkPoint orthoPts[4] = { { 0, 0 }, { w, 0 }, { 0, h }, { w, h } };
SkPoint perspPts[4] = {
{ fPerspectivePoints[0].fX * w, fPerspectivePoints[0].fY * h },
{ fPerspectivePoints[1].fX * w, fPerspectivePoints[1].fY * h },
{ fPerspectivePoints[2].fX * w, fPerspectivePoints[2].fY * h },
{ fPerspectivePoints[3].fX * w, fPerspectivePoints[3].fY * h }
};
SkMatrix m;
m.setPolyToPoly(orthoPts, perspPts, 4);
return m;
}
Update trans limit after zoom changes in viewer Previously, the trans limit assumes that only touch gesture can change the zoom level. That's not true on desktops so we need this fix. Otherwise, we won't be able to translate when we zoomed in. Bug: skia: Change-Id: I5901600a0044639a47514ab76b7e1914f04137a2 Reviewed-on: https://skia-review.googlesource.com/116987 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
2018-03-28 20:23:31 +00:00
SkMatrix Viewer::computePreTouchMatrix() {
SkMatrix m = fDefaultMatrix;
Simplify some Viewer code, and fix a few bugs The content rect was always identical to the window rect, so most of the related code did nothing. The translation limit code is always useful (to avoid dragging the slide way off-screen with the mouse), so always include it. The auto-scaling to fit the screen is also still useful, but just base it on the window rect. The zoom code has four state variables, only used two of them, and one was a trivially derived computation. Fold most of that work into computeMatrix. (The translation was always zero -- we never changed the zoom center.) Include fDefaultMatrix in the matrix from computeMatrix, rather than needing to apply it specially to the canvas. Don't apply the inverse default matrix to touch or mouse points. The absolute positions of those touch points is not important, but because that matrix includes scale (and sometimes very large or very small scale), it just had the effect of greatly amplifying or damping the drag speed. Without it, the slide always pans at the speed of the touch/mouse drag -- which seems more desirable. The use of the inverse default matrix was a clever trick, but it caused the translation (applied to the global mtx) to be scaled, so the slide was always pinned incorrectly. Instead, supply the unmodified window rect and the default matrix, so the trans limit code can do the obvious correct thing: xform the slide bounds completely, then limit the translation that will be applied after that. Slides are now correctly pinned to screen edge regardless of how much zoom is present in the default matrix. Note: There are still several bugs related to all of this code, but given the web of xform state, it's hard to unravel. The touch gesture still doesn't know about viewer's zoom, so that's ignored when doing the pinning. Beyond that, it doesn't even know about window resize - it only configures the translation limit when setting up a slide. I had a fix for all of this (doing the translation limiting in computeMatrix), but then the touch gesture doesn't know about it, and can accumulate drag motion that needs to be un-dragged to get back on-screen, even though the slide is never really translated that far. SkTouchGesture is in include. No one uses it except viewer: TBR=bsalomon@google.com Bug: skia: Change-Id: I460cc07c3de6d36e63826f57d359faf1facf5ab3 Reviewed-on: https://skia-review.googlesource.com/18524 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-06-05 12:46:04 +00:00
SkScalar zoomScale = (fZoomLevel < 0) ? SK_Scalar1 / (SK_Scalar1 - fZoomLevel)
: SK_Scalar1 + fZoomLevel;
Subpixel in Viewer from -1 to 1. Change the Subpixel positioning in Viewer from 0 to 1 to -1 to 1, with the origin at the center of the drag area. This allows for observing what happens when rolling over integer boundaries. Since it is no longer simple to reset to the origin, closing the collapsing header resets the drag point to the origin. Change-Id: I88d4fd489c3bfb914fb843fa261d4097fef3671a Reviewed-on: https://skia-review.googlesource.com/146643 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-08-09 19:18:46 +00:00
m.preTranslate((fOffset.x() - 0.5f) * 2.0f, (fOffset.y() - 0.5f) * 2.0f);
Simplify some Viewer code, and fix a few bugs The content rect was always identical to the window rect, so most of the related code did nothing. The translation limit code is always useful (to avoid dragging the slide way off-screen with the mouse), so always include it. The auto-scaling to fit the screen is also still useful, but just base it on the window rect. The zoom code has four state variables, only used two of them, and one was a trivially derived computation. Fold most of that work into computeMatrix. (The translation was always zero -- we never changed the zoom center.) Include fDefaultMatrix in the matrix from computeMatrix, rather than needing to apply it specially to the canvas. Don't apply the inverse default matrix to touch or mouse points. The absolute positions of those touch points is not important, but because that matrix includes scale (and sometimes very large or very small scale), it just had the effect of greatly amplifying or damping the drag speed. Without it, the slide always pans at the speed of the touch/mouse drag -- which seems more desirable. The use of the inverse default matrix was a clever trick, but it caused the translation (applied to the global mtx) to be scaled, so the slide was always pinned incorrectly. Instead, supply the unmodified window rect and the default matrix, so the trans limit code can do the obvious correct thing: xform the slide bounds completely, then limit the translation that will be applied after that. Slides are now correctly pinned to screen edge regardless of how much zoom is present in the default matrix. Note: There are still several bugs related to all of this code, but given the web of xform state, it's hard to unravel. The touch gesture still doesn't know about viewer's zoom, so that's ignored when doing the pinning. Beyond that, it doesn't even know about window resize - it only configures the translation limit when setting up a slide. I had a fix for all of this (doing the translation limiting in computeMatrix), but then the touch gesture doesn't know about it, and can accumulate drag motion that needs to be un-dragged to get back on-screen, even though the slide is never really translated that far. SkTouchGesture is in include. No one uses it except viewer: TBR=bsalomon@google.com Bug: skia: Change-Id: I460cc07c3de6d36e63826f57d359faf1facf5ab3 Reviewed-on: https://skia-review.googlesource.com/18524 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-06-05 12:46:04 +00:00
m.preScale(zoomScale, zoomScale);
Rotate about the slide center, and before perspective This causes rotation to happen in the perspective plane, which is more (?) interesting/useful. Change-Id: If57a81de6662591be67cb68f0278f71038ac8d40 Reviewed-on: https://skia-review.googlesource.com/124160 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-04-26 20:22:42 +00:00
const SkISize slideSize = fSlides[fCurrentSlide]->getDimensions();
m.preRotate(fRotation, slideSize.width() * 0.5f, slideSize.height() * 0.5f);
Add perspective support (rect to rect) to Viewer Change-Id: I312d5b3e6b7f37a3a7bfd5561bcdb31b43e207b8 Reviewed-on: https://skia-review.googlesource.com/123934 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2018-04-26 19:55:00 +00:00
Add toggle for 'real' vs. 'fake' perspective in Viewer Real perspective draws content with perspective applied. Fake perspective rasterizes in ortho, then stretches the image by the perspective matrix. Change-Id: I738cd379f9a58b965469ef8a57fb2dfd597fda10 Reviewed-on: https://skia-review.googlesource.com/125442 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2018-05-02 19:40:20 +00:00
if (kPerspective_Real == fPerspectiveMode) {
SkMatrix persp = this->computePerspectiveMatrix();
Rotate about the slide center, and before perspective This causes rotation to happen in the perspective plane, which is more (?) interesting/useful. Change-Id: If57a81de6662591be67cb68f0278f71038ac8d40 Reviewed-on: https://skia-review.googlesource.com/124160 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-04-26 20:22:42 +00:00
m.postConcat(persp);
Add perspective support (rect to rect) to Viewer Change-Id: I312d5b3e6b7f37a3a7bfd5561bcdb31b43e207b8 Reviewed-on: https://skia-review.googlesource.com/123934 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2018-04-26 19:55:00 +00:00
}
Update trans limit after zoom changes in viewer Previously, the trans limit assumes that only touch gesture can change the zoom level. That's not true on desktops so we need this fix. Otherwise, we won't be able to translate when we zoomed in. Bug: skia: Change-Id: I5901600a0044639a47514ab76b7e1914f04137a2 Reviewed-on: https://skia-review.googlesource.com/116987 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
2018-03-28 20:23:31 +00:00
return m;
}
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
Update trans limit after zoom changes in viewer Previously, the trans limit assumes that only touch gesture can change the zoom level. That's not true on desktops so we need this fix. Otherwise, we won't be able to translate when we zoomed in. Bug: skia: Change-Id: I5901600a0044639a47514ab76b7e1914f04137a2 Reviewed-on: https://skia-review.googlesource.com/116987 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Yuqian Li <liyuqian@google.com>
2018-03-28 20:23:31 +00:00
SkMatrix Viewer::computeMatrix() {
SkMatrix m = fGesture.localM();
m.preConcat(fGesture.globalM());
m.preConcat(this->computePreTouchMatrix());
Implement touch control BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1982643004 Review-Url: https://codereview.chromium.org/1982643004
2016-05-17 19:44:20 +00:00
return m;
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
}
Add backend selection to viewer's GUI BUG=skia: Change-Id: I3314013538792c2aa82cc49f3f072aab2cdc4a55 Reviewed-on: https://skia-review.googlesource.com/9079 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-02-28 20:45:01 +00:00
void Viewer::setBackend(sk_app::Window::BackendType backendType) {
fBackendType = backendType;
fWindow->detach();
In Viewer, use a GL window for Raster mode The GUI uses drawVertices, in a way that doesn't currently work with the raster backend. Even if it worked, drawVertices is fairly slow in raster mode, but extremely fast on GPU. This makes the GUI always usable. The tradeoff is profiling raster will be less accurate. Bug: skia: Change-Id: I69df777fc5be79f5bdd8d4505f6419bfa758c97e Reviewed-on: https://skia-review.googlesource.com/68541 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 14:54:10 +00:00
#if defined(SK_BUILD_FOR_WIN)
Add ANGLE support to Viewer on Windows Change-Id: I97a844b2f289d2518f60a64f94d60551c4530dd4 Reviewed-on: https://skia-review.googlesource.com/35742 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2017-08-17 18:37:06 +00:00
// Switching between OpenGL, Vulkan, and ANGLE in the same window is problematic at this point
// on Windows, so we just delete the window and recreate it.
In Viewer, use a GL window for Raster mode The GUI uses drawVertices, in a way that doesn't currently work with the raster backend. Even if it worked, drawVertices is fairly slow in raster mode, but extremely fast on GPU. This makes the GUI always usable. The tradeoff is profiling raster will be less accurate. Bug: skia: Change-Id: I69df777fc5be79f5bdd8d4505f6419bfa758c97e Reviewed-on: https://skia-review.googlesource.com/68541 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 14:54:10 +00:00
DisplayParams params = fWindow->getRequestedDisplayParams();
delete fWindow;
fWindow = Window::CreateNativeWindow(nullptr);
// re-register callbacks
fCommands.attach(fWindow);
Create a Window::Layer interface to reduce sk_app glue code This also makes it possible to manage other parts of viewer, etc (like the stats screen, command set, even samples) as additional layers in the stack. For now, it just removes a lot of boilerplate. Bug: skia: Change-Id: Ic2f80690fc76c683b3736287dc2b738c50d38614 Reviewed-on: https://skia-review.googlesource.com/82688 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-08 21:45:43 +00:00
fWindow->pushLayer(this);
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fWindow->pushLayer(&fStatsLayer);
Move ImGui support code to ImGuiLayer Viewer still has plenty of code that uses ImGui to create application specific UI, but the structural code that forwards input to ImGui, and converts per-frame ImGui rendering data to Skia draw commands is now in a single component that can be reused in any sk_app-based application. Bug: skia: Change-Id: Ic14ece659d4af8ee13b69c638bdaf7df6c24f5c0 Reviewed-on: https://skia-review.googlesource.com/82627 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-12-08 21:46:09 +00:00
fWindow->pushLayer(&fImGuiLayer);
In Viewer, use a GL window for Raster mode The GUI uses drawVertices, in a way that doesn't currently work with the raster backend. Even if it worked, drawVertices is fairly slow in raster mode, but extremely fast on GPU. This makes the GUI always usable. The tradeoff is profiling raster will be less accurate. Bug: skia: Change-Id: I69df777fc5be79f5bdd8d4505f6419bfa758c97e Reviewed-on: https://skia-review.googlesource.com/68541 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 14:54:10 +00:00
// Don't allow the window to re-attach. If we're in MSAA mode, the params we grabbed above
// will still include our correct sample count. But the re-created fWindow will lose that
// information. On Windows, we need to re-create the window when changing sample count,
// so we'll incorrectly detect that situation, then re-initialize the window in GL mode,
// rendering this tear-down step pointless (and causing the Vulkan window context to fail
// as if we had never changed windows at all).
fWindow->setRequestedDisplayParams(params, false);
Add backend selection to viewer's GUI BUG=skia: Change-Id: I3314013538792c2aa82cc49f3f072aab2cdc4a55 Reviewed-on: https://skia-review.googlesource.com/9079 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-02-28 20:45:01 +00:00
#endif
In Viewer, use a GL window for Raster mode The GUI uses drawVertices, in a way that doesn't currently work with the raster backend. Even if it worked, drawVertices is fairly slow in raster mode, but extremely fast on GPU. This makes the GUI always usable. The tradeoff is profiling raster will be less accurate. Bug: skia: Change-Id: I69df777fc5be79f5bdd8d4505f6419bfa758c97e Reviewed-on: https://skia-review.googlesource.com/68541 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 14:54:10 +00:00
fWindow->attach(backend_type_for_window(fBackendType));
Add backend selection to viewer's GUI BUG=skia: Change-Id: I3314013538792c2aa82cc49f3f072aab2cdc4a55 Reviewed-on: https://skia-review.googlesource.com/9079 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-02-28 20:45:01 +00:00
}
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
void Viewer::setColorMode(ColorMode colorMode) {
fColorMode = colorMode;
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
this->updateTitle();
fWindow->inval();
}
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
class OveridePaintFilterCanvas : public SkPaintFilterCanvas {
public:
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
OveridePaintFilterCanvas(SkCanvas* canvas, SkPaint* paint, Viewer::SkPaintFields* pfields,
SkFont* font, Viewer::SkFontFields* ffields)
: SkPaintFilterCanvas(canvas), fPaint(paint), fPaintOverrides(pfields), fFont(font), fFontOverrides(ffields)
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
{ }
Filter TextBlob paints in Viewer. In particular this allows subpixel positioning to be forced for drawing. Change-Id: I2c88311f075944fef66fe5ba0237804aa5755800 Reviewed-on: https://skia-review.googlesource.com/156370 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-09-24 17:01:54 +00:00
const SkTextBlob* filterTextBlob(const SkPaint& paint, const SkTextBlob* blob,
sk_sp<SkTextBlob>* cache) {
bool blobWillChange = false;
for (SkTextBlobRunIterator it(blob); !it.done(); it.next()) {
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
SkTCopyOnFirstWrite<SkFont> filteredFont(it.font());
bool shouldDraw = this->filterFont(&filteredFont);
if (it.font() != *filteredFont || !shouldDraw) {
Filter TextBlob paints in Viewer. In particular this allows subpixel positioning to be forced for drawing. Change-Id: I2c88311f075944fef66fe5ba0237804aa5755800 Reviewed-on: https://skia-review.googlesource.com/156370 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-09-24 17:01:54 +00:00
blobWillChange = true;
break;
}
}
if (!blobWillChange) {
return blob;
}
SkTextBlobBuilder builder;
for (SkTextBlobRunIterator it(blob); !it.done(); it.next()) {
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
SkTCopyOnFirstWrite<SkFont> filteredFont(it.font());
bool shouldDraw = this->filterFont(&filteredFont);
Filter TextBlob paints in Viewer. In particular this allows subpixel positioning to be forced for drawing. Change-Id: I2c88311f075944fef66fe5ba0237804aa5755800 Reviewed-on: https://skia-review.googlesource.com/156370 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-09-24 17:01:54 +00:00
if (!shouldDraw) {
continue;
}
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
SkFont font = *filteredFont;
change private alloc methods to also take fonts Bug: skia:2664 Change-Id: I772534179ce0c948984640f9fffc22e0372fce97 Reviewed-on: https://skia-review.googlesource.com/c/174848 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-12-05 22:28:14 +00:00
Filter TextBlob paints in Viewer. In particular this allows subpixel positioning to be forced for drawing. Change-Id: I2c88311f075944fef66fe5ba0237804aa5755800 Reviewed-on: https://skia-review.googlesource.com/156370 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-09-24 17:01:54 +00:00
const SkTextBlobBuilder::RunBuffer& runBuffer
= it.positioning() == SkTextBlobRunIterator::kDefault_Positioning
change private alloc methods to also take fonts Bug: skia:2664 Change-Id: I772534179ce0c948984640f9fffc22e0372fce97 Reviewed-on: https://skia-review.googlesource.com/c/174848 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-12-05 22:28:14 +00:00
? SkTextBlobBuilderPriv::AllocRunText(&builder, font,
Filter TextBlob paints in Viewer. In particular this allows subpixel positioning to be forced for drawing. Change-Id: I2c88311f075944fef66fe5ba0237804aa5755800 Reviewed-on: https://skia-review.googlesource.com/156370 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-09-24 17:01:54 +00:00
it.offset().x(),it.offset().y(), it.glyphCount(), it.textSize(), SkString())
: it.positioning() == SkTextBlobRunIterator::kHorizontal_Positioning
change private alloc methods to also take fonts Bug: skia:2664 Change-Id: I772534179ce0c948984640f9fffc22e0372fce97 Reviewed-on: https://skia-review.googlesource.com/c/174848 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-12-05 22:28:14 +00:00
? SkTextBlobBuilderPriv::AllocRunTextPosH(&builder, font,
Filter TextBlob paints in Viewer. In particular this allows subpixel positioning to be forced for drawing. Change-Id: I2c88311f075944fef66fe5ba0237804aa5755800 Reviewed-on: https://skia-review.googlesource.com/156370 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-09-24 17:01:54 +00:00
it.offset().y(), it.glyphCount(), it.textSize(), SkString())
: it.positioning() == SkTextBlobRunIterator::kFull_Positioning
change private alloc methods to also take fonts Bug: skia:2664 Change-Id: I772534179ce0c948984640f9fffc22e0372fce97 Reviewed-on: https://skia-review.googlesource.com/c/174848 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-12-05 22:28:14 +00:00
? SkTextBlobBuilderPriv::AllocRunTextPos(&builder, font,
Filter TextBlob paints in Viewer. In particular this allows subpixel positioning to be forced for drawing. Change-Id: I2c88311f075944fef66fe5ba0237804aa5755800 Reviewed-on: https://skia-review.googlesource.com/156370 Reviewed-by: Herb Derby <herb@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-09-24 17:01:54 +00:00
it.glyphCount(), it.textSize(), SkString())
: (SkASSERT_RELEASE(false), SkTextBlobBuilder::RunBuffer());
uint32_t glyphCount = it.glyphCount();
if (it.glyphs()) {
size_t glyphSize = sizeof(decltype(*it.glyphs()));
memcpy(runBuffer.glyphs, it.glyphs(), glyphCount * glyphSize);
}
if (it.pos()) {
size_t posSize = sizeof(decltype(*it.pos()));
uint8_t positioning = it.positioning();
memcpy(runBuffer.pos, it.pos(), glyphCount * positioning * posSize);
}
if (it.text()) {
size_t textSize = sizeof(decltype(*it.text()));
uint32_t textCount = it.textSize();
memcpy(runBuffer.utf8text, it.text(), textCount * textSize);
}
if (it.clusters()) {
size_t clusterSize = sizeof(decltype(*it.clusters()));
memcpy(runBuffer.clusters, it.clusters(), glyphCount * clusterSize);
}
}
*cache = builder.make();
return cache->get();
}
void onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
const SkPaint& paint) override {
sk_sp<SkTextBlob> cache;
this->SkPaintFilterCanvas::onDrawTextBlob(
this->filterTextBlob(paint, blob, &cache), x, y, paint);
}
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
bool filterFont(SkTCopyOnFirstWrite<SkFont>* font) const {
if (fFontOverrides->fTextSize) {
font->writable()->setSize(fFont->getSize());
Add text size override to Viewer. In some cases issues only happen when the actual requested text size on a paint is a particular size. Allow overriding the text size on the paint for such testing. Change-Id: Ic719ea36ba9d624725d443cbd563283628606f2d Reviewed-on: https://skia-review.googlesource.com/133446 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-07 21:54:07 +00:00
}
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
if (fFontOverrides->fHinting) {
font->writable()->setHinting(fFont->getHinting());
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
}
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fFontOverrides->fEdging) {
font->writable()->setEdging(fFont->getEdging());
Revert "hide hinting and flag enums with PAINT_FLAGS" This reverts commit 5d052dac3ac19e6ddff8b004541310241a4e70e5. Reason for revert: BREAKS CHROMIUM ROLL. https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc?l=49 | FAILED: obj/third_party/blink/renderer/platform/platform/font_platform_data_win.obj | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(49,29): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | if (text_flags & SkPaint::kLCDRenderText_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(51,36): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | } else if (text_flags & SkPaint::kAntiAlias_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(56,52): | error: no member named 'kSubpixelText_Flag' in 'SkPaint' | font->setSubpixel(SkToBool(text_flags & SkPaint::kSubpixelText_Flag)); | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(64,29): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | if (text_flags & SkPaint::kAntiAlias_Flag) | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(85,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | ? SkPaint::kAntiAlias_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(91,35): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | ? SkPaint::kLCDRenderText_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(93,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags = SkPaint::kAntiAlias_Flag | lcd_flag; | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(101,28): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags |= SkPaint::kAntiAlias_Flag; | ~~~~~~~~~^ | 8 errors generated. Original change's description: > hide hinting and flag enums with PAINT_FLAGS > > A preflight for https://skia-review.googlesource.com/c/skia/+/185460 > > Bug: skia:2664 > Change-Id: I83f7f9cd500e8507b559462835477ba8ae7c11ab > Reviewed-on: https://skia-review.googlesource.com/c/185540 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> > Auto-Submit: Mike Reed <reed@google.com> TBR=reed@google.com Change-Id: I4d1581a7e29267ad459ed31d4885b823fa00066f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:2664 Reviewed-on: https://skia-review.googlesource.com/c/185680 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
2019-01-21 18:51:32 +00:00
}
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fFontOverrides->fEmbolden) {
font->writable()->setEmbolden(fFont->isEmbolden());
Revert "hide hinting and flag enums with PAINT_FLAGS" This reverts commit 5d052dac3ac19e6ddff8b004541310241a4e70e5. Reason for revert: BREAKS CHROMIUM ROLL. https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc?l=49 | FAILED: obj/third_party/blink/renderer/platform/platform/font_platform_data_win.obj | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(49,29): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | if (text_flags & SkPaint::kLCDRenderText_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(51,36): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | } else if (text_flags & SkPaint::kAntiAlias_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(56,52): | error: no member named 'kSubpixelText_Flag' in 'SkPaint' | font->setSubpixel(SkToBool(text_flags & SkPaint::kSubpixelText_Flag)); | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(64,29): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | if (text_flags & SkPaint::kAntiAlias_Flag) | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(85,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | ? SkPaint::kAntiAlias_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(91,35): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | ? SkPaint::kLCDRenderText_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(93,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags = SkPaint::kAntiAlias_Flag | lcd_flag; | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(101,28): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags |= SkPaint::kAntiAlias_Flag; | ~~~~~~~~~^ | 8 errors generated. Original change's description: > hide hinting and flag enums with PAINT_FLAGS > > A preflight for https://skia-review.googlesource.com/c/skia/+/185460 > > Bug: skia:2664 > Change-Id: I83f7f9cd500e8507b559462835477ba8ae7c11ab > Reviewed-on: https://skia-review.googlesource.com/c/185540 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> > Auto-Submit: Mike Reed <reed@google.com> TBR=reed@google.com Change-Id: I4d1581a7e29267ad459ed31d4885b823fa00066f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:2664 Reviewed-on: https://skia-review.googlesource.com/c/185680 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
2019-01-21 18:51:32 +00:00
}
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fFontOverrides->fLinearMetrics) {
font->writable()->setLinearMetrics(fFont->isLinearMetrics());
Revert "hide hinting and flag enums with PAINT_FLAGS" This reverts commit 5d052dac3ac19e6ddff8b004541310241a4e70e5. Reason for revert: BREAKS CHROMIUM ROLL. https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc?l=49 | FAILED: obj/third_party/blink/renderer/platform/platform/font_platform_data_win.obj | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(49,29): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | if (text_flags & SkPaint::kLCDRenderText_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(51,36): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | } else if (text_flags & SkPaint::kAntiAlias_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(56,52): | error: no member named 'kSubpixelText_Flag' in 'SkPaint' | font->setSubpixel(SkToBool(text_flags & SkPaint::kSubpixelText_Flag)); | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(64,29): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | if (text_flags & SkPaint::kAntiAlias_Flag) | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(85,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | ? SkPaint::kAntiAlias_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(91,35): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | ? SkPaint::kLCDRenderText_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(93,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags = SkPaint::kAntiAlias_Flag | lcd_flag; | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(101,28): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags |= SkPaint::kAntiAlias_Flag; | ~~~~~~~~~^ | 8 errors generated. Original change's description: > hide hinting and flag enums with PAINT_FLAGS > > A preflight for https://skia-review.googlesource.com/c/skia/+/185460 > > Bug: skia:2664 > Change-Id: I83f7f9cd500e8507b559462835477ba8ae7c11ab > Reviewed-on: https://skia-review.googlesource.com/c/185540 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> > Auto-Submit: Mike Reed <reed@google.com> TBR=reed@google.com Change-Id: I4d1581a7e29267ad459ed31d4885b823fa00066f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:2664 Reviewed-on: https://skia-review.googlesource.com/c/185680 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
2019-01-21 18:51:32 +00:00
}
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fFontOverrides->fSubpixel) {
font->writable()->setSubpixel(fFont->isSubpixel());
Revert "hide hinting and flag enums with PAINT_FLAGS" This reverts commit 5d052dac3ac19e6ddff8b004541310241a4e70e5. Reason for revert: BREAKS CHROMIUM ROLL. https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc?l=49 | FAILED: obj/third_party/blink/renderer/platform/platform/font_platform_data_win.obj | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(49,29): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | if (text_flags & SkPaint::kLCDRenderText_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(51,36): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | } else if (text_flags & SkPaint::kAntiAlias_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(56,52): | error: no member named 'kSubpixelText_Flag' in 'SkPaint' | font->setSubpixel(SkToBool(text_flags & SkPaint::kSubpixelText_Flag)); | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(64,29): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | if (text_flags & SkPaint::kAntiAlias_Flag) | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(85,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | ? SkPaint::kAntiAlias_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(91,35): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | ? SkPaint::kLCDRenderText_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(93,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags = SkPaint::kAntiAlias_Flag | lcd_flag; | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(101,28): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags |= SkPaint::kAntiAlias_Flag; | ~~~~~~~~~^ | 8 errors generated. Original change's description: > hide hinting and flag enums with PAINT_FLAGS > > A preflight for https://skia-review.googlesource.com/c/skia/+/185460 > > Bug: skia:2664 > Change-Id: I83f7f9cd500e8507b559462835477ba8ae7c11ab > Reviewed-on: https://skia-review.googlesource.com/c/185540 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> > Auto-Submit: Mike Reed <reed@google.com> TBR=reed@google.com Change-Id: I4d1581a7e29267ad459ed31d4885b823fa00066f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:2664 Reviewed-on: https://skia-review.googlesource.com/c/185680 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
2019-01-21 18:51:32 +00:00
}
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fFontOverrides->fEmbeddedBitmaps) {
font->writable()->setEmbeddedBitmaps(fFont->isEmbeddedBitmaps());
Revert "hide hinting and flag enums with PAINT_FLAGS" This reverts commit 5d052dac3ac19e6ddff8b004541310241a4e70e5. Reason for revert: BREAKS CHROMIUM ROLL. https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc?l=49 | FAILED: obj/third_party/blink/renderer/platform/platform/font_platform_data_win.obj | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(49,29): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | if (text_flags & SkPaint::kLCDRenderText_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(51,36): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | } else if (text_flags & SkPaint::kAntiAlias_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(56,52): | error: no member named 'kSubpixelText_Flag' in 'SkPaint' | font->setSubpixel(SkToBool(text_flags & SkPaint::kSubpixelText_Flag)); | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(64,29): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | if (text_flags & SkPaint::kAntiAlias_Flag) | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(85,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | ? SkPaint::kAntiAlias_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(91,35): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | ? SkPaint::kLCDRenderText_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(93,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags = SkPaint::kAntiAlias_Flag | lcd_flag; | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(101,28): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags |= SkPaint::kAntiAlias_Flag; | ~~~~~~~~~^ | 8 errors generated. Original change's description: > hide hinting and flag enums with PAINT_FLAGS > > A preflight for https://skia-review.googlesource.com/c/skia/+/185460 > > Bug: skia:2664 > Change-Id: I83f7f9cd500e8507b559462835477ba8ae7c11ab > Reviewed-on: https://skia-review.googlesource.com/c/185540 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> > Auto-Submit: Mike Reed <reed@google.com> TBR=reed@google.com Change-Id: I4d1581a7e29267ad459ed31d4885b823fa00066f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:2664 Reviewed-on: https://skia-review.googlesource.com/c/185680 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
2019-01-21 18:51:32 +00:00
}
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fFontOverrides->fForceAutoHinting) {
font->writable()->setForceAutoHinting(fFont->isForceAutoHinting());
Revert "hide hinting and flag enums with PAINT_FLAGS" This reverts commit 5d052dac3ac19e6ddff8b004541310241a4e70e5. Reason for revert: BREAKS CHROMIUM ROLL. https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc?l=49 | FAILED: obj/third_party/blink/renderer/platform/platform/font_platform_data_win.obj | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(49,29): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | if (text_flags & SkPaint::kLCDRenderText_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(51,36): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | } else if (text_flags & SkPaint::kAntiAlias_Flag) { | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(56,52): | error: no member named 'kSubpixelText_Flag' in 'SkPaint' | font->setSubpixel(SkToBool(text_flags & SkPaint::kSubpixelText_Flag)); | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(64,29): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | if (text_flags & SkPaint::kAntiAlias_Flag) | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(85,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | ? SkPaint::kAntiAlias_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(91,35): | error: no member named 'kLCDRenderText_Flag' in 'SkPaint' | ? SkPaint::kLCDRenderText_Flag | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(93,27): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags = SkPaint::kAntiAlias_Flag | lcd_flag; | ~~~~~~~~~^ | ../../third_party/blink/renderer/platform/fonts/win/font_platform_data_win.cc(101,28): | error: no member named 'kAntiAlias_Flag' in 'SkPaint' | text_flags |= SkPaint::kAntiAlias_Flag; | ~~~~~~~~~^ | 8 errors generated. Original change's description: > hide hinting and flag enums with PAINT_FLAGS > > A preflight for https://skia-review.googlesource.com/c/skia/+/185460 > > Bug: skia:2664 > Change-Id: I83f7f9cd500e8507b559462835477ba8ae7c11ab > Reviewed-on: https://skia-review.googlesource.com/c/185540 > Reviewed-by: Mike Reed <reed@google.com> > Commit-Queue: Mike Reed <reed@google.com> > Auto-Submit: Mike Reed <reed@google.com> TBR=reed@google.com Change-Id: I4d1581a7e29267ad459ed31d4885b823fa00066f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia:2664 Reviewed-on: https://skia-review.googlesource.com/c/185680 Reviewed-by: Hal Canary <halcanary@google.com> Commit-Queue: Hal Canary <halcanary@google.com>
2019-01-21 18:51:32 +00:00
}
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
return true;
}
bool onFilter(SkTCopyOnFirstWrite<SkPaint>* paint, Type) const override {
if (*paint == nullptr) {
return true;
}
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fPaintOverrides->fAntiAlias) {
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
paint->writable()->setAntiAlias(fPaint->isAntiAlias());
}
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fPaintOverrides->fDither) {
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
paint->writable()->setDither(fPaint->isDither());
}
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
return true;
}
SkPaint* fPaint;
Viewer::SkPaintFields* fPaintOverrides;
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
SkFont* fFont;
Viewer::SkFontFields* fFontOverrides;
Add text rendering related overrides to Viewer. This combines the AAA and DAA settings into one Antialias setting which also exposes alias and normal settings. It also fixes restoring the AAA and DAA global state when not overriding. This adds hinting, subpixel positioning, and subpixel rendering tri-state toggles as well. Change-Id: I845fa5be1fed4142e82796e6ef417b276fa76111 Reviewed-on: https://skia-review.googlesource.com/106761 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-02-12 21:37:28 +00:00
};
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
void Viewer::drawSlide(SkCanvas* canvas) {
Viewer: balance save/restores and draw offscreen to window in src mode Change-Id: I9a9bff1c950aaeda095ee49b4860c6fee04ea731 Reviewed-on: https://skia-review.googlesource.com/8887 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-02-22 20:21:11 +00:00
SkAutoCanvasRestore autorestore(canvas, false);
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
// By default, we render directly into the window's surface/canvas
SkCanvas* slideCanvas = canvas;
Pixel zoomer in viewer Made it a separate ImGui window (rather than part of the debug window). Bring it up with 'z'. Draggable/resizable. Variable zoom scale. Enjoy. BUG=skia: Change-Id: I949ab398126c892c8d353aaebcc8403765f42841 Reviewed-on: https://skia-review.googlesource.com/8357 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-13 14:39:57 +00:00
fLastImage.reset();
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
Viewer's nonlinear blend mode uses SkColorSpaceXformCanvas Also avoid asserting when untagged images are being transformed. BUG=skia: Change-Id: If712f39b5f588b2bc3dc318a5b782badb7662ccf Reviewed-on: https://skia-review.googlesource.com/9695 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-15 14:24:55 +00:00
// If we're in any of the color managed modes, construct the color space we're going to use
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
sk_sp<SkColorSpace> colorSpace = nullptr;
Viewer's nonlinear blend mode uses SkColorSpaceXformCanvas Also avoid asserting when untagged images are being transformed. BUG=skia: Change-Id: If712f39b5f588b2bc3dc318a5b782badb7662ccf Reviewed-on: https://skia-review.googlesource.com/9695 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-15 14:24:55 +00:00
if (ColorMode::kLegacy != fColorMode) {
Reland "Add SkColorSpace factory from 3x3 row-major gamut and transfer function" Moved named common transfer functions and gamuts to constexpr values in SkColorSpace.h, in SkNamedTransferFn and SkNamedGamut namespaces. Converted nearly all SkColorSpace::MakeRGB calls within Skia to use the new factory with the named values. Multiple clients want a way to extract named transfer function and gamut - this still doesn't provide that, but this may be a better path forward for honestly advertising how SkColorSpace works internally. Originally landed as: https://skia.googlesource.com/skia/+/a9549ab31630fc244094e6f1692371cbaf87f666 Re-landing with a new serialization format, but maintaining ability to load old serialized color spaces, for SKP compatibility. Bug: skia: Change-Id: Ib84a6e1cd5d7d9816175773fdbaff2ca32658667 Reviewed-on: https://skia-review.googlesource.com/c/181176 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-01-04 22:03:00 +00:00
skcms_Matrix3x3 toXYZ;
Viewer's nonlinear blend mode uses SkColorSpaceXformCanvas Also avoid asserting when untagged images are being transformed. BUG=skia: Change-Id: If712f39b5f588b2bc3dc318a5b782badb7662ccf Reviewed-on: https://skia-review.googlesource.com/9695 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-15 14:24:55 +00:00
SkAssertResult(fColorSpacePrimaries.toXYZD50(&toXYZ));
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
colorSpace = SkColorSpace::MakeRGB(fColorSpaceTransferFn, toXYZ);
Viewer's nonlinear blend mode uses SkColorSpaceXformCanvas Also avoid asserting when untagged images are being transformed. BUG=skia: Change-Id: If712f39b5f588b2bc3dc318a5b782badb7662ccf Reviewed-on: https://skia-review.googlesource.com/9695 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-15 14:24:55 +00:00
}
Add 'Save to SKP' option to Viewer Bug: skia: Change-Id: Iea3794ce8710c84f2529b78b21655f2bf6aaa90e Reviewed-on: https://skia-review.googlesource.com/79160 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-01 16:23:53 +00:00
if (fSaveToSKP) {
SkPictureRecorder recorder;
SkCanvas* recorderCanvas = recorder.beginRecording(
SkRect::Make(fSlides[fCurrentSlide]->getDimensions()));
fSlides[fCurrentSlide]->draw(recorderCanvas);
sk_sp<SkPicture> picture(recorder.finishRecordingAsPicture());
SkFILEWStream stream("sample_app.skp");
picture->serialize(&stream);
fSaveToSKP = false;
}
Add tiled rendering option to viewer Bug: skia: Change-Id: I4bb5e0107d06798040a37609499b4e2b48cf7e29 Reviewed-on: https://skia-review.googlesource.com/c/172962 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-11-26 19:50:05 +00:00
// Grab some things we'll need to make surfaces (for tiling or general offscreen rendering)
SkColorType colorType = (ColorMode::kColorManagedF16 == fColorMode) ? kRGBA_F16_SkColorType
: kN32_SkColorType;
SkSurfaceProps props(SkSurfaceProps::kLegacyFontHost_InitType);
canvas->getProps(&props);
auto make_surface = [=](int w, int h) {
SkImageInfo info = SkImageInfo::Make(w, h, colorType, kPremul_SkAlphaType, colorSpace);
return Window::kRaster_BackendType == this->fBackendType
? SkSurface::MakeRaster(info, &props)
: canvas->makeSurface(info, &props);
};
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
// We need to render offscreen if we're...
// ... in fake perspective or zooming (so we have a snapped copy of the results)
// ... in any raster mode, because the window surface is actually GL
// ... in any color managed mode, because we always make the window surface with no color space
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
sk_sp<SkSurface> offscreenSurface = nullptr;
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
if (kPerspective_Fake == fPerspectiveMode ||
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
fShowZoomWindow ||
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
Window::kRaster_BackendType == fBackendType ||
colorSpace != nullptr) {
Viewer's nonlinear blend mode uses SkColorSpaceXformCanvas Also avoid asserting when untagged images are being transformed. BUG=skia: Change-Id: If712f39b5f588b2bc3dc318a5b782badb7662ccf Reviewed-on: https://skia-review.googlesource.com/9695 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-15 14:24:55 +00:00
Add tiled rendering option to viewer Bug: skia: Change-Id: I4bb5e0107d06798040a37609499b4e2b48cf7e29 Reviewed-on: https://skia-review.googlesource.com/c/172962 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-11-26 19:50:05 +00:00
offscreenSurface = make_surface(fWindow->width(), fWindow->height());
remove SkThreadedBMPDevice and friends It is unused, is becoming a maintainence burden and source of bugs, and takes up a lot of time on the *SAN bots. Change-Id: If383eb6e4838ca23140f9e16d518b1bfc655fa12 Reviewed-on: https://skia-review.googlesource.com/143307 Auto-Submit: Mike Klein <mtklein@google.com> Commit-Queue: Herb Derby <herb@google.com> Reviewed-by: Herb Derby <herb@google.com>
2018-07-25 17:28:44 +00:00
slideCanvas = offscreenSurface->getCanvas();
Use Offscreen Surface for Split Screen A dashed line is also added to split the screen. Currently, drawing images with sRGB seems to still have bugs. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069653002 Review-Url: https://codereview.chromium.org/2069653002
2016-06-16 21:10:34 +00:00
}
Viewer: balance save/restores and draw offscreen to window in src mode Change-Id: I9a9bff1c950aaeda095ee49b4860c6fee04ea731 Reviewed-on: https://skia-review.googlesource.com/8887 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-02-22 20:21:11 +00:00
int count = slideCanvas->save();
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
slideCanvas->clear(SK_ColorWHITE);
Improve viewer stats collection and display Measure the time taken for animation and flush. Exclude UI and stats logic from the timing. Use stacked bars to visualize the breakdown of time within a frame. BUG=skia: Change-Id: I7ef84442a68147f02f65b6aa4452768fd3314de2 Reviewed-on: https://skia-review.googlesource.com/8227 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-09 17:10:20 +00:00
// Time the painting logic of the slide
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fStatsLayer.beginTiming(fPaintTimer);
Add tiled rendering option to viewer Bug: skia: Change-Id: I4bb5e0107d06798040a37609499b4e2b48cf7e29 Reviewed-on: https://skia-review.googlesource.com/c/172962 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-11-26 19:50:05 +00:00
if (fTiled) {
int tileW = SkScalarCeilToInt(fWindow->width() * fTileScale.width());
int tileH = SkScalarCeilToInt(fWindow->height() * fTileScale.height());
sk_sp<SkSurface> tileSurface = make_surface(tileW, tileH);
SkCanvas* tileCanvas = tileSurface->getCanvas();
SkMatrix m = this->computeMatrix();
for (int y = 0; y < fWindow->height(); y += tileH) {
for (int x = 0; x < fWindow->width(); x += tileW) {
SkAutoCanvasRestore acr(tileCanvas, true);
tileCanvas->translate(-x, -y);
tileCanvas->clear(SK_ColorTRANSPARENT);
tileCanvas->concat(m);
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
OveridePaintFilterCanvas filterCanvas(tileCanvas, &fPaint, &fPaintOverrides,
&fFont, &fFontOverrides);
Add tiled rendering option to viewer Bug: skia: Change-Id: I4bb5e0107d06798040a37609499b4e2b48cf7e29 Reviewed-on: https://skia-review.googlesource.com/c/172962 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-11-26 19:50:05 +00:00
fSlides[fCurrentSlide]->draw(&filterCanvas);
tileSurface->draw(slideCanvas, x, y, nullptr);
}
}
// Draw borders between tiles
if (fDrawTileBoundaries) {
SkPaint border;
border.setColor(0x60FF00FF);
border.setStyle(SkPaint::kStroke_Style);
for (int y = 0; y < fWindow->height(); y += tileH) {
for (int x = 0; x < fWindow->width(); x += tileW) {
slideCanvas->drawRect(SkRect::MakeXYWH(x, y, tileW, tileH), border);
}
}
}
} else {
slideCanvas->concat(this->computeMatrix());
if (kPerspective_Real == fPerspectiveMode) {
slideCanvas->clipRect(SkRect::MakeWH(fWindow->width(), fWindow->height()));
}
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
OveridePaintFilterCanvas filterCanvas(slideCanvas, &fPaint, &fPaintOverrides, &fFont, &fFontOverrides);
Add tiled rendering option to viewer Bug: skia: Change-Id: I4bb5e0107d06798040a37609499b4e2b48cf7e29 Reviewed-on: https://skia-review.googlesource.com/c/172962 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-11-26 19:50:05 +00:00
fSlides[fCurrentSlide]->draw(&filterCanvas);
}
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fStatsLayer.endTiming(fPaintTimer);
Viewer: balance save/restores and draw offscreen to window in src mode Change-Id: I9a9bff1c950aaeda095ee49b4860c6fee04ea731 Reviewed-on: https://skia-review.googlesource.com/8887 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-02-22 20:21:11 +00:00
slideCanvas->restoreToCount(count);
Improve viewer stats collection and display Measure the time taken for animation and flush. Exclude UI and stats logic from the timing. Use stacked bars to visualize the breakdown of time within a frame. BUG=skia: Change-Id: I7ef84442a68147f02f65b6aa4452768fd3314de2 Reviewed-on: https://skia-review.googlesource.com/8227 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-09 17:10:20 +00:00
// Force a flush so we can time that, too
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fStatsLayer.beginTiming(fFlushTimer);
Improve viewer stats collection and display Measure the time taken for animation and flush. Exclude UI and stats logic from the timing. Use stacked bars to visualize the breakdown of time within a frame. BUG=skia: Change-Id: I7ef84442a68147f02f65b6aa4452768fd3314de2 Reviewed-on: https://skia-review.googlesource.com/8227 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-09 17:10:20 +00:00
slideCanvas->flush();
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fStatsLayer.endTiming(fFlushTimer);
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
// If we rendered offscreen, snap an image and push the results to the window's canvas
if (offscreenSurface) {
Pixel zoomer in viewer Made it a separate ImGui window (rather than part of the debug window). Bring it up with 'z'. Draggable/resizable. Variable zoom scale. Enjoy. BUG=skia: Change-Id: I949ab398126c892c8d353aaebcc8403765f42841 Reviewed-on: https://skia-review.googlesource.com/8357 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-13 14:39:57 +00:00
fLastImage = offscreenSurface->makeImageSnapshot();
Simplify viewer's handling of backbuffer surface and color space WindowContext still supports color spaces, but not other color types. Any off-screen rendering is the app's responsibility. This change also adds (working) F16 support to viewer. Note that the previous 10-bit and FP16 support in WindowContext was broken. There was no code to push the off-screen canvas to the window. If you ever made it to the unreachable off-screen code path in createSurface, it would have simply stopped drawing. The decision to limit the window's gamut to sRGB is mostly driven by my desire to add real-time editing of gamut. This design lets us do that, without tearing down and rebuilding the window for every change. An application could still supply a different gamut via setDisplayParams and render directly to the back buffer with proper color correction. BUG=skia: Change-Id: I94df35c7a42faee396009acc83683e40bb3c284d Reviewed-on: https://skia-review.googlesource.com/8153 Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-08 15:47:28 +00:00
Viewer: balance save/restores and draw offscreen to window in src mode Change-Id: I9a9bff1c950aaeda095ee49b4860c6fee04ea731 Reviewed-on: https://skia-review.googlesource.com/8887 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-02-22 20:21:11 +00:00
SkPaint paint;
paint.setBlendMode(SkBlendMode::kSrc);
Add toggle for 'real' vs. 'fake' perspective in Viewer Real perspective draws content with perspective applied. Fake perspective rasterizes in ortho, then stretches the image by the perspective matrix. Change-Id: I738cd379f9a58b965469ef8a57fb2dfd597fda10 Reviewed-on: https://skia-review.googlesource.com/125442 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2018-05-02 19:40:20 +00:00
int prePerspectiveCount = canvas->save();
if (kPerspective_Fake == fPerspectiveMode) {
paint.setFilterQuality(kHigh_SkFilterQuality);
canvas->clear(SK_ColorWHITE);
canvas->concat(this->computePerspectiveMatrix());
}
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
canvas->drawImage(fLastImage, 0, 0, &paint);
Add toggle for 'real' vs. 'fake' perspective in Viewer Real perspective draws content with perspective applied. Fake perspective rasterizes in ortho, then stretches the image by the perspective matrix. Change-Id: I738cd379f9a58b965469ef8a57fb2dfd597fda10 Reviewed-on: https://skia-review.googlesource.com/125442 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2018-05-02 19:40:20 +00:00
canvas->restoreToCount(prePerspectiveCount);
Use Offscreen Surface for Split Screen A dashed line is also added to split the screen. Currently, drawing images with sRGB seems to still have bugs. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2069653002 Review-Url: https://codereview.chromium.org/2069653002
2016-06-16 21:10:34 +00:00
}
Display JPGs in Viewer with Split Screen and ColorSpaceXform BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2058753002 Review-Url: https://codereview.chromium.org/2058753002
2016-06-13 19:26:45 +00:00
}
Add onBackendCreated callback to Viewer Also removes fWidth and fHeight from Window and instead calls into WindowContent to get these values. BUG=skia: Change-Id: I72ee506004b7da73db9abb607a3bc82edfcf7d43 Reviewed-on: https://skia-review.googlesource.com/8795 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com>
2017-02-24 20:22:53 +00:00
void Viewer::onBackendCreated() {
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
this->setupCurrentSlide();
Add onBackendCreated callback to Viewer Also removes fWidth and fHeight from Window and instead calls into WindowContent to get these values. BUG=skia: Change-Id: I72ee506004b7da73db9abb607a3bc82edfcf7d43 Reviewed-on: https://skia-review.googlesource.com/8795 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com>
2017-02-24 20:22:53 +00:00
fWindow->show();
}
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
Add onBackendCreated callback to Viewer Also removes fWidth and fHeight from Window and instead calls into WindowContent to get these values. BUG=skia: Change-Id: I72ee506004b7da73db9abb607a3bc82edfcf7d43 Reviewed-on: https://skia-review.googlesource.com/8795 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com>
2017-02-24 20:22:53 +00:00
void Viewer::onPaint(SkCanvas* canvas) {
Add ms display to Viewer. Change-Id: I6303209d3ff597611ac1a5f558294c6d6fcba670 Reviewed-on: https://skia-review.googlesource.com/67766 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-11-03 17:36:07 +00:00
this->drawSlide(canvas);
Some more improvements/fixes to the VulkanViewer * display GM name in title bar * add ms timer for update loop * add ms/frame meter * fix vsync * add some notes for later GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873453002 Review URL: https://codereview.chromium.org/1873453002
2016-04-07 18:09:51 +00:00
Add flexible keybinding/command system to sk_app. Viewer demonstrates use: Just create an instance of CommandSet, register with the window, and add commands. Hopefully, we can keep all commands in one place, and get some nice side-benefits. With this framework, if you want to add a new command, you are only required to add code in ONE place. And you get added to the help screen, for free. CommandSet automatically binds 'h' to cycle through the help modes. (Functional grouping is most useful for general use, but the other mode is nice to know what a key does, or to find an unused key for a new feature). Grouped by function: https://screenshot.googleplex.com/G5h3f52wFKu.png Alphabetical by key: https://screenshot.googleplex.com/nZiopabLKJ6.png BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955293002 Review-Url: https://codereview.chromium.org/1955293002
2016-05-10 13:50:49 +00:00
fCommands.drawHelp(canvas);
More accurate render time and continuous fresh BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2129613002 Review-Url: https://codereview.chromium.org/2129613002
2016-07-06 21:11:32 +00:00
Move ImGui support code to ImGuiLayer Viewer still has plenty of code that uses ImGui to create application specific UI, but the structural code that forwards input to ImGui, and converts per-frame ImGui rendering data to Skia draw commands is now in a single component that can be reused in any sk_app-based application. Bug: skia: Change-Id: Ic14ece659d4af8ee13b69c638bdaf7df6c24f5c0 Reviewed-on: https://skia-review.googlesource.com/82627 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-12-08 21:46:09 +00:00
this->drawImGui();
Call GrContext::performDeferredCleanup from viewer Bug: skia: Change-Id: I723c5efdd746d6182dee0511795f7eca3b6066d3 Reviewed-on: https://skia-review.googlesource.com/c/167180 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2018-11-01 16:52:34 +00:00
if (GrContext* ctx = fWindow->getGrContext()) {
// Clean out cache items that haven't been used in more than 10 seconds.
ctx->performDeferredCleanup(std::chrono::seconds(10));
}
Some more improvements/fixes to the VulkanViewer * display GM name in title bar * add ms timer for update loop * add ms/frame meter * fix vsync * add some notes for later GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873453002 Review URL: https://codereview.chromium.org/1873453002
2016-04-07 18:09:51 +00:00
}
Viewer to resize Samples with window resize. This adds onResize to sk_app::Window::Layer and uses it to resize samples in Viewer. Change-Id: Ia5ec5cf6dc74fbdf712291b9ba8707b076cb625d Reviewed-on: https://skia-review.googlesource.com/146642 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-08-09 19:06:19 +00:00
void Viewer::onResize(int width, int height) {
Fix viewer assert in onResize Bug: skia: Change-Id: I99f938c76aa08a43bdc2e0fa2ad2bb04f103d2fb Reviewed-on: https://skia-review.googlesource.com/146941 Reviewed-by: Robert Phillips <robertphillips@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2018-08-13 14:42:17 +00:00
if (fCurrentSlide >= 0) {
fSlides[fCurrentSlide]->resize(width, height);
}
Viewer to resize Samples with window resize. This adds onResize to sk_app::Window::Layer and uses it to resize samples in Viewer. Change-Id: Ia5ec5cf6dc74fbdf712291b9ba8707b076cb625d Reviewed-on: https://skia-review.googlesource.com/146642 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-08-09 19:06:19 +00:00
}
Pass Viewer touch events to slides Change-Id: Ia7b097c22e497e4e84be45108ac9796d89305ef3 Reviewed-on: https://skia-review.googlesource.com/108363 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-02-20 02:43:47 +00:00
SkPoint Viewer::mapEvent(float x, float y) {
const auto m = this->computeMatrix();
SkMatrix inv;
SkAssertResult(m.invert(&inv));
return inv.mapXY(x, y);
}
Use intptr_t for onTouch argument. On 64-bit platforms, casting int to void* is not valid. GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2047443002 Review-Url: https://codereview.chromium.org/2047443002
2016-06-06 15:48:47 +00:00
bool Viewer::onTouch(intptr_t owner, Window::InputState state, float x, float y) {
Touch input support for Windows Had to add some logic to avoid touch and mouse cross-talk, because (at least on my laptop), the touch screen generates both kinds of events. This seems really useful [1] for the many [2] Skia developers with touch-enabled Windows devices. ---------- 1: No, not really. 2: N = 1? Bug: skia: Change-Id: Ib888bf4198f2cc0a29a31581ec4b64d3d9008c33 Reviewed-on: https://skia-review.googlesource.com/18920 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-06-07 14:00:30 +00:00
if (GestureDevice::kMouse == fGestureDevice) {
return false;
}
Pass Viewer touch events to slides Change-Id: Ia7b097c22e497e4e84be45108ac9796d89305ef3 Reviewed-on: https://skia-review.googlesource.com/108363 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-02-20 02:43:47 +00:00
const auto slidePt = this->mapEvent(x, y);
if (fSlides[fCurrentSlide]->onMouse(slidePt.x(), slidePt.y(), state, 0)) {
fWindow->inval();
return true;
}
Implement touch control BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1982643004 Review-Url: https://codereview.chromium.org/1982643004
2016-05-17 19:44:20 +00:00
void* castedOwner = reinterpret_cast<void*>(owner);
switch (state) {
case Window::kUp_InputState: {
fGesture.touchEnd(castedOwner);
Improve touch support for iOS viewer Adds pinch-zoom and swipe to change slides. Bug: skia: Change-Id: I0860c933208c8cf83027675a9de11b3f782de8e3 Reviewed-on: https://skia-review.googlesource.com/142898 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2018-07-23 17:46:01 +00:00
#if defined(SK_BUILD_FOR_IOS)
// TODO: move IOS swipe detection higher up into the platform code
SkPoint dir;
if (fGesture.isFling(&dir)) {
// swiping left or right
if (SkTAbs(dir.fX) > SkTAbs(dir.fY)) {
if (dir.fX < 0) {
this->setCurrentSlide(fCurrentSlide < fSlides.count() - 1 ?
fCurrentSlide + 1 : 0);
} else {
this->setCurrentSlide(fCurrentSlide > 0 ?
fCurrentSlide - 1 : fSlides.count() - 1);
}
}
fGesture.reset();
}
#endif
Implement touch control BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1982643004 Review-Url: https://codereview.chromium.org/1982643004
2016-05-17 19:44:20 +00:00
break;
}
case Window::kDown_InputState: {
Simplify some Viewer code, and fix a few bugs The content rect was always identical to the window rect, so most of the related code did nothing. The translation limit code is always useful (to avoid dragging the slide way off-screen with the mouse), so always include it. The auto-scaling to fit the screen is also still useful, but just base it on the window rect. The zoom code has four state variables, only used two of them, and one was a trivially derived computation. Fold most of that work into computeMatrix. (The translation was always zero -- we never changed the zoom center.) Include fDefaultMatrix in the matrix from computeMatrix, rather than needing to apply it specially to the canvas. Don't apply the inverse default matrix to touch or mouse points. The absolute positions of those touch points is not important, but because that matrix includes scale (and sometimes very large or very small scale), it just had the effect of greatly amplifying or damping the drag speed. Without it, the slide always pans at the speed of the touch/mouse drag -- which seems more desirable. The use of the inverse default matrix was a clever trick, but it caused the translation (applied to the global mtx) to be scaled, so the slide was always pinned incorrectly. Instead, supply the unmodified window rect and the default matrix, so the trans limit code can do the obvious correct thing: xform the slide bounds completely, then limit the translation that will be applied after that. Slides are now correctly pinned to screen edge regardless of how much zoom is present in the default matrix. Note: There are still several bugs related to all of this code, but given the web of xform state, it's hard to unravel. The touch gesture still doesn't know about viewer's zoom, so that's ignored when doing the pinning. Beyond that, it doesn't even know about window resize - it only configures the translation limit when setting up a slide. I had a fix for all of this (doing the translation limiting in computeMatrix), but then the touch gesture doesn't know about it, and can accumulate drag motion that needs to be un-dragged to get back on-screen, even though the slide is never really translated that far. SkTouchGesture is in include. No one uses it except viewer: TBR=bsalomon@google.com Bug: skia: Change-Id: I460cc07c3de6d36e63826f57d359faf1facf5ab3 Reviewed-on: https://skia-review.googlesource.com/18524 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-06-05 12:46:04 +00:00
fGesture.touchBegin(castedOwner, x, y);
Implement touch control BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1982643004 Review-Url: https://codereview.chromium.org/1982643004
2016-05-17 19:44:20 +00:00
break;
}
case Window::kMove_InputState: {
Simplify some Viewer code, and fix a few bugs The content rect was always identical to the window rect, so most of the related code did nothing. The translation limit code is always useful (to avoid dragging the slide way off-screen with the mouse), so always include it. The auto-scaling to fit the screen is also still useful, but just base it on the window rect. The zoom code has four state variables, only used two of them, and one was a trivially derived computation. Fold most of that work into computeMatrix. (The translation was always zero -- we never changed the zoom center.) Include fDefaultMatrix in the matrix from computeMatrix, rather than needing to apply it specially to the canvas. Don't apply the inverse default matrix to touch or mouse points. The absolute positions of those touch points is not important, but because that matrix includes scale (and sometimes very large or very small scale), it just had the effect of greatly amplifying or damping the drag speed. Without it, the slide always pans at the speed of the touch/mouse drag -- which seems more desirable. The use of the inverse default matrix was a clever trick, but it caused the translation (applied to the global mtx) to be scaled, so the slide was always pinned incorrectly. Instead, supply the unmodified window rect and the default matrix, so the trans limit code can do the obvious correct thing: xform the slide bounds completely, then limit the translation that will be applied after that. Slides are now correctly pinned to screen edge regardless of how much zoom is present in the default matrix. Note: There are still several bugs related to all of this code, but given the web of xform state, it's hard to unravel. The touch gesture still doesn't know about viewer's zoom, so that's ignored when doing the pinning. Beyond that, it doesn't even know about window resize - it only configures the translation limit when setting up a slide. I had a fix for all of this (doing the translation limiting in computeMatrix), but then the touch gesture doesn't know about it, and can accumulate drag motion that needs to be un-dragged to get back on-screen, even though the slide is never really translated that far. SkTouchGesture is in include. No one uses it except viewer: TBR=bsalomon@google.com Bug: skia: Change-Id: I460cc07c3de6d36e63826f57d359faf1facf5ab3 Reviewed-on: https://skia-review.googlesource.com/18524 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-06-05 12:46:04 +00:00
fGesture.touchMoved(castedOwner, x, y);
Implement touch control BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1982643004 Review-Url: https://codereview.chromium.org/1982643004
2016-05-17 19:44:20 +00:00
break;
}
}
Touch input support for Windows Had to add some logic to avoid touch and mouse cross-talk, because (at least on my laptop), the touch screen generates both kinds of events. This seems really useful [1] for the many [2] Skia developers with touch-enabled Windows devices. ---------- 1: No, not really. 2: N = 1? Bug: skia: Change-Id: Ib888bf4198f2cc0a29a31581ec4b64d3d9008c33 Reviewed-on: https://skia-review.googlesource.com/18920 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-06-07 14:00:30 +00:00
fGestureDevice = fGesture.isBeingTouched() ? GestureDevice::kTouch : GestureDevice::kNone;
Implement touch control BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1982643004 Review-Url: https://codereview.chromium.org/1982643004
2016-05-17 19:44:20 +00:00
fWindow->inval();
return true;
}
Create a Window::Layer interface to reduce sk_app glue code This also makes it possible to manage other parts of viewer, etc (like the stats screen, command set, even samples) as additional layers in the stack. For now, it just removes a lot of boilerplate. Bug: skia: Change-Id: Ic2f80690fc76c683b3736287dc2b738c50d38614 Reviewed-on: https://skia-review.googlesource.com/82688 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-08 21:45:43 +00:00
bool Viewer::onMouse(int x, int y, Window::InputState state, uint32_t modifiers) {
Avoid redrawing every time the mouse moves Bug: skia: Change-Id: Idc74e6c7e50f8d416d716ee666b37b52792c7c4b Reviewed-on: https://skia-review.googlesource.com/87789 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-20 16:58:34 +00:00
if (GestureDevice::kTouch == fGestureDevice) {
return false;
}
Pass Viewer touch events to slides Change-Id: Ia7b097c22e497e4e84be45108ac9796d89305ef3 Reviewed-on: https://skia-review.googlesource.com/108363 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-02-20 02:43:47 +00:00
const auto slidePt = this->mapEvent(x, y);
if (fSlides[fCurrentSlide]->onMouse(slidePt.x(), slidePt.y(), state, modifiers)) {
fWindow->inval();
return true;
Avoid redrawing every time the mouse moves Bug: skia: Change-Id: Idc74e6c7e50f8d416d716ee666b37b52792c7c4b Reviewed-on: https://skia-review.googlesource.com/87789 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-20 16:58:34 +00:00
}
switch (state) {
case Window::kUp_InputState: {
fGesture.touchEnd(nullptr);
break;
Move ImGui support code to ImGuiLayer Viewer still has plenty of code that uses ImGui to create application specific UI, but the structural code that forwards input to ImGui, and converts per-frame ImGui rendering data to Skia draw commands is now in a single component that can be reused in any sk_app-based application. Bug: skia: Change-Id: Ic14ece659d4af8ee13b69c638bdaf7df6c24f5c0 Reviewed-on: https://skia-review.googlesource.com/82627 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-12-08 21:46:09 +00:00
}
Avoid redrawing every time the mouse moves Bug: skia: Change-Id: Idc74e6c7e50f8d416d716ee666b37b52792c7c4b Reviewed-on: https://skia-review.googlesource.com/87789 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-20 16:58:34 +00:00
case Window::kDown_InputState: {
fGesture.touchBegin(nullptr, x, y);
break;
}
case Window::kMove_InputState: {
fGesture.touchMoved(nullptr, x, y);
break;
Add ShadowUtils sample. Also enables mouse support in Viewer. Change-Id: Iaed08d42a64f591f0cd9b24684b3aee43404ed94 Reviewed-on: https://skia-review.googlesource.com/15313 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-05-04 18:00:59 +00:00
}
}
Avoid redrawing every time the mouse moves Bug: skia: Change-Id: Idc74e6c7e50f8d416d716ee666b37b52792c7c4b Reviewed-on: https://skia-review.googlesource.com/87789 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-20 16:58:34 +00:00
fGestureDevice = fGesture.isBeingTouched() ? GestureDevice::kMouse : GestureDevice::kNone;
if (state != Window::kMove_InputState || fGesture.isBeingTouched()) {
fWindow->inval();
}
Add ShadowUtils sample. Also enables mouse support in Viewer. Change-Id: Iaed08d42a64f591f0cd9b24684b3aee43404ed94 Reviewed-on: https://skia-review.googlesource.com/15313 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-05-04 18:00:59 +00:00
return true;
}
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
static void ImGui_Primaries(SkColorSpacePrimaries* primaries, SkPaint* gamutPaint) {
Add ImGui::DragCanvas, to simplify several custom widgets Bug: skia: Change-Id: Ic44ab00af1117a6bbc17df7f5005f4db707cb5c1 Reviewed-on: https://skia-review.googlesource.com/c/191002 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-02-09 21:32:58 +00:00
// The gamut image covers a (0.8 x 0.9) shaped region
ImGui::DragCanvas dc(primaries, { 0.0f, 0.9f }, { 0.8f, 0.0f });
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
// Background image. Only draw a subset of the image, to avoid the regions less than zero.
// Simplifes re-mapping math, clipping behavior, and increases resolution in the useful area.
// Magic numbers are pixel locations of the origin and upper-right corner.
Add ImGui::DragCanvas, to simplify several custom widgets Bug: skia: Change-Id: Ic44ab00af1117a6bbc17df7f5005f4db707cb5c1 Reviewed-on: https://skia-review.googlesource.com/c/191002 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-02-09 21:32:58 +00:00
dc.fDrawList->AddImage(gamutPaint, dc.fPos,
ImVec2(dc.fPos.x + dc.fSize.x, dc.fPos.y + dc.fSize.y),
ImVec2(242, 61), ImVec2(1897, 1922));
dc.dragPoint((SkPoint*)(&primaries->fRX), true, 0xFF000040);
dc.dragPoint((SkPoint*)(&primaries->fGX), true, 0xFF004000);
dc.dragPoint((SkPoint*)(&primaries->fBX), true, 0xFF400000);
dc.dragPoint((SkPoint*)(&primaries->fWX), true);
dc.fDrawList->AddPolyline(dc.fScreenPoints.begin(), 3, 0xFFFFFFFF, true, 1.5f);
Add perspective support (rect to rect) to Viewer Change-Id: I312d5b3e6b7f37a3a7bfd5561bcdb31b43e207b8 Reviewed-on: https://skia-review.googlesource.com/123934 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2018-04-26 19:55:00 +00:00
}
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
static bool ImGui_DragLocation(SkPoint* pt) {
Add ImGui::DragCanvas, to simplify several custom widgets Bug: skia: Change-Id: Ic44ab00af1117a6bbc17df7f5005f4db707cb5c1 Reviewed-on: https://skia-review.googlesource.com/c/191002 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-02-09 21:32:58 +00:00
ImGui::DragCanvas dc(pt);
dc.fillColor(IM_COL32(0, 0, 0, 128));
dc.dragPoint(pt);
return dc.fDragging;
}
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
Add ImGui::DragCanvas, to simplify several custom widgets Bug: skia: Change-Id: Ic44ab00af1117a6bbc17df7f5005f4db707cb5c1 Reviewed-on: https://skia-review.googlesource.com/c/191002 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-02-09 21:32:58 +00:00
static bool ImGui_DragQuad(SkPoint* pts) {
ImGui::DragCanvas dc(pts);
dc.fillColor(IM_COL32(0, 0, 0, 128));
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
Add ImGui::DragCanvas, to simplify several custom widgets Bug: skia: Change-Id: Ic44ab00af1117a6bbc17df7f5005f4db707cb5c1 Reviewed-on: https://skia-review.googlesource.com/c/191002 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-02-09 21:32:58 +00:00
for (int i = 0; i < 4; ++i) {
dc.dragPoint(pts + i);
}
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
Add ImGui::DragCanvas, to simplify several custom widgets Bug: skia: Change-Id: Ic44ab00af1117a6bbc17df7f5005f4db707cb5c1 Reviewed-on: https://skia-review.googlesource.com/c/191002 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-02-09 21:32:58 +00:00
dc.fDrawList->AddLine(dc.fScreenPoints[0], dc.fScreenPoints[1], 0xFFFFFFFF);
dc.fDrawList->AddLine(dc.fScreenPoints[1], dc.fScreenPoints[3], 0xFFFFFFFF);
dc.fDrawList->AddLine(dc.fScreenPoints[3], dc.fScreenPoints[2], 0xFFFFFFFF);
dc.fDrawList->AddLine(dc.fScreenPoints[2], dc.fScreenPoints[0], 0xFFFFFFFF);
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
Add ImGui::DragCanvas, to simplify several custom widgets Bug: skia: Change-Id: Ic44ab00af1117a6bbc17df7f5005f4db707cb5c1 Reviewed-on: https://skia-review.googlesource.com/c/191002 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-02-09 21:32:58 +00:00
return dc.fDragging;
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
}
Move ImGui support code to ImGuiLayer Viewer still has plenty of code that uses ImGui to create application specific UI, but the structural code that forwards input to ImGui, and converts per-frame ImGui rendering data to Skia draw commands is now in a single component that can be reused in any sk_app-based application. Bug: skia: Change-Id: Ic14ece659d4af8ee13b69c638bdaf7df6c24f5c0 Reviewed-on: https://skia-review.googlesource.com/82627 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-12-08 21:46:09 +00:00
void Viewer::drawImGui() {
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
// Support drawing the ImGui demo window. Superfluous, but gives a good idea of what's possible
if (fShowImGuiTestWindow) {
Update ImGui to v1.62 (June 22, 2018) He's been steadily adding features and fixing bugs, figured it was time to fetch a new version. Change-Id: I496aefc0a1b60c3be5c89a0e58dc64811fccc77e Reviewed-on: https://skia-review.googlesource.com/138591 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-06-29 18:30:48 +00:00
ImGui::ShowDemoWindow(&fShowImGuiTestWindow);
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
}
if (fShowImGuiDebugWindow) {
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
// We have some dynamic content that sizes to fill available size. If the scroll bar isn't
// always visible, we can end up in a layout feedback loop.
Update ImGui to v1.62 (June 22, 2018) He's been steadily adding features and fixing bugs, figured it was time to fetch a new version. Change-Id: I496aefc0a1b60c3be5c89a0e58dc64811fccc77e Reviewed-on: https://skia-review.googlesource.com/138591 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-06-29 18:30:48 +00:00
ImGui::SetNextWindowSize(ImVec2(400, 400), ImGuiCond_FirstUseEver);
Add viewer GUI options for desktop and Android to toggle instanced rendering. BUG=skia: Change-Id: I42674abfb7ee764f676100ac0e84cc0f07620bec Reviewed-on: https://skia-review.googlesource.com/9396 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-03-07 20:16:34 +00:00
DisplayParams params = fWindow->getRequestedDisplayParams();
bool paramsChanged = false;
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
if (ImGui::Begin("Tools", &fShowImGuiDebugWindow,
ImGuiWindowFlags_AlwaysVerticalScrollbar)) {
Add backend selection to viewer's GUI BUG=skia: Change-Id: I3314013538792c2aa82cc49f3f072aab2cdc4a55 Reviewed-on: https://skia-review.googlesource.com/9079 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-02-28 20:45:01 +00:00
if (ImGui::CollapsingHeader("Backend")) {
int newBackend = static_cast<int>(fBackendType);
ImGui::RadioButton("Raster", &newBackend, sk_app::Window::kRaster_BackendType);
ImGui::SameLine();
ImGui::RadioButton("OpenGL", &newBackend, sk_app::Window::kNativeGL_BackendType);
Add ANGLE support to Viewer on Windows Change-Id: I97a844b2f289d2518f60a64f94d60551c4530dd4 Reviewed-on: https://skia-review.googlesource.com/35742 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2017-08-17 18:37:06 +00:00
#if SK_ANGLE && defined(SK_BUILD_FOR_WIN)
ImGui::SameLine();
ImGui::RadioButton("ANGLE", &newBackend, sk_app::Window::kANGLE_BackendType);
#endif
Add backend selection to viewer's GUI BUG=skia: Change-Id: I3314013538792c2aa82cc49f3f072aab2cdc4a55 Reviewed-on: https://skia-review.googlesource.com/9079 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-02-28 20:45:01 +00:00
#if defined(SK_VULKAN)
ImGui::SameLine();
ImGui::RadioButton("Vulkan", &newBackend, sk_app::Window::kVulkan_BackendType);
Add Metal context to Viewer. Bug: skia:8737 Change-Id: I5c4c839bcf39f2cd3a9a32d005bf4bdb7c42e6a5 Reviewed-on: https://skia-review.googlesource.com/c/187925 Reviewed-by: Brian Osman <brianosman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2019-02-08 20:36:14 +00:00
#endif
#if defined(SK_METAL) && defined(SK_BUILD_FOR_MAC)
ImGui::SameLine();
ImGui::RadioButton("Metal", &newBackend, sk_app::Window::kMetal_BackendType);
Add backend selection to viewer's GUI BUG=skia: Change-Id: I3314013538792c2aa82cc49f3f072aab2cdc4a55 Reviewed-on: https://skia-review.googlesource.com/9079 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-02-28 20:45:01 +00:00
#endif
if (newBackend != fBackendType) {
fDeferredActions.push_back([=]() {
this->setBackend(static_cast<sk_app::Window::BackendType>(newBackend));
});
}
Add path renderer options to viewer GUI BUG=skia: Change-Id: I248ba081f0229d7fcf2071009076acc88b80b076 Reviewed-on: https://skia-review.googlesource.com/9088 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-01 19:59:05 +00:00
Add viewer GUI options for desktop and Android to toggle instanced rendering. BUG=skia: Change-Id: I42674abfb7ee764f676100ac0e84cc0f07620bec Reviewed-on: https://skia-review.googlesource.com/9396 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-03-07 20:16:34 +00:00
const GrContext* ctx = fWindow->getGrContext();
Add wireframe mode to Viewer. Change-Id: I0ff11088465a4702acf9841a791d76f286ddbaf1 Reviewed-on: https://skia-review.googlesource.com/15147 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2017-05-02 20:15:53 +00:00
bool* wire = &params.fGrContextOptions.fWireframeMode;
if (ctx && ImGui::Checkbox("Wireframe Mode", wire)) {
paramsChanged = true;
}
Add viewer GUI options for desktop and Android to toggle instanced rendering. BUG=skia: Change-Id: I42674abfb7ee764f676100ac0e84cc0f07620bec Reviewed-on: https://skia-review.googlesource.com/9396 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-03-07 20:16:34 +00:00
Added MSAA selection to viewer GUI On Windows, we need to reconstruct the window to allow setting a new pixel format with a different sample count. Added some code that maintains window size/position across these changes. Previously, just cycling through backends would cause the window to move, as the "default" position would cycle across the screen. Now it's pinned. BUG=skia: Change-Id: Iecbe7a490577382043ffe5a88c910b4c0be2ed5c Reviewed-on: https://skia-review.googlesource.com/9085 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-03-08 22:10:24 +00:00
if (ctx) {
int sampleCount = fWindow->sampleCount();
ImGui::Text("MSAA: "); ImGui::SameLine();
Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend."""""" This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32. Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab Reviewed-on: https://skia-review.googlesource.com/103181 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2018-02-03 01:32:49 +00:00
ImGui::RadioButton("1", &sampleCount, 1); ImGui::SameLine();
Added MSAA selection to viewer GUI On Windows, we need to reconstruct the window to allow setting a new pixel format with a different sample count. Added some code that maintains window size/position across these changes. Previously, just cycling through backends would cause the window to move, as the "default" position would cycle across the screen. Now it's pinned. BUG=skia: Change-Id: Iecbe7a490577382043ffe5a88c910b4c0be2ed5c Reviewed-on: https://skia-review.googlesource.com/9085 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2017-03-08 22:10:24 +00:00
ImGui::RadioButton("4", &sampleCount, 4); ImGui::SameLine();
ImGui::RadioButton("8", &sampleCount, 8); ImGui::SameLine();
ImGui::RadioButton("16", &sampleCount, 16);
if (sampleCount != params.fMSAASampleCount) {
params.fMSAASampleCount = sampleCount;
paramsChanged = true;
}
}
Add pixel geometry and dft selection to viewer app. Change-Id: I2fea84793383c44b102fa97b23f59235ef302ff9 Reviewed-on: https://skia-review.googlesource.com/121581 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Herb Derby <herb@google.com>
2018-04-13 18:30:23 +00:00
int pixelGeometryIdx = 0;
if (fPixelGeometryOverrides) {
pixelGeometryIdx = params.fSurfaceProps.pixelGeometry() + 1;
}
if (ImGui::Combo("Pixel Geometry", &pixelGeometryIdx,
"Default\0Flat\0RGB\0BGR\0RGBV\0BGRV\0\0"))
{
uint32_t flags = params.fSurfaceProps.flags();
if (pixelGeometryIdx == 0) {
fPixelGeometryOverrides = false;
params.fSurfaceProps = SkSurfaceProps(flags, SkSurfaceProps::kLegacyFontHost_InitType);
} else {
fPixelGeometryOverrides = true;
SkPixelGeometry pixelGeometry = SkTo<SkPixelGeometry>(pixelGeometryIdx - 1);
params.fSurfaceProps = SkSurfaceProps(flags, pixelGeometry);
}
paramsChanged = true;
}
bool useDFT = params.fSurfaceProps.isUseDeviceIndependentFonts();
if (ImGui::Checkbox("DFT", &useDFT)) {
uint32_t flags = params.fSurfaceProps.flags();
if (useDFT) {
flags |= SkSurfaceProps::kUseDeviceIndependentFonts_Flag;
} else {
flags &= ~SkSurfaceProps::kUseDeviceIndependentFonts_Flag;
}
SkPixelGeometry pixelGeometry = params.fSurfaceProps.pixelGeometry();
params.fSurfaceProps = SkSurfaceProps(flags, pixelGeometry);
paramsChanged = true;
}
Add path renderer options to viewer GUI BUG=skia: Change-Id: I248ba081f0229d7fcf2071009076acc88b80b076 Reviewed-on: https://skia-review.googlesource.com/9088 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-01 19:59:05 +00:00
if (ImGui::TreeNode("Path Renderers")) {
GpuPathRenderers prevPr = params.fGrContextOptions.fGpuPathRenderers;
auto prButton = [&](GpuPathRenderers x) {
if (ImGui::RadioButton(gPathRendererNames[x].c_str(), prevPr == x)) {
Add viewer GUI options for desktop and Android to toggle instanced rendering. BUG=skia: Change-Id: I42674abfb7ee764f676100ac0e84cc0f07620bec Reviewed-on: https://skia-review.googlesource.com/9396 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-03-07 20:16:34 +00:00
if (x != params.fGrContextOptions.fGpuPathRenderers) {
params.fGrContextOptions.fGpuPathRenderers = x;
paramsChanged = true;
}
Add path renderer options to viewer GUI BUG=skia: Change-Id: I248ba081f0229d7fcf2071009076acc88b80b076 Reviewed-on: https://skia-review.googlesource.com/9088 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-01 19:59:05 +00:00
}
};
if (!ctx) {
ImGui::RadioButton("Software", true);
Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend."""""" This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32. Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab Reviewed-on: https://skia-review.googlesource.com/103181 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2018-02-03 01:32:49 +00:00
} else if (fWindow->sampleCount() > 1) {
Add path renderer options to viewer GUI BUG=skia: Change-Id: I248ba081f0229d7fcf2071009076acc88b80b076 Reviewed-on: https://skia-review.googlesource.com/9088 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-01 19:59:05 +00:00
prButton(GpuPathRenderers::kAll);
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
if (ctx->priv().caps()->shaderCaps()->pathRenderingSupport()) {
Add path renderer options to viewer GUI BUG=skia: Change-Id: I248ba081f0229d7fcf2071009076acc88b80b076 Reviewed-on: https://skia-review.googlesource.com/9088 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-01 19:59:05 +00:00
prButton(GpuPathRenderers::kStencilAndCover);
}
prButton(GpuPathRenderers::kTessellating);
prButton(GpuPathRenderers::kNone);
} else {
prButton(GpuPathRenderers::kAll);
Make GrCaps and GrShaderCaps private. Moves getCaps() from GrContext to GrContextPriv and removes unused refCaps(). Change-Id: Ic6a8951b656c0d1b2773eae73bff8e88af819866 Reviewed-on: https://skia-review.googlesource.com/127389 Commit-Queue: Brian Salomon <bsalomon@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2018-05-11 14:14:21 +00:00
if (GrCoverageCountingPathRenderer::IsSupported(
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
*ctx->priv().caps())) {
Coverage counting path renderer Initial implementation of a GPU path renderer that draws antialiased paths by counting coverage in an offscreen buffer. Initially disabled until it has had time to soak. Bug: skia: Change-Id: I003d8cfdf8dc62641581b5ea2dc4f0aa00108df6 Reviewed-on: https://skia-review.googlesource.com/21541 Commit-Queue: Chris Dalton <csmartdalton@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Robert Phillips <robertphillips@google.com>
2017-07-14 21:17:41 +00:00
prButton(GpuPathRenderers::kCoverageCounting);
}
Rename GrAADistanceFieldPathRenderer to GrSmallPathRenderer Also disables use of small distance fields in Android framework. Change-Id: I1ba40ce85aa34d067608587e1fbe1d42e8a42868 Reviewed-on: https://skia-review.googlesource.com/9731 Commit-Queue: Jim Van Verth <jvanverth@google.com> Reviewed-by: Chris Dalton <csmartdalton@google.com>
2017-03-16 12:45:39 +00:00
prButton(GpuPathRenderers::kSmall);
Add path renderer options to viewer GUI BUG=skia: Change-Id: I248ba081f0229d7fcf2071009076acc88b80b076 Reviewed-on: https://skia-review.googlesource.com/9088 Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-03-01 19:59:05 +00:00
prButton(GpuPathRenderers::kTessellating);
prButton(GpuPathRenderers::kNone);
}
ImGui::TreePop();
}
Add backend selection to viewer's GUI BUG=skia: Change-Id: I3314013538792c2aa82cc49f3f072aab2cdc4a55 Reviewed-on: https://skia-review.googlesource.com/9079 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-02-28 20:45:01 +00:00
}
Add Transform section to viewer tools window. This adds sliders for Zoom and Rotate. Change-Id: Ie568e5381d76bd5a457760e2d6224e42e64c7f16 Reviewed-on: https://skia-review.googlesource.com/123027 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-23 16:55:06 +00:00
if (ImGui::CollapsingHeader("Transform")) {
float zoom = fZoomLevel;
if (ImGui::SliderFloat("Zoom", &zoom, MIN_ZOOM_LEVEL, MAX_ZOOM_LEVEL)) {
fZoomLevel = zoom;
this->preTouchMatrixChanged();
paramsChanged = true;
}
float deg = fRotation;
Allow finer rotation in Viewer app. It turns out the ImGui sliders don't use the format string just for display but also to modify the potential values. Change the format string for rotation to three decimal places to match zoom. Change-Id: I5f8d675a18687d67c2f19b03aa4c19c3ae094415 Reviewed-on: https://skia-review.googlesource.com/125960 Commit-Queue: Brian Osman <brianosman@google.com> Auto-Submit: Ben Wagner <bungeman@google.com> Reviewed-by: Brian Osman <brianosman@google.com>
2018-05-04 14:33:04 +00:00
if (ImGui::SliderFloat("Rotate", &deg, -30, 360, "%.3f deg")) {
Add Transform section to viewer tools window. This adds sliders for Zoom and Rotate. Change-Id: Ie568e5381d76bd5a457760e2d6224e42e64c7f16 Reviewed-on: https://skia-review.googlesource.com/123027 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-23 16:55:06 +00:00
fRotation = deg;
this->preTouchMatrixChanged();
paramsChanged = true;
}
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
if (ImGui::CollapsingHeader("Subpixel offset", ImGuiTreeNodeFlags_NoTreePushOnOpen)) {
if (ImGui_DragLocation(&fOffset)) {
this->preTouchMatrixChanged();
paramsChanged = true;
}
Subpixel in Viewer from -1 to 1. Change the Subpixel positioning in Viewer from 0 to 1 to -1 to 1, with the origin at the center of the drag area. This allows for observing what happens when rolling over integer boundaries. Since it is no longer simple to reset to the origin, closing the collapsing header resets the drag point to the origin. Change-Id: I88d4fd489c3bfb914fb843fa261d4097fef3671a Reviewed-on: https://skia-review.googlesource.com/146643 Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-08-09 19:18:46 +00:00
} else if (fOffset != SkVector{0.5f, 0.5f}) {
this->preTouchMatrixChanged();
paramsChanged = true;
fOffset = {0.5f, 0.5f};
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
}
Add tiled rendering option to viewer Bug: skia: Change-Id: I4bb5e0107d06798040a37609499b4e2b48cf7e29 Reviewed-on: https://skia-review.googlesource.com/c/172962 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-11-26 19:50:05 +00:00
if (ImGui::CollapsingHeader("Tiling")) {
ImGui::Checkbox("Enable", &fTiled);
ImGui::Checkbox("Draw Boundaries", &fDrawTileBoundaries);
ImGui::SliderFloat("Horizontal", &fTileScale.fWidth, 0.1f, 1.0f);
ImGui::SliderFloat("Vertical", &fTileScale.fHeight, 0.1f, 1.0f);
}
Add toggle for 'real' vs. 'fake' perspective in Viewer Real perspective draws content with perspective applied. Fake perspective rasterizes in ortho, then stretches the image by the perspective matrix. Change-Id: I738cd379f9a58b965469ef8a57fb2dfd597fda10 Reviewed-on: https://skia-review.googlesource.com/125442 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com> Reviewed-by: Ben Wagner <bungeman@google.com>
2018-05-02 19:40:20 +00:00
int perspectiveMode = static_cast<int>(fPerspectiveMode);
if (ImGui::Combo("Perspective", &perspectiveMode, "Off\0Real\0Fake\0\0")) {
fPerspectiveMode = static_cast<PerspectiveMode>(perspectiveMode);
Add perspective support (rect to rect) to Viewer Change-Id: I312d5b3e6b7f37a3a7bfd5561bcdb31b43e207b8 Reviewed-on: https://skia-review.googlesource.com/123934 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2018-04-26 19:55:00 +00:00
this->preTouchMatrixChanged();
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
paramsChanged = true;
Add perspective support (rect to rect) to Viewer Change-Id: I312d5b3e6b7f37a3a7bfd5561bcdb31b43e207b8 Reviewed-on: https://skia-review.googlesource.com/123934 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2018-04-26 19:55:00 +00:00
}
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
if (perspectiveMode != kPerspective_Off && ImGui_DragQuad(fPerspectivePoints)) {
Add perspective support (rect to rect) to Viewer Change-Id: I312d5b3e6b7f37a3a7bfd5561bcdb31b43e207b8 Reviewed-on: https://skia-review.googlesource.com/123934 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2018-04-26 19:55:00 +00:00
this->preTouchMatrixChanged();
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
paramsChanged = true;
Add perspective support (rect to rect) to Viewer Change-Id: I312d5b3e6b7f37a3a7bfd5561bcdb31b43e207b8 Reviewed-on: https://skia-review.googlesource.com/123934 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com> Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com> Reviewed-by: Ben Wagner <bungeman@google.com> Auto-Submit: Brian Osman <brianosman@google.com>
2018-04-26 19:55:00 +00:00
}
Add Transform section to viewer tools window. This adds sliders for Zoom and Rotate. Change-Id: Ie568e5381d76bd5a457760e2d6224e42e64c7f16 Reviewed-on: https://skia-review.googlesource.com/123027 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-23 16:55:06 +00:00
}
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
if (ImGui::CollapsingHeader("Paint")) {
int aliasIdx = 0;
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fPaintOverrides.fAntiAlias) {
aliasIdx = SkTo<int>(fPaintOverrides.fAntiAliasState) + 1;
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
}
if (ImGui::Combo("Anti-Alias", &aliasIdx,
"Default\0Alias\0Normal\0AnalyticAAEnabled\0AnalyticAAForced\0"
"DeltaAAEnabled\0DeltaAAForced\0\0"))
{
gSkUseAnalyticAA = fPaintOverrides.fOriginalSkUseAnalyticAA;
gSkForceAnalyticAA = fPaintOverrides.fOriginalSkForceAnalyticAA;
gSkUseDeltaAA = fPaintOverrides.fOriginalSkUseDeltaAA;
gSkForceDeltaAA = fPaintOverrides.fOriginalSkForceDeltaAA;
if (aliasIdx == 0) {
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.fAntiAliasState = SkPaintFields::AntiAliasState::Alias;
fPaintOverrides.fAntiAlias = false;
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
} else {
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.fAntiAlias = true;
fPaintOverrides.fAntiAliasState = SkTo<SkPaintFields::AntiAliasState>(aliasIdx-1);
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
fPaint.setAntiAlias(aliasIdx > 1);
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
switch (fPaintOverrides.fAntiAliasState) {
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
case SkPaintFields::AntiAliasState::Alias:
break;
case SkPaintFields::AntiAliasState::Normal:
break;
case SkPaintFields::AntiAliasState::AnalyticAAEnabled:
gSkUseAnalyticAA = true;
gSkForceAnalyticAA = false;
gSkUseDeltaAA = gSkForceDeltaAA = false;
break;
case SkPaintFields::AntiAliasState::AnalyticAAForced:
gSkUseAnalyticAA = gSkForceAnalyticAA = true;
gSkUseDeltaAA = gSkForceDeltaAA = false;
break;
case SkPaintFields::AntiAliasState::DeltaAAEnabled:
gSkUseAnalyticAA = gSkForceAnalyticAA = false;
gSkUseDeltaAA = true;
gSkForceDeltaAA = false;
break;
case SkPaintFields::AntiAliasState::DeltaAAForced:
gSkUseAnalyticAA = gSkForceAnalyticAA = false;
gSkUseDeltaAA = gSkForceDeltaAA = true;
break;
}
}
paramsChanged = true;
}
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
auto paintFlag = [this, &paramsChanged](const char* label, const char* items,
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
bool SkPaintFields::* flag,
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
bool (SkPaint::* isFlag)() const,
void (SkPaint::* setFlag)(bool) )
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
{
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
int itemIndex = 0;
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
if (fPaintOverrides.*flag) {
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
itemIndex = (fPaint.*isFlag)() ? 2 : 1;
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
}
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
if (ImGui::Combo(label, &itemIndex, items)) {
if (itemIndex == 0) {
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.*flag = false;
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
} else {
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
fPaintOverrides.*flag = true;
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
(fPaint.*setFlag)(itemIndex == 2);
}
paramsChanged = true;
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
}
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
};
paintFlag("Dither",
"Default\0No Dither\0Dither\0\0",
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
&SkPaintFields::fDither,
Add all SkPaint::Flags to Viewer app. Originally a change to add just one more, turned into adding all of them. Change-Id: Ibd6b6cab75d5a018744661038cfccdb50470c234 Reviewed-on: https://skia-review.googlesource.com/127134 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-05-09 22:23:51 +00:00
&SkPaint::isDither, &SkPaint::setDither);
Update Viewer for SkFont overrides. Change-Id: I18871dd6db647b24db08a3e92e0470c5baa5850c Reviewed-on: https://skia-review.googlesource.com/c/186082 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2019-01-23 15:34:59 +00:00
}
if (ImGui::CollapsingHeader("Font")) {
int hintingIdx = 0;
if (fFontOverrides.fHinting) {
hintingIdx = SkTo<int>(fFont.getHinting()) + 1;
}
if (ImGui::Combo("Hinting", &hintingIdx,
"Default\0None\0Slight\0Normal\0Full\0\0"))
{
if (hintingIdx == 0) {
fFontOverrides.fHinting = false;
fFont.setHinting(kNo_SkFontHinting);
} else {
fFont.setHinting(SkTo<SkFontHinting>(hintingIdx - 1));
fFontOverrides.fHinting = true;
}
paramsChanged = true;
}
auto fontFlag = [this, &paramsChanged](const char* label, const char* items,
bool SkFontFields::* flag,
bool (SkFont::* isFlag)() const,
void (SkFont::* setFlag)(bool) )
{
int itemIndex = 0;
if (fFontOverrides.*flag) {
itemIndex = (fFont.*isFlag)() ? 2 : 1;
}
if (ImGui::Combo(label, &itemIndex, items)) {
if (itemIndex == 0) {
fFontOverrides.*flag = false;
} else {
fFontOverrides.*flag = true;
(fFont.*setFlag)(itemIndex == 2);
}
paramsChanged = true;
}
};
fontFlag("Fake Bold Glyphs",
"Default\0No Fake Bold\0Fake Bold\0\0",
&SkFontFields::fEmbolden,
&SkFont::isEmbolden, &SkFont::setEmbolden);
fontFlag("Linear Text",
"Default\0No Linear Text\0Linear Text\0\0",
&SkFontFields::fLinearMetrics,
&SkFont::isLinearMetrics, &SkFont::setLinearMetrics);
fontFlag("Subpixel Position Glyphs",
"Default\0Pixel Text\0Subpixel Text\0\0",
&SkFontFields::fSubpixel,
&SkFont::isSubpixel, &SkFont::setSubpixel);
fontFlag("Embedded Bitmap Text",
"Default\0No Embedded Bitmaps\0Embedded Bitmaps\0\0",
&SkFontFields::fEmbeddedBitmaps,
&SkFont::isEmbeddedBitmaps, &SkFont::setEmbeddedBitmaps);
fontFlag("Force Auto-Hinting",
"Default\0No Force Auto-Hinting\0Force Auto-Hinting\0\0",
&SkFontFields::fForceAutoHinting,
&SkFont::isForceAutoHinting, &SkFont::setForceAutoHinting);
int edgingIdx = 0;
if (fFontOverrides.fEdging) {
edgingIdx = SkTo<int>(fFont.getEdging()) + 1;
}
if (ImGui::Combo("Edging", &edgingIdx,
"Default\0Alias\0Antialias\0Subpixel Antialias\0\0"))
{
if (edgingIdx == 0) {
fFontOverrides.fEdging = false;
fFont.setEdging(SkFont::Edging::kAlias);
} else {
fFont.setEdging(SkTo<SkFont::Edging>(edgingIdx-1));
fFontOverrides.fEdging = true;
}
paramsChanged = true;
}
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
ImGui::Checkbox("Override TextSize", &fFontOverrides.fTextSize);
if (fFontOverrides.fTextSize) {
ImGui::DragFloat2("TextRange", fFontOverrides.fTextSizeRange,
Add text size override to Viewer. In some cases issues only happen when the actual requested text size on a paint is a particular size. Allow overriding the text size on the paint for such testing. Change-Id: Ic719ea36ba9d624725d443cbd563283628606f2d Reviewed-on: https://skia-review.googlesource.com/133446 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-07 21:54:07 +00:00
0.001f, -10.0f, 300.0f, "%.6f", 2.0f);
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
float textSize = fFont.getSize();
Add text size override to Viewer. In some cases issues only happen when the actual requested text size on a paint is a particular size. Allow overriding the text size on the paint for such testing. Change-Id: Ic719ea36ba9d624725d443cbd563283628606f2d Reviewed-on: https://skia-review.googlesource.com/133446 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-07 21:54:07 +00:00
if (ImGui::DragFloat("TextSize", &textSize, 0.001f,
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
fFontOverrides.fTextSizeRange[0],
fFontOverrides.fTextSizeRange[1],
Add text size override to Viewer. In some cases issues only happen when the actual requested text size on a paint is a particular size. Allow overriding the text size on the paint for such testing. Change-Id: Ic719ea36ba9d624725d443cbd563283628606f2d Reviewed-on: https://skia-review.googlesource.com/133446 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-07 21:54:07 +00:00
"%.6f", 2.0f))
{
start to change Viewer's filtering to know about fonts Did not hook-up all of the font flags, but these did not appear to be "filtered" by viewer, so landing this version for now (to stop assuming that text-fields are in paint). Bug: skia: Change-Id: Id8bdfc12f838b6c3ddc2981aca698d4d80a4c639 Reviewed-on: https://skia-review.googlesource.com/c/181169 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com> Auto-Submit: Mike Reed <reed@google.com>
2019-01-04 15:11:46 +00:00
fFont.setSize(textSize);
Add text size override to Viewer. In some cases issues only happen when the actual requested text size on a paint is a particular size. Allow overriding the text size on the paint for such testing. Change-Id: Ic719ea36ba9d624725d443cbd563283628606f2d Reviewed-on: https://skia-review.googlesource.com/133446 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-07 21:54:07 +00:00
this->preTouchMatrixChanged();
paramsChanged = true;
}
}
Add paint flags to viewer GUI. Overriding bits of the paint was added with keyboard bindings but without being reflected in the GUI. This adds these flags to the GUI. Change-Id: I633801fb776248952afe7cbe8857676ef8b57135 Reviewed-on: https://skia-review.googlesource.com/121796 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-17 15:16:32 +00:00
}
Allow slides/gms to extend the UI Bug: skia: Change-Id: Ia5971d827e6e05ab6cc30af3105b3b32ee691a34 Reviewed-on: https://skia-review.googlesource.com/128321 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-05-15 14:09:52 +00:00
{
SkMetaData controls;
if (fSlides[fCurrentSlide]->onGetControls(&controls)) {
if (ImGui::CollapsingHeader("Current Slide")) {
SkMetaData::Iter iter(controls);
const char* name;
SkMetaData::Type type;
int count;
Clean up code for custom slide GUIs Bailing out early caused controls to flicker on/off if one was being interacted with. No need to rebuild the window (paramsChanged), the GUI is up, so we're already repainting. Change-Id: I0751271962075dff22b19f60f4d1dc81c9232f58 Reviewed-on: https://skia-review.googlesource.com/145335 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-08-03 15:14:02 +00:00
while ((name = iter.next(&type, &count)) != nullptr) {
Allow slides/gms to extend the UI Bug: skia: Change-Id: Ia5971d827e6e05ab6cc30af3105b3b32ee691a34 Reviewed-on: https://skia-review.googlesource.com/128321 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-05-15 14:09:52 +00:00
if (type == SkMetaData::kScalar_Type) {
float val[3];
SkASSERT(count == 3);
controls.findScalars(name, &count, val);
if (ImGui::SliderFloat(name, &val[0], val[1], val[2])) {
controls.setScalars(name, 3, val);
}
}
}
Clean up code for custom slide GUIs Bailing out early caused controls to flicker on/off if one was being interacted with. No need to rebuild the window (paramsChanged), the GUI is up, so we're already repainting. Change-Id: I0751271962075dff22b19f60f4d1dc81c9232f58 Reviewed-on: https://skia-review.googlesource.com/145335 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-08-03 15:14:02 +00:00
fSlides[fCurrentSlide]->onSetControls(controls);
Allow slides/gms to extend the UI Bug: skia: Change-Id: Ia5971d827e6e05ab6cc30af3105b3b32ee691a34 Reviewed-on: https://skia-review.googlesource.com/128321 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
2018-05-15 14:09:52 +00:00
}
}
}
Backspace opens slide picker (not paint) in viewer. A recent change added the "Paint" section to the viewer tools window. The code around forcing the slide picker open when the backspace key was pressed was inadvertantly separated from the slide picker section, so now the paint section is confusingly held open instead. This changes the logic so that the slide picker is once again the target of backspace. Change-Id: Ibfcb78bb0a1e2bdbb2ccce54b38e8206e0303753 Reviewed-on: https://skia-review.googlesource.com/122949 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-04-23 14:01:07 +00:00
if (fShowSlidePicker) {
ImGui::SetNextTreeNodeOpen(true);
}
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
if (ImGui::CollapsingHeader("Slide")) {
static ImGuiTextFilter filter;
Use ListBox for slide picker in Viewer Interaction is much nicer (the bulleted list of text had dead space between entries, so mouse clicks could go unnoticed). This version also keeps the currently active slide highlighted in the list, which is nice. Bug: skia: Change-Id: I609d90f3b1ff99765f0a7f1ca43e02a0a534dc4d Reviewed-on: https://skia-review.googlesource.com/68780 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 18:11:36 +00:00
static ImVector<const char*> filteredSlideNames;
static ImVector<int> filteredSlideIndices;
Viewer: backspace jumps directly to the slide picker Bug: skia: Change-Id: I8107358e49ef20bf26ddf6a6dbb21efc07f167e7 Reviewed-on: https://skia-review.googlesource.com/71460 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Greg Daniel <egdaniel@google.com>
2017-11-14 20:32:20 +00:00
if (fShowSlidePicker) {
ImGui::SetKeyboardFocusHere();
fShowSlidePicker = false;
}
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
filter.Draw();
Use ListBox for slide picker in Viewer Interaction is much nicer (the bulleted list of text had dead space between entries, so mouse clicks could go unnoticed). This version also keeps the currently active slide highlighted in the list, which is nice. Bug: skia: Change-Id: I609d90f3b1ff99765f0a7f1ca43e02a0a534dc4d Reviewed-on: https://skia-review.googlesource.com/68780 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 18:11:36 +00:00
filteredSlideNames.clear();
filteredSlideIndices.clear();
int filteredIndex = 0;
for (int i = 0; i < fSlides.count(); ++i) {
const char* slideName = fSlides[i]->getName().c_str();
if (filter.PassFilter(slideName) || i == fCurrentSlide) {
if (i == fCurrentSlide) {
filteredIndex = filteredSlideIndices.size();
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
}
Use ListBox for slide picker in Viewer Interaction is much nicer (the bulleted list of text had dead space between entries, so mouse clicks could go unnoticed). This version also keeps the currently active slide highlighted in the list, which is nice. Bug: skia: Change-Id: I609d90f3b1ff99765f0a7f1ca43e02a0a534dc4d Reviewed-on: https://skia-review.googlesource.com/68780 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 18:11:36 +00:00
filteredSlideNames.push_back(slideName);
filteredSlideIndices.push_back(i);
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
}
}
Use ListBox for slide picker in Viewer Interaction is much nicer (the bulleted list of text had dead space between entries, so mouse clicks could go unnoticed). This version also keeps the currently active slide highlighted in the list, which is nice. Bug: skia: Change-Id: I609d90f3b1ff99765f0a7f1ca43e02a0a534dc4d Reviewed-on: https://skia-review.googlesource.com/68780 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 18:11:36 +00:00
if (ImGui::ListBox("", &filteredIndex, filteredSlideNames.begin(),
filteredSlideNames.size(), 20)) {
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
this->setCurrentSlide(filteredSlideIndices[filteredIndex]);
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
}
}
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
if (ImGui::CollapsingHeader("Color Mode")) {
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
ColorMode newMode = fColorMode;
auto cmButton = [&](ColorMode mode, const char* label) {
if (ImGui::RadioButton(label, mode == fColorMode)) {
newMode = mode;
}
};
cmButton(ColorMode::kLegacy, "Legacy 8888");
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
cmButton(ColorMode::kColorManaged8888, "Color Managed 8888");
cmButton(ColorMode::kColorManagedF16, "Color Managed F16");
Add legacy++ to viewer (sRGB w/nonlinear blending) BUG=skia:6242 Change-Id: I696de8eac61aebaf5cb07d8874bde3c7bd470277 Reviewed-on: https://skia-review.googlesource.com/9299 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-03-06 16:47:26 +00:00
if (newMode != fColorMode) {
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
this->setColorMode(newMode);
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
}
// Pick from common gamuts:
int primariesIdx = 4; // Default: Custom
for (size_t i = 0; i < SK_ARRAY_COUNT(gNamedPrimaries); ++i) {
if (primaries_equal(*gNamedPrimaries[i].fPrimaries, fColorSpacePrimaries)) {
primariesIdx = i;
break;
}
}
Remove xform canvas mode from Viewer, simplify color management There are now three modes: Legacy, and Color Managed 8888 or F16. Rules about transfer functions are gone, so allow changing gamma in either color managed mode. To keep things much simpler, we always construct the window surface in legacy mode, and draw offscreen whenever we're doing any color management. This lets us avoid re-creating the window surface when cycling modes, and avoid making re-tagged copies when pushing color managed images to the window surface. Bug: skia: Change-Id: I59e9340900b047d5217eb8a9f63f20a1d638227d Reviewed-on: https://skia-review.googlesource.com/c/172960 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@google.com>
2018-11-26 18:55:19 +00:00
// Let user adjust the gamma
Reland "Add SkColorSpace factory from 3x3 row-major gamut and transfer function" Moved named common transfer functions and gamuts to constexpr values in SkColorSpace.h, in SkNamedTransferFn and SkNamedGamut namespaces. Converted nearly all SkColorSpace::MakeRGB calls within Skia to use the new factory with the named values. Multiple clients want a way to extract named transfer function and gamut - this still doesn't provide that, but this may be a better path forward for honestly advertising how SkColorSpace works internally. Originally landed as: https://skia.googlesource.com/skia/+/a9549ab31630fc244094e6f1692371cbaf87f666 Re-landing with a new serialization format, but maintaining ability to load old serialized color spaces, for SKP compatibility. Bug: skia: Change-Id: Ib84a6e1cd5d7d9816175773fdbaff2ca32658667 Reviewed-on: https://skia-review.googlesource.com/c/181176 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-01-04 22:03:00 +00:00
ImGui::SliderFloat("Gamma", &fColorSpaceTransferFn.g, 0.5f, 3.5f);
Allow changing the transfer function in xform canvas mode Used this to test out some theories for different color correction approaches. Bug: skia: Change-Id: I072130733eaea736c9aa129af74887b028f035b4 Reviewed-on: https://skia-review.googlesource.com/69221 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Mike Klein <mtklein@chromium.org>
2017-11-09 15:27:55 +00:00
ImGui color space controls Adds radio buttons for switching among legacy, sRGB and F16. Also adds a list of primaries you can pick from, as well as a gamut diagram showing the primaries. The primaries can be dragged around to alter the working space. BUG=skia: Change-Id: Ibd8c67dfe085594c0d7462f0efe4d79d73999919 Reviewed-on: https://skia-review.googlesource.com/8311 Reviewed-by: Matt Sarett <msarett@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 14:49:14 +00:00
if (ImGui::Combo("Primaries", &primariesIdx,
"sRGB\0AdobeRGB\0P3\0Rec. 2020\0Custom\0\0")) {
if (primariesIdx >= 0 && primariesIdx <= 3) {
fColorSpacePrimaries = *gNamedPrimaries[primariesIdx].fPrimaries;
}
}
// Allow direct editing of gamut
ImGui_Primaries(&fColorSpacePrimaries, &fImGuiGamutPaint);
}
Viewer: Add ability to pause timer from GUI and keyboard Bug: skia: Change-Id: I1e4991c996cadcdee928efdbc10fc3d7ac820045 Reviewed-on: https://skia-review.googlesource.com/c/182813 Auto-Submit: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-01-10 14:40:58 +00:00
if (ImGui::CollapsingHeader("Animation")) {
bool isPaused = fAnimTimer.isPaused();
if (ImGui::Checkbox("Pause", &isPaused)) {
fAnimTimer.togglePauseResume();
}
Make SkAnimTimer support speed control Really helpful to slow down animated content for debugging, etc... Bug: skia: Change-Id: Id22ac555c7926dc858777d3d1be8afac1686407a Reviewed-on: https://skia-review.googlesource.com/c/182920 Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Florin Malita <fmalita@chromium.org> Commit-Queue: Brian Osman <brianosman@google.com>
2019-01-10 16:27:34 +00:00
float speed = fAnimTimer.getSpeed();
if (ImGui::DragFloat("Speed", &speed, 0.1f)) {
fAnimTimer.setSpeed(speed);
}
Viewer: Add ability to pause timer from GUI and keyboard Bug: skia: Change-Id: I1e4991c996cadcdee928efdbc10fc3d7ac820045 Reviewed-on: https://skia-review.googlesource.com/c/182813 Auto-Submit: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org> Reviewed-by: Florin Malita <fmalita@chromium.org>
2019-01-10 14:40:58 +00:00
}
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
}
Add viewer GUI options for desktop and Android to toggle instanced rendering. BUG=skia: Change-Id: I42674abfb7ee764f676100ac0e84cc0f07620bec Reviewed-on: https://skia-review.googlesource.com/9396 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-03-07 20:16:34 +00:00
if (paramsChanged) {
fDeferredActions.push_back([=]() {
fWindow->setRequestedDisplayParams(params);
fWindow->inval();
this->updateTitle();
});
}
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
ImGui::End();
}
Pixel zoomer in viewer Made it a separate ImGui window (rather than part of the debug window). Bring it up with 'z'. Draggable/resizable. Variable zoom scale. Enjoy. BUG=skia: Change-Id: I949ab398126c892c8d353aaebcc8403765f42841 Reviewed-on: https://skia-review.googlesource.com/8357 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-13 14:39:57 +00:00
if (fShowZoomWindow && fLastImage) {
Update ImGui to v1.62 (June 22, 2018) He's been steadily adding features and fixing bugs, figured it was time to fetch a new version. Change-Id: I496aefc0a1b60c3be5c89a0e58dc64811fccc77e Reviewed-on: https://skia-review.googlesource.com/138591 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2018-06-29 18:30:48 +00:00
ImGui::SetNextWindowSize(ImVec2(200, 200), ImGuiCond_FirstUseEver);
if (ImGui::Begin("Zoom", &fShowZoomWindow)) {
Improve zoom window in Viewer Made a more general mechanism for getting a canvas callback during GUI rendering, clipped to a region. Use that to implement the zoom window. The new version has better zoom control (I think), avoids bugs with clamped image drawing stretching off-canvas, adds a highlight of the pixel under the cursor, and also prints the RGBA values of that pixel. Bug: skia: Change-Id: I2c4da581648e7923c2a6fb28846dfdb52bdd3029 Reviewed-on: https://skia-review.googlesource.com/70723 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-13 20:36:36 +00:00
static int zoomFactor = 8;
if (ImGui::Button("<<")) {
zoomFactor = SkTMax(zoomFactor / 2, 4);
}
ImGui::SameLine(); ImGui::Text("%2d", zoomFactor); ImGui::SameLine();
if (ImGui::Button(">>")) {
zoomFactor = SkTMin(zoomFactor * 2, 32);
}
Pixel zoomer in viewer Made it a separate ImGui window (rather than part of the debug window). Bring it up with 'z'. Draggable/resizable. Variable zoom scale. Enjoy. BUG=skia: Change-Id: I949ab398126c892c8d353aaebcc8403765f42841 Reviewed-on: https://skia-review.googlesource.com/8357 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-13 14:39:57 +00:00
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
if (!fZoomWindowFixed) {
ImVec2 mousePos = ImGui::GetMousePos();
fZoomWindowLocation = SkPoint::Make(mousePos.x, mousePos.y);
}
SkScalar x = fZoomWindowLocation.x();
SkScalar y = fZoomWindowLocation.y();
int xInt = SkScalarRoundToInt(x);
int yInt = SkScalarRoundToInt(y);
Pixel zoomer in viewer Made it a separate ImGui window (rather than part of the debug window). Bring it up with 'z'. Draggable/resizable. Variable zoom scale. Enjoy. BUG=skia: Change-Id: I949ab398126c892c8d353aaebcc8403765f42841 Reviewed-on: https://skia-review.googlesource.com/8357 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-13 14:39:57 +00:00
ImVec2 avail = ImGui::GetContentRegionAvail();
Improve zoom window in Viewer Made a more general mechanism for getting a canvas callback during GUI rendering, clipped to a region. Use that to implement the zoom window. The new version has better zoom control (I think), avoids bugs with clamped image drawing stretching off-canvas, adds a highlight of the pixel under the cursor, and also prints the RGBA values of that pixel. Bug: skia: Change-Id: I2c4da581648e7923c2a6fb28846dfdb52bdd3029 Reviewed-on: https://skia-review.googlesource.com/70723 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-13 20:36:36 +00:00
uint32_t pixel = 0;
SkImageInfo info = SkImageInfo::MakeN32Premul(1, 1);
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
if (fLastImage->readPixels(info, &pixel, info.minRowBytes(), xInt, yInt)) {
Improve zoom window in Viewer Made a more general mechanism for getting a canvas callback during GUI rendering, clipped to a region. Use that to implement the zoom window. The new version has better zoom control (I think), avoids bugs with clamped image drawing stretching off-canvas, adds a highlight of the pixel under the cursor, and also prints the RGBA values of that pixel. Bug: skia: Change-Id: I2c4da581648e7923c2a6fb28846dfdb52bdd3029 Reviewed-on: https://skia-review.googlesource.com/70723 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-13 20:36:36 +00:00
ImGui::SameLine();
Add XY to zoom window Bug: skia:7332 Change-Id: I3a7d5cf20c75bb288d5aa0fa9046e77a669aad64 Reviewed-on: https://skia-review.googlesource.com/74560 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-21 19:59:31 +00:00
ImGui::Text("(X, Y): %d, %d RGBA: %x %x %x %x",
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
xInt, yInt,
Add XY to zoom window Bug: skia:7332 Change-Id: I3a7d5cf20c75bb288d5aa0fa9046e77a669aad64 Reviewed-on: https://skia-review.googlesource.com/74560 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-21 19:59:31 +00:00
SkGetPackedR32(pixel), SkGetPackedG32(pixel),
Improve zoom window in Viewer Made a more general mechanism for getting a canvas callback during GUI rendering, clipped to a region. Use that to implement the zoom window. The new version has better zoom control (I think), avoids bugs with clamped image drawing stretching off-canvas, adds a highlight of the pixel under the cursor, and also prints the RGBA values of that pixel. Bug: skia: Change-Id: I2c4da581648e7923c2a6fb28846dfdb52bdd3029 Reviewed-on: https://skia-review.googlesource.com/70723 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-13 20:36:36 +00:00
SkGetPackedB32(pixel), SkGetPackedA32(pixel));
}
Move ImGui support code to ImGuiLayer Viewer still has plenty of code that uses ImGui to create application specific UI, but the structural code that forwards input to ImGui, and converts per-frame ImGui rendering data to Skia draw commands is now in a single component that can be reused in any sk_app-based application. Bug: skia: Change-Id: Ic14ece659d4af8ee13b69c638bdaf7df6c24f5c0 Reviewed-on: https://skia-review.googlesource.com/82627 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-12-08 21:46:09 +00:00
fImGuiLayer.skiaWidget(avail, [=](SkCanvas* c) {
Improve zoom window in Viewer Made a more general mechanism for getting a canvas callback during GUI rendering, clipped to a region. Use that to implement the zoom window. The new version has better zoom control (I think), avoids bugs with clamped image drawing stretching off-canvas, adds a highlight of the pixel under the cursor, and also prints the RGBA values of that pixel. Bug: skia: Change-Id: I2c4da581648e7923c2a6fb28846dfdb52bdd3029 Reviewed-on: https://skia-review.googlesource.com/70723 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-13 20:36:36 +00:00
// Translate so the region of the image that's under the mouse cursor is centered
// in the zoom canvas:
c->scale(zoomFactor, zoomFactor);
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
c->translate(avail.x * 0.5f / zoomFactor - x - 0.5f,
avail.y * 0.5f / zoomFactor - y - 0.5f);
Improve zoom window in Viewer Made a more general mechanism for getting a canvas callback during GUI rendering, clipped to a region. Use that to implement the zoom window. The new version has better zoom control (I think), avoids bugs with clamped image drawing stretching off-canvas, adds a highlight of the pixel under the cursor, and also prints the RGBA values of that pixel. Bug: skia: Change-Id: I2c4da581648e7923c2a6fb28846dfdb52bdd3029 Reviewed-on: https://skia-review.googlesource.com/70723 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-13 20:36:36 +00:00
c->drawImage(this->fLastImage, 0, 0);
SkPaint outline;
outline.setStyle(SkPaint::kStroke_Style);
Add subpixel offset to Viewer app. This adds a two dimensional location dragger to drag the origin across a pixel. Also makes the perspective dragger hidden when perspective is off. Also adds 'Z' to toggle the zoom window mouse follow. Change-Id: Ic75d16c95848b392608770c8ed0d4db23733242f Reviewed-on: https://skia-review.googlesource.com/137701 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
2018-06-26 18:23:20 +00:00
c->drawRect(SkRect::MakeXYWH(x, y, 1, 1), outline);
Improve zoom window in Viewer Made a more general mechanism for getting a canvas callback during GUI rendering, clipped to a region. Use that to implement the zoom window. The new version has better zoom control (I think), avoids bugs with clamped image drawing stretching off-canvas, adds a highlight of the pixel under the cursor, and also prints the RGBA values of that pixel. Bug: skia: Change-Id: I2c4da581648e7923c2a6fb28846dfdb52bdd3029 Reviewed-on: https://skia-review.googlesource.com/70723 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-13 20:36:36 +00:00
});
Pixel zoomer in viewer Made it a separate ImGui window (rather than part of the debug window). Bring it up with 'z'. Draggable/resizable. Variable zoom scale. Enjoy. BUG=skia: Change-Id: I949ab398126c892c8d353aaebcc8403765f42841 Reviewed-on: https://skia-review.googlesource.com/8357 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-13 14:39:57 +00:00
}
ImGui::End();
}
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
}
More accurate render time and continuous fresh BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2129613002 Review-Url: https://codereview.chromium.org/2129613002
2016-07-06 21:11:32 +00:00
void Viewer::onIdle() {
Fix some viewer crashes when switching color mode The whole idea of immediate mode GUIs is to put your GUI code and the resulting action close together. Unfortunately, for actions that tear down the backend (possibly freeing the surfaces we're drawing to), we can't do that. So defer that action until the next frame (really, the next idle). Only required when an action might call setDisplayParams. BUG=skia: Change-Id: I3eb95fdb462526cb6d95819612ad2725c6f1050b Reviewed-on: https://skia-review.googlesource.com/8953 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-24 16:57:23 +00:00
for (int i = 0; i < fDeferredActions.count(); ++i) {
fDeferredActions[i]();
}
fDeferredActions.reset();
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fStatsLayer.beginTiming(fAnimateTimer);
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
fAnimTimer.updateTime();
Improve viewer stats collection and display Measure the time taken for animation and flush. Exclude UI and stats logic from the timing. Use stacked bars to visualize the breakdown of time within a frame. BUG=skia: Change-Id: I7ef84442a68147f02f65b6aa4452768fd3314de2 Reviewed-on: https://skia-review.googlesource.com/8227 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-09 17:10:20 +00:00
bool animateWantsInval = fSlides[fCurrentSlide]->animate(fAnimTimer);
Move stats code to new layer (with configurable list of timers) Bug: skia: Change-Id: I3ca5c8c7047309983018339ec7b71b9aea5ee786 Reviewed-on: https://skia-review.googlesource.com/86921 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-19 16:15:16 +00:00
fStatsLayer.endTiming(fAnimateTimer);
Improve viewer stats collection and display Measure the time taken for animation and flush. Exclude UI and stats logic from the timing. Use stacked bars to visualize the breakdown of time within a frame. BUG=skia: Change-Id: I7ef84442a68147f02f65b6aa4452768fd3314de2 Reviewed-on: https://skia-review.googlesource.com/8227 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-09 17:10:20 +00:00
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
ImGuiIO& io = ImGui::GetIO();
Fix GUI windows not appearing on first key in viewer After the last update to ImGui, windows delayed visibility for one frame, to get properly sized. We would detect that no windows were "active" (really, visible) and not re-paint, so we never got the second frame when the window finally showed up. Omar put a fix to the stats in ImGui for this, so that Active windows are tracked separately from Visible. This pulls that change in, and updates the test to correctly redraw when the GUI requires it. Change-Id: Iaa61f11fcc226917e3e2b31039055a7fa1961e45 Reviewed-on: https://skia-review.googlesource.com/145361 Commit-Queue: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com> Auto-Submit: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2018-08-03 17:03:19 +00:00
// ImGui always has at least one "active" window, which is the default "Debug" window. It may
// not be visible, though. So we need to redraw if there is at least one visible window, or
// more than one active window. Newly created windows are active but not visible for one frame
// while they determine their layout and sizing.
if (animateWantsInval || fStatsLayer.getActive() || fRefresh ||
io.MetricsActiveWindows > 1 || io.MetricsRenderWindows > 0) {
More cleanup in the Vulkan viewer * add animation support for GMs * don't load all SkPictures at start, only as needed * don't update constantly, only for animation or stats * hide/show stats * scale slides up/down BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1873733003 Review URL: https://codereview.chromium.org/1873733003
2016-04-08 19:51:45 +00:00
fWindow->inval();
}
First pass at VulkanViewer BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1848833005 Review URL: https://codereview.chromium.org/1848833005
2016-04-06 13:08:59 +00:00
}
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
template <typename OptionsFunc>
static void WriteStateObject(SkJSONWriter& writer, const char* name, const char* value,
OptionsFunc&& optionsFunc) {
writer.beginObject();
{
writer.appendString(kName , name);
writer.appendString(kValue, value);
writer.beginArray(kOptions);
{
optionsFunc(writer);
}
writer.endArray();
}
writer.endObject();
}
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
void Viewer::updateUIState() {
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
if (!fWindow) {
return;
}
Revert "Revert "Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend."""""" This reverts commit 3a2cc2c2ec124de36d2544b2a523ef1dd317ca32. Fix code with samplecnt=0 that slipped in between trybots/CQ and landing of previous version Change-Id: Iab19f2e8d1e9901601c8c76244d7a88c5d707fab Reviewed-on: https://skia-review.googlesource.com/103181 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2018-02-03 01:32:49 +00:00
if (fWindow->sampleCount() < 1) {
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
return; // Surface hasn't been created yet.
}
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
SkDynamicMemoryWStream memStream;
SkJSONWriter writer(&memStream);
writer.beginArray();
Add Softkey UIState to Viewer We can use this to simulate any key/command on Android UI. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035923002 Review-Url: https://codereview.chromium.org/2035923002
2016-06-03 15:47:23 +00:00
// Slide state
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
WriteStateObject(writer, kSlideStateName, fSlides[fCurrentSlide]->getName().c_str(),
[this](SkJSONWriter& writer) {
for(const auto& slide : fSlides) {
writer.appendString(slide->getName().c_str());
}
});
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
Add Softkey UIState to Viewer We can use this to simulate any key/command on Android UI. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035923002 Review-Url: https://codereview.chromium.org/2035923002
2016-06-03 15:47:23 +00:00
// Backend state
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
WriteStateObject(writer, kBackendStateName, kBackendTypeStrings[fBackendType],
[](SkJSONWriter& writer) {
for (const auto& str : kBackendTypeStrings) {
writer.appendString(str);
}
});
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
// MSAA state
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
const auto countString = SkStringPrintf("%d", fWindow->sampleCount());
WriteStateObject(writer, kMSAAStateName, countString.c_str(),
[this](SkJSONWriter& writer) {
writer.appendS32(0);
if (sk_app::Window::kRaster_BackendType == fBackendType) {
return;
}
for (int msaa : {4, 8, 16}) {
writer.appendS32(msaa);
}
});
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
// Path renderer state
GpuPathRenderers pr = fWindow->getRequestedDisplayParams().fGrContextOptions.fGpuPathRenderers;
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
WriteStateObject(writer, kPathRendererStateName, gPathRendererNames[pr].c_str(),
[this](SkJSONWriter& writer) {
const GrContext* ctx = fWindow->getGrContext();
if (!ctx) {
writer.appendString("Software");
} else {
Rename GrContext::contextPriv to priv Mechanical. This makes the priv() accessor the same for all the context types. Change-Id: I40850eb05a33b8d7cc3eabdd42226d24b2ba58aa Reviewed-on: https://skia-review.googlesource.com/c/189164 Commit-Queue: Robert Phillips <robertphillips@google.com> Reviewed-by: Brian Salomon <bsalomon@google.com>
2019-02-04 18:26:26 +00:00
const auto* caps = ctx->priv().caps();
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
writer.appendString(gPathRendererNames[GpuPathRenderers::kAll].c_str());
if (fWindow->sampleCount() > 1) {
if (caps->shaderCaps()->pathRenderingSupport()) {
writer.appendString(
gPathRendererNames[GpuPathRenderers::kStencilAndCover].c_str());
}
} else {
if(GrCoverageCountingPathRenderer::IsSupported(*caps)) {
writer.appendString(
gPathRendererNames[GpuPathRenderers::kCoverageCounting].c_str());
}
writer.appendString(gPathRendererNames[GpuPathRenderers::kSmall].c_str());
}
writer.appendString(
gPathRendererNames[GpuPathRenderers::kTessellating].c_str());
writer.appendString(gPathRendererNames[GpuPathRenderers::kNone].c_str());
}
});
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
Add Softkey UIState to Viewer We can use this to simulate any key/command on Android UI. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035923002 Review-Url: https://codereview.chromium.org/2035923002
2016-06-03 15:47:23 +00:00
// Softkey state
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
WriteStateObject(writer, kSoftkeyStateName, kSoftkeyHint,
[this](SkJSONWriter& writer) {
writer.appendString(kSoftkeyHint);
for (const auto& softkey : fCommands.getCommandsAsSoftkeys()) {
writer.appendString(softkey.c_str());
}
});
writer.endArray();
writer.flush();
auto data = memStream.detachAsData();
Add Softkey UIState to Viewer We can use this to simulate any key/command on Android UI. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035923002 Review-Url: https://codereview.chromium.org/2035923002
2016-06-03 15:47:23 +00:00
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
// TODO: would be cool to avoid this copy
const SkString cstring(static_cast<const char*>(data->data()), data->size());
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
Use SkJSONWriter for viewer UI serialization + drop JsonCPP dependency. Bug: skia: Change-Id: I81539cea6e495fe6d55d155ae49e7ac4a79faad6 Reviewed-on: https://skia-review.googlesource.com/135628 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-06-19 01:23:06 +00:00
fWindow->setUIState(cstring.c_str());
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
}
void Viewer::onUIStateChanged(const SkString& stateName, const SkString& stateValue) {
Implement OpenGL backend in Android viewer app BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2032623002 Review-Url: https://codereview.chromium.org/2032623002
2016-06-02 19:16:25 +00:00
// For those who will add more features to handle the state change in this function:
// After the change, please call updateUIState no notify the frontend (e.g., Android app).
// For example, after slide change, updateUIState is called inside setupCurrentSlide;
// after backend change, updateUIState is called in this function.
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
if (stateName.equals(kSlideStateName)) {
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
for (int i = 0; i < fSlides.count(); ++i) {
if (fSlides[i]->getName().equals(stateValue)) {
this->setCurrentSlide(i);
return;
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
}
}
Fix Viewer slide load on backend change - take 2 Split the slide switching logic (including load/unload) into setCurrentSlide(), while keeping setupCurrentSlide() to deal with config only. Change-Id: I5bd2363ffd401c1b756217f845d4dbd16d6be5d6 Reviewed-on: https://skia-review.googlesource.com/94864 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Florin Malita <fmalita@chromium.org>
2018-01-16 21:23:03 +00:00
SkDebugf("Slide not found: %s", stateValue.c_str());
Implement OpenGL backend in Android viewer app BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2032623002 Review-Url: https://codereview.chromium.org/2032623002
2016-06-02 19:16:25 +00:00
} else if (stateName.equals(kBackendStateName)) {
for (int i = 0; i < sk_app::Window::kBackendTypeCount; i++) {
if (stateValue.equals(kBackendTypeStrings[i])) {
if (fBackendType != i) {
fBackendType = (sk_app::Window::BackendType)i;
fWindow->detach();
In Viewer, use a GL window for Raster mode The GUI uses drawVertices, in a way that doesn't currently work with the raster backend. Even if it worked, drawVertices is fairly slow in raster mode, but extremely fast on GPU. This makes the GUI always usable. The tradeoff is profiling raster will be less accurate. Bug: skia: Change-Id: I69df777fc5be79f5bdd8d4505f6419bfa758c97e Reviewed-on: https://skia-review.googlesource.com/68541 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-11-08 14:54:10 +00:00
fWindow->attach(backend_type_for_window(fBackendType));
Implement OpenGL backend in Android viewer app BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2032623002 Review-Url: https://codereview.chromium.org/2032623002
2016-06-02 19:16:25 +00:00
}
break;
}
}
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
} else if (stateName.equals(kMSAAStateName)) {
DisplayParams params = fWindow->getRequestedDisplayParams();
int sampleCount = atoi(stateValue.c_str());
if (sampleCount != params.fMSAASampleCount) {
params.fMSAASampleCount = sampleCount;
fWindow->setRequestedDisplayParams(params);
fWindow->inval();
Add viewer GUI options for desktop and Android to toggle instanced rendering. BUG=skia: Change-Id: I42674abfb7ee764f676100ac0e84cc0f07620bec Reviewed-on: https://skia-review.googlesource.com/9396 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-03-07 20:16:34 +00:00
this->updateTitle();
this->updateUIState();
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
}
} else if (stateName.equals(kPathRendererStateName)) {
DisplayParams params = fWindow->getRequestedDisplayParams();
for (const auto& pair : gPathRendererNames) {
if (pair.second == stateValue.c_str()) {
if (params.fGrContextOptions.fGpuPathRenderers != pair.first) {
params.fGrContextOptions.fGpuPathRenderers = pair.first;
fWindow->setRequestedDisplayParams(params);
fWindow->inval();
Add viewer GUI options for desktop and Android to toggle instanced rendering. BUG=skia: Change-Id: I42674abfb7ee764f676100ac0e84cc0f07620bec Reviewed-on: https://skia-review.googlesource.com/9396 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-03-07 20:16:34 +00:00
this->updateTitle();
this->updateUIState();
viewer: Add a "Path renderer" dropdown menu BUG=skia: Change-Id: Ia3ed812d24f0f83631ab238bc418a3c95d49b9dc Reviewed-on: https://skia-review.googlesource.com/9000 Reviewed-by: Yuqian Li <liyuqian@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-28 00:00:53 +00:00
}
break;
}
Add msaa flag and UI to viewer BUG=skia: Change-Id: I0a24d5e6a4271f84ea5c82eb6d9ede9a1e63f86a Reviewed-on: https://skia-review.googlesource.com/8787 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
2017-02-24 23:04:47 +00:00
}
Add Softkey UIState to Viewer We can use this to simulate any key/command on Android UI. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035923002 Review-Url: https://codereview.chromium.org/2035923002
2016-06-03 15:47:23 +00:00
} else if (stateName.equals(kSoftkeyStateName)) {
if (!stateValue.equals(kSoftkeyHint)) {
fCommands.onSoftkey(stateValue);
Add viewer GUI options for desktop and Android to toggle instanced rendering. BUG=skia: Change-Id: I42674abfb7ee764f676100ac0e84cc0f07620bec Reviewed-on: https://skia-review.googlesource.com/9396 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
2017-03-07 20:16:34 +00:00
this->updateUIState(); // This is still needed to reset the value to kSoftkeyHint
Add Softkey UIState to Viewer We can use this to simulate any key/command on Android UI. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2035923002 Review-Url: https://codereview.chromium.org/2035923002
2016-06-03 15:47:23 +00:00
}
More accurate render time and continuous fresh BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2129613002 Review-Url: https://codereview.chromium.org/2129613002
2016-07-06 21:11:32 +00:00
} else if (stateName.equals(kRefreshStateName)) {
// This state is actually NOT in the UI state.
// We use this to allow Android to quickly set bool fRefresh.
fRefresh = stateValue.equals(kON);
Now we can use drawer to view the state information of the native app, and set its state using the spinner. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2004633002 Committed: https://skia.googlesource.com/skia/+/4e4e30823fba0047b93a56bfcf05c04ca57e82ec Review-Url: https://codereview.chromium.org/2004633002
2016-05-27 15:52:52 +00:00
} else {
SkDebugf("Unknown stateName: %s", stateName.c_str());
}
}
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
bool Viewer::onKey(sk_app::Window::Key key, sk_app::Window::InputState state, uint32_t modifiers) {
Move ImGui support code to ImGuiLayer Viewer still has plenty of code that uses ImGui to create application specific UI, but the structural code that forwards input to ImGui, and converts per-frame ImGui rendering data to Skia draw commands is now in a single component that can be reused in any sk_app-based application. Bug: skia: Change-Id: Ic14ece659d4af8ee13b69c638bdaf7df6c24f5c0 Reviewed-on: https://skia-review.googlesource.com/82627 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-12-08 21:46:09 +00:00
return fCommands.onKey(key, state, modifiers);
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
}
bool Viewer::onChar(SkUnichar c, uint32_t modifiers) {
Move ImGui support code to ImGuiLayer Viewer still has plenty of code that uses ImGui to create application specific UI, but the structural code that forwards input to ImGui, and converts per-frame ImGui rendering data to Skia draw commands is now in a single component that can be reused in any sk_app-based application. Bug: skia: Change-Id: Ic14ece659d4af8ee13b69c638bdaf7df6c24f5c0 Reviewed-on: https://skia-review.googlesource.com/82627 Commit-Queue: Brian Osman <brianosman@google.com> Reviewed-by: Jim Van Verth <jvanverth@google.com>
2017-12-08 21:46:09 +00:00
if (fSlides[fCurrentSlide]->onChar(c)) {
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
fWindow->inval();
return true;
Create a Window::Layer interface to reduce sk_app glue code This also makes it possible to manage other parts of viewer, etc (like the stats screen, command set, even samples) as additional layers in the stack. For now, it just removes a lot of boilerplate. Bug: skia: Change-Id: Ic2f80690fc76c683b3736287dc2b738c50d38614 Reviewed-on: https://skia-review.googlesource.com/82688 Reviewed-by: Jim Van Verth <jvanverth@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-12-08 21:45:43 +00:00
} else {
return fCommands.onChar(c, modifiers);
Add more SampleApp support to viewer. Fixes loading a Sample as first slide. Adds char input. Adds --slide and --list options. Change-Id: I34b66818e3673fcfdc649443e7d9dfb74b478062 Reviewed-on: https://skia-review.googlesource.com/8445 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Jim Van Verth <jvanverth@google.com>
2017-02-14 20:16:46 +00:00
}
Integrate the ImGui library with viewer Code and docs are at: https://github.com/ocornut/imgui ImGui is an open source immediate mode GUI library that's lightweight and fairly simply to integrate. Widget functions return their state, and the library emits vertex and index data to render everything. It's got a huge set of built-in widgets and really robust layout control. For the initial integration, I had to fix up event handling in the viewer's app framework (to get mouse wheel and more keys, etc...). The new viewer 'Debug' window is toggled with the space bar. For this change, I've added one feature to that window: the slide picker. It's got a list of all slides, with filtering support, and the ability to click to switch slides. I also included the ImGui 'Demo' window (toggled with 'g'). This is nicely laid out, and includes examples of pretty much everything the library can do. It also serves as good documentation - find something that looks like what you want, and then go look at the corresponding code (all of it is in imgui_demo.cpp). I have other CLs with other features (like directly editing the primaries of the working color space), but I wanted to land this chunk first, then start adding more features. Other than adding new debugging features, there are few more outstanding work items: 1) Raster doesn't render the GUI correctly, due to non- invertible pos -> UV matrices. Florin is working on that. 2) Touch inputs aren't being routed yet, so the GUI isn't usable on Android yet. Might also be tough to work with, given the size. 3) ImGui has clipboard integration (that's why it wants the C, X, and V keys), but we need to wire it up to the OS' clipboard functions. 4) Draw commands can carry a void* payload to support drawing images (using whatever mechanism the engine has). I'd like to set that up (probably using SkImage*), which makes it really easy to add visualization of off-screen images in GMs, etc... BUG=skia: Change-Id: Iac2a63e37228d33141cb55b7e4d60bf11b7e9ae1 Reviewed-on: https://skia-review.googlesource.com/7702 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2017-02-10 18:36:16 +00:00
}
Reference in New Issue Copy Permalink