projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.9.3] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
wireframe
/
wireframe-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
b/dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
index
3319e92
..
1202d1c
100644
(file)
--- a/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
+++ b/
dali-toolkit/internal/visuals/wireframe/wireframe-visual.cpp
@@
-42,7
+42,7
@@
const char * const INDEX_NAME("indices");
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
-uniform
mediump
mat4 uMvpMatrix;\n
+uniform
highp
mat4 uMvpMatrix;\n
uniform mediump vec3 uSize;\n
\n
uniform mediump vec3 uSize;\n
\n
@@
-69,11
+69,10
@@
void main()\n
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(\n
uniform lowp vec4 uColor;\n
uniform lowp vec3 mixColor;\n
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(\n
uniform lowp vec4 uColor;\n
uniform lowp vec3 mixColor;\n
- uniform lowp float opacity;\n
\n
void main()\n
{\n
\n
void main()\n
{\n
- gl_FragColor = uColor * vec4( mixColor,
opacity
);\n
+ gl_FragColor = uColor * vec4( mixColor,
1.0
);\n
}\n
);
}\n
);
@@
-241,6
+240,16
@@
void WireframeVisual::OnSetTransform()
}
}
}
}
+Visual::Base& WireframeVisual::GetVisualObject()
+{
+ if( mActualVisual )
+ {
+ return *mActualVisual.Get();
+ }
+
+ return *this;
+}
+
} // namespace Internal
} // namespace Toolkit
} // namespace Internal
} // namespace Toolkit