mirror of
https://github.com/thorvg/thorvg.git
synced 2025-07-25 07:39:02 +00:00
common: styling++ (tabs -> spaces)
This commit is contained in:
parent
cf5ce5d00c
commit
cc173c1fb2
5 changed files with 34 additions and 34 deletions
|
@ -147,8 +147,8 @@ bool GlRenderer::renderShape(RenderData data)
|
||||||
const Fill* gradient = sdata->shape->fill();
|
const Fill* gradient = sdata->shape->fill();
|
||||||
if (gradient != nullptr)
|
if (gradient != nullptr)
|
||||||
{
|
{
|
||||||
drawPrimitive(*sdata, gradient, i, RenderUpdateFlag::Gradient);
|
drawPrimitive(*sdata, gradient, i, RenderUpdateFlag::Gradient);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(flags & (RenderUpdateFlag::Color | RenderUpdateFlag::Transform))
|
if(flags & (RenderUpdateFlag::Color | RenderUpdateFlag::Transform))
|
||||||
|
|
|
@ -26,13 +26,13 @@
|
||||||
#define TVG_COMPOSE_SHADER(shader) #shader
|
#define TVG_COMPOSE_SHADER(shader) #shader
|
||||||
|
|
||||||
const char* COLOR_VERT_SHADER = TVG_COMPOSE_SHADER(
|
const char* COLOR_VERT_SHADER = TVG_COMPOSE_SHADER(
|
||||||
attribute mediump vec4 aLocation; \n
|
attribute mediump vec4 aLocation; \n
|
||||||
uniform highp mat4 uTransform; \n
|
uniform highp mat4 uTransform; \n
|
||||||
varying highp float vOpacity; \n
|
varying highp float vOpacity; \n
|
||||||
void main() \n
|
void main() \n
|
||||||
{ \n
|
{ \n
|
||||||
gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0); \n
|
gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0); \n
|
||||||
vOpacity = aLocation.z; \n
|
vOpacity = aLocation.z; \n
|
||||||
});
|
});
|
||||||
|
|
||||||
const char* COLOR_FRAG_SHADER = TVG_COMPOSE_SHADER(
|
const char* COLOR_FRAG_SHADER = TVG_COMPOSE_SHADER(
|
||||||
|
@ -47,11 +47,11 @@ const char* GRADIENT_VERT_SHADER = TVG_COMPOSE_SHADER(
|
||||||
attribute highp vec4 aLocation; \n
|
attribute highp vec4 aLocation; \n
|
||||||
varying highp float vOpacity; \n
|
varying highp float vOpacity; \n
|
||||||
varying highp vec2 vPos; \n
|
varying highp vec2 vPos; \n
|
||||||
uniform highp mat4 uTransform; \n
|
uniform highp mat4 uTransform; \n
|
||||||
\n
|
\n
|
||||||
void main() \n
|
void main() \n
|
||||||
{ \n
|
{ \n
|
||||||
gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0); \n
|
gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0); \n
|
||||||
vOpacity = aLocation.z; \n
|
vOpacity = aLocation.z; \n
|
||||||
vPos = vec2((aLocation.x + 1.0) / 2.0, ((-1.0 * aLocation.y) +1.0) / 2.0); \n
|
vPos = vec2((aLocation.x + 1.0) / 2.0, ((-1.0 * aLocation.y) +1.0) / 2.0); \n
|
||||||
});
|
});
|
||||||
|
@ -62,7 +62,7 @@ precision highp float;
|
||||||
const int MAX_STOP_COUNT = 4; \n
|
const int MAX_STOP_COUNT = 4; \n
|
||||||
uniform highp vec2 uSize; \n
|
uniform highp vec2 uSize; \n
|
||||||
uniform highp vec2 uCanvasSize; \n
|
uniform highp vec2 uCanvasSize; \n
|
||||||
uniform float nStops; \n
|
uniform float nStops; \n
|
||||||
uniform float noise_level; \n
|
uniform float noise_level; \n
|
||||||
uniform float stopPoints[MAX_STOP_COUNT]; \n
|
uniform float stopPoints[MAX_STOP_COUNT]; \n
|
||||||
uniform vec4 stopColors[MAX_STOP_COUNT]; \n
|
uniform vec4 stopColors[MAX_STOP_COUNT]; \n
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
|
|
||||||
static inline uint8x8_t ALPHA_BLEND(uint8x8_t c, uint8x8_t a)
|
static inline uint8x8_t ALPHA_BLEND(uint8x8_t c, uint8x8_t a)
|
||||||
{
|
{
|
||||||
uint16x8_t t = vmull_u8(c, a);
|
uint16x8_t t = vmull_u8(c, a);
|
||||||
return vshrn_n_u16(t, 8);
|
return vshrn_n_u16(t, 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ source_file = [
|
||||||
jpg_dep = dependency('libturbojpeg', required: false)
|
jpg_dep = dependency('libturbojpeg', required: false)
|
||||||
|
|
||||||
if not jpg_dep.found()
|
if not jpg_dep.found()
|
||||||
jpg_dep = cc.find_library('turbojpeg', required: false)
|
jpg_dep = cc.find_library('turbojpeg', required: false)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if jpg_dep.found()
|
if jpg_dep.found()
|
||||||
|
|
|
@ -28,38 +28,38 @@ if host_machine.system() != 'windows'
|
||||||
endif
|
endif
|
||||||
|
|
||||||
thorvg_lib = library(
|
thorvg_lib = library(
|
||||||
'thorvg',
|
'thorvg',
|
||||||
include_directories : headers,
|
include_directories : headers,
|
||||||
version : meson.project_version(),
|
version : meson.project_version(),
|
||||||
dependencies : thorvg_lib_dep,
|
dependencies : thorvg_lib_dep,
|
||||||
install : true,
|
install : true,
|
||||||
cpp_args : compiler_flags,
|
cpp_args : compiler_flags,
|
||||||
gnu_symbol_visibility : 'hidden',
|
gnu_symbol_visibility : 'hidden',
|
||||||
)
|
)
|
||||||
|
|
||||||
thorvg_dep = declare_dependency(
|
thorvg_dep = declare_dependency(
|
||||||
include_directories: headers,
|
include_directories: headers,
|
||||||
link_with : thorvg_lib
|
link_with : thorvg_lib
|
||||||
)
|
)
|
||||||
|
|
||||||
if (cc.get_id() == 'emscripten')
|
if (cc.get_id() == 'emscripten')
|
||||||
subdir('wasm')
|
subdir('wasm')
|
||||||
|
|
||||||
executable('thorvg-wasm',
|
executable('thorvg-wasm',
|
||||||
[],
|
[],
|
||||||
include_directories : headers,
|
include_directories : headers,
|
||||||
dependencies : [thorvg_lib_dep, thorvg_wasm_dep],
|
dependencies : [thorvg_lib_dep, thorvg_wasm_dep],
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
pkg_mod = import('pkgconfig')
|
pkg_mod = import('pkgconfig')
|
||||||
|
|
||||||
pkg_mod.generate(
|
pkg_mod.generate(
|
||||||
libraries : thorvg_lib,
|
libraries : thorvg_lib,
|
||||||
version : meson.project_version(),
|
version : meson.project_version(),
|
||||||
name : 'libthorvg',
|
name : 'libthorvg',
|
||||||
filebase : 'thorvg',
|
filebase : 'thorvg',
|
||||||
description : 'A Thor library for rendering vector graphics'
|
description : 'A Thor library for rendering vector graphics'
|
||||||
)
|
)
|
||||||
|
|
||||||
subdir('bin')
|
subdir('bin')
|
||||||
|
|
Loading…
Add table
Reference in a new issue