diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-05-02 10:52:06 +0200 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-05 17:32:09 +0000 |
commit | d6dbf95535f02097c1ccfffabdfddc3c85adfde4 (patch) | |
tree | 41fbf86fba1ac18e6b784128c5abe9c79ad2516a /src/plugins | |
parent | 93afc6faef4299ebca4cb12b0cc359ce57db4185 (diff) |
GLTFIO: use QLatin1String instead of QStringLiteral
... for looking up via QJsonObject::value().
Saves ~4.5KiB in text size and costs 1KiB in data size
on optimized GCC 6.0 Linux AMD64 builds.
Change-Id: I52649e04d2a58adc88972bafdfdd1be54eb2e505
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/sceneparsers/gltf/gltfio.cpp | 142 |
1 files changed, 69 insertions, 73 deletions
diff --git a/src/plugins/sceneparsers/gltf/gltfio.cpp b/src/plugins/sceneparsers/gltf/gltfio.cpp index 4c41bfd50..c4e82bde3 100644 --- a/src/plugins/sceneparsers/gltf/gltfio.cpp +++ b/src/plugins/sceneparsers/gltf/gltfio.cpp @@ -89,79 +89,75 @@ namespace Qt3DRender { Q_LOGGING_CATEGORY(GLTFIOLog, "Qt3D.GLTFIO") -namespace { - -const QString KEY_CAMERA = QStringLiteral("camera"); -const QString KEY_CAMERAS = QStringLiteral("cameras"); -const QString KEY_SCENES = QStringLiteral("scenes"); -const QString KEY_NODES = QStringLiteral("nodes"); -const QString KEY_MESHES = QStringLiteral("meshes"); -const QString KEY_CHILDREN = QStringLiteral("children"); -const QString KEY_MATRIX = QStringLiteral("matrix"); -const QString KEY_ROTATION = QStringLiteral("rotation"); -const QString KEY_SCALE = QStringLiteral("scale"); -const QString KEY_TRANSLATION = QStringLiteral("translation"); -const QString KEY_TYPE = QStringLiteral("type"); -const QString KEY_PERSPECTIVE = QStringLiteral("perspective"); -const QString KEY_NAME = QStringLiteral("name"); -const QString KEY_COUNT = QStringLiteral("count"); -const QString KEY_YFOV = QStringLiteral("yfov"); -const QString KEY_ZNEAR = QStringLiteral("znear"); -const QString KEY_ZFAR = QStringLiteral("zfar"); -const QString KEY_MATERIALS = QStringLiteral("materials"); -const QString KEY_EXTENSIONS = QStringLiteral("extensions"); -const QString KEY_COMMON_MAT = QStringLiteral("KHR_materials_common"); -const QString KEY_TECHNIQUE = QStringLiteral("technique"); -const QString KEY_VALUES = QStringLiteral("values"); -const QString KEY_BUFFERS = QStringLiteral("buffers"); -const QString KEY_SHADERS = QStringLiteral("shaders"); -const QString KEY_PROGRAMS = QStringLiteral("programs"); -const QString KEY_PROGRAM = QStringLiteral("program"); -const QString KEY_TECHNIQUES = QStringLiteral("techniques"); -const QString KEY_ACCESSORS = QStringLiteral("accessors"); -const QString KEY_IMAGES = QStringLiteral("images"); -const QString KEY_TEXTURES = QStringLiteral("textures"); -const QString KEY_SCENE = QStringLiteral("scene"); -const QString KEY_BUFFER = QStringLiteral("buffer"); -const QString KEY_TARGET = QStringLiteral("target"); -const QString KEY_BYTE_OFFSET = QStringLiteral("byteOffset"); -const QString KEY_BYTE_LENGTH = QStringLiteral("byteLength"); -const QString KEY_BYTE_STRIDE = QStringLiteral("byteStride"); -const QString KEY_PRIMITIVES = QStringLiteral("primitives"); -const QString KEY_MODE = QStringLiteral("mode"); -const QString KEY_MATERIAL = QStringLiteral("material"); -const QString KEY_ATTRIBUTES = QStringLiteral("attributes"); -const QString KEY_INDICES = QStringLiteral("indices"); -const QString KEY_URI = QStringLiteral("uri"); -const QString KEY_FORMAT = QStringLiteral("format"); -const QString KEY_PASSES = QStringLiteral("passes"); -const QString KEY_SOURCE = QStringLiteral("source"); -const QString KEY_SAMPLER = QStringLiteral("sampler"); -const QString KEY_SAMPLERS = QStringLiteral("samplers"); -const QString KEY_SEMANTIC = QStringLiteral("semantic"); -const QString KEY_STATES = QStringLiteral("states"); -const QString KEY_UNIFORMS = QStringLiteral("uniforms"); -const QString KEY_PARAMETERS = QStringLiteral("parameters"); -const QString KEY_WRAP_S = QStringLiteral("wrapS"); -const QString KEY_MIN_FILTER = QStringLiteral("minFilter"); -const QString KEY_MAG_FILTER = QStringLiteral("magFilter"); - -const QString KEY_INSTANCE_TECHNIQUE = QStringLiteral("instanceTechnique"); -const QString KEY_INSTANCE_PROGRAM = QStringLiteral("instanceProgram"); -const QString KEY_BUFFER_VIEWS = QStringLiteral("bufferViews"); -const QString KEY_BUFFER_VIEW = QStringLiteral("bufferView"); -const QString KEY_VERTEX_SHADER = QStringLiteral("vertexShader"); -const QString KEY_FRAGMENT_SHADER = QStringLiteral("fragmentShader"); -const QString KEY_INTERNAL_FORMAT = QStringLiteral("internalFormat"); -const QString KEY_COMPONENT_TYPE = QStringLiteral("componentType"); -const QString KEY_ASPECT_RATIO = QStringLiteral("aspect_ratio"); -const QString KEY_VALUE = QStringLiteral("value"); -const QString KEY_ENABLE = QStringLiteral("enable"); -const QString KEY_FUNCTIONS = QStringLiteral("functions"); -const QString KEY_TECHNIQUE_CORE = QStringLiteral("techniqueCore"); -const QString KEY_TECHNIQUE_GL2 = QStringLiteral("techniqueGL2"); - -} // of anonymous namespace +static const auto KEY_CAMERA = QLatin1String("camera"); +static const auto KEY_CAMERAS = QLatin1String("cameras"); +static const auto KEY_SCENES = QLatin1String("scenes"); +static const auto KEY_NODES = QLatin1String("nodes"); +static const auto KEY_MESHES = QLatin1String("meshes"); +static const auto KEY_CHILDREN = QLatin1String("children"); +static const auto KEY_MATRIX = QLatin1String("matrix"); +static const auto KEY_ROTATION = QLatin1String("rotation"); +static const auto KEY_SCALE = QLatin1String("scale"); +static const auto KEY_TRANSLATION = QLatin1String("translation"); +static const auto KEY_TYPE = QLatin1String("type"); +static const auto KEY_PERSPECTIVE = QLatin1String("perspective"); +static const auto KEY_NAME = QLatin1String("name"); +static const auto KEY_COUNT = QLatin1String("count"); +static const auto KEY_YFOV = QLatin1String("yfov"); +static const auto KEY_ZNEAR = QLatin1String("znear"); +static const auto KEY_ZFAR = QLatin1String("zfar"); +static const auto KEY_MATERIALS = QLatin1String("materials"); +static const auto KEY_EXTENSIONS = QLatin1String("extensions"); +static const auto KEY_COMMON_MAT = QLatin1String("KHR_materials_common"); +static const auto KEY_TECHNIQUE = QLatin1String("technique"); +static const auto KEY_VALUES = QLatin1String("values"); +static const auto KEY_BUFFERS = QLatin1String("buffers"); +static const auto KEY_SHADERS = QLatin1String("shaders"); +static const auto KEY_PROGRAMS = QLatin1String("programs"); +static const auto KEY_PROGRAM = QLatin1String("program"); +static const auto KEY_TECHNIQUES = QLatin1String("techniques"); +static const auto KEY_ACCESSORS = QLatin1String("accessors"); +static const auto KEY_IMAGES = QLatin1String("images"); +static const auto KEY_TEXTURES = QLatin1String("textures"); +static const auto KEY_SCENE = QLatin1String("scene"); +static const auto KEY_BUFFER = QLatin1String("buffer"); +static const auto KEY_TARGET = QLatin1String("target"); +static const auto KEY_BYTE_OFFSET = QLatin1String("byteOffset"); +static const auto KEY_BYTE_LENGTH = QLatin1String("byteLength"); +static const auto KEY_BYTE_STRIDE = QLatin1String("byteStride"); +static const auto KEY_PRIMITIVES = QLatin1String("primitives"); +static const auto KEY_MODE = QLatin1String("mode"); +static const auto KEY_MATERIAL = QLatin1String("material"); +static const auto KEY_ATTRIBUTES = QLatin1String("attributes"); +static const auto KEY_INDICES = QLatin1String("indices"); +static const auto KEY_URI = QLatin1String("uri"); +static const auto KEY_FORMAT = QLatin1String("format"); +static const auto KEY_PASSES = QLatin1String("passes"); +static const auto KEY_SOURCE = QLatin1String("source"); +static const auto KEY_SAMPLER = QLatin1String("sampler"); +static const auto KEY_SAMPLERS = QLatin1String("samplers"); +static const auto KEY_SEMANTIC = QLatin1String("semantic"); +static const auto KEY_STATES = QLatin1String("states"); +static const auto KEY_UNIFORMS = QLatin1String("uniforms"); +static const auto KEY_PARAMETERS = QLatin1String("parameters"); +static const auto KEY_WRAP_S = QLatin1String("wrapS"); +static const auto KEY_MIN_FILTER = QLatin1String("minFilter"); +static const auto KEY_MAG_FILTER = QLatin1String("magFilter"); + +static const auto KEY_INSTANCE_TECHNIQUE = QLatin1String("instanceTechnique"); +static const auto KEY_INSTANCE_PROGRAM = QLatin1String("instanceProgram"); +static const auto KEY_BUFFER_VIEWS = QLatin1String("bufferViews"); +static const auto KEY_BUFFER_VIEW = QLatin1String("bufferView"); +static const auto KEY_VERTEX_SHADER = QLatin1String("vertexShader"); +static const auto KEY_FRAGMENT_SHADER = QLatin1String("fragmentShader"); +static const auto KEY_INTERNAL_FORMAT = QLatin1String("internalFormat"); +static const auto KEY_COMPONENT_TYPE = QLatin1String("componentType"); +static const auto KEY_ASPECT_RATIO = QLatin1String("aspect_ratio"); +static const auto KEY_VALUE = QLatin1String("value"); +static const auto KEY_ENABLE = QLatin1String("enable"); +static const auto KEY_FUNCTIONS = QLatin1String("functions"); +static const auto KEY_TECHNIQUE_CORE = QLatin1String("techniqueCore"); +static const auto KEY_TECHNIQUE_GL2 = QLatin1String("techniqueGL2"); GLTFIO::GLTFIO() : QSceneIOHandler(), m_parseDone(false) |